From 622006c9fde29f5e1b5d94043ef1fd6bd78d2a98 Mon Sep 17 00:00:00 2001 From: Martin Stockhammer Date: Sun, 17 Nov 2019 13:29:31 +0100 Subject: [PATCH] Applying references after package change of components spring-registry and expression-evaluator --- .../archiva-configuration/pom.xml | 21 +++++++--- .../configuration/ArchivaConfiguration.java | 6 +-- .../DefaultArchivaConfiguration.java | 16 +++---- .../archiva/configuration/FileTypes.java | 8 ++-- .../registry/ConfigurationRegistryReader.java | 2 +- .../registry/ConfigurationRegistryWriter.java | 2 +- .../ArchivaConfigurationTest.java | 2 +- .../src/test/resources/spring-context.xml | 34 +++++++-------- .../src/main/java/SimpleArtifactConsumer.java | 6 +-- .../archetype-resources/pom.xml | 13 ++++-- .../projects/compile/archetype.properties | 4 +- .../archiva-core-consumers/pom.xml | 5 +++ .../consumers/core/AutoRemoveConsumer.java | 4 +- .../repository/RepositoryPurgeConsumer.java | 4 +- .../resources/META-INF/spring-context.xml | 2 +- .../src/test/resources/log4j2-test.xml | 2 +- ...ing-context-cleanup-released-snapshots.xml | 4 +- .../spring-context-purge-consumer-test.xml | 6 +-- .../src/test/resources/spring-context.xml | 2 +- .../archiva-lucene-consumers/pom.xml | 4 +- .../lucene/NexusIndexerConsumer.java | 4 +- .../src/test/resources/spring-context.xml | 2 +- .../archiva-metadata-consumer/pom.xml | 4 +- .../ArchivaMetadataCreationConsumer.java | 4 +- .../archiva-base/archiva-proxy/pom.xml | 4 +- .../archiva-repository-admin-default/pom.xml | 5 +++ .../repository/AbstractRepositoryAdmin.java | 6 +-- .../DefaultRepositoryCommonValidator.java | 6 +-- .../DefaultManagedRepositoryAdmin.java | 2 +- ...faultArchivaRuntimeConfigurationAdmin.java | 2 +- ...faultRedbackRuntimeConfigurationAdmin.java | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../archiva-repository-api/pom.xml | 4 +- .../repository/RepositoryContentFactory.java | 4 +- .../archiva-repository-layer/pom.xml | 5 +++ .../base/ArchivaRepositoryRegistry.java | 2 +- .../metadata/base/MetadataTools.java | 4 +- .../src/test/resources/spring-context.xml | 2 +- .../archiva-repository-scanner/pom.xml | 5 +++ .../scanner/RepositoryContentConsumers.java | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../archiva-maven/archiva-maven-proxy/pom.xml | 4 +- .../archiva/proxy/MockConfiguration.java | 10 ++--- .../archiva-maven-repository/pom.xml | 5 +++ .../configuration/StubConfiguration.java | 4 +- .../configuration/TestConfiguration.java | 4 +- .../maven2/conf/MockConfiguration.java | 6 +-- .../spring-context-repo-request-test.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../archiva-scheduler-repository/pom.xml | 5 +++ .../src/test/resources/spring-context.xml | 2 +- .../META-INF/spring-context-test.xml | 4 +- .../src/test/resources/spring-context.xml | 2 +- .../web/startup/SecuritySynchronization.java | 6 +-- .../spring-context-artifacts-download.xml | 2 +- .../spring-context-merge-index-download.xml | 2 +- .../resources/spring-context-rss-servlet.xml | 2 +- .../resources/spring-context-test-common.xml | 2 +- .../resources/spring-context-test-upload.xml | 2 +- .../archiva-web/archiva-webapp/pom.xml | 16 ++----- .../webapp/WEB-INF/applicationContext.xml | 2 +- .../archiva-webapp/src/test/log4j2-test.xml | 2 +- .../resources/repository-servlet-simple.xml | 2 +- .../spring-context-servlet-security-test.xml | 2 +- .../src/test/resources/spring-context.xml | 2 +- .../consumers/DuplicateArtifactsConsumer.java | 4 +- pom.xml | 42 ++++--------------- 67 files changed, 187 insertions(+), 171 deletions(-) diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index dfb6a9b05..d5207dacf 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -42,8 +42,8 @@ archiva-policies - org.apache.archiva.redback.components.registry - spring-registry-api + org.apache.archiva.components.registry + archiva-components-spring-registry-api org.springframework @@ -62,8 +62,12 @@ - org.apache.archiva.redback.components.registry - spring-registry-commons + org.apache.archiva.components.registry + archiva-components-spring-registry-api + + + org.apache.archiva.components.registry + archiva-components-spring-registry-commons org.springframework @@ -72,8 +76,8 @@ - org.apache.archiva.redback.components - expression-evaluator + org.apache.archiva.components + archiva-components-expression-evaluator commons-configuration @@ -142,6 +146,11 @@ + + commons-beanutils + commons-beanutils + test + org.apache.archiva archiva-test-utils diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaConfiguration.java index 0f6ff82e2..9d8ead089 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/ArchivaConfiguration.java @@ -19,8 +19,8 @@ package org.apache.archiva.configuration; * under the License. */ -import org.apache.archiva.redback.components.registry.RegistryException; -import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.archiva.components.registry.RegistryException; +import org.apache.archiva.components.registry.RegistryListener; import java.nio.file.Path; import java.util.List; @@ -47,7 +47,7 @@ public interface ArchivaConfiguration * Save any updated configuration. * * @param configuration the configuration to save - * @throws org.apache.archiva.redback.components.registry.RegistryException + * @throws org.apache.archiva.components.registry.RegistryException * if there is a problem saving the registry data * @throws IndeterminateConfigurationException * if the configuration cannot be saved because it was read from two sources diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java index af7e2ef6d..b45fb5a59 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java @@ -25,14 +25,14 @@ import org.apache.archiva.configuration.io.registry.ConfigurationRegistryWriter; import org.apache.archiva.policies.AbstractUpdatePolicy; import org.apache.archiva.policies.CachedFailuresPolicy; import org.apache.archiva.policies.ChecksumPolicy; -import org.apache.archiva.redback.components.evaluator.DefaultExpressionEvaluator; -import org.apache.archiva.redback.components.evaluator.EvaluatorException; -import org.apache.archiva.redback.components.evaluator.ExpressionEvaluator; -import org.apache.archiva.redback.components.evaluator.sources.SystemPropertyExpressionSource; -import org.apache.archiva.redback.components.registry.Registry; -import org.apache.archiva.redback.components.registry.RegistryException; -import org.apache.archiva.redback.components.registry.RegistryListener; -import org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry; +import org.apache.archiva.components.evaluator.DefaultExpressionEvaluator; +import org.apache.archiva.components.evaluator.EvaluatorException; +import org.apache.archiva.components.evaluator.ExpressionEvaluator; +import org.apache.archiva.components.evaluator.sources.SystemPropertyExpressionSource; +import org.apache.archiva.components.registry.Registry; +import org.apache.archiva.components.registry.RegistryException; +import org.apache.archiva.components.registry.RegistryListener; +import org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.configuration.BaseConfiguration; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java index c7a9d4935..428255371 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java @@ -23,10 +23,10 @@ import org.apache.archiva.common.FileTypeUtils; import org.apache.archiva.configuration.functors.FiletypeSelectionPredicate; import org.apache.archiva.configuration.io.registry.ConfigurationRegistryReader; import org.apache.archiva.configuration.util.PathMatcher; -import org.apache.archiva.redback.components.registry.Registry; -import org.apache.archiva.redback.components.registry.RegistryException; -import org.apache.archiva.redback.components.registry.RegistryListener; -import org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry; +import org.apache.archiva.components.registry.Registry; +import org.apache.archiva.components.registry.RegistryException; +import org.apache.archiva.components.registry.RegistryListener; +import org.apache.archiva.components.registry.commons.CommonsConfigurationRegistry; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.IterableUtils; import org.apache.commons.collections4.Predicate; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryReader.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryReader.java index 8c0ff5d56..f3f0f2ea7 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryReader.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryReader.java @@ -21,7 +21,7 @@ package org.apache.archiva.configuration.io.registry; */ import org.apache.archiva.configuration.*; -import org.apache.archiva.redback.components.registry.Registry; +import org.apache.archiva.components.registry.Registry; import java.util.Iterator; import java.util.List; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryWriter.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryWriter.java index 786b027a9..2cbd387b6 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryWriter.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/io/registry/ConfigurationRegistryWriter.java @@ -21,7 +21,7 @@ package org.apache.archiva.configuration.io.registry; */ import org.apache.archiva.configuration.*; -import org.apache.archiva.redback.components.registry.Registry; +import org.apache.archiva.components.registry.Registry; import java.util.Iterator; import java.util.List; diff --git a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java index ffd513f78..90802a64b 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/test/java/org/apache/archiva/configuration/ArchivaConfigurationTest.java @@ -19,7 +19,7 @@ package org.apache.archiva.configuration; * under the License. */ -import org.apache.archiva.redback.components.registry.RegistryException; +import org.apache.archiva.components.registry.RegistryException; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; 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 f0bd4e10d..4f40fc978 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 @@ -32,12 +32,12 @@ - + - + @@ -45,7 +45,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + ${httpclientVersion} ${httpcoreVersion} ${asmVersion} + ${archivaCompVersion} + ${beanUtilsVersion} @@ -95,9 +97,9 @@ test - org.apache.archiva.redback.components.registry - spring-registry-api - ${redback.registry.version} + org.apache.archiva.components.registry + archiva-components-spring-registry-api + ${archiva.comp.version} commons-logging @@ -171,6 +173,11 @@ test + + commons-beanutils + commons-beanutils + ${commons.beanutils.version} + junit junit diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties index 59ca7c984..6b48f58d5 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/resources/projects/compile/archetype.properties @@ -32,4 +32,6 @@ springockitoVersion=${springockito.version} mockitoVersion=${mockito.version} httpclientVersion=${httpclient.version} httpcoreVersion=${httpclient.core.version} -asmVersion=${asm.version} \ No newline at end of file +asmVersion=${asm.version} +archivaCompVersion=${archiva.comp.version} +beanUtilsVersion=${commons.beanutils.version} \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 0c1a81f5f..b0d007a87 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -82,6 +82,11 @@ + + org.apache.archiva.components.registry + archiva-components-spring-registry-commons + test + org.apache.archiva.maven archiva-maven-repository diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java index 15013c64a..89b014a7b 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java @@ -25,8 +25,8 @@ import org.apache.archiva.configuration.FileTypes; import org.apache.archiva.consumers.AbstractMonitoredConsumer; import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; -import org.apache.archiva.redback.components.registry.Registry; -import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.archiva.components.registry.Registry; +import org.apache.archiva.components.registry.RegistryListener; import org.apache.archiva.repository.ManagedRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java index 309d90838..248e96d4b 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java @@ -27,8 +27,8 @@ import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.metadata.repository.RepositorySessionFactory; -import org.apache.archiva.redback.components.registry.Registry; -import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.archiva.components.registry.Registry; +import org.apache.archiva.components.registry.RegistryListener; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.RepositoryContentFactory; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml index 810411f3d..c38d4e543 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/META-INF/spring-context.xml @@ -35,7 +35,7 @@ - + - + diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml index ddc8bfff8..9a4fa2c83 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/resources/spring-context-cleanup-released-snapshots.xml @@ -37,7 +37,7 @@ - + - + - + - + - + - + slf4j-api - org.apache.archiva.redback.components.registry - spring-registry-api + org.apache.archiva.components.registry + archiva-components-spring-registry-api org.apache.archiva.redback.components diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java index 0c16c5804..ea7ade252 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java @@ -27,8 +27,8 @@ import org.apache.archiva.consumers.AbstractMonitoredConsumer; import org.apache.archiva.consumers.ConsumerException; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.indexer.UnsupportedBaseContextException; -import org.apache.archiva.redback.components.registry.Registry; -import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.archiva.components.registry.Registry; +import org.apache.archiva.components.registry.RegistryListener; import org.apache.archiva.redback.components.taskqueue.TaskQueueException; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.RepositoryType; diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml index ebf31812a..cecafef8a 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml @@ -30,7 +30,7 @@ - + slf4j-api - org.apache.archiva.redback.components.registry - spring-registry-api + org.apache.archiva.components.registry + archiva-components-spring-registry-api diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java index 6ec311ef3..f694d5af4 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java @@ -35,8 +35,8 @@ 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.registry.Registry; -import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.archiva.components.registry.Registry; +import org.apache.archiva.components.registry.RegistryListener; import org.apache.archiva.repository.ManagedRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 5d90c62ce..af604519d 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -102,8 +102,8 @@ archiva-plexus-bridge - org.apache.archiva.redback.components.registry - spring-registry-commons + org.apache.archiva.components.registry + archiva-components-spring-registry-commons test diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml index eaaeb1ddc..a02803d80 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml @@ -96,6 +96,11 @@ + + org.apache.archiva.components.registry + archiva-components-spring-registry-commons + test + org.modelmapper modelmapper diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java index 85c16121f..f1c947572 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/AbstractRepositoryAdmin.java @@ -27,7 +27,7 @@ import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.IndeterminateConfigurationException; import org.apache.archiva.metadata.model.facets.AuditEvent; -import org.apache.archiva.redback.components.registry.Registry; +import org.apache.archiva.components.registry.Registry; import org.apache.archiva.redback.users.User; import org.apache.archiva.repository.Repository; import org.apache.archiva.metadata.audit.AuditListener; @@ -89,7 +89,7 @@ public abstract class AbstractRepositoryAdmin { getArchivaConfiguration().save( config ); } - catch ( org.apache.archiva.redback.components.registry.RegistryException e ) + catch ( org.apache.archiva.components.registry.RegistryException e ) { throw new RepositoryAdminException( "Error occurred in the registry: " + e.getLocalizedMessage(), e ); } @@ -190,7 +190,7 @@ public abstract class AbstractRepositoryAdmin return registry; } - public void setRegistry( org.apache.archiva.redback.components.registry.Registry registry ) + public void setRegistry( org.apache.archiva.components.registry.Registry registry ) { this.registry = registry; } diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java index ff2766e3f..692bf11ed 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/DefaultRepositoryCommonValidator.java @@ -25,7 +25,7 @@ import org.apache.archiva.admin.model.beans.ManagedRepository; import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; -import org.apache.archiva.redback.components.registry.Registry; +import org.apache.archiva.components.registry.Registry; import org.apache.archiva.redback.components.scheduler.CronExpressionValidator; import org.apache.commons.lang3.StringUtils; import org.apache.commons.validator.GenericValidator; @@ -51,7 +51,7 @@ public class DefaultRepositoryCommonValidator @Inject @Named( value = "commons-configuration" ) - private org.apache.archiva.redback.components.registry.Registry registry; + private org.apache.archiva.components.registry.Registry registry; /** * @param abstractRepository @@ -182,7 +182,7 @@ public class DefaultRepositoryCommonValidator return registry; } - public void setRegistry( org.apache.archiva.redback.components.registry.Registry registry ) + public void setRegistry( org.apache.archiva.components.registry.Registry registry ) { this.registry = registry; } 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 3c04c955b..ce1c305a8 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 @@ -35,7 +35,7 @@ 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.redback.components.registry.RegistryException; +import org.apache.archiva.components.registry.RegistryException; import org.apache.archiva.redback.components.taskqueue.TaskQueueException; import org.apache.archiva.redback.role.RoleManager; import org.apache.archiva.redback.role.RoleManagerException; 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 718bfc169..2b6980cf9 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 @@ -28,7 +28,7 @@ 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.redback.components.registry.RegistryException; +import org.apache.archiva.components.registry.RegistryException; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; 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 0433e65a1..92e4c3969 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 @@ -29,7 +29,7 @@ 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.redback.components.registry.RegistryException; +import org.apache.archiva.components.registry.RegistryException; import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfigurationException; import org.apache.archiva.redback.configuration.UserConfigurationKeys; diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml index dd261ebad..661aec58e 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml @@ -45,7 +45,7 @@ - + javax.inject - org.apache.archiva.redback.components.registry - spring-registry-api + org.apache.archiva.components.registry + archiva-components-spring-registry-api diff --git a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java index 3936dc321..537a043a6 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java +++ b/archiva-modules/archiva-base/archiva-repository-api/src/main/java/org/apache/archiva/repository/RepositoryContentFactory.java @@ -21,8 +21,8 @@ package org.apache.archiva.repository; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.ConfigurationNames; -import org.apache.archiva.redback.components.registry.Registry; -import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.archiva.components.registry.Registry; +import org.apache.archiva.components.registry.RegistryListener; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 4768691df..209911ea3 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -111,6 +111,11 @@ + + commons-beanutils + commons-beanutils + test + org.apache.logging.log4j log4j-slf4j-impl diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java index 4db1b592f..0f0d4bfea 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/base/ArchivaRepositoryRegistry.java @@ -24,7 +24,7 @@ import org.apache.archiva.event.Event; import org.apache.archiva.event.EventManager; import org.apache.archiva.event.EventType; import org.apache.archiva.indexer.*; -import org.apache.archiva.redback.components.registry.RegistryException; +import org.apache.archiva.components.registry.RegistryException; import org.apache.archiva.repository.EditableManagedRepository; import org.apache.archiva.repository.EditableRemoteRepository; import org.apache.archiva.repository.EditableRepository; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java index 83b8922d3..8b321c764 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/base/MetadataTools.java @@ -35,8 +35,8 @@ import org.apache.archiva.model.Plugin; import org.apache.archiva.model.ProjectReference; import org.apache.archiva.model.SnapshotVersion; import org.apache.archiva.model.VersionedReference; -import org.apache.archiva.redback.components.registry.Registry; -import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.archiva.components.registry.Registry; +import org.apache.archiva.components.registry.RegistryListener; import org.apache.archiva.repository.ContentNotFoundException; import org.apache.archiva.repository.LayoutException; import org.apache.archiva.repository.ManagedRepositoryContent; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context.xml index 1d41a6ed4..5c100d2c0 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/spring-context.xml @@ -31,7 +31,7 @@ - + + + commons-beanutils + commons-beanutils + test + org.slf4j slf4j-simple diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java index 0cbc0aa6a..828fd5c0b 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java @@ -28,7 +28,7 @@ import org.apache.archiva.consumers.InvalidRepositoryContentConsumer; import org.apache.archiva.consumers.KnownRepositoryContentConsumer; import org.apache.archiva.consumers.RepositoryContentConsumer; import org.apache.archiva.consumers.functors.ConsumerWantsFilePredicate; -import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.archiva.components.registry.RegistryListener; import org.apache.archiva.repository.ManagedRepository; import org.apache.archiva.repository.scanner.functors.ConsumerProcessFileClosure; import org.apache.archiva.repository.scanner.functors.TriggerBeginScanClosure; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml index d0b44b201..be7ef6558 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/resources/spring-context.xml @@ -32,7 +32,7 @@ - + test - org.apache.archiva.redback.components.registry - spring-registry-commons + org.apache.archiva.components.registry + archiva-components-spring-registry-commons test diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java index 1579ce7bb..7e3d945fa 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/proxy/MockConfiguration.java @@ -20,9 +20,9 @@ package org.apache.archiva.proxy; */ import org.apache.archiva.configuration.*; -import org.apache.archiva.redback.components.registry.Registry; -import org.apache.archiva.redback.components.registry.RegistryException; -import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.archiva.components.registry.Registry; +import org.apache.archiva.components.registry.RegistryException; +import org.apache.archiva.components.registry.RegistryListener; import org.apache.commons.lang3.StringUtils; import org.easymock.EasyMock; import org.easymock.IMocksControl; @@ -86,7 +86,7 @@ public class MockConfiguration } @Override - public void addChangeListener( org.apache.archiva.redback.components.registry.RegistryListener listener ) + public void addChangeListener( org.apache.archiva.components.registry.RegistryListener listener ) { registryListeners.add( listener ); } @@ -113,7 +113,7 @@ public class MockConfiguration public void triggerChange( String name, String value ) { - for ( org.apache.archiva.redback.components.registry.RegistryListener listener : registryListeners ) + for ( org.apache.archiva.components.registry.RegistryListener listener : registryListeners ) { try { diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml index 045da6a0a..d83328f05 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/pom.xml @@ -151,6 +151,11 @@ + + commons-beanutils + commons-beanutils + test + org.springframework spring-test diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/StubConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/StubConfiguration.java index 2c41b4845..f1f3d5ca0 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/StubConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/StubConfiguration.java @@ -19,8 +19,8 @@ package org.apache.archiva.configuration; * under the License. */ -import org.apache.archiva.redback.components.registry.RegistryException; -import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.archiva.components.registry.RegistryException; +import org.apache.archiva.components.registry.RegistryListener; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java index 4c14045b7..6b899b7e4 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/configuration/TestConfiguration.java @@ -1,7 +1,7 @@ package org.apache.archiva.configuration; -import org.apache.archiva.redback.components.registry.RegistryException; -import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.archiva.components.registry.RegistryException; +import org.apache.archiva.components.registry.RegistryListener; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java index bf035ad06..2cd0db66d 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/conf/MockConfiguration.java @@ -23,9 +23,9 @@ import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.ArchivaRuntimeConfiguration; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.ConfigurationListener; -import org.apache.archiva.redback.components.registry.Registry; -import org.apache.archiva.redback.components.registry.RegistryException; -import org.apache.archiva.redback.components.registry.RegistryListener; +import org.apache.archiva.components.registry.Registry; +import org.apache.archiva.components.registry.RegistryException; +import org.apache.archiva.components.registry.RegistryListener; import org.apache.commons.lang3.StringUtils; import org.easymock.IMocksControl; import org.springframework.stereotype.Service; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml index 3f28158ae..8b7e4fa29 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/resources/spring-context-repo-request-test.xml @@ -35,7 +35,7 @@ - + - + + + commons-beanutils + commons-beanutils + test + org.apache.archiva.maven archiva-maven-repository diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml index 47127b63d..8030e079e 100755 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/spring-context.xml @@ -55,7 +55,7 @@ - + - + --> - diff --git a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml index 696514868..59e3c2fd0 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-security/src/test/resources/spring-context.xml @@ -86,7 +86,7 @@ - + - + - + - + - + - + - org.apache.archiva.redback.components.registry - spring-registry-api + org.apache.archiva.components.registry + archiva-components-spring-registry-api - org.apache.archiva.redback.components.registry - spring-registry-commons + org.apache.archiva.components.registry + archiva-components-spring-registry-commons - - ant - ant-optional - - - jdom - jdom - commons-logging commons-logging-api 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 9071317e9..1e63b2700 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 @@ -69,7 +69,7 @@ - diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml index b4965e64c..b7fa9f8a3 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/log4j2-test.xml @@ -82,7 +82,7 @@ - + diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml index 435ca0d00..abcab4b5c 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/resources/repository-servlet-simple.xml @@ -37,7 +37,7 @@ - + - + - + - org.apache.archiva.redback.components - expression-evaluator - ${plexus-expression-evaluator.version} - - - org.codehaus.plexus - plexus-container-default - - + org.apache.archiva.components + archiva-components-expression-evaluator + ${archiva.comp.version} org.codehaus.plexus @@ -1268,29 +1262,15 @@ - org.apache.archiva.redback.components.registry - spring-registry-api - ${redback.registry.version} - - - javax.annotation - jsr250-api - - + org.apache.archiva.components.registry + archiva-components-spring-registry-api + ${archiva.comp.version} - org.apache.archiva.redback.components.registry - spring-registry-commons - ${redback.registry.version} + org.apache.archiva.components.registry + archiva-components-spring-registry-commons + ${archiva.comp.version} - - ant - ant-optional - - - jdom - jdom - commons-logging commons-logging-api @@ -1299,10 +1279,6 @@ commons-logging commons-logging - - javax.annotation - jsr250-api - -- 2.39.5