Cleanup of scheduler dependencies

diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
index eb76b22f6efd0389e2f0c3b3123a268e1b5c51d3..c98a7e5245b766679ce96b3a6b36a27704ae478a 100644 (file)
--- a/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-proxy/pom.xml
@@ -78,6 +78,11 @@
     </dependency>
 
     <!-- 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>

diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
index 8fb5a380a4c09ef2fb9f68f26872a0a53194c9e4..43015daa1c956411765947b621e4115a7fffb50c 100644 (file)
--- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
@@ -151,6 +151,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>

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
index caad124cc4fb54a990b596744df6444c6fe450c8..0a918a755bae3140a74b3c512d6e1632f468c375 100644 (file)
--- 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 64ccb2cc9bf5f8747f7922e724c76c44e81863b1..73e987ece3f1a964af757c2de9a1d00d15cd4d26 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
@@ -36,31 +36,49 @@
       <groupId>org.apache.archiva</groupId>
       <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 5047b1800f4e944e5a86692f61ec926ed3532847..6c8246ed871b42e093a53c24443a32ab283c0427 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -36,10 +36,6 @@
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-scheduler-repository-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-scheduler-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-storage-api</artifactId>

diff --git a/status-dep.txt b/status-dep.txt
index 84980d53c065baa27d0ac7d3f4b47ac9e25debfd..572cae9834c5e7471e62b1072c7110987bdf7d69 100644 (file)
--- 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