Add javax.inject/annotation provided by Jakarta from Maven-Central

Use the javax namespace bundles provided by Jakarta. Part of #1056
eclipse-platform · May 8, 2023 · 1f5b08f · 1f5b08f
1 parent cf435f2
commit 1f5b08f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
@@ -156,6 +156,18 @@
 				  <version>1.5</version>
 				  <type>jar</type>
 			  </dependency>
+			  <dependency>
+				  <groupId>jakarta.annotation</groupId>
+				  <artifactId>jakarta.annotation-api</artifactId>
+				  <version>1.3.5</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>jakarta.inject</groupId>
+				  <artifactId>jakarta.inject-api</artifactId>
+				  <version>1.0.5</version>
+				  <type>jar</type>
+			  </dependency>
 			  <dependency>
 				  <groupId>net.java.dev.jna</groupId>
 				  <artifactId>jna-platform</artifactId>
@@ -246,12 +258,6 @@
 	  </location>
 	  <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Jetty and servlet API" missingManifest="error" type="Maven">
 		  <dependencies>
-			  <dependency>
-				  <groupId>jakarta.inject</groupId>
-				  <artifactId>jakarta.inject-api</artifactId>
-				  <version>1.0.5</version>
-				  <type>jar</type>
-			  </dependency>
 			  <dependency>
 				  <groupId>jakarta.servlet</groupId>
 				  <artifactId>jakarta.servlet-api</artifactId>
@@ -399,7 +405,7 @@
 	  </location>
 	  <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="OSGi" missingManifest="error" type="Maven">
 		  <dependencies>
-  			  <dependency>
+			  <dependency>
 				  <groupId>org.osgi</groupId>
 				  <artifactId>org.osgi.annotation.versioning</artifactId>
 				  <version>1.1.2</version>

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/category.xml
@@ -46,4 +46,7 @@
    <!-- Will be removed soon, once integrated in an appropriate feature -->
    <bundle id="org.eclipse.unittest.ui"/>
    <bundle id="org.eclipse.unittest.ui.source"/>
+   <!-- Will be removed as soon as it is pulled in transitivly, when javax-bundles are removed. -->
+   <bundle id="jakarta.inject.jakarta.inject-api"/>
+   <bundle id="jakarta.annotation-api"/>
 </site>