This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
The following commit(s) were added to refs/heads/master by this push:
new 63bb256 Cleanup of dependencies
63bb256 is described below
commit 63bb25640b79d58eac426c88bdeba9b4901a73bd
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sat Feb 1 10:08:40 2020 +0100
Cleanup of dependencies
---
archiva-modules/archiva-base/archiva-repository-layer/pom.xml | 4 ----
archiva-modules/archiva-base/archiva-repository-scanner/pom.xml | 9 +++++++++
pom.xml | 5 ++---
status-dep.txt | 3 +++
4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index a5f22a3..9f9db76 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -62,10 +62,6 @@
<artifactId>archiva-xml-tools</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.maven</groupId>
- <artifactId>archiva-maven-metadata</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-filelock</artifactId>
</dependency>
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
index 9ae83fa..98a3a09 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
@@ -49,9 +49,18 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-model</artifactId>
+ </dependency>
<!-- Test scope -->
<dependency>
+ <groupId>org.apache.archiva.maven</groupId>
+ <artifactId>archiva-maven-metadata</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<scope>test</scope>
diff --git a/pom.xml b/pom.xml
index 8bdb65d..0433998 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,6 @@
<!-- 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>
@@ -75,7 +74,7 @@
<!-- dependencies of maven modules -->
<jsoup.version>1.12.1</jsoup.version>
<rome.version>1.12.2</rome.version>
- <cronutils.version>9.0.1</cronutils.version>
+ <cronutils.version>9.0.2</cronutils.version>
<lucene.version>4.10.4</lucene.version>
@@ -786,7 +785,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>${commons-beanutils.version}</version>
+ <version>${commons.beanutils.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
diff --git a/status-dep.txt b/status-dep.txt
index 04f86f4..37e4038 100644
--- a/status-dep.txt
+++ b/status-dep.txt
@@ -12,6 +12,9 @@ archiva-modules
archiva-checksum
archiva-policies
archiva-configuration
+ archiva-repository-api
+ archiva-xml-tools
+ archiva-repository-layer
