again osgi grhhh :-)

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

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
index 2687d702f21188bf97c6f149d4ec55628c078ba0..5ba3564c2a5f1cad05e9e41e3cd9f1538c6234d9 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/pom.xml
@@ -242,7 +242,7 @@
       </plugin>
     </plugins>
   </build>
-  <repositories>
+  <!--repositories>
     <repository>
       <id>archiva.snapshots</id>
       <name>Archiva VM Snapshots Repository</name>
@@ -254,5 +254,5 @@
         <enabled>true</enabled>
       </snapshots>
     </repository>
-  </repositories>
+  </repositories-->
 </project>

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
index bf3e532304303e4dc7404af2aa13d152184cfb21..0277de251b19fbc641c7731ddb7b1f1751456a92 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
@@ -107,7 +107,7 @@
               javax.ws.rs,
               javax.xml.bind.annotation,
               org.apache.archiva.admin.model.beans;version=${project.version},
-              org.codehaus.plexus.redback.authorization,
+              org.apache.archiva.redback.authorization,
               org.apache.archiva.metadata.model,
               org.apache.archiva.repository.scanner,
               org.codehaus.jackson.annotate

diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml
index 08b7c82d97eb19ad6301764c1f28d4c61870aea5..b4477976950fc4555cc576deea2c7cc40b76a14c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-security/pom.xml
+++ b/archiva-modules/archiva-web/archiva-security/pom.xml
@@ -208,13 +208,13 @@
               org.apache.archiva.admin.model.beans;version=${project.version},
               org.apache.archiva.admin.model.managed;version=${project.version},
               org.apache.archiva.configuration;version=${project.version},
-              org.codehaus.plexus.redback.authentication,
-              org.codehaus.plexus.redback.authorization,
-              org.codehaus.plexus.redback.policy,
-              org.codehaus.plexus.redback.rbac,
-              org.codehaus.plexus.redback.system*,
+              org.apache.archiva.redback.authentication,
+              org.apache.archiva.redback.authorization,
+              org.apache.archiva.redback.policy,
+              org.apache.archiva.redback.rbac,
+              org.apache.archiva.redback.system*,
               org.apache.archiva.redback.users,
-              org.codehaus.plexus.redback.role,
+              org.apache.archiva.redback.role,
               org.springframework*;version="[3,4)",
               org.slf4j;resolution:=optional
             </Import-Package>

diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 91d8549f7525229138745fcd01ecf8b6500a3974..ede661101c3e83119aa285f5ca40aadaf6bc8116 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -195,9 +195,9 @@
               org.apache.commons.lang.math;version="[2.4,3)",
               org.apache.maven.index,
               org.apache.maven.index.context,
-              org.codehaus.plexus.redback.rbac,
-              org.codehaus.plexus.redback.role,
-              org.codehaus.plexus.redback.system.check,
+              org.apache.archiva.redback.rbac,
+              org.apache.archiva.redback.role,
+              org.apache.archiva.redback.system.check,
               org.codehaus.plexus.registry,
               org.codehaus.plexus.taskqueue,
               org.codehaus.plexus.taskqueue.execution,
@@ -213,10 +213,10 @@
               org.apache.archiva.security,
               org.apache.commons.codec,
               org.apache.commons.codec.binary,
-              org.codehaus.plexus.redback.authentication,
-              org.codehaus.plexus.redback.authorization,
-              org.codehaus.plexus.redback.policy,
-              org.codehaus.plexus.redback.system,
+              org.apache.archiva.redback.authentication,
+              org.apache.archiva.redback.authorization,
+              org.apache.archiva.redback.policy,
+              org.apache.archiva.redback.system,
               org.apache.archiva.redback.users,
               org.codehaus.redback.integration.filter.authentication
             </Import-Package>