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>

9 files changed, 2 insertions, 301 deletions

diff --git a/archiva-modules/plugins/audit/pom.xml b/archiva-modules/plugins/audit/pom.xml
index be0268318..7a3292df0 100644
--- a/archiva-modules/plugins/audit/pom.xml
+++ b/archiva-modules/plugins/audit/pom.xml
@@ -25,7 +25,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>audit</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Core Plugins :: Audit Logging</name>
 
   <properties>
@@ -49,29 +48,4 @@
     </dependency>  
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.audit</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.audit;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.inject,
-              org.apache.archiva.metadata.model;version=${project.version},
-              org.apache.archiva.metadata.repository;version=${project.version},
-              org.springframework.stereotype;version="[3,4)",
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/archiva-modules/plugins/generic-metadata-support/pom.xml b/archiva-modules/plugins/generic-metadata-support/pom.xml
index 68bd5cd17..4f2cb194a 100644
--- a/archiva-modules/plugins/generic-metadata-support/pom.xml
+++ b/archiva-modules/plugins/generic-metadata-support/pom.xml
@@ -25,7 +25,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>generic-metadata-support</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Core Plugins :: Generic Metadata Support</name>
 
   <properties>
@@ -47,25 +46,5 @@
       <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.metadata.generic</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.metadata.generic;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              org.apache.archiva.metadata.model;version=${project.version},
-              org.springframework*;version="[3,4)"
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+
 </project>
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml
index 9c6a4c28f..d91003805 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -25,7 +25,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>maven2-repository</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Core Plugins :: Maven 2.x Repository Support</name>
 
   <properties>
@@ -207,80 +206,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.maven2</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.dependency.tree.maven2;version=${project.version};-split-package:=merge-first,
-              org.apache.archiva.metadata.repository.storage.maven2;version=${project.version};-split-package:=merge-first,
-            </Export-Package>
-            <Import-Package>
-              !org.apache.archiva.metadata.repository.filter,
-              javax.annotation,
-              javax.xml.bind.annotation,
-              javax.inject,
-              org.apache.archiva.maven2.metadata*;version=${project.version},
-              org.apache.archiva.model*;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.metadata.model;version=${project.version},
-              org.apache.archiva.metadata.repository;version=${project.version},
-              org.apache.archiva.metadata.repository.filter;version=${project.version},
-              org.apache.archiva.metadata.repository.storage;version=${project.version},
-              org.apache.archiva.proxy.common;version=${project.version},
-              org.apache.archiva.reports;version=${project.version},
-              org.apache.archiva.xml;version=${project.version},
-              org.apache.archiva.admin.model;version=${project.version},
-              org.apache.archiva.admin.model.beans;version=${project.version},
-              org.apache.archiva.admin.model.managed;version=${project.version},
-              org.apache.archiva.admin.model.networkproxy;version=${project.version},
-              org.apache.archiva.admin.model.proxyconnector;version=${project.version},
-              org.apache.archiva.admin.model.remote;version=${project.version},
-              org.apache.commons.collections;version="[3.2,4)",
-              org.apache.commons.configuration;version="[1.4,2)",
-              org.apache.commons.lang*;version="[2.4,3)",
-              org.apache.maven.artifact*,
-              org.apache.maven.model*,
-              org.apache.maven.wagon*,
-              org.codehaus.plexus*,
-              com.google.common.io,
-              org.springframework*;version="[3,4)",
-              org.slf4j;resolution:=optional,
-              org.apache.maven.repository.internal,
-              org.sonatype.aether.connector.file,
-              org.sonatype.aether.impl,
-              org.sonatype.aether.spi.connector,
-              org.sonatype.aether.transfer,
-              org.sonatype.aether,
-              org.sonatype.aether.artifact,
-              org.sonatype.aether.collection,
-              org.sonatype.aether.graph,
-              org.sonatype.aether.impl.internal,
-              org.sonatype.aether.repository,
-              org.sonatype.aether.util,
-              org.sonatype.aether.util.artifact,
-              org.modelmapper,
-              org.modelmapper.config,
-              org.modelmapper.convention,
-              org.modelmapper.spi,
-              org.apache.archiva.maven2.model,
-              org.sonatype.aether.util.graph.selector,
-              org.apache.archiva.metadata.model.maven2,
-              org.apache.archiva.policies,
-              org.apache.archiva.proxy,
-              org.apache.archiva.repository,
-              org.apache.archiva.repository.content,
-              org.apache.archiva.repository.layout,
-              org.apache.archiva.proxy.model
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
index 3f2cafe65..bd905acc3 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
@@ -26,7 +26,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>metadata-store-cassandra</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Core Plugins :: Cassandra Storage for Metadata</name>
 
   <properties>
@@ -192,45 +191,6 @@
     </testResources>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.metadata.repository.cassandra</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.metadata.repository.cassandra;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-                javax.annotation,
-                javax.inject,
-                javax.persistence,
-                com.google.common.base,
-                com.google.common.collect,
-                com.netflix.astyanax,
-                com.netflix.astyanax.connectionpool,
-                com.netflix.astyanax.connectionpool.exceptions,
-                com.netflix.astyanax.connectionpool.impl,
-                com.netflix.astyanax.entitystore,
-                com.netflix.astyanax.impl,
-                com.netflix.astyanax.ddl,
-                com.netflix.astyanax.thrift,
-                net.sf.beanlib.provider.replicator,
-                org.apache.archiva.metadata.model;version=${project.version},
-                org.apache.archiva.metadata.repository;version=${project.version},
-                org.apache.archiva.configuration,
-                org.apache.commons.lang;version="[2.4,3)",
-                org.slf4j;resolution:=optional,
-                org.springframework.context,
-                org.springframework.stereotype,
-                com.netflix.astyanax.serializers,
-                org.apache.commons.codec.binary,
-                org.apache.commons.io
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
         <executions>
diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml
index 4e85c63ff..c4fabc35e 100644
--- a/archiva-modules/plugins/metadata-store-file/pom.xml
+++ b/archiva-modules/plugins/metadata-store-file/pom.xml
@@ -25,7 +25,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>metadata-store-file</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Core Plugins :: File System Backed Metadata Repository</name>
 
   <properties>
@@ -100,30 +99,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.metadata.repository.file</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.metadata.repository.file;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              org.apache.archiva.configuration;version=${project.version},
-              org.apache.archiva.metadata.model;version=${project.version},
-              org.apache.archiva.metadata.repository;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.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/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index 114bcb7dc..2b38ec7d6 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -26,7 +26,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>metadata-store-jcr</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Core Plugins :: JCR Storage for Metadata</name>
 
   <properties>
@@ -203,32 +202,6 @@
     </testResources>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.metadata.repository.jcr</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.metadata.repository.jcr;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              javax.jcr,
-              javax.jcr.nodetype,
-              javax.jcr.query,
-              org.apache.archiva.metadata.model;version=${project.version},
-              org.apache.archiva.metadata.repository;version=${project.version},
-              org.apache.commons.lang;version="[2.4,3)",
-              org.springframework*;version="[3,4)",
-              org.slf4j;resolution:=optional,
-              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/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml
index ad15973c0..bb1ced84a 100644
--- a/archiva-modules/plugins/problem-reports/pom.xml
+++ b/archiva-modules/plugins/problem-reports/pom.xml
@@ -25,7 +25,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>problem-reports</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Core Plugins :: Problem Reporting Plugin</name>
 
   <properties>
@@ -96,35 +95,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.reports</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.reports*;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject,
-              org.apache.archiva.admin.model.beans;version=${project.version},
-              org.apache.archiva.checksum;version=${project.version},
-              org.apache.archiva.configuration;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.apache.archiva.repository.events;version=${project.version},
-              org.apache.archiva.consumers;version=${project.version},
-              org.apache.commons.collections;version="[3.2,4)",
-              org.springframework.*;version="[3,4)",
-              org.apache.archiva.redback.components.registry,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml
index 4fe10de2e..eeba93852 100644
--- a/archiva-modules/plugins/repository-statistics/pom.xml
+++ b/archiva-modules/plugins/repository-statistics/pom.xml
@@ -25,7 +25,6 @@
     <version>3.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>repository-statistics</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Core Plugins :: Repository Statistics</name>
 
   <properties>
@@ -84,32 +83,5 @@
       <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.repository.statistics</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.metadata.repository.stats;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.jcr,
-              javax.jcr.query,
-              org.apache.archiva.metadata.model;version=${project.version},
-              org.apache.archiva.metadata.repository;version=${project.version},
-              org.apache.archiva.metadata.repository.storage.maven2;version=${project.version},
-              org.apache.archiva.metadata.model.maven2,
-              org.springframework*;version="[3,4)",
-              org.apache.commons.lang.time,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+
 </project>
diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml
index d77142822..bdf308224 100644
--- a/archiva-modules/plugins/stage-repository-merge/pom.xml
+++ b/archiva-modules/plugins/stage-repository-merge/pom.xml
@@ -26,7 +26,6 @@
   </parent>
   <groupId>org.apache.archiva</groupId>
   <artifactId>stage-repository-merge</artifactId>
-  <packaging>bundle</packaging>
   <name>Archiva Core Plugins :: Stage Repository Merge</name>
 
   <properties>
@@ -133,32 +132,6 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.stagerepository.merge</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.apache.archiva.stagerepository.merge;version=${project.version}
-            </Export-Package>
-            <Import-Package>
-              javax.inject,
-              org.apache.archiva.common.utils;version=${project.version},
-              org.apache.archiva.configuration;version=${project.version},
-              org.apache.archiva.metadata.*;version=${project.version},
-              org.apache.archiva.model;version=${project.version},
-              org.apache.archiva.repository*;version=${project.version},
-              org.apache.archiva.maven2.metadata*;version=${project.version},
-              org.apache.archiva.xml*;version=${project.version},
-              org.apache.commons.io;version="[1.4,2)",
-              org.springframework*;version="[3,4)",
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>