From b23049bd27cc9d8c015b2b4a984c4ea5411f556f Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 6 Feb 2020 12:59:55 +0100 Subject: [PATCH] Polishing --- .../beans/factory/annotation/InjectionMetadata.java | 5 +++-- spring-context/spring-context.gradle | 7 +++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java index 107aa580b58..3af5c136939 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/InjectionMetadata.java @@ -1,5 +1,5 @@ /* -4 * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2020 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -152,7 +152,7 @@ public class InjectionMetadata { * Return an {@code InjectionMetadata} instance, possibly for empty elements. * @param elements the elements to inject (possibly empty) * @param clazz the target class - * @return a new {@code InjectionMetadata} instance, + * @return a new {@link #InjectionMetadata(Class, Collection)} instance, * or {@link #EMPTY} in case of no elements * @since 5.2 */ @@ -165,6 +165,7 @@ public class InjectionMetadata { * @param metadata the existing metadata instance * @param clazz the current target class * @return {@code true} indicating a refresh, {@code false} otherwise + * @see #needsRefresh(Class) */ public static boolean needsRefresh(@Nullable InjectionMetadata metadata, Class clazz) { return (metadata == null || metadata.needsRefresh(clazz)); diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle index 4d37abe0786..99e550fa328 100644 --- a/spring-context/spring-context.gradle +++ b/spring-context/spring-context.gradle @@ -15,7 +15,7 @@ dependencies { optional("javax.inject:javax.inject") optional("javax.interceptor:javax.interceptor-api") optional("javax.money:money-api") - // TODO: overriding 2.0.1.Final, because of LocalValidatorFactoryBean + // Overriding 2.0.1.Final due to Bean Validation 1.1 compatibility in LocalValidatorFactoryBean optional("javax.validation:validation-api:1.1.0.Final") optional("javax.xml.ws:jaxws-api") optional("org.aspectj:aspectjweaver") @@ -35,12 +35,11 @@ dependencies { testCompile("org.codehaus.groovy:groovy-xml") testCompile("org.apache.commons:commons-pool2") testCompile("javax.inject:javax.inject-tck") - // Substitute for "javax.management:jmxremote_optional:1.0.1_04" which - // is not available on Maven Central - testRuntime("org.glassfish.external:opendmk_jmxremote_optional_jar") testCompile("org.awaitility:awaitility") testRuntime("javax.xml.bind:jaxb-api") testRuntime("org.glassfish:javax.el") + // Substitute for javax.management:jmxremote_optional:1.0.1_04 (not available on Maven Central) + testRuntime("org.glassfish.external:opendmk_jmxremote_optional_jar") testRuntime("org.javamoney:moneta") testRuntime("org.junit.vintage:junit-vintage-engine") // for @Inject TCK testFixturesApi("org.junit.jupiter:junit-jupiter-api")