This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch archiva-2.x
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/archiva-2.x by this push:
new 7c910b2f1 revert some upgrade as it is too much work for a maintenance
branch
7c910b2f1 is described below
commit 7c910b2f165a8ecad1b2d6a2699591d5706e2689
Author: Olivier Lamy <[email protected]>
AuthorDate: Wed May 10 21:30:40 2023 +1000
revert some upgrade as it is too much work for a maintenance branch
Signed-off-by: Olivier Lamy <[email protected]>
---
archiva-modules/archiva-web/archiva-web-common/pom.xml | 10 ++++++++++
pom.xml | 4 ++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml
b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 41d3cc5a8..6895c32a7 100644
--- 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 61fe79f9a..8c6d819bc 100644
--- 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>
