aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorMartin Stockhammer <martin_s@apache.org>2020-01-26 18:24:58 +0100
committerMartin Stockhammer <martin_s@apache.org>2020-01-26 18:24:58 +0100
commitfbe62fe6463c0ce9cb8a1205553d2fac278bf726 (patch)
tree9aa213c7219dfc3a498df30bc21b50ba299199bc /pom.xml
parent9c0449cc94e85394b33089658fb6471f67b92e11 (diff)
downloadarchiva-fbe62fe6463c0ce9cb8a1205553d2fac278bf726.tar.gz
archiva-fbe62fe6463c0ce9cb8a1205553d2fac278bf726.zip
Rearranging javax dependencies
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml29
1 files changed, 19 insertions, 10 deletions
diff --git a/pom.xml b/pom.xml
index 764e431e9..72685fc38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,8 @@
<!-- Java Enterprise APIs -->
<javax.servlet.version>4.0.1</javax.servlet.version>
+ <javax.activation.version>1.1.1</javax.activation.version>
+ <javax.jaxb.version>2.3.1</javax.jaxb.version>
<commons-codec.version>1.13</commons-codec.version>
@@ -138,23 +140,39 @@
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>${javax.inject.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>javax.transaction-api</artifactId>
<version>${javax.transaction.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<version>${javax.persistence.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax.annotation.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${javax.activation.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${javax.jaxb.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
@@ -179,11 +197,7 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>1.1</version>
- </dependency>
+
<dependency>
<groupId>org.apache.archiva.maven</groupId>
<artifactId>archiva-maven-common</artifactId>
@@ -1668,11 +1682,6 @@
</dependency>
<!-- Dependencies for JDK >=9 update -->
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.3.0</version>
- </dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>