update plexus-spring groupId

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

diff --git a/archiva-cli/pom.xml b/archiva-cli/pom.xml
index 3d20aa31d9baaf814ae2c105c4b93c2ad098ab85..d022b557d1eb279c06674aa78ecabe16f21df04f 100644 (file)
--- 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 803ee1ead16d87ca214c5d1bca3c9c764e97abe1..8a7d0dff6da621322c3f3f147016595d31409ec1 100644 (file)
--- 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 25d64a9a60212db57849e005e02f30a63fd6324f..0702c84f3c5ae581e74cd96f5e0642152faccdea 100644 (file)
--- 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 e08045cb2520aecac59f26d77aa70473895b6234..9ec933bea734cd818fe5b067605605c1fc03e39c 100644 (file)
--- 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 d30f9311020466cd90e3d5c3209ec81c34e5efe8..cebe075c5e987d73f50ad07bb3250dc62dee1918 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
@@ -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 8f740673408bbe865c99ae74f63141577c89a0ec..e11ad55fdfafb2419aec35ea003d712fb18446be 100644 (file)
--- 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 984e30992cff9ee83043f512ad5e0f6861bc5954..d978c192b3504836fb9da20960deeab6134e619e 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
@@ -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 09836f261cd50c64003a653b2f0b47d952724de3..5b7b25266883d1d13fef014e9cc7bb78efcfe94d 100644 (file)
--- 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 43b414fbbf5955baf9530194b01c59a84c9e198e..5f2c63ec11425ee38cb4bb61773c3ae44d6f4d32 100644 (file)
--- 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 6cc51fffa4b586d6a7fc97bd6655f0a77de80115..86a7851067c999a7c973c4c3bba93ae9f583003e 100755 (executable)
--- 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 ab1f56fd48d8d1ed1f8151026960b5217b55f3db..e8049835e43036d65030dd19986b5c6a9799855f 100644 (file)
--- 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 4988d3215e9bf6a394af9ab33b5fb3754b2b2388..d3397844477a6276fbbb5f5448538c87d6b24658 100644 (file)
--- 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 dbfe1eabe5db82ffe3b76c3498a5fc1371263ca2..7b3812b5dd3258ead0fee23982cf37f975a2010f 100644 (file)
--- 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 721e0675f6b72614eb76bd63ff5a04c6dbce1e2b..d8c6fcb90512bea3464c543c7b58ce88274f0208 100644 (file)
--- 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 28bac5af8d99f821b158bca6a46aa81db3d00d2a..b76c4d92c593c341274c0ff11034ea36e018d76e 100644 (file)
--- 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 3d39a6a17b149898e8ff140e2275387e03045b48..115617def2685d10ecdce55ab6091a2d78203d89 100644 (file)
--- 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 d62f776c10eb236797abc96ac8d5a6226c094af1..e5f733d831c99fc81111e490c624eb1fa5cf0fa9 100644 (file)
--- 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 430ac740c0f33e53ef1b4c4bbfc54f9eefb9b8e9..29ed58c6aeae32214dd7f5b1c246596b5b88b8e1 100644 (file)
--- 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 19ab660da4bb60a4a05a9b4291c22935e56fddf3..e9e571be6f449f34e4ad6ca6dff03f3eaaae5368 100644 (file)
--- 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 d816bd85bcf7055c41d628e829cbc28da5936de1..4cab22d8c0cfab30b9595b0e8d2127cb3054ef09 100644 (file)
--- 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 6d6f818488abf3046d6ae027fe390d54efbb6ee0..6ac1dcb23d13c27a3647998d05acddab3b87cd5b 100644 (file)
--- 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 f59b10550352a74686a08dc6ef97456827b495c3..3385f39527a920b0ccf454fe19303e24414befc5 100644 (file)
--- 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 803fde3e5b1522d1bd41bfbadd6c3a3bbd3c0fcf..f93c46365d6b3ef301ca2c3bd2493af522efbb03 100644 (file)
--- 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 c539e17c8c5e1446c834629f5d5a370865e5df14..f8ad19a28e754d2b800a80f2c86ed9c03312827a 100644 (file)
--- 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 c5cfe020da42a66723196647a0d88c05f23c0983..c2bd09fa0e77b24517b56a6db334dcdab20f0812 100644 (file)
--- 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 28522063323156da43ba456e8c1eb405c12642c5..967e3e26103fd3e5239240c4b2bd738ece458d0f 100644 (file)
--- 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 3849d853c8260c3cd9d76e17767c96fedf2c1995..0264068d138739da944a0f78dd0b880ebc425c84 100644 (file)
--- 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 0a9cd3ea5f836a778554c33e10b97c18d3fdf9a0..776777defab89ba21f0d571a7cc503b2331e69d5 100644 (file)
--- 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 9a9d488847a9d7bdf95a42cf502588a831674aa1..ccab0476301200fbbc0d7f680fcd932e053ba347 100644 (file)
--- 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 04661f2b1c915972cb4aa4a5c072d7ed6e27a10d..8c018a9bbae92ffaf14f6f5fb0c24fcd365eee38 100644 (file)
--- 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>