@@ -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"/> |
@@ -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> |
@@ -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"/> |
@@ -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> |
@@ -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> | |||
@@ -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> |
@@ -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; |
@@ -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"/> |
@@ -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"/> |
@@ -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; |
@@ -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; | |||
@@ -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; |
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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"/> |
@@ -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> | |||
@@ -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> | |||
@@ -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; |
@@ -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; |
@@ -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; |
@@ -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; |
@@ -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; |
@@ -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"/> |
@@ -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> |
@@ -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; |
@@ -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; |
@@ -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> |
@@ -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"/> |
@@ -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; |
@@ -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"/> |
@@ -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> | |||
@@ -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> |
@@ -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> | |||
@@ -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> | |||
@@ -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 --> |