From: Olivier Lamy <olamy@apache.org>
Date: Thu, 12 Apr 2012 09:36:55 +0000 (+0000)
Subject: osgi fix
X-Git-Tag: archiva-1.4-M3~789
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=16c46cae45e9410048fc2035a3ae117996fff722;p=archiva.git

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 e4eae128e..1ce3a1551 100644
--- 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 98a8b717d..1392714fc 100644
--- 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 731792610..5230c09d7 100644
--- 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