From 714f508973243768affc08ee77273784af7acb6b Mon Sep 17 00:00:00 2001
From: olivier lamy <olamy@apache.org>
Date: Sun, 30 Dec 2018 12:04:10 +1000
Subject: [PATCH] no more bundle as no one use that and this just stuck the
 build on Jenkins....

Signed-off-by: olivier lamy <olamy@apache.org>
---
 pom.xml                                       |  1 -
 .../redback-authentication-api/pom.xml        | 26 -----
 .../redback-authentication-ldap/pom.xml       | 23 -----
 .../redback-authentication-memory/pom.xml     | 21 -----
 .../redback-authentication-open/pom.xml       | 22 -----
 .../redback-authentication-users/pom.xml      | 10 --
 .../redback-authorization-api/pom.xml         | 20 ----
 .../redback-authorization-open/pom.xml        | 21 -----
 .../redback-authorization-rbac/pom.xml        | 10 --
 redback-common/redback-common-jpa/pom.xml     | 58 ++++++------
 redback-common/redback-common-ldap/pom.xml    | 24 -----
 redback-configuration/pom.xml                 | 25 -----
 redback-data-management/pom.xml               | 21 -----
 redback-features/pom.xml                      | 94 -------------------
 .../src/main/resources/features.xml           | 50 ----------
 .../redback-common-integrations/pom.xml       | 35 -------
 .../redback-integrations-security/pom.xml     | 21 -----
 .../redback-rest/redback-rest-api/pom.xml     | 57 -----------
 .../redback-rest-services/pom.xml             | 50 ----------
 .../redback-authentication-keys/pom.xml       | 10 --
 redback-keys/redback-keys-api/pom.xml         | 10 --
 .../redback-keys-cached/pom.xml               | 10 --
 .../redback-keys-jpa/pom.xml                  |  2 +-
 .../redback-keys-memory/pom.xml               | 10 --
 redback-keys/redback-keys-tests/pom.xml       |  1 -
 redback-policy/pom.xml                        | 10 --
 redback-rbac/redback-rbac-model/pom.xml       | 11 +--
 .../redback-rbac-cached/pom.xml               | 10 --
 .../redback-rbac-jpa/pom.xml                  |  2 +-
 .../redback-rbac-ldap/pom.xml                 |  5 -
 .../redback-rbac-memory/pom.xml               | 10 --
 .../redback-rbac-role-manager/pom.xml         |  5 -
 redback-system/pom.xml                        | 10 --
 redback-users/redback-users-api/pom.xml       | 11 +--
 .../redback-users-cached/pom.xml              | 10 --
 .../redback-users-configurable/pom.xml        | 10 --
 .../redback-users-jpa/pom.xml                 |  1 -
 .../redback-users-ldap/pom.xml                |  6 +-
 .../redback-users-memory/pom.xml              | 10 --
 39 files changed, 34 insertions(+), 709 deletions(-)
 delete mode 100644 redback-features/pom.xml
 delete mode 100644 redback-features/src/main/resources/features.xml

diff --git a/pom.xml b/pom.xml
index 81b1a1e9..1273ee2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,6 @@
     <module>redback-users</module>
     <module>redback-data-management</module>
     <module>redback-integrations</module>
-    <module>redback-features</module>
   </modules>
 
   <scm>
diff --git a/redback-authentication/redback-authentication-api/pom.xml b/redback-authentication/redback-authentication-api/pom.xml
index 92efe616..f6467611 100644
--- a/redback-authentication/redback-authentication-api/pom.xml
+++ b/redback-authentication/redback-authentication-api/pom.xml
@@ -27,7 +27,6 @@
   </parent>
 
   <artifactId>redback-authentication-api</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -52,29 +51,4 @@
     </dependency>     
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.authentication;version=${project.version};-split-package:=import-first
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject;version="[1,2)",
-              org.apache.archiva.redback.policy;version=${project.version},
-              org.apache.archiva.redback.users;version=${project.version},
-              org.apache.commons.lang;version="[2.6,3)",
-              org.springframework*;version="[3,4)",
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
index 430f90b0..7bc17896 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-authentication-ldap</artifactId>
-  <packaging>bundle</packaging>
   <name>Redback :: Authentication Provider :: Ldap</name>
 
   <properties>
@@ -98,28 +97,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.authentication.ldap;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.naming*,
-              javax.inject;version="[1,2)",
-              org.apache.archiva.redback.authentication;version=${project.version},
-              org.apache.archiva.redback.common.ldap*;version=${project.version},
-              org.apache.archiva.redback.configuration;version=${project.version},
-              org.apache.archiva.redback.users.ldap.service;version=${project.version},
-              org.apache.commons.lang;version="[2.6,3)",
-              org.springframework.stereotype;version="[3,4)",
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.sonatype.plugins</groupId>
         <artifactId>port-allocator-maven-plugin</artifactId>
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
index ba237895..d8c63e44 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-authentication-memory</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -58,24 +57,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.authentication.memory;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              org.apache.archiva.redback.authentication;version=${project.version},
-              org.springframework.stereotype;version="[3,4)"
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
index 7fb46780..c90dfdca 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-authentication-open</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -49,25 +48,4 @@
     </dependency>     
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.authentication.open;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              org.apache.archiva.redback.authentication;version=${project.version},
-              org.apache.archiva.redback.policy;version=${project.version},
-              org.springframework.stereotype;version="[3,4)"
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
index f2bc002b..dc2d7911 100644
--- a/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-users/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-authentication-users</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -71,13 +70,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-authorization/redback-authorization-api/pom.xml b/redback-authorization/redback-authorization-api/pom.xml
index da79ffc1..ad4eb9f3 100644
--- a/redback-authorization/redback-authorization-api/pom.xml
+++ b/redback-authorization/redback-authorization-api/pom.xml
@@ -28,29 +28,9 @@
   </parent>
 
   <artifactId>redback-authorization-api</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
   <name>Redback :: Authorization API</name>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.authorization;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              org.apache.archiva.redback.users;version=${project.version}
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml b/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
index f158e03c..cca4e349 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-authorization-open</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -49,24 +48,4 @@
     </dependency>     
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.authorization.open;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              org.apache.archiva.redback.authorization;version=${project.version},
-              org.springframework.stereotype;version="[3,4)"
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
index 0d8b390e..d6d6d7bd 100644
--- a/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
+++ b/redback-authorization/redback-authorization-providers/redback-authorization-rbac/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-authorization-rbac</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -81,13 +80,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-common/redback-common-jpa/pom.xml b/redback-common/redback-common-jpa/pom.xml
index 630b1d15..63f31cfc 100644
--- a/redback-common/redback-common-jpa/pom.xml
+++ b/redback-common/redback-common-jpa/pom.xml
@@ -20,41 +20,41 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>redback-common</artifactId>
-        <groupId>org.apache.archiva.redback</groupId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>redback-common</artifactId>
+    <groupId>org.apache.archiva.redback</groupId>
+    <version>3.0.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>redback-common-jpa</artifactId>
-    <packaging>jar</packaging>
+  <artifactId>redback-common-jpa</artifactId>
+  <packaging>jar</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
-    <name>Redback :: JPA Common Package</name>
+  <name>Redback :: JPA Common Package</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.archiva.redback</groupId>
-            <artifactId>redback-rbac-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.archiva.redback</groupId>
-            <artifactId>redback-users-api</artifactId>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.archiva.redback</groupId>
+      <artifactId>redback-rbac-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.archiva.redback</groupId>
+      <artifactId>redback-users-api</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>org.apache.openjpa</groupId>
-            <artifactId>openjpa</artifactId>
-            <version>${openjpa.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <dependency>
+      <groupId>org.apache.openjpa</groupId>
+      <artifactId>openjpa</artifactId>
+      <version>${openjpa.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
 
 </project>
diff --git a/redback-common/redback-common-ldap/pom.xml b/redback-common/redback-common-ldap/pom.xml
index 18728370..aa9dddf8 100644
--- a/redback-common/redback-common-ldap/pom.xml
+++ b/redback-common/redback-common-ldap/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-common-ldap</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -84,29 +83,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.common.ldap*;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.naming*,
-              javax.inject;version="[1,2)",
-              org.apache.archiva.redback.configuration;version=${project.version},
-              org.apache.archiva.redback.users;version=${project.version},
-              org.apache.commons.lang;version="[2.6,3)",
-              org.springframework.stereotype;version="[3,4)",
-              com.google.common.collect,
-              com.sun.jndi.ldap;resolution:=optional,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
diff --git a/redback-configuration/pom.xml b/redback-configuration/pom.xml
index b8e93321..beff5a0c 100644
--- a/redback-configuration/pom.xml
+++ b/redback-configuration/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-configuration</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.basedir}</site.staging.base>
   </properties>
@@ -70,28 +69,4 @@
     </dependency>     
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.configuration;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject;version="[1,2)",
-              org.apache.archiva.redback.components.evaluator*;version=${project.version},
-              org.apache.archiva.redback.components.registry;version=${project.version},
-              org.springframework.stereotype;version="[3,4)",
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-data-management/pom.xml b/redback-data-management/pom.xml
index ec17c496..fee647d6 100644
--- a/redback-data-management/pom.xml
+++ b/redback-data-management/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-data-management</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.basedir}</site.staging.base>
   </properties>
@@ -99,26 +98,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.management;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.xml.stream,
-              org.apache.archiva.redback.keys*;version=${project.version},
-              org.apache.archiva.redback.rbac*;version=${project.version},
-              org.apache.archiva.redback.users*;version=${project.version},
-              org.codehaus.plexus.util;version="[3,4)",
-              org.apache.commons.io,
-              org.springframework.stereotype;version="[3,4)"
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
diff --git a/redback-features/pom.xml b/redback-features/pom.xml
deleted file mode 100644
index 7cf5d550..00000000
--- a/redback-features/pom.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~  http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.apache.archiva.redback</groupId>
-    <artifactId>redback</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>redback-features</artifactId>
-  <packaging>pom</packaging>
-  <name>Redback :: Karaf Features</name>
-
-  <properties>
-    <site.staging.base>${project.parent.basedir}</site.staging.base>
-    <javax-inject.bundle.version>1_2</javax-inject.bundle.version>
-  </properties>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <configuration>
-          <useDefaultDelimiters>false</useDefaultDelimiters>
-          <delimiters>
-            <delimiter>${*}</delimiter>
-          </delimiters>
-        </configuration>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-artifact</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attach-artifact</goal>
-            </goals>
-            <configuration>
-              <artifacts>
-                <artifact>
-                  <file>${project.build.outputDirectory}/features.xml</file>
-                  <type>xml</type>
-                  <classifier>features</classifier>
-                </artifact>
-              </artifacts>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
\ No newline at end of file
diff --git a/redback-features/src/main/resources/features.xml b/redback-features/src/main/resources/features.xml
deleted file mode 100644
index 28b12864..00000000
--- a/redback-features/src/main/resources/features.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<features name="redback-core-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0">
-
-  <feature name="redback-configuration" version="${project.version}" resolver="(obr)">
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
-    <bundle>mvn:org.apache.archiva.redback/redback-configuration/${project.version}</bundle>
-  </feature>
-
-  <feature name="redback-policy" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">redback-configuration</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
-    <bundle>mvn:org.apache.archiva.redback/redback-policy/${project.version}</bundle>
-  </feature>
-
-  <feature name="redback-authentication-api" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">redback-policy</feature>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
-    <bundle>mvn:org.apache.archiva.redback/redback-authentication-api/${project.version}</bundle>
-  </feature>
-
-  <feature name="redback-authentication-ldap" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">redback-authentication-api</feature>
-    <bundle>mvn:org.apache.archiva.redback/redback-authentication-ldap/${project.version}</bundle>
-  </feature>
-
-  <feature name="redback-authentication-memory" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">redback-authentication-api</feature>
-    <bundle>mvn:org.apache.archiva.redback/redback-authentication-memory/${project.version}</bundle>
-  </feature>
-
-  <feature name="redback-authentication-open" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">redback-authentication-api</feature>
-    <bundle>mvn:org.apache.archiva.redback/redback-authentication-open/${project.version}</bundle>
-  </feature>
-
-</features>
\ No newline at end of file
diff --git a/redback-integrations/redback-common-integrations/pom.xml b/redback-integrations/redback-common-integrations/pom.xml
index c32e6b54..477ec8dc 100644
--- a/redback-integrations/redback-common-integrations/pom.xml
+++ b/redback-integrations/redback-common-integrations/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-common-integrations</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -189,40 +188,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.integration*;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject;version="[1,2)",
-              javax.mail*,
-              javax.servlet*,
-              org.apache.archiva.redback.authentication;version=${project.version},
-              org.apache.archiva.redback.authorization;version=${project.version},
-              org.apache.archiva.redback.configuration;version=${project.version},
-              org.apache.archiva.redback.keys;version=${project.version},
-              org.apache.archiva.redback.policy;version=${project.version},
-              org.apache.archiva.redback.rbac;version=${project.version},
-              org.apache.archiva.redback.role*;version=${project.version},
-              org.apache.archiva.redback.system*;version=${project.version},
-              org.apache.archiva.redback.users;version=${project.version},
-              org.apache.commons.beanutils;version="[1.7,2)",
-              org.apache.commons.codec.binary;version="[1.6,2)",
-              org.apache.commons.lang;version="[2.6,3)",
-              org.apache.velocity*;version="[1.7,2)",
-              org.codehaus.plexus.util;version="[3,4)",
-              org.springframework*;version="[3,4)",
-              org.apache.commons.io,
-              org.slf4j;resolution:=optional
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
diff --git a/redback-integrations/redback-integrations-security/pom.xml b/redback-integrations/redback-integrations-security/pom.xml
index 90c75a1a..064bad70 100644
--- a/redback-integrations/redback-integrations-security/pom.xml
+++ b/redback-integrations/redback-integrations-security/pom.xml
@@ -28,29 +28,8 @@
   </parent>
 
   <artifactId>redback-integrations-security</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
   <name>Redback :: Integration :: Security</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.integration.security.role;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-integrations/redback-rest/redback-rest-api/pom.xml b/redback-integrations/redback-rest/redback-rest-api/pom.xml
index c98678d3..281793c5 100644
--- a/redback-integrations/redback-rest/redback-rest-api/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-api/pom.xml
@@ -28,8 +28,6 @@
   </parent>
 
   <artifactId>redback-rest-api</artifactId>
-  <!-- DO NOT USE bundle packaging generated documentation is not included in the jar !!! -->
-  <packaging>jar</packaging>
   <name>Redback :: Integration :: REST :: Api</name>
 
   <properties>
@@ -61,59 +59,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.rest.api*;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.ws.rs,
-              javax.xml.bind.annotation,
-              org.apache.archiva.redback.authorization;version=${project.version},
-              org.apache.archiva.redback.integration.util;version=${project.version},
-              org.apache.archiva.redback.rbac;version=${project.version},
-              org.apache.archiva.redback.users;version=${project.version},
-              org.apache.commons.lang;version="[2.6,3)"
-            </Import-Package>
-          </instructions>
-        </configuration>
-        <executions>
-          <execution>
-            <id>create-manifest</id>
-            <phase>process-test-classes</phase>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>bind-sources</id>
-            <goals>
-              <goal>jar-no-fork</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-integrations/redback-rest/redback-rest-services/pom.xml b/redback-integrations/redback-rest/redback-rest-services/pom.xml
index 47f20f89..8ef5f63f 100644
--- a/redback-integrations/redback-rest/redback-rest-services/pom.xml
+++ b/redback-integrations/redback-rest/redback-rest-services/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-rest-services</artifactId>
-  <packaging>bundle</packaging>
   <name>Redback :: Integration :: REST :: Services</name>
 
   <properties>
@@ -214,55 +213,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              org.apache.archiva.redback.rest.services*;version=${project.version};-split-package:=merge-first
-            </Export-Package>
-            <Import-Package>
-              javax.annotation,
-              javax.inject;version="[1,2)",
-              javax.mail.internet,
-              javax.servlet.http,
-              javax.ws.rs.core,
-              javax.ws.rs.ext,
-              net.sf.ehcache,
-              org.apache.archiva.redback.authentication;version=${project.version},
-              org.apache.archiva.redback.authorization;version=${project.version},
-              org.apache.archiva.redback.components.cache;version=${project.version},
-              org.apache.archiva.redback.configuration;version=${project.version},
-              org.apache.archiva.redback.integration.filter.authentication*;version=${project.version},
-              org.apache.archiva.redback.integration.mail;version=${project.version},
-              org.apache.archiva.redback.integration.model;version=${project.version},
-              org.apache.archiva.redback.integration.util;version=${project.version},
-              org.apache.archiva.redback.keys*;version=${project.version},
-              org.apache.archiva.redback.policy;version=${project.version},
-              org.apache.archiva.redback.rbac;version=${project.version},
-              org.apache.archiva.redback.rest.api.model;version=${project.version},
-              org.apache.archiva.redback.rest.api.services;version=${project.version},
-              org.apache.archiva.redback.role*;version=${project.version},
-              org.apache.archiva.redback.system*;version=${project.version},
-              org.apache.archiva.redback.users;version=${project.version},
-              org.apache.commons.io;version="[1.4,2)",
-              org.apache.commons.lang;version="[2.6,3)",
-              org.apache.cxf*;version="[3.0.3,4)",
-              com.fasterxml.jackson.databind;version="[2.2,3)",
-              org.codehaus.plexus.util;version="[3,4)",
-              org.springframework*;version="[3,4)",
-              org.apache.commons.lang.time,
-              org.slf4j;resolution:=optional,
-              javax.naming,
-              javax.naming.directory,
-              org.apache.archiva.redback.common.ldap,
-              org.apache.archiva.redback.common.ldap.connection,
-              org.apache.archiva.redback.common.ldap.role
-            </Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
diff --git a/redback-keys/redback-authentication-keys/pom.xml b/redback-keys/redback-authentication-keys/pom.xml
index adeec606..4d9686cb 100644
--- a/redback-keys/redback-authentication-keys/pom.xml
+++ b/redback-keys/redback-authentication-keys/pom.xml
@@ -29,7 +29,6 @@
   </parent>
 
   <artifactId>redback-authentication-keys</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -58,13 +57,4 @@
     </dependency>    
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-keys/redback-keys-api/pom.xml b/redback-keys/redback-keys-api/pom.xml
index 90210ca0..4ed59300 100644
--- a/redback-keys/redback-keys-api/pom.xml
+++ b/redback-keys/redback-keys-api/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-keys-api</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -61,13 +60,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
index 78963b1c..af16c749 100644
--- a/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-cached/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-keys-cached</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -89,13 +88,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml b/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml
index d75c3c43..c70d94ef 100644
--- a/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-jpa/pom.xml
@@ -28,7 +28,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>redback-keys-jpa</artifactId>
-  <packaging>jar</packaging>
+
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
diff --git a/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml b/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
index f79ab83c..a7893585 100644
--- a/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
+++ b/redback-keys/redback-keys-providers/redback-keys-memory/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-keys-memory</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -67,13 +66,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-keys/redback-keys-tests/pom.xml b/redback-keys/redback-keys-tests/pom.xml
index 0734666e..60d6c862 100644
--- a/redback-keys/redback-keys-tests/pom.xml
+++ b/redback-keys/redback-keys-tests/pom.xml
@@ -26,7 +26,6 @@
   </parent>
   <artifactId>redback-keys-tests</artifactId>
   <name>Redback :: Key Management Test Harness</name>
-  <packaging>jar</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
diff --git a/redback-policy/pom.xml b/redback-policy/pom.xml
index a5098e9f..5b0ea4f8 100644
--- a/redback-policy/pom.xml
+++ b/redback-policy/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-policy</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.basedir}</site.staging.base>
   </properties>
@@ -66,13 +65,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-rbac/redback-rbac-model/pom.xml b/redback-rbac/redback-rbac-model/pom.xml
index bbdf94c4..cf95e703 100644
--- a/redback-rbac/redback-rbac-model/pom.xml
+++ b/redback-rbac/redback-rbac-model/pom.xml
@@ -28,7 +28,7 @@
   </parent>
 
   <artifactId>redback-rbac-model</artifactId>
-  <packaging>bundle</packaging>
+
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -63,13 +63,4 @@
 
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
index d7734714..b0637161 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-cached/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-rbac-cached</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -93,13 +92,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
index 78c07f9d..1fb235d5 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-jpa/pom.xml
@@ -28,7 +28,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>redback-rbac-jpa</artifactId>
-  <packaging>jar</packaging>
+
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
index 86ce8eac..0547ccca 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-ldap/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-rbac-ldap</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -108,10 +107,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
diff --git a/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml b/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
index 3c532502..4deb3eeb 100644
--- a/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
+++ b/redback-rbac/redback-rbac-providers/redback-rbac-memory/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-rbac-memory</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -72,13 +71,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-rbac/redback-rbac-role-manager/pom.xml b/redback-rbac/redback-rbac-role-manager/pom.xml
index a320ed8a..00ee2978 100644
--- a/redback-rbac/redback-rbac-role-manager/pom.xml
+++ b/redback-rbac/redback-rbac-role-manager/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-rbac-role-manager</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -98,10 +97,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
diff --git a/redback-system/pom.xml b/redback-system/pom.xml
index ee873911..9eff38e7 100644
--- a/redback-system/pom.xml
+++ b/redback-system/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-system</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.basedir}</site.staging.base>
   </properties>
@@ -88,13 +87,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-users/redback-users-api/pom.xml b/redback-users/redback-users-api/pom.xml
index e304a365..216c5664 100644
--- a/redback-users/redback-users-api/pom.xml
+++ b/redback-users/redback-users-api/pom.xml
@@ -28,7 +28,7 @@
   </parent>
 
   <artifactId>redback-users-api</artifactId>
-  <packaging>bundle</packaging>
+
   <properties>
     <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -41,13 +41,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-users/redback-users-providers/redback-users-cached/pom.xml b/redback-users/redback-users-providers/redback-users-cached/pom.xml
index b1fbbd17..51bb4bd4 100644
--- a/redback-users/redback-users-providers/redback-users-cached/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-cached/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-users-cached</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -89,13 +88,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-users/redback-users-providers/redback-users-configurable/pom.xml b/redback-users/redback-users-providers/redback-users-configurable/pom.xml
index 475c869c..c833d4bc 100644
--- a/redback-users/redback-users-providers/redback-users-configurable/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-configurable/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-users-configurable</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -54,13 +53,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>
diff --git a/redback-users/redback-users-providers/redback-users-jpa/pom.xml b/redback-users/redback-users-providers/redback-users-jpa/pom.xml
index 239267d0..55521029 100644
--- a/redback-users/redback-users-providers/redback-users-jpa/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-jpa/pom.xml
@@ -28,7 +28,6 @@
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>redback-users-jpa</artifactId>
-  <packaging>jar</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
diff --git a/redback-users/redback-users-providers/redback-users-ldap/pom.xml b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
index a59d78ef..0dc94189 100644
--- a/redback-users/redback-users-providers/redback-users-ldap/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-ldap/pom.xml
@@ -28,7 +28,7 @@
   </parent>
   
   <artifactId>redback-users-ldap</artifactId>
-  <packaging>bundle</packaging>
+
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -85,10 +85,6 @@
 
   <build>
     <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
diff --git a/redback-users/redback-users-providers/redback-users-memory/pom.xml b/redback-users/redback-users-providers/redback-users-memory/pom.xml
index f854ce03..6513dc1a 100644
--- a/redback-users/redback-users-providers/redback-users-memory/pom.xml
+++ b/redback-users/redback-users-providers/redback-users-memory/pom.xml
@@ -28,7 +28,6 @@
   </parent>
 
   <artifactId>redback-users-memory</artifactId>
-  <packaging>bundle</packaging>
   <properties>
     <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
@@ -63,13 +62,4 @@
     </dependency>
   </dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
 </project>