revert some upgrade as it is too much work for a maintenance branch

Signed-off-by: Olivier Lamy <olamy@apache.org>

diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 41d3cc5a8794251dfad5d17c632be7fd90cc42a4..6895c32a73c275619234e0e00c67674363b9d63b 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -408,6 +408,16 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derbytools</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/pom.xml b/pom.xml
index 61fe79f9adde4d6b701145e2c49c3ed65441cced..8c6d819bc7da8af292d0a2d847139f01c59c6c5a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@
     <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
     <jacocoagent />
     <lucene.version>3.6.2</lucene.version>
-    <jackrabbit.version>2.20.10</jackrabbit.version>
+    <jackrabbit.version>2.19.6</jackrabbit.version>
 
     <sirona.version>0.1-incubating</sirona.version>
 
@@ -1209,7 +1209,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>3.1.0</version>
+        <version>3.0.1</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>