From c4a600ec7d3060147f47b60c72a0d9a0f3b29f0e Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Mon, 1 May 2023 15:42:24 +0200
Subject: [PATCH] Add javax.inject/annotation provided by Jakarta from
 Maven-Central

Use the javax namespace bundles provided by Jakarta.

Part of https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1056
---
 .../eclipse-sdk-prereqs.target                | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target b/eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
index f8ff33bb1b6..da47612fe23 100644
--- 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>