You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2019/11/19 22:36:44 UTC
[archiva] branch master updated (672e1e1 -> 1d5e607)
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git.
from 672e1e1 Merge pull request #51 from joestr/patch-1
new 7c42329 Removing duplicate dependency entry
new aa36da0 Adding flag for using local jenkins
new 1d5e607 Switching to moved component-spring-cache module
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Jenkinsfile | 7 +++++--
archiva-cli/src/main/resources/log4j2.xml | 2 +-
.../archiva-base/archiva-configuration/pom.xml | 14 +++++++------
.../src/test/resources/spring-context.xml | 2 +-
.../resourcesstatic/archetype-resources/pom.xml | 6 +++---
.../archiva-lucene-consumers/pom.xml | 4 ++--
.../archiva-base/archiva-policies/pom.xml | 8 ++++----
.../policies/urlcache/DefaultUrlFailureCache.java | 2 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../managed/DefaultManagedRepositoryAdmin.java | 2 +-
.../DefaultArchivaRuntimeConfigurationAdmin.java | 2 +-
.../DefaultRedbackRuntimeConfigurationAdmin.java | 2 +-
.../archiva-base/archiva-repository-layer/pom.xml | 4 ++--
.../archiva-repository-scanner/pom.xml | 4 ++--
.../archiva-maven/archiva-maven-converter/pom.xml | 4 ++--
.../src/test/resources/spring-context.xml | 2 +-
.../archiva-maven/archiva-maven-repository/pom.xml | 4 ++--
.../archiva-scheduler-repository/pom.xml | 4 ++--
.../DefaultArchivaRuntimeConfigurationService.java | 2 +-
.../rest/services/DefaultBrowseService.java | 2 +-
.../DefaultRedbackRuntimeConfigurationService.java | 2 +-
.../rest/services/DefaultRepositoriesService.java | 2 +-
.../rest/services/DefaultSystemStatusService.java | 4 ++--
.../src/main/resources/META-INF/spring-context.xml | 2 +-
archiva-modules/archiva-web/archiva-rss/pom.xml | 4 ++--
.../security/ArchivaConfigurableUsersManager.java | 2 +-
.../archiva/web/security/ArchivaRbacManager.java | 2 +-
archiva-modules/archiva-web/archiva-webapp/pom.xml | 4 ++--
.../src/main/webapp/WEB-INF/applicationContext.xml | 24 +++++++++++-----------
.../repository/DefaultMetadataResolver.java | 2 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../plugins/metadata-store-cassandra/pom.xml | 4 ++--
.../plugins/metadata-store-file/pom.xml | 4 ++--
archiva-modules/plugins/metadata-store-jcr/pom.xml | 4 ++--
archiva-modules/plugins/problem-reports/pom.xml | 4 ++--
pom.xml | 12 +++++------
37 files changed, 82 insertions(+), 77 deletions(-)
[archiva] 02/03: Adding flag for using local jenkins
Posted by ma...@apache.org.
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
commit aa36da078e3d7cb54fccf01e572d25cf03c8947d
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Nov 17 21:16:39 2019 +0100
Adding flag for using local jenkins
---
Jenkinsfile | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index d53c044..c8100e9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,7 +40,10 @@ publishers = [artifactsPublisher(disabled: false),
junitPublisher(disabled: false, ignoreAttachments: false),
pipelineGraphPublisher(disabled: false),mavenLinkerPublisher(disabled: false)]
-INTEGRATION_PIPELINE = "Archiva-IntegrationTests-Gitbox"
+cmdLine = (env.NONAPACHEORG_RUN != 'y' && env.BRANCH_NAME == 'master') ? "clean deploy" : "clean install"
+
+
+ INTEGRATION_PIPELINE = "Archiva-IntegrationTests-Gitbox"
pipeline {
agent {
@@ -103,7 +106,7 @@ pipeline {
// -Dmaven.compiler.fork=true: Do compile in a separate forked process
// -Dmaven.test.failure.ignore=true: Do not stop, if some tests fail
// -Pci-build: Profile for CI-Server
- sh "mvn clean deploy -B -U -e -fae -Dmaven.compiler.fork=true -Pci-build -T${THREADS}"
+ sh "mvn ${cmdLine} -B -U -e -fae -Dmaven.compiler.fork=true -Pci-build -T${THREADS}"
}
}
}
[archiva] 01/03: Removing duplicate dependency entry
Posted by ma...@apache.org.
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
commit 7c42329da247d6634bc8a2658bdf96f54554b478
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Nov 17 15:45:29 2019 +0100
Removing duplicate dependency entry
---
archiva-modules/archiva-base/archiva-configuration/pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index d5207da..9aafd6d 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -63,10 +63,6 @@
</dependency>
<dependency>
<groupId>org.apache.archiva.components.registry</groupId>
- <artifactId>archiva-components-spring-registry-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva.components.registry</groupId>
<artifactId>archiva-components-spring-registry-commons</artifactId>
<exclusions>
<exclusion>
[archiva] 03/03: Switching to moved component-spring-cache module
Posted by ma...@apache.org.
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
commit 1d5e607431206b0fd0350bdd590bb7897fcc033a
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Tue Nov 19 23:36:35 2019 +0100
Switching to moved component-spring-cache module
---
archiva-cli/src/main/resources/log4j2.xml | 2 +-
.../archiva-base/archiva-configuration/pom.xml | 10 +++++++--
.../src/test/resources/spring-context.xml | 2 +-
.../resourcesstatic/archetype-resources/pom.xml | 6 +++---
.../archiva-lucene-consumers/pom.xml | 4 ++--
.../archiva-base/archiva-policies/pom.xml | 8 ++++----
.../policies/urlcache/DefaultUrlFailureCache.java | 2 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../src/test/resources/spring-context.xml | 2 +-
.../managed/DefaultManagedRepositoryAdmin.java | 2 +-
.../DefaultArchivaRuntimeConfigurationAdmin.java | 2 +-
.../DefaultRedbackRuntimeConfigurationAdmin.java | 2 +-
.../archiva-base/archiva-repository-layer/pom.xml | 4 ++--
.../archiva-repository-scanner/pom.xml | 4 ++--
.../archiva-maven/archiva-maven-converter/pom.xml | 4 ++--
.../src/test/resources/spring-context.xml | 2 +-
.../archiva-maven/archiva-maven-repository/pom.xml | 4 ++--
.../archiva-scheduler-repository/pom.xml | 4 ++--
.../DefaultArchivaRuntimeConfigurationService.java | 2 +-
.../rest/services/DefaultBrowseService.java | 2 +-
.../DefaultRedbackRuntimeConfigurationService.java | 2 +-
.../rest/services/DefaultRepositoriesService.java | 2 +-
.../rest/services/DefaultSystemStatusService.java | 4 ++--
.../src/main/resources/META-INF/spring-context.xml | 2 +-
archiva-modules/archiva-web/archiva-rss/pom.xml | 4 ++--
.../security/ArchivaConfigurableUsersManager.java | 2 +-
.../archiva/web/security/ArchivaRbacManager.java | 2 +-
archiva-modules/archiva-web/archiva-webapp/pom.xml | 4 ++--
.../src/main/webapp/WEB-INF/applicationContext.xml | 24 +++++++++++-----------
.../repository/DefaultMetadataResolver.java | 2 +-
.../src/main/resources/META-INF/spring-context.xml | 2 +-
.../plugins/metadata-store-cassandra/pom.xml | 4 ++--
.../plugins/metadata-store-file/pom.xml | 4 ++--
archiva-modules/plugins/metadata-store-jcr/pom.xml | 4 ++--
archiva-modules/plugins/problem-reports/pom.xml | 4 ++--
pom.xml | 12 +++++------
36 files changed, 77 insertions(+), 71 deletions(-)
diff --git a/archiva-cli/src/main/resources/log4j2.xml b/archiva-cli/src/main/resources/log4j2.xml
index 4b3286c..95994df 100644
--- a/archiva-cli/src/main/resources/log4j2.xml
+++ b/archiva-cli/src/main/resources/log4j2.xml
@@ -25,7 +25,7 @@
</appenders>
<loggers>
<logger name="org.apache.archiva" level="info"/>
- <logger name="org.apache.archiva.redback.components.cache.ehcache" level="warn" />
+ <logger name="org.apache.archiva.components.cache.ehcache" level="warn" />
<root level="error" includeLocation="true">
<appender-ref ref="console"/>
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index 9aafd6d..7e1b134 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -114,6 +114,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2.2</version>
+ </dependency>
<!--
<dependency>
<groupId>org.apache.archiva.redback.components</groupId>
@@ -142,6 +147,7 @@
</dependency>
<!-- Test scope -->
+
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
@@ -165,8 +171,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
index 4f40fc9..a3e0579 100755
--- a/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/src/test/resources/spring-context.xml
@@ -323,7 +323,7 @@
</property>
</bean>
- <bean name="cache#url-failures-cache" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
+ <bean name="cache#url-failures-cache" class="org.apache.archiva.components.cache.ehcache.EhcacheCache">
<property name="diskExpiryThreadIntervalSeconds" value="600"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
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 ba1805c..291a6e5 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
@@ -79,9 +79,9 @@
<!-- Test scope -->
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
- <version>${redbackCacheVersion}</version>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
+ <version>${archiva.comp.version}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index 0e541d0..4265964 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -156,8 +156,8 @@
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<scope>test</scope>
</dependency>
diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index bc63437..4490335 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -63,8 +63,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-api</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-api</artifactId>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -75,8 +75,8 @@
<!-- Test scope -->
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
index 1bf1e50..90e3b54 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/urlcache/DefaultUrlFailureCache.java
@@ -19,7 +19,7 @@ package org.apache.archiva.policies.urlcache;
* under the License.
*/
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
diff --git a/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
index 676edf7..e42a9b8 100644
--- a/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-policies/src/main/resources/META-INF/spring-context.xml
@@ -35,7 +35,7 @@
- <bean name="cache#url-failures-cache" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache" lazy-init="true"
+ <bean name="cache#url-failures-cache" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" lazy-init="true"
destroy-method="dispose">
<property name="diskExpiryThreadIntervalSeconds" value="600"/>
<property name="diskPersistent" value="true"/>
diff --git a/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml
index c3263e5..9142697 100755
--- a/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-policies/src/test/resources/spring-context.xml
@@ -29,7 +29,7 @@
<context:property-placeholder system-properties-mode="OVERRIDE"/>
- <bean name="cache#url-failures-cache" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache">
+ <bean name="cache#url-failures-cache" class="org.apache.archiva.components.cache.ehcache.EhcacheCache">
<property name="diskExpiryThreadIntervalSeconds" value="600"/>
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
index ce1c305..e2e2aa3 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
@@ -34,7 +34,7 @@ import org.apache.archiva.indexer.IndexUpdateFailedException;
import org.apache.archiva.metadata.model.facets.AuditEvent;
import org.apache.archiva.metadata.repository.*;
import org.apache.archiva.metadata.repository.stats.model.RepositoryStatisticsManager;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.components.registry.RegistryException;
import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
import org.apache.archiva.redback.role.RoleManager;
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
index 2b6980c..b6b1eb4 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultArchivaRuntimeConfigurationAdmin.java
@@ -27,7 +27,7 @@ import org.apache.archiva.admin.repository.AbstractRepositoryAdmin;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.IndeterminateConfigurationException;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.components.registry.RegistryException;
import org.springframework.stereotype.Service;
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
index 92e4c39..7e934b1 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/runtime/DefaultRedbackRuntimeConfigurationAdmin.java
@@ -28,7 +28,7 @@ import org.apache.archiva.admin.repository.AbstractRepositoryAdmin;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.IndeterminateConfigurationException;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.components.registry.RegistryException;
import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.configuration.UserConfigurationException;
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index 209911e..bc03101 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -137,8 +137,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
index c97fd34..2cc7122 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
@@ -73,8 +73,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml
index 72502c6..e1e5309 100644
--- a/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml
@@ -102,8 +102,8 @@
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<scope>test</scope>
</dependency>
<dependency>
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 2681a48..479506b 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
@@ -66,7 +66,7 @@
</bean>
- <bean name="cache#url-failures-cache" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache" lazy-init="true"
+ <bean name="cache#url-failures-cache" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" lazy-init="true"
destroy-method="dispose">
<property name="diskExpiryThreadIntervalSeconds" value="600"/>
<property name="diskPersistent" value="false"/>
diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
index d83328f..7adac0d 100644
--- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml
@@ -206,8 +206,8 @@
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<scope>test</scope>
</dependency>
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index e9d16d3..3401c72 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -131,8 +131,8 @@
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<scope>test</scope>
</dependency>
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
index 8b741b3..a799462 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultArchivaRuntimeConfigurationService.java
@@ -24,7 +24,7 @@ import org.apache.archiva.admin.model.beans.CacheConfiguration;
import org.apache.archiva.admin.model.beans.FileLockConfiguration;
import org.apache.archiva.admin.model.runtime.ArchivaRuntimeConfigurationAdmin;
import org.apache.archiva.common.filelock.FileLockManager;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.apache.archiva.rest.api.services.ArchivaRuntimeConfigurationService;
import org.springframework.stereotype.Service;
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
index a553bf8..3bb2a87 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
@@ -37,7 +37,7 @@ import org.apache.archiva.model.ArchivaArtifact;
import org.apache.archiva.model.ArchivaRepositoryMetadata;
import org.apache.archiva.proxy.ProxyRegistry;
import org.apache.archiva.proxy.model.RepositoryProxyHandler;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.ReleaseScheme;
import org.apache.archiva.repository.RepositoryException;
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
index 5cc791f..96b544f 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRedbackRuntimeConfigurationService.java
@@ -28,7 +28,7 @@ import org.apache.archiva.redback.common.ldap.connection.LdapConnectionConfigura
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.apache.archiva.redback.common.ldap.connection.LdapException;
import org.apache.archiva.redback.common.ldap.user.LdapUserMapper;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.policy.CookieSettings;
import org.apache.archiva.redback.policy.PasswordRule;
import org.apache.archiva.redback.rbac.RBACManager;
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
index c6be5bf..4c9ccd4 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java
@@ -36,7 +36,7 @@ import org.apache.archiva.model.ArtifactReference;
import org.apache.archiva.model.VersionedReference;
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authorization.AuthorizationException;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
import org.apache.archiva.redback.system.DefaultSecuritySession;
import org.apache.archiva.redback.system.SecuritySession;
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
index 82f92dc..705bdb6 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
@@ -20,8 +20,8 @@ package org.apache.archiva.rest.services;
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
-import org.apache.archiva.redback.components.cache.Cache;
-import org.apache.archiva.redback.components.cache.CacheStatistics;
+import org.apache.archiva.components.cache.Cache;
+import org.apache.archiva.components.cache.CacheStatistics;
import org.apache.archiva.redback.components.taskqueue.TaskQueue;
import org.apache.archiva.redback.components.taskqueue.TaskQueueException;
import org.apache.archiva.repository.scanner.RepositoryScanner;
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
index c9e677d..a923273 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/resources/META-INF/spring-context.xml
@@ -86,7 +86,7 @@
</jaxrs:outFaultInterceptors>
</jaxrs:server>
- <bean name="browse#versionMetadata" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="browse#versionMetadata" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml
index 7d830a0..c3ca0b5 100644
--- a/archiva-modules/archiva-web/archiva-rss/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rss/pom.xml
@@ -76,8 +76,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
index 6be5929..969f0ea 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaConfigurableUsersManager.java
@@ -20,7 +20,7 @@ package org.apache.archiva.web.security;
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.users.AbstractUserManager;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
index d0cb25b..67dc4b7 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaRbacManager.java
@@ -20,7 +20,7 @@ package org.apache.archiva.web.security;
import org.apache.archiva.admin.model.RepositoryAdminException;
import org.apache.archiva.admin.model.runtime.RedbackRuntimeConfigurationAdmin;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.redback.rbac.AbstractRBACManager;
import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.Permission;
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 0f17786..29e667f 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -497,8 +497,8 @@
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
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 1e63b27..389ac85 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
@@ -120,7 +120,7 @@
</bean>
-->
<!-- for change configuration of the users cache -->
- <bean name="cache#users" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#users" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -133,7 +133,7 @@
- <bean name="cache#url-failures-cache" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache" lazy-init="true"
+ <bean name="cache#url-failures-cache" class="org.apache.archiva.components.cache.ehcache.EhcacheCache" lazy-init="true"
destroy-method="dispose">
<property name="diskExpiryThreadIntervalSeconds" value="600"/>
<property name="diskPersistent" value="true"/>
@@ -148,7 +148,7 @@
<property name="timeToLiveSeconds" value="1800"/>
</bean>
- <bean name="cache#keys" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#keys" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -159,7 +159,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
- <bean name="cache#operations" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#operations" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -170,7 +170,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
- <bean name="cache#permissions" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#permissions" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -181,7 +181,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
- <bean name="cache#resources" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#resources" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -192,7 +192,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
- <bean name="cache#roles" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#roles" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -203,7 +203,7 @@
<property name="timeToLiveSeconds" value="14400"/>
</bean>
- <bean name="cache#effectiveRoleSet" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#effectiveRoleSet" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -218,7 +218,7 @@
Caches with Short Term entries
================================================================ -->
- <bean name="cache#userAssignments" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#userAssignments" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -229,7 +229,7 @@
<property name="timeToLiveSeconds" value="600"/>
</bean>
- <bean name="cache#userPermissions" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#userPermissions" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -240,7 +240,7 @@
<property name="timeToLiveSeconds" value="600"/>
</bean>
- <bean name="cache#ldapRoles" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#ldapRoles" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
@@ -251,7 +251,7 @@
<property name="timeToLiveSeconds" value="600"/>
</bean>
- <bean name="cache#namespaces" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#namespaces" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
index 488de18..e94ff09 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/DefaultMetadataResolver.java
@@ -29,7 +29,7 @@ import org.apache.archiva.metadata.repository.storage.RepositoryStorage;
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataInvalidException;
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataNotFoundException;
import org.apache.archiva.metadata.repository.storage.RepositoryStorageRuntimeException;
-import org.apache.archiva.redback.components.cache.Cache;
+import org.apache.archiva.components.cache.Cache;
import org.apache.archiva.metadata.audit.RepositoryListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml b/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml
index 34e5c3d..06b3213 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/resources/META-INF/spring-context.xml
@@ -39,7 +39,7 @@
</constructor-arg>
</bean>
- <bean name="cache#namespaces" class="org.apache.archiva.redback.components.cache.ehcache.EhcacheCache"
+ <bean name="cache#namespaces" class="org.apache.archiva.components.cache.ehcache.EhcacheCache"
init-method="initialize">
<property name="diskPersistent" value="false"/>
<property name="eternal" value="false"/>
diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
index 8f4021c..974c0f3 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
@@ -186,8 +186,8 @@
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<scope>test</scope>
</dependency>
diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml
index 80ae8fb..4c4c42c 100644
--- a/archiva-modules/plugins/metadata-store-file/pom.xml
+++ b/archiva-modules/plugins/metadata-store-file/pom.xml
@@ -43,8 +43,8 @@
<!-- Test scope -->
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index 0882bd4..97ea6b8 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -162,8 +162,8 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<scope>test</scope>
</dependency>
diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml
index 1067f4c..4b85596 100644
--- a/archiva-modules/plugins/problem-reports/pom.xml
+++ b/archiva-modules/plugins/problem-reports/pom.xml
@@ -81,8 +81,8 @@
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 89dd965..76dd097 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1002,9 +1002,9 @@
<version>${plexus-utils.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-api</artifactId>
- <version>${redback.cache.version}</version>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-api</artifactId>
+ <version>${archiva.comp.version}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
@@ -1013,9 +1013,9 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.archiva.redback.components.cache</groupId>
- <artifactId>spring-cache-ehcache</artifactId>
- <version>${redback.cache.version}</version>
+ <groupId>org.apache.archiva.components.cache</groupId>
+ <artifactId>archiva-components-spring-cache-ehcache</artifactId>
+ <version>${archiva.comp.version}</version>
</dependency>
<!-- redback -->