osgi fix

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

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/test-settings.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/test-settings.xml
index e4eae128eb5688ed3542ce64e07fe4838d1588b3..1ce3a15510b69c7f1288ee51d0f25739a4552a11 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/test-settings.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/test/test-settings.xml
@@ -20,6 +20,7 @@ under the License.
 -->
 
 <settings>
+
   <profiles>
     <profile>
       <id>it-repo</id>

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 98a8b717d5b342a19b74076bf2492021497b04f1..1392714fc082cefaa0345c471e833100879cf0c9 100644 (file)
--- 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
@@ -239,7 +239,7 @@
               org.apache.archiva.redback.users,
               org.codehaus.plexus.registry,
               org.codehaus.plexus.taskqueue,
-              org.codehaus.redback.components.scheduler,
+              org.apache.archiva.redback.components.scheduler,
               org.slf4j;resolution:=optional
             </Import-Package>
           </instructions>

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index 73179261004dbf940a869ffc693fea856a52a67d..5230c09d7dabd80e3311e52fa760952fbd0c7490 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -122,7 +122,7 @@
               org.apache.commons.lang;version="[2.4,3)",
               org.codehaus.plexus.personality.plexus.lifecycle.phase,
               org.codehaus.plexus.taskqueue*,
-              org.codehaus.redback.components.scheduler,
+              org.apache.archiva.redback.components.scheduler,
               org.quartz*;version="[2,3)",
               org.springframework*;version="[3,4)",
               org.slf4j;resolution:=optional