This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-components.git
The following commit(s) were added to refs/heads/master by this push:
new 267c37a Moving to jakarta libraries
267c37a is described below
commit 267c37a231960b7df9dec97f8173537a109ddf13
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sat Jul 4 16:58:45 2020 +0200
Moving to jakarta libraries
---
pom.xml | 17 +++++++++++------
spring-apacheds/pom.xml | 4 ++--
spring-cache/spring-cache-api/pom.xml | 8 ++++----
.../spring-cache-providers/spring-cache-ehcache/pom.xml | 8 ++++----
.../spring-cache-providers/spring-cache-hashmap/pom.xml | 8 ++++----
spring-cache/spring-cache-test/pom.xml | 4 ++++
spring-quartz/pom.xml | 8 ++++----
spring-registry/pom.xml | 5 -----
spring-registry/spring-registry-commons/pom.xml | 8 ++++----
spring-taskqueue/pom.xml | 8 ++++----
10 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index 972468c..eb54458 100644
--- a/pom.xml
+++ b/pom.xml
@@ -174,16 +174,21 @@
<artifactId>spring-test</artifactId>
<version>${spring.version}</version>
</dependency>
+
+
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${jakarta.inject.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>${javax.annotation.version}</version>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation.version}</version>
+ <scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
diff --git a/spring-apacheds/pom.xml b/spring-apacheds/pom.xml
index 4e01b63..a37c88d 100644
--- a/spring-apacheds/pom.xml
+++ b/spring-apacheds/pom.xml
@@ -85,8 +85,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/spring-cache/spring-cache-api/pom.xml
b/spring-cache/spring-cache-api/pom.xml
index fe8a9aa..5b90938 100644
--- a/spring-cache/spring-cache-api/pom.xml
+++ b/spring-cache/spring-cache-api/pom.xml
@@ -49,12 +49,12 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
b/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
index 6733e69..5c70875 100644
--- a/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
+++ b/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
@@ -55,12 +55,12 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
b/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
index 9faaf25..11ce26d 100644
--- a/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
+++ b/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
@@ -45,12 +45,12 @@
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
diff --git a/spring-cache/spring-cache-test/pom.xml
b/spring-cache/spring-cache-test/pom.xml
index 0d83c98..b5c293c 100644
--- a/spring-cache/spring-cache-test/pom.xml
+++ b/spring-cache/spring-cache-test/pom.xml
@@ -47,6 +47,10 @@
<artifactId>spring-test</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
<!-- JUNIT 5 -->
<dependency>
diff --git a/spring-quartz/pom.xml b/spring-quartz/pom.xml
index ad4d11f..6e25fec 100644
--- a/spring-quartz/pom.xml
+++ b/spring-quartz/pom.xml
@@ -41,12 +41,12 @@
<dependencies>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/spring-registry/pom.xml b/spring-registry/pom.xml
index c468db5..04b2cf3 100644
--- a/spring-registry/pom.xml
+++ b/spring-registry/pom.xml
@@ -76,11 +76,6 @@
<version>${commons.beanutils.version}</version>
</dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- <version>${javax.annotation.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
diff --git a/spring-registry/spring-registry-commons/pom.xml
b/spring-registry/spring-registry-commons/pom.xml
index 49c0f40..86b56fa 100644
--- a/spring-registry/spring-registry-commons/pom.xml
+++ b/spring-registry/spring-registry-commons/pom.xml
@@ -59,8 +59,8 @@
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
@@ -85,8 +85,8 @@
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
diff --git a/spring-taskqueue/pom.xml b/spring-taskqueue/pom.xml
index 49a9c46..5a6463c 100644
--- a/spring-taskqueue/pom.xml
+++ b/spring-taskqueue/pom.xml
@@ -46,12 +46,12 @@
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
