commit c9da1ef58df446fd6b2a5f136a4cabc70fa35ed2
author Martin Stockhammer <martin_s@apache.org> Wed Dec 25 15:10:14 2019 +0100
committer Martin Stockhammer <martin_s@apache.org> Wed Dec 25 15:10:14 2019 +0100
tree 2503a577ad9bffc9dce1477896f5aad7b9430a19
parent 1955e4c27e36f61e27971a812f428cc0b27b4c62

Fix for JDK11 dependencies

archiva-modules/archiva-web/archiva-web-common/pom.xml

diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 6ed1a9a..e69e74f 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -211,6 +211,10 @@
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
     </dependency>
     <dependency>
@@ -239,6 +243,12 @@
 
 
     <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>javax.annotation-api</artifactId>
+    </dependency>
+
+
+    <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>javax.transaction-api</artifactId>
       <scope>test</scope>
@@ -392,12 +402,6 @@
 
     <!-- Needed for JDK >= 9 -->
     <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
       <scope>test</scope>

pom.xml

diff --git a/pom.xml b/pom.xml
index 2f6e0ad..a449f83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -825,7 +825,7 @@
       <dependency>
         <groupId>org.hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
-        <version>2.3.2</version>
+        <version>${hsqldb.version}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -1290,11 +1290,7 @@
         <scope>test</scope>
       </dependency>
 
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-test</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
+
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-tx</artifactId>
@@ -1661,12 +1657,6 @@
 
       <!-- Dependencies for JDK >=9 update -->
       <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <version>1.3.2</version>
-      </dependency>
-
-      <dependency>
         <groupId>javax.xml.bind</groupId>
         <artifactId>jaxb-api</artifactId>
         <version>2.3.0</version>