fix repackaging of spring-registry to a new package

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1325313 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index ae8d3de3052e60bce5cae779f91011cb52489b5b..f806588afb3d7ef99716eb2733b005fb0b429ff3 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -193,9 +193,10 @@
               org.apache.commons.configuration;version="[1.3,2)",
               org.apache.commons.io;version="[1.4,2)",
               org.codehaus.plexus.evaluator*,
-              org.codehaus.plexus.registry,
+              org.apache.archiva.redback.components.registry,
               org.codehaus.plexus.util,
               org.apache.tools.ant.types.selectors,
+              org.apache.archiva.redback.components.registry,
               org.codehaus.redback.components.registry.commons,
               org.codehaus.redback.components.springutils,
               org.springframework.stereotype;version="[3,4)",

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 301ae922ba18ed328acd8b5b2fe38f345e6d56e5..dc06df7c04962edb4bd2baa53f222fbafc3e8d7f 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -171,7 +171,7 @@
               org.apache.commons.lang*;version="[2.4,3)",
               org.springframework*;version="[3,4)",
               org.codehaus.plexus.digest,
-              org.codehaus.plexus.registry,
+              org.apache.archiva.redback.components.registry,
               org.slf4j;resolution:=optional
             </Import-Package>
           </instructions>

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 e69d75a4fef8286e5006b6a83ca97da493ed1dec..15555a302df34e56aebf136b44fb65db7500a39d 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -127,7 +127,7 @@
               org.apache.archiva.scheduler*;version=${project.version},
               org.springframework*;version="[3,4)",
               org.apache.maven.index*,
-              org.codehaus.plexus.registry,
+              org.apache.archiva.redback.components.registry,
               org.codehaus.plexus.taskqueue,
               org.slf4j;resolution:=optional
             </Import-Package>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
index 9b37e2a4c0bae8bd00e1c53087c87c9a4f29c01b..554ded0d23c6d7a028fbb3e24a914da78bb4aef9 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
@@ -81,7 +81,7 @@
               org.apache.archiva.metadata.repository;version=${project.version},
               org.apache.archiva.metadata.repository.storage;version=${project.version},
               org.springframework*;version="[3,4)",
-              org.codehaus.plexus.registry,
+              org.apache.archiva.redback.components.registry,
               org.slf4j;resolution:=optional
             </Import-Package>
           </instructions>

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 1392714fc082cefaa0345c471e833100879cf0c9..7cc3d4ac4adc5c8660cb84a52afbc69427b8ea4b 100644 (file)
--- 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
@@ -237,7 +237,7 @@
               org.apache.maven.wagon*,
               org.apache.archiva.redback.role,
               org.apache.archiva.redback.users,
-              org.codehaus.plexus.registry,
+              org.apache.archiva.redback.components.registry,
               org.codehaus.plexus.taskqueue,
               org.apache.archiva.redback.components.scheduler,
               org.slf4j;resolution:=optional

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index d3b66446b846f719c54833d5ca0f94210c2c20bf..b258f78b308765568515fe7dda8d0ddd63022b56 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -122,7 +122,7 @@
               org.apache.commons.lang*;version="[2.4,3)",
               org.springframework*;version="[3,4)",
               org.dom4j;version="[1.6,2)",
-              org.codehaus.plexus.registry,
+              org.apache.archiva.redback.components.registry,
               org.slf4j;resolution:=optional
             </Import-Package>
           </instructions>

diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml
index 5704ba57e3e715225cb5f8fae31c32ed58258ecf..7dec12dc439548ae0e91f413f0a9bce2b5589d80 100644 (file)
--- a/archiva-modules/plugins/problem-reports/pom.xml
+++ b/archiva-modules/plugins/problem-reports/pom.xml
@@ -94,7 +94,7 @@
               org.apache.archiva.consumers;version=${project.version},
               org.apache.commons.collections;version="[3.2,4)",
               org.springframework.*;version="[3,4)",
-              org.codehaus.plexus.registry,
+              org.apache.archiva.redback.components.registry,
               org.slf4j;resolution:=optional
             </Import-Package>
           </instructions>

diff --git a/pom.xml b/pom.xml
index 7a9d0282f747187af0081716a36cf65c085e3861..d777422ac0db7da3a1dba3bc16dc54d4d3db8747 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1706,9 +1706,9 @@
           </configuration>
           <dependencies>
             <dependency>
-              <groupId>org.codehaus.modello</groupId>
-              <artifactId>modello-plugin-plexus-registry</artifactId>
-              <version>1.0-alpha-21</version>
+              <groupId>org.apache.archiva.redback.components.registry</groupId>
+              <artifactId>modello-plugin-redback-registry</artifactId>
+              <version>${redback.registry.version}</version>
             </dependency>
           </dependencies>
         </plugin>