diff options
| author | Martin Stockhammer <martin_s@apache.org> | 2019-11-24 11:22:58 +0100 |
|---|---|---|
| committer | Martin Stockhammer <martin_s@apache.org> | 2019-11-24 11:22:58 +0100 |
| commit | 58b9a3a8b64de41f0774e67882d493202a3be300 (patch) | |
| tree | c5b2ddd8271c2f18fffd7c3fc236297344a70dc9 /archiva-modules/archiva-web/archiva-web-common | |
| parent | bb56494366bbb9b89f4284e5b0f5b4c6ea5aedd6 (diff) | |
| download | archiva-58b9a3a8b64de41f0774e67882d493202a3be300.tar.gz archiva-58b9a3a8b64de41f0774e67882d493202a3be300.zip | |
Changing dependencies to new spring-quartz component
Diffstat (limited to 'archiva-modules/archiva-web/archiva-web-common')
5 files changed, 6 insertions, 16 deletions
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index 1371b3733..8cc0d7247 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 287429ac8..4c697aad3 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 e24d4c400..3733a90ac 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 9eccc4823..e9d9a81fe 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 f29dbcb16..0b483ff4b 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> |