Begin migration to Jakarta Annotations (#320)

jenkinsci · Jan 5, 2022 · 229a24f · 229a24f
1 parent 109da85
commit 229a24f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -49,10 +49,19 @@
       <artifactId>commons-io</artifactId>
       <version>2.11.0</version>
     </dependency>
+    <!--
+      For compatibility only. TODO once plugins have migrated to Jakarta Annotations,
+      this dependency can be dropped.
+    -->
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+      <version>1.3.2</version>
+    </dependency>
     <dependency>
       <groupId>jakarta.annotation</groupId>
       <artifactId>jakarta.annotation-api</artifactId>
-      <version>1.3.5</version>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

diff --git a/core/src/main/java/org/kohsuke/stapler/DataBoundSetter.java b/core/src/main/java/org/kohsuke/stapler/DataBoundSetter.java
@@ -1,8 +1,8 @@
 package org.kohsuke.stapler;
 
+import jakarta.annotation.PostConstruct;
 import net.sf.json.JSONObject;
 
-import javax.annotation.PostConstruct;
 import java.beans.Introspector;
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

diff --git a/core/src/main/java/org/kohsuke/stapler/MetaClass.java b/core/src/main/java/org/kohsuke/stapler/MetaClass.java
@@ -24,14 +24,14 @@
 package org.kohsuke.stapler;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import jakarta.annotation.PostConstruct;
 import net.sf.json.JSONArray;
 import org.apache.commons.io.IOUtils;
 import org.kohsuke.stapler.bind.JavaScriptMethod;
 import org.kohsuke.stapler.lang.FieldRef;
 import org.kohsuke.stapler.lang.Klass;
 import org.kohsuke.stapler.lang.MethodRef;
 
-import javax.annotation.PostConstruct;
 import javax.servlet.ServletException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -601,7 +601,7 @@ public SingleLinkedList<MethodRef> getPostConstructMethods() {
             SingleLinkedList<MethodRef> l = baseClass==null ? SingleLinkedList.empty() : baseClass.getPostConstructMethods();
 
             for (MethodRef mr : klass.getDeclaredMethods()) {
-                if (mr.hasAnnotation(PostConstruct.class)) {
+                if (mr.hasAnnotation(PostConstruct.class) || mr.hasAnnotation(javax.annotation.PostConstruct.class)) {
                     l = l.grow(mr);
                 }
             }

diff --git a/core/src/test/java/org/kohsuke/stapler/DataBindingTest.java b/core/src/test/java/org/kohsuke/stapler/DataBindingTest.java
@@ -1,10 +1,10 @@
 package org.kohsuke.stapler;
 
+import jakarta.annotation.PostConstruct;
 import junit.framework.TestCase;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
-import javax.annotation.PostConstruct;
 import java.lang.reflect.Type;
 import java.net.Proxy;
 import java.util.ArrayList;