From 1d5e607431206b0fd0350bdd590bb7897fcc033a Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Tue, 19 Nov 2019 23:36:35 +0100 Subject: [PATCH] Switching to moved component-spring-cache module --- archiva-cli/src/main/resources/log4j2.xml | 2 +- .../archiva-configuration/pom.xml | 10 ++++++-- .../src/test/resources/spring-context.xml | 2 +- .../archetype-resources/pom.xml | 6 ++--- .../archiva-lucene-consumers/pom.xml | 4 ++-- .../archiva-base/archiva-policies/pom.xml | 8 +++---- .../urlcache/DefaultUrlFailureCache.java | 2 +- .../resources/META-INF/spring-context.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../DefaultManagedRepositoryAdmin.java | 2 +- ...faultArchivaRuntimeConfigurationAdmin.java | 2 +- ...faultRedbackRuntimeConfigurationAdmin.java | 2 +- .../archiva-repository-layer/pom.xml | 4 ++-- .../archiva-repository-scanner/pom.xml | 4 ++-- .../archiva-maven-converter/pom.xml | 4 ++-- .../src/test/resources/spring-context.xml | 2 +- .../archiva-maven-repository/pom.xml | 4 ++-- .../archiva-scheduler-repository/pom.xml | 4 ++-- ...ultArchivaRuntimeConfigurationService.java | 2 +- .../rest/services/DefaultBrowseService.java | 2 +- ...ultRedbackRuntimeConfigurationService.java | 2 +- .../services/DefaultRepositoriesService.java | 2 +- .../services/DefaultSystemStatusService.java | 4 ++-- .../resources/META-INF/spring-context.xml | 2 +- .../archiva-web/archiva-rss/pom.xml | 4 ++-- .../ArchivaConfigurableUsersManager.java | 2 +- .../web/security/ArchivaRbacManager.java | 2 +- .../archiva-web/archiva-webapp/pom.xml | 4 ++-- .../webapp/WEB-INF/applicationContext.xml | 24 +++++++++---------- .../repository/DefaultMetadataResolver.java | 2 +- .../resources/META-INF/spring-context.xml | 2 +- .../plugins/metadata-store-cassandra/pom.xml | 4 ++-- .../plugins/metadata-store-file/pom.xml | 4 ++-- .../plugins/metadata-store-jcr/pom.xml | 4 ++-- .../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 4b3286cc0..95994df8a 100644 --- a/archiva-cli/src/main/resources/log4j2.xml +++ b/archiva-cli/src/main/resources/log4j2.xml @@ -25,7 +25,7 @@ - + diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 9aafd6da6..7e1b134b6 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -114,6 +114,11 @@ + + commons-collections + commons-collections + 3.2.2 + + commons-beanutils commons-beanutils @@ -165,8 +171,8 @@ test - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache test 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 4f40fc978..a3e057945 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 @@ - + 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 ba1805cc3..291a6e5ef 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 @@ - org.apache.archiva.redback.components.cache - spring-cache-ehcache - ${redbackCacheVersion} + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache + ${archiva.comp.version} test 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 0e541d0e0..4265964c0 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 @@ - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache test diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index bc63437c3..449033581 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -63,8 +63,8 @@ slf4j-api - org.apache.archiva.redback.components.cache - spring-cache-api + org.apache.archiva.components.cache + archiva-components-spring-cache-api commons-logging @@ -75,8 +75,8 @@ - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache commons-logging 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 1bf1e50ad..90e3b54eb 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 676edf7e9..e42a9b8e7 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 @@ - 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 c3263e5e2..91426974c 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 @@ - + 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 ce1c305a8..e2e2aa319 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 2b6980cf9..b6b1eb41b 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 92e4c3969..7e934b16d 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 209911ea3..bc031014e 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 @@ test - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache test diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml index c97fd34f2..2cc712260 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 @@ test - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache test diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml index 72502c677..e1e530917 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 @@ - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache test 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 2681a4867..479506b8f 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 @@ - diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml index d83328f05..7adac0dda 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 @@ - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache test diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml index e9d16d32c..3401c7209 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 @@ - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache test 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 8b741b315..a799462ed 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 a553bf824..3bb2a87db 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 5cc791f28..96b544f8e 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 c6be5bf40..4c9ccd43b 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 82f92dcb8..705bdb60f 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 c9e677db6..a92327309 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 @@ - diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index 7d830a095..c3ca0b538 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -76,8 +76,8 @@ test - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache test 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 6be59293a..969f0ea2a 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 d0cb25bc9..67dc4b7a4 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 0f177868e..29e667f01 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -497,8 +497,8 @@ - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache commons-logging 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 1e63b2700..389ac8571 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 @@ --> - @@ -133,7 +133,7 @@ - @@ -148,7 +148,7 @@ - @@ -159,7 +159,7 @@ - @@ -170,7 +170,7 @@ - @@ -181,7 +181,7 @@ - @@ -192,7 +192,7 @@ - @@ -203,7 +203,7 @@ - @@ -218,7 +218,7 @@ Caches with Short Term entries ================================================================ --> - @@ -229,7 +229,7 @@ - @@ -240,7 +240,7 @@ - @@ -251,7 +251,7 @@ - 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 488de18a2..e94ff0969 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 34e5c3d5d..06b3213a5 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 @@ - diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml index 8f4021cc4..974c0f3ef 100644 --- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml +++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml @@ -186,8 +186,8 @@ - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache test diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml index 80ae8fb51..4c4c42caf 100644 --- a/archiva-modules/plugins/metadata-store-file/pom.xml +++ b/archiva-modules/plugins/metadata-store-file/pom.xml @@ -43,8 +43,8 @@ - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache test diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml index 0882bd4cf..97ea6b82f 100644 --- a/archiva-modules/plugins/metadata-store-jcr/pom.xml +++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml @@ -162,8 +162,8 @@ - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache test diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml index 1067f4cbd..4b8559646 100644 --- a/archiva-modules/plugins/problem-reports/pom.xml +++ b/archiva-modules/plugins/problem-reports/pom.xml @@ -81,8 +81,8 @@ - org.apache.archiva.redback.components.cache - spring-cache-ehcache + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache test diff --git a/pom.xml b/pom.xml index 89dd965b8..76dd097cb 100644 --- a/pom.xml +++ b/pom.xml @@ -1002,9 +1002,9 @@ ${plexus-utils.version} - org.apache.archiva.redback.components.cache - spring-cache-api - ${redback.cache.version} + org.apache.archiva.components.cache + archiva-components-spring-cache-api + ${archiva.comp.version} javax.annotation @@ -1013,9 +1013,9 @@ - org.apache.archiva.redback.components.cache - spring-cache-ehcache - ${redback.cache.version} + org.apache.archiva.components.cache + archiva-components-spring-cache-ehcache + ${archiva.comp.version} -- 2.39.5