You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/12 17:09:01 UTC
svn commit: r1325313 - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-configuration/
archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/
archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/
archiva-mod...
Author: olamy
Date: Thu Apr 12 15:09:01 2012
New Revision: 1325313
URL: http://svn.apache.org/viewvc?rev=1325313&view=rev
Log:
fix repackaging of spring-registry to a new package
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml?rev=1325313&r1=1325312&r2=1325313&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml Thu Apr 12 15:09:01 2012
@@ -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)",
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml?rev=1325313&r1=1325312&r2=1325313&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml Thu Apr 12 15:09:01 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml?rev=1325313&r1=1325312&r2=1325313&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml Thu Apr 12 15:09:01 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml?rev=1325313&r1=1325312&r2=1325313&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml Thu Apr 12 15:09:01 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml?rev=1325313&r1=1325312&r2=1325313&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml Thu Apr 12 15:09:01 2012
@@ -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
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml?rev=1325313&r1=1325312&r2=1325313&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/pom.xml Thu Apr 12 15:09:01 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml?rev=1325313&r1=1325312&r2=1325313&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml Thu Apr 12 15:09:01 2012
@@ -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>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1325313&r1=1325312&r2=1325313&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Thu Apr 12 15:09:01 2012
@@ -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>