From 4f6ab066733f970a38c4fd84e63c7eea02c76b75 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sat, 31 Dec 2011 09:28:02 +0000
Subject: [PATCH] [MRM-1562] Update to Archiva as OSGi compliant application
 Patch on features descriptor cleanup. Submitted by Jean-Baptiste Onofre.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1226052 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-karaf/archiva-features/pom.xml    |  10 +-
 .../src/main/resources/features.xml           | 295 +++++++++---------
 .../archiva-web/archiva-webdav/pom.xml        |   4 +-
 .../plugins/metadata-store-jcr/pom.xml        |   2 +-
 pom.xml                                       |   9 +-
 5 files changed, 157 insertions(+), 163 deletions(-)

diff --git a/archiva-modules/archiva-karaf/archiva-features/pom.xml b/archiva-modules/archiva-karaf/archiva-features/pom.xml
index 84a7dbd6c..f45a44083 100644
--- a/archiva-modules/archiva-karaf/archiva-features/pom.xml
+++ b/archiva-modules/archiva-karaf/archiva-features/pom.xml
@@ -34,25 +34,29 @@
     <beanlib.bundle.version>5.0.2beta_1-SNAPSHOT</beanlib.bundle.version>
     <cglib.bundle.version>2.2_2</cglib.bundle.version>
     <commons-beanutils.bundle.version>1.8.2_2</commons-beanutils.bundle.version>
-    <commons-codec.bundle.version>1.3_4</commons-codec.bundle.version>
     <commons-collections.bundle.version>3.2.1_2</commons-collections.bundle.version>
     <commons-configuration.bundle.version>1.4_3</commons-configuration.bundle.version>
     <commons-digester.bundle.version>1.8_3</commons-digester.bundle.version>
+    <commons-httpclient.bundle.version>3.1_6</commons-httpclient.bundle.version>
+    <commons-io.2.version>2.0.1</commons-io.2.version>
     <commons-io.bundle.version>1.4_2</commons-io.bundle.version>
     <commons-jxpath.bundle.version>1.2_5</commons-jxpath.bundle.version>
-    <commons-lang.bundle.version>2.4_5</commons-lang.bundle.version>
     <commons-validator.bundle.version>1.3.1_1-SNAPSHOT</commons-validator.bundle.version>
     <dom4j.bundle.version>1.6.1_4</dom4j.bundle.version>
     <ehcache.bundle.version>2.4.3_1</ehcache.bundle.version>
+    <freemarker.bundle.version>2.3.18_1</freemarker.bundle.version>
+    <javassist.bundle.version>3.12.1.ga_1</javassist.bundle.version>
     <javax-inject.bundle.version>1_1</javax-inject.bundle.version>
     <jcharset.version>1.0</jcharset.version>
     <jcip-annotations.bundle.version>1.0_1-SNAPSHOT</jcip-annotations.bundle.version>
     <jdom.bundle.version>1.1_4</jdom.bundle.version>
     <joda-time.bundle.version>1.5.2_4</joda-time.bundle.version>
     <jsoup.bundle.version>1.5.2_1</jsoup.bundle.version>
+    <junit.bundle.version>4.9_1</junit.bundle.version>
     <lucene.bundle.version>3.0.3_2</lucene.bundle.version>
     <maven.archetype.version>2.1</maven.archetype.version>
     <maven-model-v3.version>2.0</maven-model-v3.version>
+    <ognl.bundle.version>2.7.3_5</ognl.bundle.version>
     <oro.bundle.version>2.0.8_5</oro.bundle.version>
     <plexus-classworlds.version>2.4</plexus-classworlds.version>
     <plexus-component-annotations.version>1.5.5</plexus-component-annotations.version>
@@ -64,7 +68,9 @@
     <sisu-inject-bean.version>2.3.0</sisu-inject-bean.version>
     <sisu-guava.version>0.9.9</sisu-guava.version>
     <stax-utils.bundle.version>20040917_2</stax-utils.bundle.version>
+    <testng.version>6.3.1</testng.version>
     <velocity.bundle.version>1.7_3</velocity.bundle.version>
+    <velocity-tools.version>2.0-alpha1</velocity-tools.version>
     <xpp3.bundle.version>1.1.4c_5</xpp3.bundle.version>
     <xstream.bundle.version>1.4_1</xstream.bundle.version>
     <ws-commons-util.bundle.version>1.0.2_1-SNAPSHOT</ws-commons-util.bundle.version>
diff --git a/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml b/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
index f55d3e4f6..246fca19d 100644
--- a/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
+++ b/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
@@ -18,16 +18,16 @@
   <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxfVersion}/xml/features</repository>
 
   <feature name="archiva-common" description="Archiva Common module" version="${project.version}" resolver="(obr)">
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.plexus/plexus-classworlds/${plexus-classworlds.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.plexus/plexus-component-annotations/${plexus-component-annotations.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.plexus/plexus-utils/${plexus-utils.version}</bundle>
-    <bundle>mvn:org.sonatype.sisu/sisu-guava/${sisu-guava.version}</bundle>
-    <bundle>mvn:org.sonatype.sisu/sisu-guice/${sisu-guice.version}</bundle>
-    <bundle>mvn:org.sonatype.sisu/sisu-inject-bean/${sisu-inject-bean.version}</bundle>
-    <bundle>mvn:org.sonatype.sisu/sisu-inject-plexus/${sisu-inject-plexus.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-classworlds/${plexus-classworlds.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-component-annotations/${plexus-component-annotations.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-utils/${plexus-utils.version}</bundle>
+    <bundle dependency="true">mvn:org.sonatype.sisu/sisu-guava/${sisu-guava.version}</bundle>
+    <bundle dependency="true">mvn:org.sonatype.sisu/sisu-guice/${sisu-guice.version}</bundle>
+    <bundle dependency="true">mvn:org.sonatype.sisu/sisu-inject-bean/${sisu-inject-bean.version}</bundle>
+    <bundle dependency="true">mvn:org.sonatype.sisu/sisu-inject-plexus/${sisu-inject-plexus.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-common/${project.version}</bundle>
   </feature>
 
@@ -52,15 +52,15 @@
     <feature version="[3,4)">spring-web</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
-    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-digester/${commons-digester.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-jxpath/${commons-jxpath.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/${commons-configuration.bundle.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.plexus/plexus-expression-evaluator/${plexus-expression-evaluator.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.plexus/plexus-interpolation/${plexus-interpolation.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.redback.components.registry/spring-registry-api/${redback.registry.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.redback.components.registry/spring-registry-commons/${redback.registry.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.redback.components/spring-utils/${redback.spring-utils.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-expression-evaluator/${plexus-expression-evaluator.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-interpolation/${plexus-interpolation.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback.components.registry/spring-registry-api/${redback.registry.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback.components.registry/spring-registry-commons/${redback.registry.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback.components/spring-utils/${redback.spring-utils.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-configuration/${project.version}</bundle>
   </feature>
 
@@ -71,16 +71,18 @@
 
   <feature name="archiva-plexus-bridge" description="Archive Plexus Bridge module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-common</feature>
-    <bundle>wrap:mvn:org.codehaus.plexus/plexus-digest/${plexus-digest.version}</bundle>
+    <feature version="[3,4)">spring</feature>
+    <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-digest/${plexus-digest.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-plexus-bridge/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-repository-admin-api" description="Archiva Repository Admin API module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-common</feature>
-    <bundle>wrap:mvn:org.codehaus.redback/redback-users-api/${redback.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.redback/redback-configuration/${redback.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.redback/redback-policy/${redback.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.redback/redback-users-memory/${redback.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-users-api/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-configuration/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-policy/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-users-memory/${redback.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-repository-admin-api/${project.version}</bundle>
   </feature>
 
@@ -92,7 +94,6 @@
   </feature>
 
   <feature name="archiva-audit" description="Archiva Audit module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-configuration</feature>
     <feature version="${project.version}">archiva-metadata</feature>
     <bundle>mvn:org.apache.archiva/audit/${project.version}</bundle>
   </feature>
@@ -107,35 +108,37 @@
   </feature>
 
   <feature name="archiva-maven2-repository" description="Archiva Maven 2 Repository module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-metadata</feature>
+    <feature version="${project.version}">archiva-checksum</feature>
+    <feature version="${project.version}">archiva-plexus-bridge</feature>
+    <feature version="${project.version}">archiva-configuration</feature>
     <feature version="${project.version}">archiva-proxy-common</feature>
     <feature version="${project.version}">archiva-reports</feature>
     <feature version="${project.version}">archiva-xml-tools</feature>
-    <bundle>wrap:mvn:org.apache.maven/maven-artifact/${maven.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven/maven-model/${maven.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven/maven-project/${maven.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven/maven-settings/${maven.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven/maven-artifact-manager/${maven.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.shared/maven-dependency-tree/${maven-dependency-tree.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-artifact/${maven.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-model/${maven.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-project/${maven.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-settings/${maven.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-artifact-manager/${maven.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.shared/maven-dependency-tree/${maven-dependency-tree.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.archetype/archetype-catalog/${maven.archetype.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.archetype/archetype-registry/${maven.archetype.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.archetype/archetype-descriptor/${maven.archetype.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.shared/maven-invoker/${maven.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.indexer/indexer-core/${maven.indexer.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.indexer/indexer-artifact/${maven.indexer.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.archetype/archetype-catalog/${maven.archetype.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.archetype/archetype-registry/${maven.archetype.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.archetype/archetype-descriptor/${maven.archetype.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.shared/maven-invoker/${maven.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.indexer/indexer-core/${maven.indexer.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.indexer/indexer-artifact/${maven.indexer.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.plexus/plexus-velocity/${plexus-velocity.version}</bundle>
-    <bundle>wrap:mvn:net.sourceforge.jchardet/jchardet/${jcharset.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.archetype/archetype-common/${maven.archetype.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven/maven-model-builder/${maven3x.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-velocity/${plexus-velocity.version}</bundle>
+    <bundle dependency="true">wrap:mvn:net.sourceforge.jchardet/jchardet/${jcharset.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.archetype/archetype-common/${maven.archetype.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-model-builder/${maven3x.version}</bundle>
     <bundle>mvn:org.apache.archiva/maven2-repository/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-consumers-api" description="Archiva Consumers API module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
     <feature version="${project.version}">archiva-repository-admin-api</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
@@ -144,35 +147,29 @@
 
   <feature name="archiva-consumers" description="Archiva Consumers module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-consumers-api</feature>
-    <feature version="${project.version}">archiva-checksum</feature>
-    <feature version="${project.version}">archiva-plexus-bridge</feature>
     <feature version="${project.version}">archiva-configuration</feature>
+    <feature version="${project.version}">archiva-plexus-bridge</feature>
     <feature version="${project.version}">archiva-metadata</feature>
     <feature version="${project.version}">archiva-model</feature>
-    <feature version="${project.version}">archiva-scheduler-api</feature>
+    <feature version="${project.version}">archiva-repository-layer</feature>
     <bundle>mvn:org.apache.archiva/archiva-core-consumers/${project.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-lucene-consumers/${project.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-metadata-consumer/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-reports" description="Archiva Problem Reports module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
-    <feature version="${project.version}">archiva-checksum</feature>
     <feature version="${project.version}">archiva-configuration</feature>
-    <feature version="${project.version}">archiva-repository-admin-api</feature>
-    <feature version="${project.version}">archiva-metadata</feature>
     <feature version="${project.version}">archiva-consumers-api</feature>
+    <feature version="${project.version}">archiva-metadata</feature>
     <bundle>mvn:org.apache.archiva/problem-reports/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-repository-layer" description="Archiva Repository Layer module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
-    <feature version="${project.version}">archiva-checksum</feature>
     <feature version="${project.version}">archiva-configuration</feature>
     <feature version="${project.version}">archiva-metadata</feature>
-    <feature version="${project.version}">archiva-model</feature>
     <feature version="${project.version}">archiva-repository-admin-api</feature>
-    <feature version="${project.version}">archiva-xml-tools</feature>
+    <feature version="${project.version}">archiva-maven2-repository</feature>
+    <feature version="${project.version}">archiva-model</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle>
@@ -181,77 +178,64 @@
   </feature>
 
   <feature name="archiva-proxy-common" description="Archiva Proxy Common module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
-    <feature version="${project.version}">archiva-repository-admin-api</feature>
-    <feature version="${project.version}">archiva-configuration</feature>
-    <feature version="${project.version}">archiva-model</feature>
-    <feature version="${project.version}">archiva-policies</feature>
-    <feature version="${project.version}">archiva-metadata</feature>
-    <feature version="${project.version}">archiva-scheduler-api</feature>
-    <feature version="${project.version}">archiva-repository-layer</feature>
+    <feature version="${project.version}">archiva-plexus-bridge</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.wagon/wagon-provider-api/${wagon.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.wagon/wagon-file/${wagon.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.wagon/wagon-provider-api/${wagon.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.wagon/wagon-file/${wagon.version}</bundle>
     <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient.version}</bundle>
     <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsoup/${jsoup.bundle.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.wagon/wagon-http-shared4/${wagon.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.wagon/wagon-http/${wagon.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.wagon/wagon-http-shared4/${wagon.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.wagon/wagon-http/${wagon.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-proxy-common/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-proxy" description="Archiva Proxy module" version="${project.version}" resolver="(obr)">
+    <feature version="${project.version}">archiva-configuration</feature>
+    <feature version="${project.version}">archiva-repository-admin-api</feature>
+    <feature version="${project.version}">archiva-model</feature>
     <feature version="${project.version}">archiva-proxy-common</feature>
+    <feature version="${project.version}">archiva-repository-layer</feature>
+    <feature version="${project.version}">archiva-scheduler</feature>
     <bundle>mvn:org.apache.archiva/archiva-proxy/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-scheduler-api" description="Archiva Scheduler API module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
-    <feature version="${project.version}">archiva-plexus-bridge</feature>
-    <feature version="${project.version}">archiva-repository-admin-api</feature>
-    <feature version="${project.version}">archiva-configuration</feature>
-    <feature version="${project.version}">archiva-proxy</feature>
-    <bundle>wrap:mvn:org.codehaus.redback.components/spring-taskqueue/${redback.taskqueue.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback.components/spring-taskqueue/${redback.taskqueue.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-scheduler-api/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-repository-statistics" description="Archiva Repository Statistics module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
-    <feature version="${project.version}">archiva-maven2-repository</feature>
+    <feature version="${project.version}">archiva-repository-layer</feature>
     <bundle dependency="true">mvn:javax.jcr/jcr/${javax.jcr.version}</bundle>
     <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}</bundle>
     <bundle>mvn:org.apache.archiva/repository-statistics/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-repository-scanner" description="Archiva Repository Scanner module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
-    <feature version="${project.version}">archiva-configuration</feature>
-    <feature version="${project.version}">archive-repository-layer</feature>
     <feature version="${project.version}">archiva-repository-admin-api</feature>
-    <feature version="${project.version}">archiva-consumers-api</feature>
+    <feature version="${project.version}">archiva-configuration</feature>
+    <feature version="${project.version}">archiva-consumers</feature>
+    <feature version="${project.version}">archiva-scheduler-api</feature>
     <bundle>mvn:org.apache.archiva/archiva-repository-scanner/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-scheduler" description="Archiva Scheduler module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-scheduler-api</feature>
-    <feature version="${project.version}">archiva-metadata</feature>
+    <feature version="${project.version}">archiva-plexus-bridge</feature>
+    <feature version="${project.version}">archiva-proxy-common</feature>
+    <feature version="${project.version}">archiva-repository-scanner</feature>
     <feature version="${project.version}">archiva-repository-statistics</feature>
-    <feature version="${project.version}">archiva-proxy</feature>
-    <bundle>wrap:mvn:org.codehaus.redback.components/spring-quartz/${redback.quartz.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback.components/spring-quartz/${redback.quartz.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.indexer/indexer-artifact/${maven.indexer.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.indexer/indexer-core/${maven.indexer.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.indexer/indexer-artifact/${maven.indexer.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-scheduler-indexing/${project.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-scheduler-repository/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-repository-admin-default" description="Archiva Repository Admin Default module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-repository-admin-api</feature>
-    <feature version="${project.version}">archiva-audit</feature>
-    <feature version="${project.version}">archiva-plexus-bridge</feature>
-    <feature version="${project.version}">archiva-scheduler</feature>
-    <feature version="${project.version}">archiva-metadata</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-validator/${commons-validator.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.bundle.version}</bundle>
@@ -259,48 +243,47 @@
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcip-annotations/${jcip-annotations.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.beanlib/${beanlib.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stax-utils/${stax-utils.bundle.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.redback/redback-rbac/${redback.version}</bundle>
-    <bundle>wrap:mvn:org.codehaus.redback/redback-rbac-role-manager/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-rbac-jdo/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-rbac-model/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-rbac-role-manager/${redback.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-repository-admin-default/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-transaction" description="Archiva Transaction module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
+    <feature version="${project.version}">archiva-plexus-bridge</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-transaction/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-artifact-converter" description="Archiva Artifact Converter module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
-    <feature version="${project.version}">archiva-plexus-bridge</feature>
     <feature version="${project.version}">archiva-transaction</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven/maven-model-v3/${maven-model-v3.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven/maven-model/${maven3x.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven.shared/maven-model-converter/${maven-model-converter.version}</bundle>
-    <bundle>wrap:mvn:org.apache.maven/maven-repository-metadata/${maven.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-model-v3/${maven-model-v3.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-model/${maven3x.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.shared/maven-model-converter/${maven-model-converter.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-repository-metadata/${maven.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-artifact/${maven.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-artifact-converter/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-converter" description="Archiva Converter module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
-    <feature version="${project.version}">archiva-repository-admin-api</feature>
-    <feature version="${project.version}">archiva-plexus-bridge</feature>
-    <feature version="${project.version}">archiva-model</feature>
-    <feature version="${project.version}">archiva-consumers-api</feature>
-    <feature version="${project.version}">archiva-repository-layer</feature>
-    <feature version="${project.version}">archiva-repository-scanner</feature>
+    <feature version="${project.version}">archiva-consumers</feature>
+    <feature version="${project.version}">archiva-scheduler</feature>
     <feature version="${project.version}">archiva-transaction</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-model-v3/${maven-model-v3.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-model/${maven3x.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.shared/maven-model-converter/${maven-model-converter.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven/maven-repository-metadata/${maven.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-converter/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-indexer" description="Archiva Indexer module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
-    <feature version="${project.version}">archiva-plexus-bridge</feature>
     <feature version="${project.version}">archiva-repository-admin-api</feature>
+    <feature version="${project.version}">archiva-plexus-bridge</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.maven.indexer/indexer-core/${maven.indexer.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-indexer/${project.version}</bundle>
   </feature>
 
@@ -309,71 +292,73 @@
   </feature>
 
   <feature name="archiva-rest-api" description="Archiva REST API module" version="${project.version}" resolver="(obr)">
-    <feature version="[2.4,3)">cxf</feature>
-    <feature version="${project.version}">archiva-common</feature>
     <feature version="${project.version}">archiva-repository-admin-api</feature>
+    <feature version="[2.4,3)">cxf</feature>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-authorization-api/${redback.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-rest-api/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-rest-services" description="Archiva REST Services module" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-rest-api</feature>
+    <feature version="${project.version}">archiva-audit</feature>
+    <feature version="${project.version}">archiva-indexer</feature>
+    <feature version="${project.version}">archiva-checksum</feature>
+    <feature version="${project.version}">archiva-repository-layer</feature>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcip-annotations/${jcip-annotations.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.beanlib/${beanlib.bundle.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-rest-services/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-rss" description="Archiva RSS module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
     <feature version="${project.version}">archiva-metadata</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rome/${rome.bundle.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-rss/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-security" description="Archiva Security module" version="${project.version}" resolver="(obr)">
-    <feature>http</feature>
-    <feature version="${project.version}">archiva-common</feature>
     <feature version="${project.version}">archiva-configuration</feature>
-    <feature version="${project.version}">archiva-security-common</feature>
+    <feature>http</feature>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-authentication-api/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-authorization-api/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-policy/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-rbac-jdo/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-rbac-model/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-rbac-role-manager/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-system/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-users-api/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-users-jdo/${redback.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-security/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-webdav" description="Archiva WebDav module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
-    <feature version="${project.version}">archiva-configuration</feature>
-    <feature>http</feature>
-    <feature version="${project.version}">archiva-repository-admin-api</feature>
     <feature version="${project.version}">archiva-audit</feature>
-    <feature version="${project.version}">archiva-plexus-bridge</feature>
     <feature version="${project.version}">archiva-indexer</feature>
-    <feature version="${project.version}">archiva-model</feature>
-    <feature version="${project.version}">archiva-policies</feature>
     <feature version="${project.version}">archiva-proxy</feature>
-    <feature version="${project.version}">archiva-metadata</feature>
-    <feature version="${project.version}">archiva-scheduler</feature>
     <feature version="${project.version}">archiva-security</feature>
+    <feature>http</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
-    <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-util/${jackrabbit.version}</bundle>
     <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-webdav/${jackrabbit.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${joda-time.bundle.version}</bundle>
+    <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-common-integrations/${redback.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-webdav/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-stage-repository-merge" description="Archiva Stage Repository Merge module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
-    <feature version="${project.version}">archiva-configuration</feature>
-    <feature version="${project.version}">archiva-metadata</feature>
-    <feature version="${project.version}">archiva-model</feature>
     <feature version="${project.version}">archiva-repository-layer</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
     <bundle>mvn:org.apache.archiva/stage-repository-merge/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-generic-metadata-support" description="Archiva Generic Metadata Support module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
     <feature version="${project.version}">archiva-metadata</feature>
     <bundle>mvn:org.apache.archiva/generic-metadata-support/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-metadata-store-file" description="Archiva Metadata Store File module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
     <feature version="${project.version}">archiva-configuration</feature>
     <feature version="${project.version}">archiva-metadata</feature>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle>
@@ -381,15 +366,16 @@
   </feature>
 
   <feature name="archiva-metadata-store-jcr" description="Archiva Metadata Store JCR module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-common</feature>
+    <feature version="${project.version}">archiva-configuration</feature>
     <feature version="${project.version}">archiva-metadata</feature>
+    <bundle dependency="true">mvn:javax.jcr/jcr/${javax.jcr.version}</bundle>
     <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}</bundle>
-    <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-core/${jackrabbit.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.jackrabbit/jackrabbit-core/${jackrabbit.version}</bundle>
     <bundle>mvn:org.apache.archiva/metadata-store-jcr/${project.version}</bundle>
   </feature>
 
   <feature name="archiva-npanday-support" description="Archiva Npanday Support module" version="${project.version}" resolver="(obr)">
-    <feature version="${project.version}">archiva-maven2-repository</feature>
+    <feature version="${project.version}">archiva-repository-layer</feature>
     <bundle>mvn:org.apache.archiva/npanday-support/${project.version}</bundle>
   </feature>
 
@@ -397,53 +383,52 @@
     <feature>war</feature>
     <feature version="[3,4)">spring</feature>
     <feature version="[3,4)">spring-web</feature>
-    <feature version="${project.version}">archiva-common</feature>
+    <feature version="${project.version}">archiva-rss</feature>
     <feature version="${project.version}">archiva-plexus-bridge</feature>
     <feature version="${project.version}">archiva-configuration</feature>
-    <feature version="${project.version}">archiva-repository-layer</feature>
+    <feature version="${project.version}">archiva-scheduler</feature>
+    <feature version="${project.version}">archiva-security-common</feature>
     <feature version="${project.version}">archiva-security</feature>
+    <bundle dependency="true">mvn:commons-codec/commons-codec/${commons-codec.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-common-integrations/${redback.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-webapp-common/${project.version}</bundle>
   </feature>
 
   <feature name="archiva" description="Archiva application" version="${project.version}" resolver="(obr)">
     <feature version="${project.version}">archiva-common</feature>
-    <feature version="${project.version}">archiva-checksum</feature>
-    <feature version="${project.version}">archiva-policies</feature>
-    <feature version="${project.version}">archiva-configuration</feature>
-    <feature version="${project.version}">archiva-model</feature>
-    <feature version="${project.version}">archiva-plexus-bridge</feature>
+    <feature version="${project.version}">archiva-repository-admin-default</feature>
     <feature version="${project.version}">archiva-repository-admin-api</feature>
-    <feature version="${project.version}">archiva-metadata</feature>
     <feature version="${project.version}">archiva-audit</feature>
-    <feature version="${project.version}">archiva-xml-tools</feature>
-    <feature version="${project.version}">archiva-repository-layer</feature>
-    <feature version="${project.version}">archiva-maven2-repository</feature>
-    <feature version="${project.version}">archiva-consumers-api</feature>
-    <feature version="${project.version}">archiva-consumers</feature>
-    <feature version="${project.version}">archiva-reports</feature>
-    <feature version="${project.version}">archiva-proxy-common</feature>
-    <feature version="${project.version}">archiva-proxy</feature>
-    <feature version="${project.version}">archiva-scheduler-api</feature>
+    <feature version="${project.version}">archiva-plexus-bridge</feature>
+    <feature version="${project.version}">archiva-configuration</feature>
     <feature version="${project.version}">archiva-repository-statistics</feature>
-    <feature version="${project.version}">archiva-repository-scanner</feature>
     <feature version="${project.version}">archiva-scheduler</feature>
-    <feature version="${project.version}">archiva-repository-admin-default</feature>
-    <feature version="${project.version}">archiva-transaction</feature>
-    <feature version="${project.version}">archiva-artifact-converter</feature>
     <feature version="${project.version}">archiva-indexer</feature>
-    <feature version="${project.version}">archiva-security-common</feature>
+    <feature version="${project.version}">archiva-generic-metadata-support</feature>
     <feature version="${project.version}">archiva-rest-api</feature>
-    <feature version="${project.version}">archiva-rest-service</feature>
     <feature version="${project.version}">archiva-rss</feature>
     <feature version="${project.version}">archiva-security</feature>
-    <feature version="${project.version}">archiva-webdav</feature>
-    <feature version="${project.version}">archiva-stage-repository</feature>
-    <feature version="${project.version}">archiva-generic-metadata-support</feature>
-    <feature version="${project.version}">archiva-metadata-store-jcr</feature>
-    <feature version="${project.version}">archiva-npanday-support</feature>
-    <feature version="${project.version}">archiva-webapp-common</feature>
+    <feature version="${project.version}">archiva-stage-repository-merge</feature>
+    <feature>war</feature>
+    <feature version="[3,4)">spring-web</feature>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-digester/${commons-digester.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version}</bundle>
+    <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rome/${rome.bundle.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.velocity.tools/velocity-tools/${velocity-tools.version}</bundle>
+    <bundle dependency="true">mvn:org.testng/testng/${testng.version}</bundle>
+    <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.2.version}</bundle>
+    <bundle dependency="true">mvn:commons-fileupload/commons-fileupload/${commons-fileupload.version}</bundle>
     <bundle dependency="true">mvn:org.apache.struts/struts2-core/${struts.version}</bundle>
     <bundle dependency="true">mvn:org.apache.struts.xwork/xwork-core/${struts.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-common-integrations/${redback.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.codehaus.redback/redback-rest-services/${redback.version}</bundle>
     <bundle>mvn:org.apache.archiva/archiva-webapp/${project.version}/war</bundle>
   </feature>
 
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 0d2af91dc..c1fed8cd6 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -217,8 +217,8 @@
               org.apache.archiva.security;version=${project.version},
               org.apache.commons.io;version="[1.4,2)",
               org.apache.commons.lang;version="[2.4,3)",
-              org.apache.jackrabbit.util;version="[2.3,3)",
-              org.apache.jackrabbit.webdav*;version="[2.3,3)",
+              org.apache.jackrabbit.util;version="[1,3)",
+              org.apache.jackrabbit.webdav*;version="[1,3)",
               org.joda.time*;version="[1.5,2)",
               org.springframework*;version="[3,4)",
               org.apache.maven.index*,
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index 792fe5711..ea7932b41 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -102,7 +102,7 @@
               org.apache.archiva.metadata.repository;version=${project.version},
               org.apache.commons.lang;version="[2.4,3)",
               org.apache.jackrabbit.commons;version="[2.3,3)",
-              org.apache.jackrabbit.core.config;version="[2.3,3)",
+              org.apache.jackrabbit.core.config,
               org.springframework*;version="[3,4)",
               org.slf4j;resolution:=optional
             </Import-Package>
diff --git a/pom.xml b/pom.xml
index c0179c427..ed8a2a4ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,9 @@
   <properties>
     <!-- Note: when upgrading to 2.3.1+, template/xhtml can be removed from the
          webapp resources -->
+    <commons-codec.version>1.5</commons-codec.version>
+    <commons-fileupload.version>1.2.2</commons-fileupload.version>
+    <commons-lang.version>2.6</commons-lang.version>
     <struts.version>2.2.3.1</struts.version>
     <maven3x.version>3.0.3</maven3x.version>
     <maven.version>2.0.8</maven.version>
@@ -513,7 +516,7 @@
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.5</version>
+        <version>${commons-codec.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-configuration</groupId>
@@ -577,7 +580,7 @@
       <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
-        <version>1.2.2</version>
+        <version>${commons-fileupload.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>
@@ -587,7 +590,7 @@
       <dependency>
         <groupId>commons-lang</groupId>
         <artifactId>commons-lang</artifactId>
-        <version>2.6</version>
+        <version>${commons-lang.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
-- 
2.39.5