no more osgi bundle as no one use it and the build stucks on Jenkins because of this

Signed-off-by: olivier lamy <olamy@apache.org>

26 files changed, 2 insertions, 707 deletions

diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml
index 95a20f4b5..4b8bb255f 100644
--- a/archiva-modules/archiva-base/archiva-checksum/pom.xml
+++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml
@@ -25,7 +25,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-checksum</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Checksum</name>
 
   <properties>
@@ -71,26 +70,6 @@
   </dependencies>
 
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.checksum</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.checksum;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              org.apache.commons.io*;version="[1.4,2)",
-              org.apache.commons.lang;version="[2.4,3)",
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
         <plugin>
diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml
index e0458d407..22ae3ba75 100644
--- a/archiva-modules/archiva-base/archiva-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-common/pom.xml
@@ -26,7 +26,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-common</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Common</name>
 
   <properties>
@@ -63,26 +62,6 @@
     </dependency>
   </dependencies>
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.common</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.common*;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              org.apache.commons.lang*;version="[2,3)",
-              org.codehaus.plexus.logging,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
         <plugin>
diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index 11d2270e4..e03bebe1d 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -26,7 +26,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-configuration</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Configuration</name>
 
   <properties>
@@ -199,38 +198,6 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.configuration</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.configuration*;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              org.apache.archiva.common;version=${project.version},
-              org.apache.archiva.policies;version=${project.version},
-              org.apache.commons.collections;version="[3.2,4)",
-              org.apache.commons.lang;version="[2.4,3)",
-              org.apache.commons.configuration;version="[1.3,2)",
-              org.apache.commons.io;version="[1.4,2)",
-              org.apache.archiva.redback.components.evaluator*,
-              org.apache.archiva.redback.components.registry,
-              org.codehaus.plexus.util,
-              org.apache.tools.ant.types.selectors,
-              org.apache.archiva.redback.components.registry,
-              org.apache.archiva.redback.components.registry.commons,
-              org.apache.archiva.redback.components.springutils,
-              org.springframework.stereotype;version="[3,4)",
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
index deb832d49..a9c22d35e 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml
@@ -26,7 +26,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-consumer-api</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Consumers :: API</name>
 
   <properties>
@@ -55,31 +54,4 @@
       <artifactId>ant</artifactId>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.consumers.api</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.consumers*;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              org.apache.archiva.admin.model.beans;version=${project.version},
-              org.apache.archiva.common*;version=${project.version},
-              org.apache.commons.collections;version="[3.2,4)",
-              org.apache.commons.io;version="[1.4,2)",
-              org.codehaus.plexus.util,
-              org.apache.tools.ant.types.selectors,
-              org.apache.commons.lang,
-              org.slf4j
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index 4f2e3a082..6e3db0cb9 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -26,7 +26,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-core-consumers</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Consumers :: Core Consumers</name>
 
   <properties>
@@ -226,40 +225,6 @@
     </pluginManagement>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.consumers.core</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.consumers.core*;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              org.apache.archiva.checksum;version=${project.version},
-              org.apache.archiva.common.utils;version=${project.version},
-              org.apache.archiva.configuration;version=${project.version},
-              org.apache.archiva.common.plexusbridge;version=${project.version},
-              org.apache.archiva.consumers;version=${project.version},
-              org.apache.archiva.metadata.repository;version=${project.version},
-              org.apache.archiva.model;version=${project.version},
-              org.apache.archiva.repository;version=${project.version},
-              org.apache.archiva.repository.events;version=${project.version},
-              org.apache.archiva.repository.layout;version=${project.version},
-              org.apache.archiva.repository.metadata;version=${project.version},
-              org.apache.commons.io;version="[1.4,2)",
-              org.apache.commons.lang*;version="[2.4,3)",
-              org.springframework*;version="[3,4)",
-              org.apache.archiva.redback.components.registry,
-              org.apache.archiva.metadata.model*;version=${project.version},
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <executions>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index 24e3e9b12..03c9c1277 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -26,7 +26,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-lucene-consumers</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Consumers :: Lucene</name>
 
   <properties>
@@ -154,34 +153,6 @@
     </dependency>
   </dependencies>
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.consumers.lucene</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.consumers.lucene;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              org.apache.archiva.common.plexusbridge;version=${project.version},
-              org.apache.archiva.configuration;version=${project.version},
-              org.apache.archiva.consumers;version=${project.version},
-              org.apache.archiva.scheduler*;version=${project.version},
-              org.springframework*;version="[3,4)",
-              org.apache.maven.index*,
-              org.apache.archiva.redback.components.registry,
-              org.apache.archiva.redback.components.taskqueue,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
         <plugin>
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
index b56bf1b05..845f0943a 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
@@ -26,7 +26,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-metadata-consumer</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Consumers :: Metadata</name>
 
   <properties>
@@ -63,35 +62,4 @@
       <artifactId>spring-registry-api</artifactId>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.consumers.metadata</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.consumers.metadata;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              org.apache.archiva.admin.model.beans;version=${project.version},
-              org.apache.archiva.common.utils;version=${project.version},
-              org.apache.archiva.configuration;version=${project.version},
-              org.apache.archiva.consumers;version=${project.version},
-              org.apache.archiva.metadata.model;version=${project.version},
-              org.apache.archiva.metadata.repository;version=${project.version},
-              org.apache.archiva.metadata.repository.storage;version=${project.version},
-              org.springframework*;version="[3,4)",
-              org.apache.archiva.redback.components.registry,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml
index 8186e6be5..c2e9a5fc8 100644
--- a/archiva-modules/archiva-base/archiva-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-converter/pom.xml
@@ -26,7 +26,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-converter</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Repository Converter</name>
 
   <properties>
@@ -153,41 +152,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.converter</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.converter*;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              org.apache.archiva.admin.model.beans;version=${project.version},
-              org.apache.archiva.common.plexusbridge;version=${project.version},
-              org.apache.archiva.common.utils;version=${project.version},
-              org.apache.archiva.model;version=${project.version},
-              org.apache.archiva.consumers;version=${project.version},
-              org.apache.archiva.repository;version=${project.version},
-              org.apache.archiva.repository.content;version=${project.version},
-              org.apache.archiva.repository.layout;version=${project.version},
-              org.apache.archiva.repository.scanner;version=${project.version},
-              org.apache.archiva.transaction;version=${project.version},
-              org.apache.commons.io;version="[1.4,2)",
-              org.springframework*;version="[3,4)",
-              org.apache.maven.artifact*,
-              org.apache.maven.model*,
-              org.codehaus.plexus.digest,
-              org.codehaus.plexus.util*,
-              org.apache.archiva.repository.content.maven2,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
diff --git a/archiva-modules/archiva-base/archiva-filelock/pom.xml b/archiva-modules/archiva-base/archiva-filelock/pom.xml
index c8891194f..fb369c652 100644
--- a/archiva-modules/archiva-base/archiva-filelock/pom.xml
+++ b/archiva-modules/archiva-base/archiva-filelock/pom.xml
@@ -26,7 +26,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-filelock</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: FileLock</name>
 
   <properties>
@@ -102,25 +101,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.common</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.common*;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              org.slf4j,
-              org.springframework.stereotype,
-              org.springframework.util,
-              org.apache.commons.lang.time
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml b/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml
index 1cc6b0f2e..16df6c316 100644
--- a/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml
@@ -26,7 +26,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-maven2-indexer</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Maven2 Indexer</name>
 
   <properties>
@@ -272,34 +271,6 @@
     </pluginManagement>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.indexer</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.indexer.*;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              com.google.common.io,
-              org.apache.archiva.admin.model*;version=${project.version},
-              org.apache.archiva.common.plexusbridge;version=${project.version},
-              org.apache.commons.io;version="[1.4,2)",
-              org.apache.commons.lang*;version="[2.4,3)",
-              org.springframework*;version="[3,4)",
-              org.apache.maven.index*,
-              org.apache.archiva.redback.components.scheduler,
-              org.quartz,
-              org.apache.archiva.scheduler,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
diff --git a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml b/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml
index fbf7f1efb..c32019ebf 100644
--- a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml
+++ b/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml
@@ -26,7 +26,6 @@
   </parent>
 
   <artifactId>archiva-maven2-metadata</artifactId>
-  <packaging>bundle</packaging>
 
   <name>Archiva Base :: Maven 2 Metadata</name>
 
@@ -55,28 +54,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.maven2.metadata</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.maven2.metadata*;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              org.apache.archiva.model;version=${project.version},
-              org.apache.archiva.xml;version=${project.version},
-              org.apache.commons.lang.math,
-              org.dom4j
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
index 2a3a01506..7007ae50b 100644
--- a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
@@ -26,7 +26,6 @@
   </parent>
 
   <artifactId>archiva-maven2-model</artifactId>
-  <packaging>bundle</packaging>
 
   <name>Archiva Base :: Maven 2 Model</name>
 
@@ -42,26 +41,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.maven2.model</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Import-Package>
-              javax.xml.bind.annotation,
-              com.fasterxml.jackson.annotation
-            </Import-Package>
-            <Export-Package>
-              org.apache.archiva.maven2.model*;version=${project.version}
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml
index 49bb61dad..a30d7d01d 100755
--- a/archiva-modules/archiva-base/archiva-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-model/pom.xml
@@ -26,7 +26,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-model</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Model</name>
 
   <properties>
@@ -80,23 +79,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.model</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.model;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              org.apache.archiva.common.utils;version=${project.version},
-              org.apache.commons.lang;version="[2.4,3)"
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
index eaee92067..b6c2fe296 100644
--- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
+++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
@@ -26,7 +26,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-plexus-bridge</artifactId>
-  <packaging>bundle</packaging>
+
   <name>Archiva Base :: Plexus Bridge</name>
 
   <properties>
@@ -88,34 +88,4 @@
     </dependency>
     -->
   </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.common.plexusbridge</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.common.plexusbridge;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              org.codehaus.plexus,
-              org.codehaus.plexus.classworlds*,
-              org.codehaus.plexus.component.repository.exception,
-              org.codehaus.plexus.digest,
-              org.springframework.stereotype;version="[3,4)",
-              org.apache.maven.index.context;resolution:=optional,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index 267c001ea..63acd6750 100644
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -26,7 +26,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-policies</artifactId>
-  <packaging>bundle</packaging>
+
   <name>Archiva Base :: Policies</name>
 
   <properties>
@@ -123,28 +123,6 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.policies</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.policies*;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.inject,
-              org.apache.archiva.checksum;version=${project.version},
-              org.apache.archiva.common*;version=${project.version},
-              org.apache.commons.lang;version="[2,3)",
-              org.springframework.stereotype;version="[3,4)",
-              org.apache.archiva.redback.components.cache,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
diff --git a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml b/archiva-modules/archiva-base/archiva-proxy-api/pom.xml
index 15e70cb4f..2bc408482 100644
--- a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy-api/pom.xml
@@ -25,7 +25,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-proxy-api</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Proxy Api</name>
 
 
@@ -40,21 +39,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.proxy.model</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.proxy;version=${project.version}
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
index 733c599a3..fa95a18cf 100644
--- a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
@@ -25,7 +25,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-proxy-common</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Proxy Common</name>
 
   <properties>
@@ -88,32 +87,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.proxy.common</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.proxy.common;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.inject,
-              org.apache.archiva.common.plexusbridge;version=${project.version},
-              org.apache.commons.lang;version="[2.4,3)",
-              org.springframework.stereotype;version="[3,4)",
-              org.springframework.context;version="[3,4)",
-              org.springframework.beans;version="[3,4)",
-              org.apache.archiva.admin.model.beans;version=${project.version},
-              org.apache.maven.wagon*,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index a27897df6..d55959f3a 100644
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -26,7 +26,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-proxy</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Proxy</name>
 
   <properties>
@@ -252,48 +251,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.proxy</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.proxy;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              com.google.common.collect,
-              org.apache.archiva.admin.model.beans;version=${project.version},
-              org.apache.archiva.configuration;version=${project.version},
-              org.apache.archiva.model;version=${project.version},
-              org.apache.archiva.policies*;version=${project.version},
-              org.apache.archiva.proxy.common;version=${project.version},
-              org.apache.archiva.repository*;version=${project.version},
-              org.apache.archiva.scheduler*;version=${project.version},
-              org.apache.archiva.admin.model;version=${project.version},
-              org.apache.archiva.admin.model.networkproxy;version=${project.version},
-              org.apache.archiva.proxy.model;version=${project.version},
-              org.apache.commons.collections;version="[3.2,4)",
-              org.apache.commons.io;version="[1.4,2)",
-              org.apache.commons.lang;version="[2.4,3)",
-              org.springframework.stereotype;version="[3,4)",
-              org.apache.archiva.redback.components.registry,
-              org.apache.archiva.redback.components.taskqueue,
-              org.apache.tools.ant.types.selectors,
-              org.apache.maven.wagon,
-              org.apache.maven.wagon.authentication,
-              org.apache.maven.wagon.proxy,
-              org.apache.maven.wagon.repository,
-              com.google.common.io,
-              org.apache.archiva.common.filelock,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
index c912c182c..7b1604ae8 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
@@ -26,7 +26,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-repository-admin-api</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Repository Admin Api</name>
 
   <properties>
@@ -98,26 +97,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.repository.admin.api</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.admin.model*;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.xml.bind.annotation,
-              org.apache.commons.collections;version="[3.2,4)",
-              org.apache.commons.lang;version="[2.4,3)",
-              org.apache.archiva.redback.users,
-              org.apache.maven.index.context;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
         <executions>
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 b752f2810..4f7c70627 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
@@ -26,7 +26,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-repository-admin-default</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Repository Admin Default</name>
 
   <properties>
@@ -276,49 +275,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.repository.admin.default</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.admin.repository*;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              org.modelmapper,
-              org.apache.archiva.admin.model*;version=${project.version},
-              org.apache.archiva.audit;version=${project.version},
-              org.apache.archiva.common.plexusbridge;version=${project.version},
-              org.apache.archiva.configuration*;version=${project.version},
-              org.apache.archiva.metadata*;version=${project.version},
-              org.apache.archiva.scheduler*;version=${project.version},
-              org.apache.commons.collections;version="[3.2,4)",
-              org.apache.commons.io;version="[1.4,2)",
-              org.apache.commons.lang*;version="[2.4,3)",
-              org.apache.commons.validator;version="[1.3,2)",
-              org.apache.http*;version="[4,5)",
-              org.springframework*;version="[3,4)",
-              org.apache.maven.index*,
-              org.apache.maven.wagon*,
-              org.modelmapper.config,
-              org.modelmapper.convention,
-              org.modelmapper.spi,
-              org.apache.archiva.redback.role,
-              org.apache.archiva.redback.users,
-              org.apache.archiva.redback.components.registry,
-              org.apache.archiva.redback.components.taskqueue,
-              org.apache.archiva.redback.components.scheduler,
-              org.apache.archiva.redback.configuration,
-              org.apache.archiva.redback.components.cache,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
diff --git a/archiva-modules/archiva-base/archiva-repository-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-api/pom.xml
index 6aa2d7676..b5f10a7db 100644
--- a/archiva-modules/archiva-base/archiva-repository-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-api/pom.xml
@@ -26,7 +26,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-repository-api</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Repository API</name>
 
   <properties>
@@ -74,25 +73,6 @@
     </pluginManagement>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.indexer.api</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.indexer.*;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              org.apache.commons.lang*;version="[2.4,3)",
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index 1af1ab065..b134f243e 100644
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -26,7 +26,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-repository-layer</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Repository Interface Layer</name>
 
   <properties>
@@ -134,40 +133,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.repository.layer</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.repository;version=${project.version};-split-package:=merge-first,
-              org.apache.archiva.repository.connector;version=${project.version};-split-package:=merge-first,
-              org.apache.archiva.repository.content;version=${project.version};-split-package:=merge-first,
-              org.apache.archiva.repository.layout;version=${project.version};-split-package:=merge-first,
-              org.apache.archiva.repository.metadata;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              org.apache.archiva.model*;version=${project.version},
-              org.apache.archiva.maven2.metadata*;version=${project.version},
-              org.apache.archiva.common*;version=${project.version},
-              org.apache.archiva.checksum;version=${project.version},
-              org.apache.archiva.configuration;version=${project.version},
-              org.apache.archiva.xml;version=${project.version},
-              org.apache.commons.collections;version="[3.2,4)",
-              org.apache.commons.io;version="[1.4,2)",
-              org.apache.commons.lang*;version="[2.4,3)",
-              org.springframework*;version="[3,4)",
-              org.dom4j;version="[1.6,2)",
-              org.apache.archiva.redback.components.registry,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
index 7136844d7..e7e317225 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
@@ -26,7 +26,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-repository-scanner</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Repository Scanner</name>
 
   <properties>
@@ -68,32 +67,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.repository.scanner</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.repository.scanner*;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.inject,
-              org.apache.archiva.admin.model*;version=${project.version},
-              org.apache.archiva.common*;version=${project.version},
-              org.apache.archiva.configuration;version=${project.version},
-              org.apache.archiva.consumers*;version=${project.version},
-              org.apache.commons.collections*;version="[3.2,4)",
-              org.apache.commons.lang;version="[2.4,3)",
-              org.springframework*;version="[3,4)",
-              org.codehaus.plexus.util,
-              org.slf4j;resolution:=optional,
-              javax.xml.bind.annotation
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
diff --git a/archiva-modules/archiva-base/archiva-security-common/pom.xml b/archiva-modules/archiva-base/archiva-security-common/pom.xml
index f9ebb9e9e..60806b572 100644
--- a/archiva-modules/archiva-base/archiva-security-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-security-common/pom.xml
@@ -26,31 +26,10 @@
   </parent>
   <groupId>org.apache.archiva</groupId>
   <artifactId>archiva-security-common</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Security Common</name>
 
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.security.common</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.security.common;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml
index a9eee95f9..b63aecc3c 100644
--- a/archiva-modules/archiva-base/archiva-transaction/pom.xml
+++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml
@@ -25,7 +25,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-transaction</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: Transactions</name>
   <description>API for managing transaction.</description>
 
@@ -87,25 +86,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.transaction</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.transaction;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              org.apache.commons.io;version="[1.4,2)",
-              org.codehaus.plexus.digest
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
index f962aed3f..8dc755071 100644
--- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
+++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
@@ -26,7 +26,6 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-xml-tools</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Base :: XML Tools</name>
 
   <properties>
@@ -66,28 +65,6 @@
     </dependency>
   </dependencies>
   <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.xml.tools</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.xml;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              org.apache.archiva.common;version=${project.version},
-              org.apache.commons.collections;version="[3.2,4)",
-              org.apache.commons.io;version="[1.4,2)",
-              org.apache.commons.lang;version="[2.4,3)",
-              org.dom4j*;version="[1.6,2)"
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
     <pluginManagement>
       <plugins>
         <plugin>