Adding felix config to the consumer pom

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

diff --git a/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index 538c0cd4db1e1f3482e6e832e19031b1baabee72..fdae9fc6aa5a1daa7b0f9dffb27aceb16c72c8e1 100644 (file)
--- a/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -26,6 +26,7 @@
 
   <artifactId>archiva-core-consumers</artifactId>
   <name>Archiva Consumers :: Core Consumers</name>
+  <packaging>bundle</packaging>
 
   <dependencies>
     <dependency>
@@ -44,6 +45,10 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-digest</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-spring</artifactId>
@@ -62,4 +67,19 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>1.4.3</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>org.apache.archiva.consumers.core,org.apache.maven.archiva.consumers.core.repository</Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

diff --git a/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java b/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
index 7ce2db1445632ec090270869b9a22500d2cb0a65..9593e93de54863fe9cd95061a0ac18f664e1cf2c 100644 (file)
--- a/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
+++ b/archiva-plugins/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
@@ -19,8 +19,6 @@ package org.apache.maven.archiva.consumers.core;
  * under the License.
  */
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ConfigurationNames;
 import org.apache.maven.archiva.configuration.FileTypes;

diff --git a/archiva-plugins/pom.xml b/archiva-plugins/pom.xml
index afbfc63fa5884305d03ab0d297dd260cd2fc69e8..c7b1cb896c9fbacfe3d16a52f42d4a379317a42f 100644 (file)
--- a/archiva-plugins/pom.xml
+++ b/archiva-plugins/pom.xml
@@ -224,6 +224,11 @@
   </dependencies>
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <version>1.2.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>jackrabbit-webdav</artifactId>
@@ -237,8 +242,8 @@
       </dependency>
       <dependency>
         <groupId>xerces</groupId>
-           <artifactId>xercesImpl</artifactId>
-           <version>2.8.1</version>
+             <artifactId>xercesImpl</artifactId>
+              <version>2.8.1</version>
       </dependency>
       <dependency>
         <groupId>javax.activation</groupId>