Migrate to javax.inject/annotation provided by Jakarta from Maven-Ctrl.

Part of eclipse-platform/eclipse.platform.releng.aggregator#1056
eclipse-platform · May 9, 2023 · 1f6826c · 1f6826c
1 parent 28e70d3
commit 1f6826c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/bundles/org.eclipse.jdt.doc.isv/pom.xml b/bundles/org.eclipse.jdt.doc.isv/pom.xml
@@ -171,7 +171,7 @@
                       <type>eclipse-plugin</type>
                     </dependency>
                     <dependency>
-                      <artifactId>javax.annotation</artifactId>
+                      <artifactId>jakarta.annotation-api</artifactId>
                       <type>eclipse-plugin</type>
                     </dependency>
                     <dependency>

diff --git a/bundles/org.eclipse.pde.doc.user/pom.xml b/bundles/org.eclipse.pde.doc.user/pom.xml
@@ -131,7 +131,7 @@
                       <type>eclipse-plugin</type>
                     </dependency>
                     <dependency>
-                      <artifactId>javax.annotation</artifactId>
+                      <artifactId>jakarta.annotation-api</artifactId>
                       <type>eclipse-plugin</type>
                     </dependency>
                     <dependency>

diff --git a/bundles/org.eclipse.platform.doc.isv/platformOptions.txt b/bundles/org.eclipse.platform.doc.isv/platformOptions.txt
@@ -135,9 +135,9 @@
 -classpath @rt@
 ;${dependency.dir}/icu4j_*.jar
 ;${dependency.dir}/com.jcraft.jsch_*.jar
-;${dependency.dir}/javax.annotation_*.jar
+;${dependency.dir}/jakarta.annotation-api_*.jar
 ;${dependency.dir}/javax.el-api_*.jar
-;${dependency.dir}/javax.inject_*.jar
+;${dependency.dir}/jakarta.inject-api_*.jar
 ;${dependency.dir}/javax.servlet.jsp-api_*.jar
 ;${dependency.dir}/jakarta.servlet-api_*.jar
 ;${dependency.dir}/org.apache.ant_*/lib/ant.jar

diff --git a/bundles/org.eclipse.platform.doc.isv/pom.xml b/bundles/org.eclipse.platform.doc.isv/pom.xml
@@ -78,7 +78,7 @@
                   </requirement>
                   <requirement>
                     <type>eclipse-plugin</type>
-                    <id>javax.annotation</id>
+                    <id>jakarta.annotation-api</id>
                     <versionRange>0.0.0</versionRange>
                   </requirement>
                   <requirement>
@@ -88,7 +88,7 @@
                   </requirement>
                   <requirement>
                     <type>eclipse-plugin</type>
-                    <id>javax.inject</id>
+                    <id>jakarta.inject.jakarta.inject-api</id>
                     <versionRange>0.0.0</versionRange>
                   </requirement>
                   <requirement>
@@ -323,7 +323,7 @@
                       <type>eclipse-plugin</type>
                     </dependency>
                     <dependency>
-                      <artifactId>javax.annotation</artifactId>
+                      <artifactId>jakarta.annotation-api</artifactId>
                       <type>eclipse-plugin</type>
                     </dependency>
                     <dependency>