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-redback-core.git
The following commit(s) were added to refs/heads/master by this push:
new ab874fe Moving to jakarta libraries
ab874fe is described below
commit ab874fecc93b97c97775dfbca0a19088aeb71892
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sat Jul 4 16:59:49 2020 +0200
Moving to jakarta libraries
---
pom.xml | 118 ++++++++++-----------
.../redback-authentication-api/pom.xml | 8 +-
.../redback-authentication-ldap/pom.xml | 4 +-
.../redback-authentication-memory/pom.xml | 4 +-
.../redback-authentication-open/pom.xml | 4 +-
.../redback-authentication-users/pom.xml | 16 +--
.../redback-authorization-open/pom.xml | 4 +-
.../redback-authorization-rbac/pom.xml | 16 +--
.../redback-common-configuration-acc2/pom.xml | 8 +-
redback-common/redback-common-jpa/pom.xml | 8 +-
redback-common/redback-common-ldap/pom.xml | 8 +-
redback-configuration/pom.xml | 8 +-
.../redback-common-integrations/pom.xml | 24 ++---
.../redback-rest/redback-rest-api/pom.xml | 8 +-
.../redback-rest/redback-rest-services/pom.xml | 67 ++++++------
redback-keys/redback-authentication-keys/pom.xml | 4 +-
.../redback-keys-cached/pom.xml | 16 +--
.../redback-keys-jpa/pom.xml | 16 +--
.../redback-keys-memory/pom.xml | 4 +-
redback-policy/pom.xml | 8 +-
redback-rbac/redback-rbac-model/pom.xml | 8 +-
.../redback-rbac-cached/pom.xml | 12 +--
.../redback-rbac-jpa/pom.xml | 16 +--
.../redback-rbac-ldap/pom.xml | 16 +--
.../redback-rbac-memory/pom.xml | 12 +--
redback-rbac/redback-rbac-role-manager/pom.xml | 16 +--
redback-system/pom.xml | 12 +--
.../redback-users-cached/pom.xml | 12 +--
.../redback-users-configurable/pom.xml | 8 +-
.../redback-users-jpa/pom.xml | 12 +--
.../redback-users-ldap/pom.xml | 8 +-
.../redback-users-memory/pom.xml | 8 +-
redback-users/redback-users-tests/pom.xml | 4 +-
33 files changed, 248 insertions(+), 249 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1aac0b0..a12e8af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -513,34 +513,8 @@
<artifactId>archiva-components-spring-apacheds</artifactId>
<version>${archiva.comp.version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>1.4</version>
- </dependency>
- -->
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>${javax.jaxrs.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!--
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-xc</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- -->
- <dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
@@ -560,6 +534,12 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -617,19 +597,8 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javax.mail.version}</version>
- <scope>provided</scope>
- </dependency>
+
<!-- JUNIT 5 -->
<dependency>
@@ -681,42 +650,56 @@
<!-- Java EE Dependencies -->
<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>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${javax.jaxb.version}</version>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ <version>${jakarta.inject.version}</version>
<scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>${javax.inject.version}</version>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta.servlet.version}</version>
<scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${javax.servlet.version}</version>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
+ <version>${jakarta.persistence.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
+ <version>${jakarta.transaction.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ <version>${jakarta.ws.rs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
+ <version>${jakarta.mail.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
- <version>${javax.persistence.version}</version>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>jakarta.mail</artifactId>
+ <version>${jakarta.mail.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
- <version>${javax.transaction.version}</version>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta.xml.bind.version}</version>
<scope>provided</scope>
</dependency>
@@ -771,17 +754,26 @@
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>java.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </exclusion>
</exclusions>
+
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/redback-authentication/redback-authentication-api/pom.xml
b/redback-authentication/redback-authentication-api/pom.xml
index d102cd6..cf3629c 100644
--- a/redback-authentication/redback-authentication-api/pom.xml
+++ b/redback-authentication/redback-authentication-api/pom.xml
@@ -43,12 +43,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>
diff --git
a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
index 0bd8031..98995f9 100644
---
a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
+++
b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
@@ -61,8 +61,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
diff --git
a/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
b/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
index f70ab7e..7419adc 100644
---
a/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
+++
b/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
@@ -43,8 +43,8 @@
<artifactId>spring-context</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/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
b/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
index babb0f3..792f79b 100644
---
a/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
+++
b/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
@@ -47,8 +47,8 @@
<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>
diff --git
a/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
index 52021c1..3a513c3 100644
---
a/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
+++
b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
@@ -53,12 +53,12 @@
</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.slf4j</groupId>
@@ -82,13 +82,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
b/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
index a1a38e6..5520b26 100644
---
a/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
+++
b/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
@@ -43,8 +43,8 @@
<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>
diff --git
a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
index bedf397..46c683d 100644
---
a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
+++
b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
@@ -57,12 +57,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>
@@ -93,13 +93,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml
b/redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml
index d998dbb..4c78f5f 100644
---
a/redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml
+++
b/redback-common/redback-common-configuration/redback-common-configuration-acc2/pom.xml
@@ -57,13 +57,13 @@
</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/redback-common/redback-common-jpa/pom.xml
b/redback-common/redback-common-jpa/pom.xml
index 7dbac5f..47a5284 100644
--- a/redback-common/redback-common-jpa/pom.xml
+++ b/redback-common/redback-common-jpa/pom.xml
@@ -75,12 +75,12 @@
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/redback-common/redback-common-ldap/pom.xml
b/redback-common/redback-common-ldap/pom.xml
index 95d383c..b54100e 100644
--- a/redback-common/redback-common-ldap/pom.xml
+++ b/redback-common/redback-common-ldap/pom.xml
@@ -49,12 +49,12 @@
<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.apache.commons</groupId>
diff --git a/redback-configuration/pom.xml b/redback-configuration/pom.xml
index 5c3c040..b8aea40 100644
--- a/redback-configuration/pom.xml
+++ b/redback-configuration/pom.xml
@@ -68,12 +68,12 @@
<scope>test</scope>
</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.apache.commons</groupId>
diff --git a/redback-integrations/redback-common-integrations/pom.xml
b/redback-integrations/redback-common-integrations/pom.xml
index 3b43bc5..b9c58b5 100644
--- a/redback-integrations/redback-common-integrations/pom.xml
+++ b/redback-integrations/redback-common-integrations/pom.xml
@@ -120,8 +120,8 @@
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
@@ -152,8 +152,8 @@
<artifactId>freemarker</artifactId>
</dependency>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
@@ -165,23 +165,23 @@
<artifactId>spring-context-support</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.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope>
</dependency>
diff --git a/redback-integrations/redback-rest/redback-rest-api/pom.xml
b/redback-integrations/redback-rest/redback-rest-api/pom.xml
index 9fc6b2a..806886d 100644
--- a/redback-integrations/redback-rest/redback-rest-api/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-api/pom.xml
@@ -55,8 +55,8 @@
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
</dependency>
<!-- normally not needed but here for wadl feature currently in cxf -->
<!--
@@ -107,8 +107,8 @@
</activation>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.0</version>
<scope>provided</scope>
</dependency>
diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml
b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 61b6e7b..45ac45b 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -100,8 +100,8 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
</dependency>
<dependency>
@@ -124,23 +124,7 @@
<artifactId>redback-rest-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- </dependency>
+
<dependency>
@@ -252,6 +236,12 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -313,19 +303,36 @@
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
- <scope>provided</scope>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <scope>test</scope>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.mail</groupId>
+ <artifactId>jakarta.mail-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.mail</groupId>
+ <artifactId>jakarta.mail</artifactId>
</dependency>
</dependencies>
@@ -403,8 +410,8 @@
</activation>
<dependencies>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
<version>2.3.0</version>
<scope>provided</scope>
</dependency>
diff --git a/redback-keys/redback-authentication-keys/pom.xml
b/redback-keys/redback-authentication-keys/pom.xml
index 3ac0dcf..ce150ae 100644
--- a/redback-keys/redback-authentication-keys/pom.xml
+++ b/redback-keys/redback-authentication-keys/pom.xml
@@ -49,8 +49,8 @@
<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>org.apache.archiva.redback</groupId>
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
index d0ff141..da42b3e 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
@@ -49,12 +49,12 @@
</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>
@@ -96,13 +96,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml
b/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml
index 421ad41..092ca5e 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml
@@ -47,20 +47,20 @@
<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.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-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.apache.commons</groupId>
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
b/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
index 6593651..e2ac14a 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
@@ -43,8 +43,8 @@
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/redback-policy/pom.xml b/redback-policy/pom.xml
index 3664659..0b91623 100644
--- a/redback-policy/pom.xml
+++ b/redback-policy/pom.xml
@@ -44,8 +44,8 @@
<artifactId>redback-users-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.apache.commons</groupId>
@@ -60,8 +60,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/redback-rbac/redback-rbac-model/pom.xml
b/redback-rbac/redback-rbac-model/pom.xml
index b5e8e4b..64e7362 100644
--- a/redback-rbac/redback-rbac-model/pom.xml
+++ b/redback-rbac/redback-rbac-model/pom.xml
@@ -49,12 +49,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>
</dependencies>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
index ef7e3a4..6e1fb7d 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
@@ -53,8 +53,8 @@
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
@@ -75,13 +75,13 @@
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
index c8710b6..51c8c95 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
@@ -44,24 +44,24 @@
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-common-jpa</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.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
index ee3d323..e7094e8 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
@@ -65,12 +65,12 @@
<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>
@@ -99,13 +99,13 @@
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
b/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
index 4306da4..ee86d7b 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
@@ -52,8 +52,8 @@
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -77,13 +77,13 @@
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/redback-rbac/redback-rbac-role-manager/pom.xml
b/redback-rbac/redback-rbac-role-manager/pom.xml
index 2b18ecb..04529b4 100644
--- a/redback-rbac/redback-rbac-role-manager/pom.xml
+++ b/redback-rbac/redback-rbac-role-manager/pom.xml
@@ -50,16 +50,16 @@
</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>
<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>commons-io</groupId>
@@ -71,13 +71,13 @@
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/redback-system/pom.xml b/redback-system/pom.xml
index ebec6b5..6f9a313 100644
--- a/redback-system/pom.xml
+++ b/redback-system/pom.xml
@@ -61,8 +61,8 @@
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
@@ -93,13 +93,13 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/redback-users/redback-users-providers/redback-users-cached/pom.xml
b/redback-users/redback-users-providers/redback-users-cached/pom.xml
index a11d104..ad1d5e6 100644
--- a/redback-users/redback-users-providers/redback-users-cached/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/pom.xml
@@ -45,8 +45,8 @@
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -114,8 +114,8 @@
</dependency>
<dependency>
- <groupId>javax.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -130,8 +130,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/redback-users/redback-users-providers/redback-users-configurable/pom.xml
b/redback-users/redback-users-providers/redback-users-configurable/pom.xml
index 89da886..226b29a 100644
--- a/redback-users/redback-users-providers/redback-users-configurable/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-configurable/pom.xml
@@ -40,16 +40,16 @@
<artifactId>redback-configuration</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>
<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/redback-users/redback-users-providers/redback-users-jpa/pom.xml
b/redback-users/redback-users-providers/redback-users-jpa/pom.xml
index 1085bd3..ba7a090 100644
--- a/redback-users/redback-users-providers/redback-users-jpa/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-jpa/pom.xml
@@ -44,16 +44,16 @@
<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.persistence</groupId>
- <artifactId>javax.persistence-api</artifactId>
+ <groupId>jakarta.persistence</groupId>
+ <artifactId>jakarta.persistence-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>javax.transaction-api</artifactId>
+ <groupId>jakarta.transaction</groupId>
+ <artifactId>jakarta.transaction-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/redback-users/redback-users-providers/redback-users-ldap/pom.xml
b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
index 078e441..d43b14b 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
@@ -61,12 +61,12 @@
</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.apache.commons</groupId>
diff --git a/redback-users/redback-users-providers/redback-users-memory/pom.xml
b/redback-users/redback-users-providers/redback-users-memory/pom.xml
index 3785cf0..9d3b25e 100644
--- a/redback-users/redback-users-providers/redback-users-memory/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-memory/pom.xml
@@ -44,8 +44,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -56,8 +56,8 @@
<artifactId>spring-context</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/redback-users/redback-users-tests/pom.xml
b/redback-users/redback-users-tests/pom.xml
index 2d7c917..f189f93 100644
--- a/redback-users/redback-users-tests/pom.xml
+++ b/redback-users/redback-users-tests/pom.xml
@@ -78,8 +78,8 @@
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
+ <groupId>jakarta.inject</groupId>
+ <artifactId>jakarta.inject-api</artifactId>
</dependency>
</dependencies>
