From b781d2f5f76de809074373a8e6a531c49714242f Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Mon, 16 May 2011 21:26:24 +0000
Subject: [PATCH] update plexus-spring groupId

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1103898 13f79535-47bb-0310-9956-ffa450edef68
---
 archiva-cli/pom.xml                                            | 2 +-
 .../archiva-base/archiva-artifact-converter/pom.xml            | 2 +-
 archiva-modules/archiva-base/archiva-common/pom.xml            | 2 +-
 archiva-modules/archiva-base/archiva-configuration/pom.xml     | 2 +-
 .../archiva-consumers/archiva-core-consumers/pom.xml           | 2 +-
 .../archiva-consumers/archiva-dependency-tree-consumer/pom.xml | 2 +-
 .../archiva-consumers/archiva-lucene-consumers/pom.xml         | 2 +-
 archiva-modules/archiva-base/archiva-converter/pom.xml         | 2 +-
 archiva-modules/archiva-base/archiva-indexer/pom.xml           | 2 +-
 archiva-modules/archiva-base/archiva-model/pom.xml             | 2 +-
 archiva-modules/archiva-base/archiva-policies/pom.xml          | 2 +-
 archiva-modules/archiva-base/archiva-proxy/pom.xml             | 2 +-
 archiva-modules/archiva-base/archiva-repository-layer/pom.xml  | 2 +-
 .../archiva-base/archiva-repository-scanner/pom.xml            | 2 +-
 archiva-modules/archiva-base/archiva-transaction/pom.xml       | 2 +-
 .../archiva-scheduler/archiva-scheduler-indexing/pom.xml       | 2 +-
 .../archiva-scheduler/archiva-scheduler-repository/pom.xml     | 2 +-
 archiva-modules/archiva-web/archiva-rss/pom.xml                | 2 +-
 archiva-modules/archiva-web/archiva-security/pom.xml           | 2 +-
 archiva-modules/archiva-web/archiva-webdav/pom.xml             | 2 +-
 .../archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml | 2 +-
 .../archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml | 2 +-
 archiva-modules/metadata/metadata-repository-api/pom.xml       | 2 +-
 archiva-modules/plugins/maven2-repository/pom.xml              | 2 +-
 archiva-modules/plugins/metadata-store-file/pom.xml            | 2 +-
 archiva-modules/plugins/metadata-store-jcr/pom.xml             | 2 +-
 archiva-modules/plugins/problem-reports/pom.xml                | 2 +-
 archiva-modules/plugins/repository-statistics/pom.xml          | 2 +-
 archiva-modules/plugins/stage-repository-merge/pom.xml         | 2 +-
 pom.xml                                                        | 3 ++-
 30 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 3d20aa31d..d022b557d 100644
--- a/archiva-cli/pom.xml
+++ b/archiva-cli/pom.xml
@@ -65,7 +65,7 @@
       <version>7</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
index 803ee1ead..8a7d0dff6 100644
--- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
@@ -34,7 +34,7 @@
       <artifactId>maven-repository-metadata</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml
index 25d64a9a6..0702c84f3 100644
--- a/archiva-modules/archiva-base/archiva-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-common/pom.xml
@@ -51,7 +51,7 @@
       <artifactId>plexus-component-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index e08045cb2..9ec933bea 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -29,7 +29,7 @@
   <name>Archiva Base :: Configuration</name>
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
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 d30f93110..cebe075c5 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
@@ -59,7 +59,7 @@
 
     <!-- test dependencies -->
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
index 8f7406734..e11ad55fd 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
@@ -32,7 +32,7 @@
       <artifactId>archiva-consumer-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
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 984e30992..d978c192b 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
@@ -75,7 +75,7 @@
       <artifactId>javax.inject</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency> 
diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml
index 09836f261..5b7b25266 100644
--- a/archiva-modules/archiva-base/archiva-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-converter/pom.xml
@@ -49,7 +49,7 @@
       <artifactId>plexus-i18n</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml
index 43b414fbb..5f2c63ec1 100644
--- a/archiva-modules/archiva-base/archiva-indexer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml
@@ -41,7 +41,7 @@
       <artifactId>lucene-queries</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml
index 6cc51fffa..86a785106 100755
--- a/archiva-modules/archiva-base/archiva-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-model/pom.xml
@@ -41,7 +41,7 @@
       <artifactId>archiva-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index ab1f56fd4..e8049835e 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -38,7 +38,7 @@
       <artifactId>archiva-checksum</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index 4988d3215..d33978444 100644
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -29,7 +29,7 @@
   <name>Archiva Base :: Proxy</name>
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index dbfe1eabe..7b3812b5d 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -59,7 +59,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
index 721e0675f..d8c6fcb90 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
@@ -41,7 +41,7 @@
       <artifactId>spring-context</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml
index 28bac5af8..b76c4d92c 100644
--- a/archiva-modules/archiva-base/archiva-transaction/pom.xml
+++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml
@@ -37,7 +37,7 @@
       <artifactId>plexus-digest</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
index 3d39a6a17..115617def 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
@@ -36,7 +36,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index d62f776c1..e5f733d83 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -41,7 +41,7 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml
index 430ac740c..29ed58c6a 100644
--- a/archiva-modules/archiva-web/archiva-rss/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rss/pom.xml
@@ -29,7 +29,7 @@
   <name>Archiva Web :: RSS</name>
   <dependencies>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml
index 19ab660da..e9e571be6 100644
--- a/archiva-modules/archiva-web/archiva-security/pom.xml
+++ b/archiva-modules/archiva-web/archiva-security/pom.xml
@@ -38,7 +38,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index d816bd85b..4cab22d8c 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -81,7 +81,7 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
index 6d6f81848..6ac1dcb23 100644
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml
@@ -51,7 +51,7 @@
       <artifactId>spring-context</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
index f59b10550..3385f3952 100644
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml
@@ -80,7 +80,7 @@
       <artifactId>commons-validator</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/metadata/metadata-repository-api/pom.xml b/archiva-modules/metadata/metadata-repository-api/pom.xml
index 803fde3e5..f93c46365 100644
--- a/archiva-modules/metadata/metadata-repository-api/pom.xml
+++ b/archiva-modules/metadata/metadata-repository-api/pom.xml
@@ -35,7 +35,7 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml
index c539e17c8..f8ad19a28 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -38,7 +38,7 @@
       <artifactId>metadata-repository-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml
index c5cfe020d..c2bd09fa0 100644
--- a/archiva-modules/plugins/metadata-store-file/pom.xml
+++ b/archiva-modules/plugins/metadata-store-file/pom.xml
@@ -61,7 +61,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index 285220633..967e3e261 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -46,7 +46,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
     </dependency>
     <dependency>
diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml
index 3849d853c..0264068d1 100644
--- a/archiva-modules/plugins/problem-reports/pom.xml
+++ b/archiva-modules/plugins/problem-reports/pom.xml
@@ -45,7 +45,7 @@
       <artifactId>archiva-consumer-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml
index 0a9cd3ea5..776777def 100644
--- a/archiva-modules/plugins/repository-statistics/pom.xml
+++ b/archiva-modules/plugins/repository-statistics/pom.xml
@@ -38,7 +38,7 @@
       <artifactId>maven2-repository</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml
index 9a9d48884..ccab04763 100644
--- a/archiva-modules/plugins/stage-repository-merge/pom.xml
+++ b/archiva-modules/plugins/stage-repository-merge/pom.xml
@@ -20,7 +20,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.redback</groupId>
+      <groupId>org.codehaus.redback.components</groupId>
       <artifactId>plexus-spring</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/pom.xml b/pom.xml
index 04661f2b1..8c018a9bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,7 @@
                     <exclude>org.codehaus.plexus:plexus-container-default</exclude>
                     <exclude>org.codehaus.plexus:plexus-log4j-logging</exclude>
                     <exclude>org.codehaus.plexus:plexus-spring</exclude>
+                    <exclude>org.codehaus.redback:plexus-spring</exclude>
                     <exclude>commons-logging:commons-logging</exclude>
                     <exclude>org.slf4j:jcl104-over-slf4j</exclude>
                     <exclude>velocity:velocity-dep</exclude>
@@ -532,7 +533,7 @@
         <version>1.4-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.redback</groupId>
+        <groupId>org.codehaus.redback.components</groupId>
         <artifactId>plexus-spring</artifactId>
         <version>1.3-SNAPSHOT</version>
         <exclusions>
-- 
2.39.5