aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-base/archiva-consumers
diff options
context:
space:
mode:
authorMartin Stockhammer <martin_s@apache.org>2019-11-24 11:22:58 +0100
committerMartin Stockhammer <martin_s@apache.org>2019-11-24 11:22:58 +0100
commit58b9a3a8b64de41f0774e67882d493202a3be300 (patch)
treec5b2ddd8271c2f18fffd7c3fc236297344a70dc9 /archiva-modules/archiva-base/archiva-consumers
parentbb56494366bbb9b89f4284e5b0f5b4c6ea5aedd6 (diff)
downloadarchiva-58b9a3a8b64de41f0774e67882d493202a3be300.tar.gz
archiva-58b9a3a8b64de41f0774e67882d493202a3be300.zip
Changing dependencies to new spring-quartz component
Diffstat (limited to 'archiva-modules/archiva-base/archiva-consumers')
-rw-r--r--archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml6
-rw-r--r--archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml2
-rw-r--r--archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml2
-rw-r--r--archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml2
-rw-r--r--archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml2
5 files changed, 3 insertions, 11 deletions
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 109b638c7..5148224c0 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 d50eea78b..f1557b263 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 229deb9c3..3dab62357 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 c38d4e543..599643a30 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 cecafef8a..30e73d05f 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>