From 6f7d3ac0a8f2e1677c2ae797d4b302649995b974 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 12 Apr 2012 15:09:01 +0000
Subject: 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
---
 archiva-modules/archiva-base/archiva-configuration/pom.xml          | 3 ++-
 .../archiva-base/archiva-consumers/archiva-core-consumers/pom.xml   | 2 +-
 .../archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml | 2 +-
 .../archiva-consumers/archiva-metadata-consumer/pom.xml             | 2 +-
 .../archiva-repository-admin-default/pom.xml                        | 2 +-
 archiva-modules/archiva-base/archiva-repository-layer/pom.xml       | 2 +-
 archiva-modules/plugins/problem-reports/pom.xml                     | 2 +-
 pom.xml                                                             | 6 +++---
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index ae8d3de30..f806588af 100644
--- 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 301ae922b..dc06df7c0 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
@@ -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 e69d75a4f..15555a302 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
@@ -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 9b37e2a4c..554ded0d2 100644
--- 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 1392714fc..7cc3d4ac4 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
@@ -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 d3b66446b..b258f78b3 100644
--- 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 5704ba57e..7dec12dc4 100644
--- 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 7a9d0282f..d777422ac 100644
--- 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>
-- 
cgit v1.2.3