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 58b9a3a Changing dependencies to new spring-quartz component
58b9a3a is described below
commit 58b9a3a8b64de41f0774e67882d493202a3be300
Author: Martin Stockhammer <[email protected]>
AuthorDate: Sun Nov 24 11:22:58 2019 +0100
Changing dependencies to new spring-quartz component
---
.../archiva-base/archiva-configuration/pom.xml | 6 ------
.../META-INF/maven/archetype-metadata.xml | 6 ------
.../src/test/resources/spring-context.xml | 2 +-
.../resourcesstatic/archetype-resources/pom.xml | 2 --
.../src/test/resources/META-INF/spring-context.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../archiva-base/archiva-plexus-bridge/pom.xml | 7 -------
.../archiva-repository-admin-default/pom.xml | 4 ++--
.../DefaultRepositoryCommonValidator.java | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../src/test/resources/spring-context-storage.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../archiva-scheduler-repository-api/pom.xml | 14 ++-----------
.../archiva-scheduler-repository/pom.xml | 14 ++-----------
.../DefaultRepositoryArchivaTaskScheduler.java | 4 ++--
.../scheduler/repository/RepositoryTaskJob.java | 2 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../rest/services/DefaultCommonServices.java | 2 +-
.../resources/META-INF/spring-context-test.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../archiva-web/archiva-web-common/pom.xml | 14 ++-----------
.../apache/archiva/web/startup/ArchivaStartup.java | 2 +-
.../test/resources/spring-context-test-common.xml | 2 +-
.../test/resources/spring-context-test-upload.xml | 2 +-
.../src/test/resources/spring-context-with-jcr.xml | 2 +-
archiva-modules/archiva-web/archiva-webapp/pom.xml | 14 ++-----------
.../src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
.../spring-context-servlet-security-test.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
pom.xml | 24 +++++++++-------------
33 files changed, 44 insertions(+), 109 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml
b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index 7e1b134..497e099 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -119,12 +119,6 @@
<artifactId>commons-collections</artifactId>
<version>3.2.2</version>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.archiva.redback.components</groupId>
- <artifactId>spring-utils</artifactId>
- </dependency>
--->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 109b638..5148224 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -52,12 +52,6 @@
<requiredProperty key="guavaVersion">
<defaultValue>${guava.version}</defaultValue>
</requiredProperty>
- <requiredProperty key="redbackRegistryVersion">
- <defaultValue>${redback.registry.version}</defaultValue>
- </requiredProperty>
- <requiredProperty key="redbackCacheVersion">
- <defaultValue>${redback.cache.version}</defaultValue>
- </requiredProperty>
<requiredProperty key="springockitoVersion">
<defaultValue>${springockito.version}</defaultValue>
</requiredProperty>
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
index d50eea7..f1557b2 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
@@ -42,7 +42,7 @@
<bean name="networkProxyAdmin#mock"
class="org.apache.archiva.mock.MockNetworkProxyAdmin"/>
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
index 229deb9..3dab623 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
@@ -34,8 +34,6 @@
<slf4j.version>${slf4jVersion}</slf4j.version>
<log4j.version>${log4jVersion}</log4j.version>
<spring.version>${springVersion}</spring.version>
-
<redback.registry.version>${redbackRegistryVersion}</redback.registry.version>
- <redback.cache.version>${redbackCacheVersion}</redback.cache.version>
<guava.version>${guavaVersion}</guava.version>
<springockito.version>${springockitoVersion}</springockito.version>
<mockito.version>${mockitoVersion}</mockito.version>
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
index c38d4e5..599643a 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml
@@ -23,7 +23,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";
default-lazy-init="true">
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
index cecafef..30e73d0 100644
---
a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
+++
b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
@@ -45,7 +45,7 @@
</property>
</bean>
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
index cd702af..91d3800 100644
--- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
+++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
@@ -78,13 +78,6 @@
<artifactId>maven-artifact</artifactId>
<scope>test</scope>
</dependency>
-<!--
- <dependency>
- <groupId>org.apache.archiva.redback.components</groupId>
- <artifactId>spring-utils</artifactId>
- <scope>test</scope>
- </dependency>
--->
</dependencies>
</project>
diff --git
a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index a7b8af0..ecc8157 100644
---
a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++
b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -165,8 +165,8 @@
<artifactId>commons-validator</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components</groupId>
- <artifactId>spring-quartz</artifactId>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-quartz</artifactId>
</dependency>
<dependency>
<groupId>org.apache.archiva.redback</groupId>
diff --git
a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java
b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java
index 692bf11..c46362e 100644
---
a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java
+++
b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java
@@ -26,7 +26,7 @@ import
org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.components.registry.Registry;
-import org.apache.archiva.redback.components.scheduler.CronExpressionValidator;
+import org.apache.archiva.components.scheduler.CronExpressionValidator;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.validator.GenericValidator;
import org.springframework.stereotype.Service;
diff --git
a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
index 661aec5..f2ec06a 100644
---
a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
+++
b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml
@@ -33,7 +33,7 @@
<context:annotation-config/>
<context:component-scan
base-package="org.apache.archiva.admin.mock,org.apache.archiva.repository.content.maven2"/>
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git
a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/resources/spring-context.xml
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/resources/spring-context.xml
index 83a361f..f4568d1 100644
---
a/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/resources/spring-context.xml
+++
b/archiva-modules/archiva-maven/archiva-maven-indexer/src/test/resources/spring-context.xml
@@ -33,7 +33,7 @@
<bean name="wagon#file" scope="prototype"
class="org.apache.maven.wagon.providers.file.FileWagon"/>
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git
a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/spring-context.xml
b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/spring-context.xml
index 479506b..a97bfe5 100755
---
a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/spring-context.xml
+++
b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/resources/spring-context.xml
@@ -35,7 +35,7 @@
<alias name="archivaConfiguration#mock" alias="archivaConfiguration"/>
<alias name="archivaTaskScheduler#repositoryMock"
alias="archivaTaskScheduler#repository" />
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git
a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml
b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml
index cf2465e..a4c76fa 100644
---
a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml
+++
b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-storage.xml
@@ -39,7 +39,7 @@
<alias name="archivaTaskScheduler#repositoryMock"
alias="archivaTaskScheduler#repository" />
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git
a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml
b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml
index e02db17..872f498 100644
---
a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml
+++
b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context.xml
@@ -40,7 +40,7 @@
<alias name="archivaTaskScheduler#repositoryMock"
alias="archivaTaskScheduler#repository" />
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git
a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml
b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml
index 160a3ac..521f871 100644
---
a/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml
+++
b/archiva-modules/archiva-maven/archiva-maven-scheduler/src/test/resources/spring-context.xml
@@ -27,7 +27,7 @@
<context:component-scan
base-package="org.apache.archiva.repository.content.maven2,org.apache.archiva.indexer.maven"
/>
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
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 c07080f..64ccb2c 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml
@@ -41,22 +41,12 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components</groupId>
- <artifactId>spring-quartz</artifactId>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-quartz</artifactId>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <exclusions>
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index 3401c72..46a01e4 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -46,22 +46,12 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components</groupId>
- <artifactId>spring-quartz</artifactId>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-quartz</artifactId>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <exclusions>
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
diff --git
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
index 7152f0a..da624e2 100644
---
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
+++
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/DefaultRepositoryArchivaTaskScheduler.java
@@ -29,8 +29,8 @@ import
org.apache.archiva.metadata.repository.MetadataRepositoryException;
import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import
org.apache.archiva.metadata.repository.stats.model.RepositoryStatisticsManager;
-import org.apache.archiva.redback.components.scheduler.CronExpressionValidator;
-import org.apache.archiva.redback.components.scheduler.Scheduler;
+import org.apache.archiva.components.scheduler.CronExpressionValidator;
+import org.apache.archiva.components.scheduler.Scheduler;
import org.apache.archiva.components.taskqueue.TaskQueue;
import org.apache.archiva.components.taskqueue.TaskQueueException;
import
org.apache.archiva.scheduler.repository.model.RepositoryArchivaTaskScheduler;
diff --git
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
index 99d719d..0ed7b70 100644
---
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
+++
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/java/org/apache/archiva/scheduler/repository/RepositoryTaskJob.java
@@ -19,7 +19,7 @@ package org.apache.archiva.scheduler.repository;
* under the License.
*/
-import org.apache.archiva.redback.components.scheduler.AbstractJob;
+import org.apache.archiva.components.scheduler.AbstractJob;
import org.apache.archiva.components.taskqueue.TaskQueue;
import org.apache.archiva.components.taskqueue.TaskQueueException;
import org.apache.archiva.scheduler.repository.model.RepositoryTask;
diff --git
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/spring-context.xml
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/spring-context.xml
index e209e07..fdba0a0 100755
---
a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/spring-context.xml
+++
b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/main/resources/META-INF/spring-context.xml
@@ -42,7 +42,7 @@
<!--
olamy we can use this if one day we move away from the old plexus stuff :-)
btw comment this as it breaks unit tests in web as depending on classloader
loading
- it override beans with same name but with type
org.apache.archiva.redback.components.scheduler.DefaultScheduler
+ it override beans with same name but with type
org.apache.archiva.components.scheduler.DefaultScheduler
<task:scheduler id="scheduler" pool-size="10"/>
-->
</beans>
\ No newline at end of file
diff --git
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
index 87bbac8..2005a44 100644
---
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
+++
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
@@ -18,7 +18,7 @@ package org.apache.archiva.rest.services;
* under the License.
*/
-import org.apache.archiva.redback.components.scheduler.CronExpressionValidator;
+import org.apache.archiva.components.scheduler.CronExpressionValidator;
import org.apache.archiva.redback.rest.api.services.RedbackServiceException;
import org.apache.archiva.redback.rest.api.services.UtilServices;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
diff --git
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
index 5a79159..e2854e5 100644
---
a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
+++
b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml
@@ -34,7 +34,7 @@
<context:component-scan
base-package="org.apache.archiva.redback.keys,org.apache.archiva.rest.services.utils,org.apache.archiva.repository.content.maven2"/>
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git
a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
index 59e3c2f..67e2f8b 100644
---
a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
+++
b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml
@@ -105,7 +105,7 @@
<bean name="archivaTaskScheduler#repository"
class="org.apache.archiva.security.mock.MockBeanServices"/>
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml
b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 1371b37..8cc0d72 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -194,22 +194,12 @@
<artifactId>archiva-components-spring-taskqueue</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components</groupId>
- <artifactId>spring-quartz</artifactId>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-quartz</artifactId>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <exclusions>
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git
a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
index 287429a..4c697aa 100644
---
a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
+++
b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
@@ -20,7 +20,7 @@ package org.apache.archiva.web.startup;
*/
import org.apache.archiva.common.ArchivaException;
-import org.apache.archiva.redback.components.scheduler.DefaultScheduler;
+import org.apache.archiva.components.scheduler.DefaultScheduler;
import org.apache.archiva.components.taskqueue.Task;
import
org.apache.archiva.components.taskqueue.execution.ThreadedTaskQueueExecutor;
import
org.apache.archiva.scheduler.repository.DefaultRepositoryArchivaTaskScheduler;
diff --git
a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
index e24d4c4..3733a90 100644
---
a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
+++
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-common.xml
@@ -31,7 +31,7 @@
<context:component-scan
base-package="org.apache.archiva.redback.keys,org.apache.archiva.rest.services.utils"/>
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git
a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml
index 9eccc48..e9d9a81 100644
---
a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml
+++
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-test-upload.xml
@@ -33,7 +33,7 @@
<context:component-scan
base-package="org.apache.archiva.repository.content.maven2,org.apache.archiva.redback.keys,org.apache.archiva.rest.services.utils"/>
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git
a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
index f29dbcb..0b483ff 100644
---
a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
+++
b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-with-jcr.xml
@@ -45,7 +45,7 @@
</constructor-arg>
</bean>
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml
b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 29e667f..a8629e8 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -518,22 +518,12 @@
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components</groupId>
- <artifactId>spring-quartz</artifactId>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-quartz</artifactId>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <exclusions>
- <exclusion>
- <groupId>c3p0</groupId>
- <artifactId>c3p0</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
diff --git
a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index 389ac85..3699f53 100644
---
a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++
b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -100,7 +100,7 @@
</bean>
<!-- END SNIPPET: configuration-files-list -->
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git
a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
index b782fbf..ab8c88a 100644
---
a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
+++
b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context-servlet-security-test.xml
@@ -33,7 +33,7 @@
<context:component-scan
base-package="org.apache.archiva.redback.keys,org.apache.archiva.webdav,org.apache.archiva.metadata.repository,org.apache.archiva.webdav.util,org.apache.archiva.common.plexusbridge"/>
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git
a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
index 9b3a139..6ff00c8 100644
---
a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
+++
b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/spring-context.xml
@@ -32,7 +32,7 @@
<context:annotation-config/>
<context:component-scan
base-package="org.apache.archiva.redback.keys,org.apache.archiva.webdav,org.apache.archiva.metadata.repository"
/>
- <bean name="scheduler"
class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
+ <bean name="scheduler"
class="org.apache.archiva.components.scheduler.DefaultScheduler">
<property name="properties">
<props>
<prop key="org.quartz.scheduler.instanceName">scheduler1</prop>
diff --git a/pom.xml b/pom.xml
index da3eeea..4073930 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,11 +62,6 @@
<wagon.version>3.3.3</wagon.version>
<redback.version>3.0.0-SNAPSHOT</redback.version>
- <redback.cache.version>2.2</redback.cache.version>
- <redback.quartz.version>2.1</redback.quartz.version>
- <redback.registry.version>2.4</redback.registry.version>
- <redback.spring-utils.version>2.1</redback.spring-utils.version>
- <redback.taskqueue.version>2.1</redback.taskqueue.version>
<!-- dependencies of maven modules -->
<jsoup.version>1.12.1</jsoup.version>
@@ -956,27 +951,28 @@
<version>${archiva.comp.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components</groupId>
- <artifactId>spring-quartz</artifactId>
- <version>${redback.quartz.version}</version>
+ <groupId>org.apache.archiva.components</groupId>
+ <artifactId>archiva-components-spring-quartz</artifactId>
+ <version>${archiva.comp.version}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
+ <artifactId>javax.annotation-api</artifactId>
</exclusion>
- </exclusions> </dependency>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.2.1</version>
+ <version>${quartz.version}</version>
<exclusions>
<exclusion>
- <groupId>c3p0</groupId>
+ <groupId>com.mchange</groupId>
<artifactId>c3p0</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP-java7</artifactId>
</exclusion>
</exclusions>
</dependency>
