@@ -76,8 +76,8 @@ | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.mail</groupId> | |||
<artifactId>mail</artifactId> | |||
<groupId>jakarta.mail</groupId> | |||
<artifactId>jakarta.mail-api</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
</dependencies> |
@@ -82,14 +82,14 @@ | |||
<dependencies> | |||
<!-- Needed for JDK >= 9 --> | |||
<dependency> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
<groupId>jakarta.annotation</groupId> | |||
<artifactId>jakarta.annotation-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.xml.bind</groupId> | |||
<artifactId>jaxb-api</artifactId> | |||
<groupId>jakarta.xml.bind</groupId> | |||
<artifactId>jakarta.xml.bind-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
</dependencies> |
@@ -77,12 +77,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> |
@@ -52,12 +52,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.springframework</groupId> |
@@ -64,6 +64,12 @@ | |||
<requiredProperty key="mavenWagonVersion"> | |||
<defaultValue>${wagon.version}</defaultValue> | |||
</requiredProperty> | |||
<requiredProperty key="jakartaInjectVersion"> | |||
<defaultValue>${jakarta.inject.version}</defaultValue> | |||
</requiredProperty> | |||
<requiredProperty key="jakartaAnnotationVersion"> | |||
<defaultValue>${jakarta.annotation.version}</defaultValue> | |||
</requiredProperty> | |||
</requiredProperties> |
@@ -42,6 +42,8 @@ | |||
<commons.beanutils.version>${beanUtilsVersion}</commons.beanutils.version> | |||
<maven.wagon.version>${mavenWagonVersion}</maven.wagon.version> | |||
<archiva.comp.version>${archivaCompVersion}</archiva.comp.version> | |||
<jakarta.inject.version>${jakartaInjectVersion}</jakarta.inject.version> | |||
<jakarta.annotation.version>${jakartaAnnotationVersion}</jakarta.annotation.version> | |||
</properties> | |||
<dependencies> | |||
<dependency> | |||
@@ -147,14 +149,14 @@ | |||
<version>${slf4j.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> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
<version>1.3.2</version> | |||
<groupId>jakarta.annotation</groupId> | |||
<artifactId>jakarta.annotation-api</artifactId> | |||
<version>${jakarta.annotation.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework</groupId> |
@@ -34,3 +34,5 @@ httpcoreVersion=${httpclient.core.version} | |||
archivaCompVersion=${archiva.comp.version} | |||
beanUtilsVersion=${commons.beanutils.version} | |||
mavenWagonVersion=${wagon.version} | |||
jakartaInjectVersion=${jakarta.inject.version} | |||
jakartaAnnotationVersion=${jakarta.annotation.version} |
@@ -87,12 +87,12 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<groupId>jakarta.annotation</groupId> | |||
<artifactId>jakarta.annotation-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
@@ -137,13 +137,13 @@ | |||
</dependency> | |||
<!-- This dependency is needed by openjpa --> | |||
<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> | |||
@@ -347,8 +347,8 @@ Using provided scope to avoid adding it to packaging. | |||
</activation> | |||
<dependencies> | |||
<dependency> | |||
<groupId>javax.xml.bind</groupId> | |||
<artifactId>jaxb-api</artifactId> | |||
<groupId>jakarta.xml.bind</groupId> | |||
<artifactId>jakarta.xml.bind-api</artifactId> | |||
</dependency> | |||
</dependencies> | |||
</profile> |
@@ -79,12 +79,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> |
@@ -63,12 +63,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> |
@@ -51,8 +51,8 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
</dependency> | |||
<dependency> |
@@ -54,8 +54,8 @@ | |||
<classifier>no_aop</classifier> | |||
</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.maven</groupId> |
@@ -55,8 +55,8 @@ | |||
<artifactId>commons-io</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> | |||
@@ -157,14 +157,14 @@ | |||
<dependencies> | |||
<!-- Needed for JDK >= 9 --> | |||
<dependency> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
<groupId>jakarta.annotation</groupId> | |||
<artifactId>jakarta.annotation-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.xml.bind</groupId> | |||
<artifactId>jaxb-api</artifactId> | |||
<groupId>jakarta.xml.bind</groupId> | |||
<artifactId>jakarta.xml.bind-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
</dependencies> |
@@ -88,12 +88,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> | |||
@@ -180,8 +180,8 @@ | |||
<dependencies> | |||
<!-- Needed for JDK >= 9 --> | |||
<dependency> | |||
<groupId>javax.xml.bind</groupId> | |||
<artifactId>jaxb-api</artifactId> | |||
<groupId>jakarta.xml.bind</groupId> | |||
<artifactId>jakarta.xml.bind-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
</dependencies> |
@@ -120,12 +120,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> | |||
@@ -187,8 +187,8 @@ | |||
<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> | |||
@@ -223,8 +223,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> | |||
<dependency> |
@@ -60,12 +60,12 @@ | |||
<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>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
<groupId>jakarta.annotation</groupId> | |||
<artifactId>jakarta.annotation-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.components.registry</groupId> |
@@ -83,13 +83,13 @@ | |||
<artifactId>cron-utils</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
<scope>provided</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> |
@@ -83,8 +83,8 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
</dependency> | |||
<dependency> |
@@ -68,14 +68,14 @@ | |||
<dependencies> | |||
<!-- Needed for JDK >= 9 --> | |||
<dependency> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
<groupId>jakarta.annotation</groupId> | |||
<artifactId>jakarta.annotation-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.xml.bind</groupId> | |||
<artifactId>jaxb-api</artifactId> | |||
<groupId>jakarta.xml.bind</groupId> | |||
<artifactId>jakarta.xml.bind-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
</dependencies> |
@@ -51,8 +51,8 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
</dependency> | |||
<!-- |
@@ -140,8 +140,8 @@ | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
</dependency> | |||
@@ -172,8 +172,8 @@ | |||
<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> | |||
@@ -193,8 +193,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> | |||
<dependency> |
@@ -42,8 +42,8 @@ | |||
<artifactId>archiva-proxy</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
<groupId>jakarta.servlet</groupId> | |||
<artifactId>jakarta.servlet-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
@@ -116,12 +116,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> | |||
@@ -167,8 +167,8 @@ | |||
<!-- Test scope --> | |||
<dependency> | |||
<groupId>javax.persistence</groupId> | |||
<artifactId>javax.persistence-api</artifactId> | |||
<groupId>jakarta.persistence</groupId> | |||
<artifactId>jakarta.persistence-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
@@ -192,8 +192,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> | |||
<dependency> | |||
@@ -249,8 +249,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> |
@@ -112,12 +112,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> | |||
@@ -377,14 +377,14 @@ | |||
<dependencies> | |||
<!-- Needed for JDK >= 9 --> | |||
<dependency> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
<groupId>jakarta.annotation</groupId> | |||
<artifactId>jakarta.annotation-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.xml.bind</groupId> | |||
<artifactId>jaxb-api</artifactId> | |||
<groupId>jakarta.xml.bind</groupId> | |||
<artifactId>jakarta.xml.bind-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
</dependencies> |
@@ -82,12 +82,16 @@ | |||
</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>jakarta.servlet</groupId> | |||
<artifactId>jakarta.servlet-api</artifactId> | |||
</dependency> | |||
<dependency> |
@@ -51,8 +51,8 @@ | |||
<artifactId>archiva-components-spring-taskqueue</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> |
@@ -98,12 +98,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> |
@@ -74,8 +74,8 @@ | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.ws.rs</groupId> | |||
<artifactId>javax.ws.rs-api</artifactId> | |||
<groupId>jakarta.ws.rs</groupId> | |||
<artifactId>jakarta.ws.rs-api</artifactId> | |||
</dependency> | |||
</dependencies> | |||
@@ -109,8 +109,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> |
@@ -247,8 +247,8 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>jakarta.xml.bind</groupId> | |||
@@ -296,29 +296,38 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.ws.rs</groupId> | |||
<artifactId>javax.ws.rs-api</artifactId> | |||
<groupId>jakarta.ws.rs</groupId> | |||
<artifactId>jakarta.ws.rs-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.fasterxml.jackson.core</groupId> | |||
<artifactId>jackson-databind</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.modelmapper</groupId> | |||
<artifactId>modelmapper</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.fasterxml.jackson.jaxrs</groupId> | |||
<artifactId>jackson-jaxrs-json-provider</artifactId> | |||
<version>2.10.4</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.fasterxml.jackson.jaxrs</groupId> | |||
<artifactId>jackson-jaxrs-xml-provider</artifactId> | |||
<version>2.10.4</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.fasterxml.jackson.dataformat</groupId> | |||
<artifactId>jackson-dataformat-xml</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.fasterxml.jackson.jaxrs</groupId> | |||
<artifactId>jackson-jaxrs-base</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.modelmapper</groupId> | |||
<artifactId>modelmapper</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.cxf</groupId> | |||
<artifactId>cxf-core</artifactId> | |||
@@ -350,8 +359,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> | |||
@@ -360,8 +369,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> | |||
<dependency> | |||
@@ -376,6 +385,11 @@ | |||
<classifier>tests</classifier> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback</groupId> | |||
<artifactId>redback-keys-jpa</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
@@ -390,8 +404,8 @@ | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.mail</groupId> | |||
<artifactId>mail</artifactId> | |||
<groupId>jakarta.mail</groupId> | |||
<artifactId>jakarta.mail-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
@@ -434,22 +448,33 @@ | |||
</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.validation</groupId> | |||
<artifactId>validation-api</artifactId> | |||
<groupId>jakarta.validation</groupId> | |||
<artifactId>jakarta.validation-api</artifactId> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.eclipse.jetty</groupId> | |||
<artifactId>jetty-server</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.eclipse.jetty</groupId> | |||
<artifactId>jetty-servlet</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<!-- Needed for JDK >= 9 --> | |||
<dependency> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
<groupId>jakarta.annotation</groupId> | |||
<artifactId>jakarta.annotation-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> |
@@ -52,8 +52,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>com.rometools</groupId> |
@@ -45,12 +45,12 @@ | |||
<artifactId>archiva-security-common</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-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> | |||
@@ -153,8 +153,8 @@ | |||
<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> | |||
@@ -168,8 +168,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> | |||
<dependency> |
@@ -286,12 +286,12 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.activation</groupId> | |||
<artifactId>activation</artifactId> | |||
<groupId>jakarta.activation</groupId> | |||
<artifactId>jakarta.activation-api</artifactId> | |||
</dependency> | |||
@@ -320,8 +320,8 @@ | |||
<artifactId>commons-codec</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.ws.rs</groupId> | |||
<artifactId>javax.ws.rs-api</artifactId> | |||
<groupId>jakarta.ws.rs</groupId> | |||
<artifactId>jakarta.ws.rs-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.quartz-scheduler</groupId> | |||
@@ -344,8 +344,8 @@ | |||
<artifactId>jsoup</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
<groupId>jakarta.servlet</groupId> | |||
<artifactId>jakarta.servlet-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework</groupId> | |||
@@ -380,15 +380,15 @@ | |||
<dependency> | |||
<groupId>javax.mail</groupId> | |||
<artifactId>mail</artifactId> | |||
<groupId>jakarta.mail</groupId> | |||
<artifactId>jakarta.mail-api</artifactId> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
<groupId>jakarta.annotation</groupId> | |||
<artifactId>jakarta.annotation-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
@@ -397,13 +397,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> | |||
@@ -510,8 +510,8 @@ | |||
<!-- Needed for JDK >= 9 --> | |||
<dependency> | |||
<groupId>javax.xml.bind</groupId> | |||
<artifactId>jaxb-api</artifactId> | |||
<groupId>jakarta.xml.bind</groupId> | |||
<artifactId>jakarta.xml.bind-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
@@ -610,8 +610,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> |
@@ -92,8 +92,8 @@ | |||
<artifactId>commons-logging</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
<groupId>jakarta.servlet</groupId> | |||
<artifactId>jakarta.servlet-api</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>org.eclipse.jetty</groupId> | |||
@@ -150,8 +150,8 @@ | |||
<artifactId>commons-logging</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
<groupId>jakarta.servlet</groupId> | |||
<artifactId>jakarta.servlet-api</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>org.eclipse.jetty</groupId> | |||
@@ -188,8 +188,8 @@ | |||
<artifactId>commons-logging</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
<groupId>jakarta.servlet</groupId> | |||
<artifactId>jakarta.servlet-api</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>org.eclipse.jetty</groupId> | |||
@@ -262,12 +262,12 @@ | |||
<artifactId>derby</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.mail</groupId> | |||
<artifactId>mail</artifactId> | |||
<groupId>jakarta.mail</groupId> | |||
<artifactId>jakarta.mail-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.activation</groupId> | |||
<artifactId>activation</artifactId> | |||
<groupId>jakarta.activation</groupId> | |||
<artifactId>jakarta.activation-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.commons</groupId> | |||
@@ -570,8 +570,8 @@ | |||
<version>${derbyVersion}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.mail</groupId> | |||
<artifactId>mail</artifactId> | |||
<groupId>jakarta.mail</groupId> | |||
<artifactId>jakarta.mail-api</artifactId> | |||
<version>${javax.mail.version}</version> | |||
</dependency> | |||
<dependency> |
@@ -17,7 +17,8 @@ | |||
~ specific language governing permissions and limitations | |||
~ under the License. | |||
--> | |||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | |||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | |||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> | |||
<modelVersion>4.0.0</modelVersion> | |||
<parent> | |||
<groupId>org.apache.archiva</groupId> | |||
@@ -35,8 +36,8 @@ | |||
<archiva.logMissingI18n>true</archiva.logMissingI18n> | |||
<archivaAppServerBase>${project.build.directory}/appserver-base</archivaAppServerBase> | |||
<jettyDumpOnStart>false</jettyDumpOnStart> | |||
<archiva.baseRestUrl /> | |||
<rest.admin.pwd /> | |||
<archiva.baseRestUrl/> | |||
<rest.admin.pwd/> | |||
<archiva.groupIndexTtl>30</archiva.groupIndexTtl> | |||
<archiva.repositorySessionFactory.id>jcr</archiva.repositorySessionFactory.id> | |||
<cassandra.host>localhost</cassandra.host> | |||
@@ -48,66 +49,80 @@ | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>generic-metadata-support</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>repository-statistics</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>problem-reports</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>audit</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-scheduler-repository</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.maven</groupId> | |||
<artifactId>archiva-maven-indexer</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-filelock</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-repository-admin-api</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-repository-admin-default</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>metadata-repository-api</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>metadata-store-jcr</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>metadata-store-file</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>metadata-store-cassandra</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.commons</groupId> | |||
<artifactId>commons-configuration2</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>commons-beanutils</groupId> | |||
@@ -123,6 +138,7 @@ | |||
<dependency> | |||
<groupId>commons-digester</groupId> | |||
<artifactId>commons-digester</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>commons-logging</groupId> | |||
@@ -133,6 +149,7 @@ | |||
<dependency> | |||
<groupId>commons-beanutils</groupId> | |||
<artifactId>commons-beanutils</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>commons-logging</groupId> | |||
@@ -144,16 +161,19 @@ | |||
<dependency> | |||
<groupId>commons-io</groupId> | |||
<artifactId>commons-io</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.maven</groupId> | |||
<artifactId>archiva-maven-repository</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.codehaus.plexus</groupId> | |||
<artifactId>plexus-utils</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<!-- normally not needed as we are 1.6 required | |||
but due to http://jira.codehaus.org/browse/MODELLO-266 | |||
@@ -164,6 +184,7 @@ | |||
<groupId>org.apache.maven.indexer</groupId> | |||
<artifactId>indexer-core</artifactId> | |||
<classifier>shaded-lucene</classifier> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>org.codehaus.plexus</groupId> | |||
@@ -224,6 +245,7 @@ | |||
<dependency> | |||
<groupId>org.apache.httpcomponents</groupId> | |||
<artifactId>httpclient</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>commons-logging</groupId> | |||
@@ -234,6 +256,7 @@ | |||
<dependency> | |||
<groupId>org.apache.httpcomponents</groupId> | |||
<artifactId>httpcore</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>commons-logging</groupId> | |||
@@ -245,10 +268,12 @@ | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-repository-layer</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-xml-tools</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>xerces</groupId> | |||
@@ -259,14 +284,17 @@ | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-security</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-core-consumers</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-configuration</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
@@ -276,19 +304,23 @@ | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>stage-repository-merge</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-signature-consumers</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-rss</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-rest-services</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>org.eclipse.jetty</groupId> | |||
@@ -320,15 +352,18 @@ | |||
<dependency> | |||
<groupId>org.apache.archiva.components.registry</groupId> | |||
<artifactId>archiva-components-spring-registry-api</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.components.registry</groupId> | |||
<artifactId>archiva-components-spring-registry-commons</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-rest-api</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>org.eclipse.jetty</groupId> | |||
@@ -360,6 +395,7 @@ | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-web-common</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>javax.servlet</groupId> | |||
@@ -371,6 +407,7 @@ | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-webdav</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>javax.servlet</groupId> | |||
@@ -382,6 +419,7 @@ | |||
<dependency> | |||
<groupId>org.apache.archiva.components.cache</groupId> | |||
<artifactId>archiva-components-spring-cache-ehcache</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>commons-logging</groupId> | |||
@@ -392,6 +430,7 @@ | |||
<dependency> | |||
<groupId>net.sf.ehcache</groupId> | |||
<artifactId>ehcache</artifactId> | |||
<scope>runtime</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>commons-logging</groupId> | |||
@@ -403,34 +442,38 @@ | |||
<dependency> | |||
<groupId>org.apache.archiva.components</groupId> | |||
<artifactId>archiva-components-spring-quartz</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.quartz-scheduler</groupId> | |||
<artifactId>quartz</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback</groupId> | |||
<artifactId>redback-rbac-ldap</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback</groupId> | |||
<artifactId>redback-rest-services</artifactId> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback</groupId> | |||
<artifactId>redback-common-integrations</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback</groupId> | |||
<artifactId>redback-integrations-security</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva.redback</groupId> | |||
<artifactId>redback-rbac-jpa</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
@@ -456,19 +499,23 @@ | |||
<dependency> | |||
<groupId>org.apache.cxf</groupId> | |||
<artifactId>cxf-rt-frontend-jaxrs</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.cxf</groupId> | |||
<artifactId>cxf-rt-rs-extension-providers</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework</groupId> | |||
<artifactId>spring-core</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.jsoup</groupId> | |||
<artifactId>jsoup</artifactId> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
@@ -484,15 +531,15 @@ | |||
<scope>test</scope> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
<groupId>jakarta.servlet</groupId> | |||
<artifactId>jakarta.servlet-api</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.mail</groupId> | |||
<artifactId>mail</artifactId> | |||
<groupId>jakarta.mail</groupId> | |||
<artifactId>jakarta.mail-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
@@ -522,11 +569,41 @@ | |||
<groupId>org.springframework</groupId> | |||
<artifactId>spring-orm</artifactId> | |||
<version>${spring.version}</version> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework</groupId> | |||
<artifactId>spring-context</artifactId> | |||
<version>${spring.version}</version> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.webjars</groupId> | |||
<artifactId>bootstrap</artifactId> | |||
<version>4.5.0</version> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.webjars</groupId> | |||
<artifactId>font-awesome</artifactId> | |||
<version>5.13.0</version> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.webjars</groupId> | |||
<artifactId>d3js</artifactId> | |||
<version>5.16.0</version> | |||
<scope>runtime</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.webjars</groupId> | |||
<artifactId>webjars-locator</artifactId> | |||
<version>0.40</version> | |||
<scope>runtime</scope> | |||
</dependency> | |||
</dependencies> | |||
@@ -546,7 +623,7 @@ | |||
<artifactId>apache-rat-plugin</artifactId> | |||
<configuration> | |||
<excludes> | |||
<exclude>nbactions.xml</exclude> | |||
<exclude>nbactions.xml</exclude> | |||
<exclude>src/main/webapp/css/*.css</exclude> | |||
<exclude>src/main/webapp/js/*.js</exclude> | |||
<exclude>src/site/resources/css/*.css</exclude> | |||
@@ -712,7 +789,7 @@ | |||
<value>${openjpa.Log}</value> | |||
</systemProperty> | |||
</systemProperties> | |||
<useTestScope>false</useTestScope> | |||
</configuration> | |||
<dependencies> | |||
<dependency> | |||
@@ -721,29 +798,61 @@ | |||
<version>${derbyVersion}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.mail</groupId> | |||
<artifactId>mail</artifactId> | |||
<version>${javax.mail.version}</version> | |||
<groupId>jakarta.mail</groupId> | |||
<artifactId>jakarta.mail-api</artifactId> | |||
<version>${jakarta.mail.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.openjpa</groupId> | |||
<artifactId>openjpa</artifactId> | |||
<version>${openjpaVersion}</version> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>junit</groupId> | |||
<artifactId>junit</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> | |||
<dependency> | |||
<groupId>jakarta.persistence</groupId> | |||
<artifactId>jakarta.persistence-api</artifactId> | |||
<version>${jakarta.persistence.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.geronimo.specs</groupId> | |||
<artifactId>geronimo-jpa_2.0_spec</artifactId> | |||
<version>1.1</version> | |||
<groupId>jakarta.transaction</groupId> | |||
<artifactId>jakarta.transaction-api</artifactId> | |||
<version>${jakarta.transaction.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.geronimo.specs</groupId> | |||
<artifactId>geronimo-jta_1.1_spec</artifactId> | |||
<version>1.1.1</version> | |||
<groupId>jakarta.ws.rs</groupId> | |||
<artifactId>jakarta.ws.rs-api</artifactId> | |||
<version>${jakarta.ws.rs.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>net.sourceforge.serp</groupId> | |||
<artifactId>serp</artifactId> | |||
<version>1.15.1</version> | |||
<groupId>com.sun.mail</groupId> | |||
<artifactId>jakarta.mail</artifactId> | |||
<version>${jakarta.mail.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.eclipse.jetty</groupId> | |||
@@ -779,7 +888,7 @@ | |||
</goals> | |||
<configuration> | |||
<target> | |||
<mkdir dir="${project.build.directory}/appserver-base/conf" /> | |||
<mkdir dir="${project.build.directory}/appserver-base/conf"/> | |||
</target> | |||
</configuration> | |||
</execution> | |||
@@ -838,6 +947,8 @@ | |||
<skipProvidedScope>true</skipProvidedScope> | |||
<failBuildOnCVSS>8</failBuildOnCVSS> | |||
<suppressionFile>${project.basedir}/src/main/resources/META-INF/owasp/cve-suppressions.xml</suppressionFile> | |||
<ossindexAnalyzerEnabled>false</ossindexAnalyzerEnabled> | |||
<assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled> | |||
</configuration> | |||
<executions> | |||
<execution> |
@@ -51,9 +51,6 @@ | |||
<alias name="ldapRoleMapperConfiguration#archiva" alias="ldapRoleMapperConfiguration#default"/> | |||
<bean id="loggerManager" class="org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager" | |||
init-method="initialize"/> | |||
<!-- only here to cleanup temp indexes for groups increase number if use for something else --> | |||
<task:executor id="springExecutor" pool-size="2"/> | |||
<task:scheduler id="springScheduler" pool-size="2"/> |
@@ -185,8 +185,8 @@ | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>net.sf.ehcache</groupId> | |||
@@ -241,8 +241,8 @@ | |||
<artifactId>slf4j-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> | |||
@@ -273,8 +273,8 @@ | |||
<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> | |||
@@ -283,8 +283,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> | |||
<dependency> | |||
@@ -398,13 +398,13 @@ | |||
<!-- START Needed for JDK >= 9 --> | |||
<dependency> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
<groupId>jakarta.annotation</groupId> | |||
<artifactId>jakarta.annotation-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.xml.bind</groupId> | |||
<artifactId>jaxb-api</artifactId> | |||
<groupId>jakarta.xml.bind</groupId> | |||
<artifactId>jakarta.xml.bind-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> |
@@ -71,8 +71,8 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
</dependency> | |||
<dependency> |
@@ -80,12 +80,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> | |||
@@ -143,6 +143,15 @@ | |||
<groupId>org.jboss.logging</groupId> | |||
<artifactId>jboss-logging</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.validation</groupId> | |||
<artifactId>validation-api</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
@@ -189,6 +198,12 @@ | |||
<groupId>org.apache.thrift</groupId> | |||
<artifactId>libthrift</artifactId> | |||
<version>0.13.0</version> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<!-- | |||
<dependency> | |||
@@ -220,6 +235,12 @@ | |||
<groupId>org.hibernate</groupId> | |||
<artifactId>hibernate-validator</artifactId> | |||
<version>4.3.2.Final</version> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>javax.validation</groupId> | |||
<artifactId>validation-api</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
@@ -59,8 +59,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> |
@@ -169,12 +169,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> |
@@ -49,8 +49,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> | |||
<!-- Test scope --> |
@@ -68,12 +68,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> | |||
@@ -167,14 +167,14 @@ | |||
<dependencies> | |||
<!-- Needed for JDK >= 9 --> | |||
<dependency> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
<groupId>jakarta.annotation</groupId> | |||
<artifactId>jakarta.annotation-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.xml.bind</groupId> | |||
<artifactId>jaxb-api</artifactId> | |||
<groupId>jakarta.xml.bind</groupId> | |||
<artifactId>jakarta.xml.bind-api</artifactId> | |||
<scope>test</scope> | |||
</dependency> | |||
</dependencies> |
@@ -62,8 +62,8 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
</dependency> | |||
@@ -1 +1 @@ | |||
mvn jetty:run -pl :archiva-webapp -am | |||
mvn jetty:run -pl :archiva-webapp -am "$@" |
@@ -86,7 +86,7 @@ | |||
<httpclient.version>4.5.2</httpclient.version> | |||
<httpclient.core.version>4.4.4</httpclient.core.version> | |||
<openjpaVersion>2.4.1</openjpaVersion> | |||
<openjpaVersion>3.1.1</openjpaVersion> | |||
<modelmapper.version>2.3.5</modelmapper.version> | |||
@@ -126,52 +126,86 @@ | |||
<dependencies> | |||
<!-- Java EE 8.0 (Jakarta) same as Java EE 7.0 --> | |||
<dependency> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
<version>${javax.inject.version}</version> | |||
<groupId>jakarta.inject</groupId> | |||
<artifactId>jakarta.inject-api</artifactId> | |||
<version>${jakarta.inject.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.transaction</groupId> | |||
<artifactId>javax.transaction-api</artifactId> | |||
<version>${javax.transaction.version}</version> | |||
<groupId>jakarta.transaction</groupId> | |||
<artifactId>jakarta.transaction-api</artifactId> | |||
<version>${jakarta.transaction.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.persistence</groupId> | |||
<artifactId>javax.persistence-api</artifactId> | |||
<version>${javax.persistence.version}</version> | |||
<groupId>jakarta.persistence</groupId> | |||
<artifactId>jakarta.persistence-api</artifactId> | |||
<version>${jakarta.persistence.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>javax.activation</groupId> | |||
<artifactId>activation</artifactId> | |||
<version>${javax.activation.version}</version> | |||
<groupId>jakarta.json.bind</groupId> | |||
<artifactId>jakarta.json.bind-api</artifactId> | |||
<version>${jakarta.json.bind.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.xml.bind</groupId> | |||
<artifactId>jaxb-api</artifactId> | |||
<version>${javax.jaxb.version}</version> | |||
<groupId>jakarta.xml.bind</groupId> | |||
<artifactId>jakarta.xml.bind-api</artifactId> | |||
<version>${jakarta.xml.bind.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>jakarta.ws.rs</groupId> | |||
<artifactId>jakarta.ws.rs-api</artifactId> | |||
<version>${jakarta.ws.rs.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>jakarta.validation</groupId> | |||
<artifactId>jakarta.validation-api</artifactId> | |||
<version>${jakarta.validation.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>jakarta.activation</groupId> | |||
<artifactId>jakarta.activation-api</artifactId> | |||
<version>${jakarta.activation.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>jakarta.mail</groupId> | |||
<artifactId>jakarta.mail-api</artifactId> | |||
<version>${jakarta.mail.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.ws.rs</groupId> | |||
<artifactId>javax.ws.rs-api</artifactId> | |||
<version>${javax.jaxrs.version}</version> | |||
<groupId>com.sun.mail</groupId> | |||
<artifactId>jakarta.mail</artifactId> | |||
<version>${jakarta.mail.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.validation</groupId> | |||
<artifactId>validation-api</artifactId> | |||
<version>${javax.validation.version}</version> | |||
<groupId>jakarta.servlet</groupId> | |||
<artifactId>jakarta.servlet-api</artifactId> | |||
<version>${jakarta.servlet.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>jakarta.enterprise</groupId> | |||
<artifactId>jakarta.enterprise.cdi-api</artifactId> | |||
<version>${jakarta.enterprise.cdi.version}</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
@@ -183,10 +217,6 @@ | |||
<groupId>junit</groupId> | |||
<artifactId>junit</artifactId> | |||
</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> | |||
@@ -195,6 +225,18 @@ | |||
<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> | |||
@@ -699,6 +741,14 @@ | |||
<groupId>com.google.inject</groupId> | |||
<artifactId>guice</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
@@ -746,6 +796,10 @@ | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>jsr250-api</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.enterprise</groupId> | |||
<artifactId>cdi-api</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
@@ -767,10 +821,28 @@ | |||
<artifactId>jackson-annotations</artifactId> | |||
<version>${jackson.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.fasterxml.jackson.dataformat</groupId> | |||
<artifactId>jackson-dataformat-xml</artifactId> | |||
<version>${jackson.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.fasterxml.jackson.jaxrs</groupId> | |||
<artifactId>jackson-jaxrs-base</artifactId> | |||
<version>${jackson.version}</version> | |||
</dependency> | |||
<dependency> | |||
<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> | |||
@@ -928,11 +1000,6 @@ | |||
<artifactId>lucene-highlighter</artifactId> | |||
<version>${lucene.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.mail</groupId> | |||
<artifactId>mail</artifactId> | |||
<version>${javax.mail.version}</version> | |||
</dependency> | |||
<!-- Maven related dependencies --> | |||
@@ -972,6 +1039,10 @@ | |||
<groupId>com.google.guava</groupId> | |||
<artifactId>guava</artifactId> | |||
</exclusion> | |||
<exclusion> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
@@ -993,6 +1064,12 @@ | |||
<artifactId>maven-resolver-provider</artifactId> | |||
<version>${maven3x.version}</version> | |||
<type>pom</type> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
@@ -1000,6 +1077,12 @@ | |||
<groupId>org.apache.maven</groupId> | |||
<artifactId>maven-resolver-provider</artifactId> | |||
<version>${maven3x.version}</version> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>javax.inject</groupId> | |||
<artifactId>javax.inject</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.maven.resolver</groupId> | |||
@@ -1063,8 +1146,8 @@ | |||
<version>${archiva.comp.version}</version> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>javax.annotation</groupId> | |||
<artifactId>javax.annotation-api</artifactId> | |||
<groupId>jakarta.annotation</groupId> | |||
<artifactId>jakarta.annotation-api</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
@@ -1272,11 +1355,6 @@ | |||
<artifactId>archiva-components-spring-registry-commons</artifactId> | |||
<version>${archiva.comp.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
<version>${javax.servlet.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.slf4j</groupId> | |||
<artifactId>slf4j-api</artifactId> | |||
@@ -1440,6 +1518,12 @@ | |||
<groupId>org.eclipse.jetty</groupId> | |||
<artifactId>jetty-server</artifactId> | |||
<version>${jetty.version}</version> | |||
<exclusions> | |||
<exclusion> | |||
<groupId>javax.servlet</groupId> | |||
<artifactId>javax.servlet-api</artifactId> | |||
</exclusion> | |||
</exclusions> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.eclipse.jetty</groupId> | |||
@@ -1681,13 +1765,6 @@ | |||
</dependency> | |||
<dependency> | |||
<groupId>jakarta.xml.bind</groupId> | |||
<artifactId>jakarta.xml.bind-api</artifactId> | |||
<version>2.3.3</version> | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.fasterxml.jackson.core</groupId> | |||
<artifactId>jackson-databind</artifactId> |