Fix links and tests broken during merge

See gh-28083
spring-projects · Mar 1, 2022 · 66e9095 · 66e9095
1 parent 466dd82
commit 66e9095
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 267 deletions.
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/RootBeanDefinition.java
@@ -461,7 +461,7 @@ public Set<Member> getExternallyManagedConfigMembers() {
 	/**
 	 * Register an externally managed configuration initialization method &mdash;
 	 * for example, a method annotated with JSR-250's
-	 * {@link javax.annotation.PostConstruct} annotation.
+	 * {@link jakarta.annotation.PostConstruct} annotation.
 	 * <p>The supplied {@code initMethod} may be the
 	 * {@linkplain Method#getName() simple method name} for non-private methods or the
 	 * {@linkplain org.springframework.util.ClassUtils#getQualifiedMethodName(Method)
@@ -538,7 +538,7 @@ public Set<String> getExternallyManagedInitMethods() {
 	/**
 	 * Register an externally managed configuration destruction method &mdash;
 	 * for example, a method annotated with JSR-250's
-	 * {@link javax.annotation.PreDestroy} annotation.
+	 * {@link jakarta.annotation.PreDestroy} annotation.
 	 * <p>The supplied {@code destroyMethod} may be the
 	 * {@linkplain Method#getName() simple method name} for non-private methods or the
 	 * {@linkplain org.springframework.util.ClassUtils#getQualifiedMethodName(Method)

diff --git a/...src/test/java/org/springframework/context/annotation/InitDestroyMethodLifecycleTests.java b/...src/test/java/org/springframework/context/annotation/InitDestroyMethodLifecycleTests.java
@@ -19,9 +19,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.DisposableBean;
@@ -41,8 +40,8 @@
  * <li>{@link InitializingBean} &amp; {@link DisposableBean} interfaces</li>
  * <li>Custom {@link RootBeanDefinition#getInitMethodName() init} &amp;
  * {@link RootBeanDefinition#getDestroyMethodName() destroy} methods</li>
- * <li>JSR 250's {@link javax.annotation.PostConstruct @PostConstruct} &amp;
- * {@link javax.annotation.PreDestroy @PreDestroy} annotations</li>
+ * <li>JSR 250's {@link jakarta.annotation.PostConstruct @PostConstruct} &amp;
+ * {@link jakarta.annotation.PreDestroy @PreDestroy} annotations</li>
  * </ul>
  *
  * @author Sam Brannen
@@ -173,7 +172,6 @@ public void destroy() throws Exception {
 		}
 	}
 
-
 	static class CustomInitDestroyBean {
 
 		final List<String> initMethods = new ArrayList<>();

diff --git a/...rc/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java b/...rc/test/java/org/springframework/context/annotation/Spr3775InitDestroyLifecycleTests.java