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 906a258 Cleanup of scheduler dependencies
906a258 is described below
commit 906a258164f9688a4fc6765932782f33b252bd1f
Author: Martin Stockhammer <[email protected]>
AuthorDate: Mon Feb 3 21:58:05 2020 +0100
Cleanup of scheduler dependencies
---
.../archiva-maven/archiva-maven-proxy/pom.xml | 5 ++
.../archiva-maven/archiva-maven-repository/pom.xml | 5 ++
.../archiva-scheduler-indexing/pom.xml | 8 ++-
.../archiva-scheduler-repository-api/pom.xml | 20 +++++++-
.../archiva-scheduler-repository/pom.xml | 4 --
status-dep.txt | 60 +++++++++++-----------
6 files changed, 67 insertions(+), 35 deletions(-)
diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
index eb76b22..c98a7e5 100644
--- a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
@@ -79,6 +79,11 @@
<!-- Test scope -->
<dependency>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-quartz</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva.maven</groupId>
<artifactId>archiva-maven-metadata</artifactId>
<scope>test</scope>
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
index 8fb5a38..43015da 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
@@ -152,6 +152,11 @@
<!-- Test scope -->
<dependency>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-quartz</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
<classifier>shaded-lucene</classifier>
diff --git
a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
index caad124..0a918a7 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
@@ -38,12 +38,18 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-repository-admin-api</artifactId>
+ <artifactId>archiva-repository-api</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-configuration</artifactId>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-taskqueue</artifactId>
+ </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
diff --git
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
index 64ccb2c..73e987e 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
@@ -37,30 +37,48 @@
<artifactId>archiva-scheduler-api</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-storage-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-taskqueue</artifactId>
+ </dependency>
+
+ <!--
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ -->
+ <!--
<dependency>
<groupId>org.apache.archiva.components</groupId>
<artifactId>archiva-components-spring-quartz</artifactId>
</dependency>
+ -->
+ <!--
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
</dependency>
+ -->
+ <!--
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>metadata-statistics-api</artifactId>
</dependency>
+ -->
+ <!--
<dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-configuration</artifactId>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ -->
</dependencies>
<build>
diff --git
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index 5047b18..6c8246e 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -38,10 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-scheduler-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva</groupId>
<artifactId>archiva-storage-api</artifactId>
</dependency>
<dependency>
diff --git a/status-dep.txt b/status-dep.txt
index 84980d5..572cae9 100644
--- a/status-dep.txt
+++ b/status-dep.txt
@@ -3,35 +3,37 @@
# MST - 2020-01-30
archiva-modules
- archiva-base
- archiva-common
- archiva-storage-api
- archiva-storage-fs
- archiva-filelock
- archiva-model
- archiva-checksum
- archiva-policies
- archiva-configuration
- archiva-repository-api
- archiva-xml-tools
- archiva-repository-layer
- archiva-proxy-api
- archiva-proxy
- archiva-repository-scanner
- archiva-security-common
- archiva-consumers
- archiva-consumers-api
- archiva-core-consumers
- archiva-metadata-consumer
- archiva-signature-consumer
- archiva-lucene-consumer
- archiva-consumer-archetype
- archiva-repository-admin
- archiva-repository-admin-api
- archiva-repository-admin-default
- archiva-scheduler
- archiva-scheduler-api
- archiva-scheduler-repository
+ archiva-base
+ archiva-common
+ archiva-storage-api
+ archiva-storage-fs
+ archiva-filelock
+ archiva-model
+ archiva-checksum
+ archiva-policies
+ archiva-configuration
+ archiva-repository-api
+ archiva-xml-tools
+ archiva-repository-layer
+ archiva-proxy-api
+ archiva-proxy
+ archiva-repository-scanner
+ archiva-security-common
+ archiva-consumers
+ archiva-consumers-api
+ archiva-core-consumers
+ archiva-metadata-consumer
+ archiva-signature-consumer
+ archiva-lucene-consumer
+ archiva-consumer-archetype
+ archiva-repository-admin
+ archiva-repository-admin-api
+ archiva-repository-admin-default
+ archiva-scheduler
+ archiva-scheduler-api
+ archiva-scheduler-repository-api
+ archiva-scheduler-repository
+ archiva-scheduler-indexer
