diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 95a20f4b5..4b8bb255f 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT archiva-checksum - bundle Archiva Base :: Checksum @@ -71,26 +70,6 @@ - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.checksum - ${project.version} - - org.apache.archiva.checksum;version=${project.version} - - - org.apache.commons.io*;version="[1.4,2)", - org.apache.commons.lang;version="[2.4,3)", - org.slf4j;resolution:=optional - - - - - diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index e0458d407..22ae3ba75 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -26,7 +26,6 @@ 4.0.0 archiva-common - bundle Archiva Base :: Common @@ -63,26 +62,6 @@ - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.common - ${project.version} - - org.apache.archiva.common*;version=${project.version} - - - org.apache.commons.lang*;version="[2,3)", - org.codehaus.plexus.logging, - org.slf4j;resolution:=optional - - - - - diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 11d2270e4..e03bebe1d 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -26,7 +26,6 @@ 4.0.0 archiva-configuration - bundle Archiva Base :: Configuration @@ -199,38 +198,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.configuration - ${project.version} - - org.apache.archiva.configuration*;version=${project.version} - - - javax.annotation, - javax.inject, - org.apache.archiva.common;version=${project.version}, - org.apache.archiva.policies;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.lang;version="[2.4,3)", - org.apache.commons.configuration;version="[1.3,2)", - org.apache.commons.io;version="[1.4,2)", - org.apache.archiva.redback.components.evaluator*, - org.apache.archiva.redback.components.registry, - org.codehaus.plexus.util, - org.apache.tools.ant.types.selectors, - org.apache.archiva.redback.components.registry, - org.apache.archiva.redback.components.registry.commons, - org.apache.archiva.redback.components.springutils, - org.springframework.stereotype;version="[3,4)", - org.slf4j;resolution:=optional - - - - diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index deb832d49..a9c22d35e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -26,7 +26,6 @@ 3.0.0-SNAPSHOT archiva-consumer-api - bundle Archiva Base :: Consumers :: API @@ -55,31 +54,4 @@ ant - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.consumers.api - ${project.version} - - org.apache.archiva.consumers*;version=${project.version} - - - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.common*;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.io;version="[1.4,2)", - org.codehaus.plexus.util, - org.apache.tools.ant.types.selectors, - org.apache.commons.lang, - org.slf4j - - - - - - diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 4f2e3a082..6e3db0cb9 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -26,7 +26,6 @@ 3.0.0-SNAPSHOT archiva-core-consumers - bundle Archiva Base :: Consumers :: Core Consumers @@ -225,40 +224,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.consumers.core - ${project.version} - - org.apache.archiva.consumers.core*;version=${project.version} - - - javax.annotation, - javax.inject, - org.apache.archiva.checksum;version=${project.version}, - org.apache.archiva.common.utils;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.archiva.consumers;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.archiva.model;version=${project.version}, - org.apache.archiva.repository;version=${project.version}, - org.apache.archiva.repository.events;version=${project.version}, - org.apache.archiva.repository.layout;version=${project.version}, - org.apache.archiva.repository.metadata;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang*;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.apache.archiva.redback.components.registry, - org.apache.archiva.metadata.model*;version=${project.version}, - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-jar-plugin diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 24e3e9b12..03c9c1277 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -26,7 +26,6 @@ 3.0.0-SNAPSHOT archiva-lucene-consumers - bundle Archiva Base :: Consumers :: Lucene @@ -154,34 +153,6 @@ - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.consumers.lucene - ${project.version} - - org.apache.archiva.consumers.lucene;version=${project.version} - - - javax.annotation, - javax.inject, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.consumers;version=${project.version}, - org.apache.archiva.scheduler*;version=${project.version}, - org.springframework*;version="[3,4)", - org.apache.maven.index*, - org.apache.archiva.redback.components.registry, - org.apache.archiva.redback.components.taskqueue, - org.slf4j;resolution:=optional - - - - - diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml index b56bf1b05..845f0943a 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml @@ -26,7 +26,6 @@ 3.0.0-SNAPSHOT archiva-metadata-consumer - bundle Archiva Base :: Consumers :: Metadata @@ -63,35 +62,4 @@ spring-registry-api - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.consumers.metadata - ${project.version} - - org.apache.archiva.consumers.metadata;version=${project.version} - - - javax.annotation, - javax.inject, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.common.utils;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.consumers;version=${project.version}, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.archiva.metadata.repository.storage;version=${project.version}, - org.springframework*;version="[3,4)", - org.apache.archiva.redback.components.registry, - org.slf4j;resolution:=optional - - - - - - diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 8186e6be5..c2e9a5fc8 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -26,7 +26,6 @@ 4.0.0 archiva-converter - bundle Archiva Base :: Repository Converter @@ -152,41 +151,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.converter - ${project.version} - - org.apache.archiva.converter*;version=${project.version};-split-package:=merge-first - - - javax.annotation, - javax.inject, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.archiva.common.utils;version=${project.version}, - org.apache.archiva.model;version=${project.version}, - org.apache.archiva.consumers;version=${project.version}, - org.apache.archiva.repository;version=${project.version}, - org.apache.archiva.repository.content;version=${project.version}, - org.apache.archiva.repository.layout;version=${project.version}, - org.apache.archiva.repository.scanner;version=${project.version}, - org.apache.archiva.transaction;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.springframework*;version="[3,4)", - org.apache.maven.artifact*, - org.apache.maven.model*, - org.codehaus.plexus.digest, - org.codehaus.plexus.util*, - org.apache.archiva.repository.content.maven2, - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-base/archiva-filelock/pom.xml b/archiva-modules/archiva-base/archiva-filelock/pom.xml index c8891194f..fb369c652 100644 --- a/archiva-modules/archiva-base/archiva-filelock/pom.xml +++ b/archiva-modules/archiva-base/archiva-filelock/pom.xml @@ -26,7 +26,6 @@ 4.0.0 archiva-filelock - bundle Archiva Base :: FileLock @@ -101,25 +100,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.common - ${project.version} - - org.apache.archiva.common*;version=${project.version} - - - org.slf4j, - org.springframework.stereotype, - org.springframework.util, - org.apache.commons.lang.time - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml b/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml index 1cc6b0f2e..16df6c316 100644 --- a/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml @@ -26,7 +26,6 @@ 4.0.0 archiva-maven2-indexer - bundle Archiva Base :: Maven2 Indexer @@ -271,34 +270,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.indexer - ${project.version} - - org.apache.archiva.indexer.*;version=${project.version};-split-package:=merge-first - - - javax.annotation, - javax.inject, - com.google.common.io, - org.apache.archiva.admin.model*;version=${project.version}, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang*;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.apache.maven.index*, - org.apache.archiva.redback.components.scheduler, - org.quartz, - org.apache.archiva.scheduler, - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml b/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml index fbf7f1efb..c32019ebf 100644 --- a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml +++ b/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml @@ -26,7 +26,6 @@ archiva-maven2-metadata - bundle Archiva Base :: Maven 2 Metadata @@ -55,28 +54,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.maven2.metadata - ${project.version} - - org.apache.archiva.maven2.metadata*;version=${project.version} - - - org.apache.archiva.model;version=${project.version}, - org.apache.archiva.xml;version=${project.version}, - org.apache.commons.lang.math, - org.dom4j - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml index 2a3a01506..7007ae50b 100644 --- a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml @@ -26,7 +26,6 @@ archiva-maven2-model - bundle Archiva Base :: Maven 2 Model @@ -42,26 +41,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.maven2.model - ${project.version} - - javax.xml.bind.annotation, - com.fasterxml.jackson.annotation - - - org.apache.archiva.maven2.model*;version=${project.version} - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 49bb61dad..a30d7d01d 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -26,7 +26,6 @@ 4.0.0 archiva-model - bundle Archiva Base :: Model @@ -80,23 +79,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.model - ${project.version} - - org.apache.archiva.model;version=${project.version} - - - org.apache.archiva.common.utils;version=${project.version}, - org.apache.commons.lang;version="[2.4,3)" - - - - diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml index eaee92067..b6c2fe296 100644 --- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml +++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml @@ -26,7 +26,7 @@ 4.0.0 archiva-plexus-bridge - bundle + Archiva Base :: Plexus Bridge @@ -88,34 +88,4 @@ --> - - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.common.plexusbridge - ${project.version} - - org.apache.archiva.common.plexusbridge;version=${project.version} - - - javax.annotation, - javax.inject, - org.codehaus.plexus, - org.codehaus.plexus.classworlds*, - org.codehaus.plexus.component.repository.exception, - org.codehaus.plexus.digest, - org.springframework.stereotype;version="[3,4)", - org.apache.maven.index.context;resolution:=optional, - org.slf4j;resolution:=optional - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index 267c001ea..63acd6750 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -26,7 +26,7 @@ 4.0.0 archiva-policies - bundle + Archiva Base :: Policies @@ -123,28 +123,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.policies - ${project.version} - - org.apache.archiva.policies*;version=${project.version} - - - javax.inject, - org.apache.archiva.checksum;version=${project.version}, - org.apache.archiva.common*;version=${project.version}, - org.apache.commons.lang;version="[2,3)", - org.springframework.stereotype;version="[3,4)", - org.apache.archiva.redback.components.cache, - org.slf4j;resolution:=optional - - - - diff --git a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml b/archiva-modules/archiva-base/archiva-proxy-api/pom.xml index 15e70cb4f..2bc408482 100644 --- a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy-api/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT archiva-proxy-api - bundle Archiva Base :: Proxy Api @@ -40,21 +39,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.proxy.model - ${project.version} - - org.apache.archiva.proxy;version=${project.version} - - - - - - diff --git a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml index 733c599a3..fa95a18cf 100644 --- a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT archiva-proxy-common - bundle Archiva Base :: Proxy Common @@ -88,32 +87,4 @@ test - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.proxy.common - ${project.version} - - org.apache.archiva.proxy.common;version=${project.version} - - - javax.inject, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.commons.lang;version="[2.4,3)", - org.springframework.stereotype;version="[3,4)", - org.springframework.context;version="[3,4)", - org.springframework.beans;version="[3,4)", - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.maven.wagon*, - org.slf4j;resolution:=optional - - - - - - diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index a27897df6..d55959f3a 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -26,7 +26,6 @@ 4.0.0 archiva-proxy - bundle Archiva Base :: Proxy @@ -251,48 +250,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.proxy - ${project.version} - - org.apache.archiva.proxy;version=${project.version} - - - javax.annotation, - javax.inject, - com.google.common.collect, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.model;version=${project.version}, - org.apache.archiva.policies*;version=${project.version}, - org.apache.archiva.proxy.common;version=${project.version}, - org.apache.archiva.repository*;version=${project.version}, - org.apache.archiva.scheduler*;version=${project.version}, - org.apache.archiva.admin.model;version=${project.version}, - org.apache.archiva.admin.model.networkproxy;version=${project.version}, - org.apache.archiva.proxy.model;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang;version="[2.4,3)", - org.springframework.stereotype;version="[3,4)", - org.apache.archiva.redback.components.registry, - org.apache.archiva.redback.components.taskqueue, - org.apache.tools.ant.types.selectors, - org.apache.maven.wagon, - org.apache.maven.wagon.authentication, - org.apache.maven.wagon.proxy, - org.apache.maven.wagon.repository, - com.google.common.io, - org.apache.archiva.common.filelock, - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml index c912c182c..7b1604ae8 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml @@ -26,7 +26,6 @@ 3.0.0-SNAPSHOT archiva-repository-admin-api - bundle Archiva Base :: Repository Admin Api @@ -97,26 +96,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.repository.admin.api - ${project.version} - - org.apache.archiva.admin.model*;version=${project.version} - - - javax.xml.bind.annotation, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.lang;version="[2.4,3)", - org.apache.archiva.redback.users, - org.apache.maven.index.context;resolution:=optional - - - - org.apache.maven.plugins maven-source-plugin diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml index b752f2810..4f7c70627 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml @@ -26,7 +26,6 @@ 3.0.0-SNAPSHOT archiva-repository-admin-default - bundle Archiva Base :: Repository Admin Default @@ -275,49 +274,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.repository.admin.default - ${project.version} - - org.apache.archiva.admin.repository*;version=${project.version} - - - javax.annotation, - javax.inject, - org.modelmapper, - org.apache.archiva.admin.model*;version=${project.version}, - org.apache.archiva.audit;version=${project.version}, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.archiva.configuration*;version=${project.version}, - org.apache.archiva.metadata*;version=${project.version}, - org.apache.archiva.scheduler*;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang*;version="[2.4,3)", - org.apache.commons.validator;version="[1.3,2)", - org.apache.http*;version="[4,5)", - org.springframework*;version="[3,4)", - org.apache.maven.index*, - org.apache.maven.wagon*, - org.modelmapper.config, - org.modelmapper.convention, - org.modelmapper.spi, - org.apache.archiva.redback.role, - org.apache.archiva.redback.users, - org.apache.archiva.redback.components.registry, - org.apache.archiva.redback.components.taskqueue, - org.apache.archiva.redback.components.scheduler, - org.apache.archiva.redback.configuration, - org.apache.archiva.redback.components.cache, - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-base/archiva-repository-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-api/pom.xml index 6aa2d7676..b5f10a7db 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-api/pom.xml @@ -26,7 +26,6 @@ 4.0.0 archiva-repository-api - bundle Archiva Base :: Repository API @@ -73,25 +72,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.indexer.api - ${project.version} - - org.apache.archiva.indexer.*;version=${project.version};-split-package:=merge-first - - - javax.annotation, - javax.inject, - org.apache.commons.lang*;version="[2.4,3)", - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 1af1ab065..b134f243e 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -26,7 +26,6 @@ 4.0.0 archiva-repository-layer - bundle Archiva Base :: Repository Interface Layer @@ -133,40 +132,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.repository.layer - ${project.version} - - org.apache.archiva.repository;version=${project.version};-split-package:=merge-first, - org.apache.archiva.repository.connector;version=${project.version};-split-package:=merge-first, - org.apache.archiva.repository.content;version=${project.version};-split-package:=merge-first, - org.apache.archiva.repository.layout;version=${project.version};-split-package:=merge-first, - org.apache.archiva.repository.metadata;version=${project.version};-split-package:=merge-first - - - javax.annotation, - javax.inject, - org.apache.archiva.model*;version=${project.version}, - org.apache.archiva.maven2.metadata*;version=${project.version}, - org.apache.archiva.common*;version=${project.version}, - org.apache.archiva.checksum;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.xml;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang*;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.dom4j;version="[1.6,2)", - org.apache.archiva.redback.components.registry, - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml index 7136844d7..e7e317225 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml @@ -26,7 +26,6 @@ 3.0.0-SNAPSHOT archiva-repository-scanner - bundle Archiva Base :: Repository Scanner @@ -67,32 +66,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.repository.scanner - ${project.version} - - org.apache.archiva.repository.scanner*;version=${project.version} - - - javax.inject, - org.apache.archiva.admin.model*;version=${project.version}, - org.apache.archiva.common*;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.consumers*;version=${project.version}, - org.apache.commons.collections*;version="[3.2,4)", - org.apache.commons.lang;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.codehaus.plexus.util, - org.slf4j;resolution:=optional, - javax.xml.bind.annotation - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-base/archiva-security-common/pom.xml b/archiva-modules/archiva-base/archiva-security-common/pom.xml index f9ebb9e9e..60806b572 100644 --- a/archiva-modules/archiva-base/archiva-security-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-security-common/pom.xml @@ -26,31 +26,10 @@ org.apache.archiva archiva-security-common - bundle Archiva Base :: Security Common ${project.parent.parent.basedir} - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.security.common - ${project.version} - - org.apache.archiva.security.common;version=${project.version};-split-package:=merge-first - - - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index a9eee95f9..b63aecc3c 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT archiva-transaction - bundle Archiva Base :: Transactions API for managing transaction. @@ -87,25 +86,4 @@ test - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.transaction - ${project.version} - - org.apache.archiva.transaction;version=${project.version};-split-package:=merge-first - - - org.apache.commons.io;version="[1.4,2)", - org.codehaus.plexus.digest - - - - - - diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index f962aed3f..8dc755071 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -26,7 +26,6 @@ 4.0.0 archiva-xml-tools - bundle Archiva Base :: XML Tools @@ -66,28 +65,6 @@ - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.xml.tools - ${project.version} - - org.apache.archiva.xml;version=${project.version} - - - org.apache.archiva.common;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang;version="[2.4,3)", - org.dom4j*;version="[1.6,2)" - - - - - diff --git a/archiva-modules/archiva-karaf/archiva-features/pom.xml b/archiva-modules/archiva-karaf/archiva-features/pom.xml deleted file mode 100644 index 3223f88d1..000000000 --- a/archiva-modules/archiva-karaf/archiva-features/pom.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - - - org.apache.archiva - archiva-karaf - 3.0.0-SNAPSHOT - - 4.0.0 - org.apache.archiva.karaf - apache-archiva - pom - Archiva :: Karaf Features - - - ${project.parent.parent.basedir} - - 1.0_5 - 5.0.2beta_1-SNAPSHOT - 2.2_2 - 1.8.2_2 - 1.4_3 - 1.8_3 - 3.1_6 - 1.2_5 - 1.3.1_1-SNAPSHOT - 1.6.1_4 - 2.4.3_1 - 2.3.18_1 - 3.12.1.ga_1 - 1_1 - 1.0 - 1.0_1-SNAPSHOT - 1.1_4 - 1.5.2_4 - 1.5.2_1 - 4.9_1 - 3.0.3_2 - 2.1 - 2.0 - 2.7.3_5 - 2.0.8_5 - 2.4 - 1.5.5 - 1.14 - 1.1.8 - 2.1.0_1-SNAPSHOT - 1.0_2 - 1.9.0 - 2.3.0 - 14.0.1 - 20040917_2 - 6.3.1 - 1.7_3 - 2.0-alpha1 - 1.1.4c_5 - 1.4_1 - 1.0.2_1-SNAPSHOT - - - - - - src/main/resources - true - - **/* - - - - - - org.apache.maven.plugins - maven-resources-plugin - - false - - ${*} - - - - - filter - generate-resources - - resources - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifact - package - - attach-artifact - - - - - target/classes/features.xml - xml - features - - - - - - - - - - - - validate - - - - org.apache.karaf.tooling - features-maven-plugin - 2.4.1 - - ${project.build.directory}/classes/features.xml - ${project.build.directory}/classes/config.properties - jre-1.6 - - - - validate - process-resources - - validate - - - - - - - - - - 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 deleted file mode 100644 index 492f96c5d..000000000 --- a/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml +++ /dev/null @@ -1,427 +0,0 @@ - - - - - mvn:org.apache.cxf.karaf/apache-cxf/${cxfVersion}/xml/features - - - mvn:commons-lang/commons-lang/${commons-lang.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version} - wrap:mvn:org.codehaus.plexus/plexus-classworlds/${plexus-classworlds.version} - wrap:mvn:org.codehaus.plexus/plexus-component-annotations/${plexus-component-annotations.version} - wrap:mvn:org.codehaus.plexus/plexus-utils/${plexus-utils.version} - mvn:com.google.guava/guava/${guava.version} - mvn:org.sonatype.sisu/sisu-guice/${sisu-guice.version} - mvn:org.sonatype.sisu/sisu-inject-bean/${sisu-inject-bean.version} - mvn:org.sonatype.sisu/sisu-inject-plexus/${sisu-inject-plexus.version} - mvn:org.apache.archiva/archiva-common/${project.version} - - - - archiva-common - mvn:commons-io/commons-io/${commons-io.version} - mvn:org.apache.archiva/archiva-checksum/${project.version} - - - - archiva-checksum - spring - wrap:mvn:org.apache.archiva.redback.components.cache/spring-cache-api/${redback.cache.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache.bundle.version} - wrap:mvn:org.apache.archiva.redback.components.cache/spring-cache-ehcache/${redback.cache.version} - mvn:org.apache.archiva/archiva-policies/${project.version} - - - - archiva-policies - http - spring-web - mvn:commons-collections/commons-collections/${commons-collections.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version} - mvn:commons-codec/commons-codec/${commons-codec.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-digester/${commons-digester.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-jxpath/${commons-jxpath.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/${commons-configuration.bundle.version} - wrap:mvn:org.codehaus.plexus/plexus-interpolation/${plexus-interpolation.version} - wrap:mvn:org.apache.archiva.redback.components.registry/spring-registry-api/${redback.registry.version} - wrap:mvn:org.apache.archiva.redback.components.registry/spring-registry-commons/${redback.registry.version} - mvn:org.apache.archiva/archiva-configuration/${project.version} - - - - archiva-common - mvn:org.apache.archiva/archiva-model/${project.version} - - - - archiva-common - spring - wrap:mvn:org.codehaus.plexus/plexus-digest/${plexus-digest.version} - mvn:org.apache.archiva/archiva-plexus-bridge/${project.version} - - - - archiva-common - mvn:commons-collections/commons-collections/${commons-collections.version} - wrap:mvn:org.codehaus.redback/redback-users-api/${redback.version} - wrap:mvn:org.codehaus.redback/redback-configuration/${redback.version} - wrap:mvn:org.codehaus.redback/redback-policy/${redback.version} - wrap:mvn:org.codehaus.redback/redback-users-memory/${redback.version} - mvn:org.apache.archiva/archiva-repository-admin-api/${project.version} - - - - archiva-common - spring - mvn:org.apache.archiva/metadata-model/${project.version} - mvn:org.apache.archiva/metadata-repository-api/${project.version} - mvn:org.apache.archiva/metadata-statistics-api/${project.version} - - - - archiva-metadata - mvn:org.apache.archiva/audit/${project.version} - - - - archiva-common - mvn:commons-collections/commons-collections/${commons-collections.version} - mvn:commons-io/commons-io/${commons-io.version} - mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version} - mvn:org.apache.archiva/archiva-xml-tools/${project.version} - - - - archiva-checksum - archiva-plexus-bridge - archiva-configuration - archiva-proxy-common - archiva-reports - archiva-xml-tools - wrap:mvn:org.apache.maven/maven-artifact/${maven.version} - wrap:mvn:org.apache.maven/maven-model/${maven.version} - wrap:mvn:org.apache.maven/maven-project/${maven.version} - wrap:mvn:org.apache.maven/maven-settings/${maven.version} - wrap:mvn:org.apache.maven/maven-artifact-manager/${maven.version} - wrap:mvn:org.apache.maven.shared/maven-dependency-tree/${maven-dependency-tree.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version} - wrap:mvn:org.apache.maven.archetype/archetype-catalog/${maven.archetype.version} - wrap:mvn:org.apache.maven.archetype/archetype-registry/${maven.archetype.version} - wrap:mvn:org.apache.maven.archetype/archetype-descriptor/${maven.archetype.version} - wrap:mvn:org.apache.maven.shared/maven-invoker/${maven.version} - wrap:mvn:org.apache.maven.indexer/indexer-core/${maven.indexer.version} - wrap:mvn:org.apache.maven.indexer/indexer-artifact/${maven.indexer.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version} - mvn:commons-collections/commons-collections/${commons-collections.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version} - wrap:mvn:org.codehaus.plexus/plexus-velocity/${plexus-velocity.version} - wrap:mvn:net.sourceforge.jchardet/jchardet/${jcharset.version} - wrap:mvn:org.apache.maven.archetype/archetype-common/${maven.archetype.version} - wrap:mvn:org.apache.maven/maven-model-builder/${maven3x.version} - mvn:org.apache.archiva/maven2-repository/${project.version} - - - - archiva-repository-admin-api - mvn:commons-collections/commons-collections/${commons-collections.version} - mvn:commons-io/commons-io/${commons-io.version} - mvn:org.apache.archiva/archiva-consumer-api/${project.version} - - - - archiva-consumers-api - archiva-configuration - archiva-plexus-bridge - archiva-metadata - archiva-model - archiva-repository-layer - mvn:org.apache.archiva/archiva-core-consumers/${project.version} - mvn:org.apache.archiva/archiva-lucene-consumers/${project.version} - mvn:org.apache.archiva/archiva-metadata-consumer/${project.version} - - - - archiva-configuration - archiva-consumers-api - archiva-metadata - mvn:org.apache.archiva/problem-reports/${project.version} - - - - archiva-configuration - archiva-metadata - archiva-repository-admin-api - archiva-maven2-repository - archiva-model - mvn:commons-collections/commons-collections/${commons-collections.version} - mvn:commons-io/commons-io/${commons-io.version} - mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version} - mvn:org.apache.archiva/archiva-repository-layer/${project.version} - - - - archiva-plexus-bridge - mvn:commons-collections/commons-collections/${commons-collections.version} - mvn:commons-io/commons-io/${commons-io.version} - wrap:mvn:org.apache.maven.wagon/wagon-provider-api/${wagon.version} - wrap:mvn:org.apache.maven.wagon/wagon-file/${wagon.version} - mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient.version} - mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsoup/${jsoup.bundle.version} - wrap:mvn:org.apache.maven.wagon/wagon-http-shared4/${wagon.version} - wrap:mvn:org.apache.maven.wagon/wagon-http/${wagon.version} - mvn:org.apache.archiva/archiva-proxy-common/${project.version} - - - - archiva-configuration - archiva-repository-admin-api - archiva-model - archiva-proxy-common - archiva-repository-layer - archiva-scheduler - mvn:org.apache.archiva/archiva-proxy/${project.version} - - - - wrap:mvn:org.apache.archiva.redback.components/spring-taskqueue/${redback.taskqueue.version} - mvn:org.apache.archiva/archiva-scheduler-api/${project.version} - - - - archiva-repository-layer - mvn:org.apache.archiva/repository-statistics/${project.version} - - - - archiva-repository-admin-api - archiva-configuration - archiva-consumers - archiva-scheduler-api - mvn:org.apache.archiva/archiva-repository-scanner/${project.version} - - - - archiva-plexus-bridge - archiva-proxy-common - archiva-repository-scanner - archiva-repository-statistics - wrap:mvn:org.apache.archiva.redback.components/spring-quartz/${redback.quartz.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version} - wrap:mvn:org.apache.maven.indexer/indexer-core/${maven.indexer.version} - wrap:mvn:org.apache.maven.indexer/indexer-artifact/${maven.indexer.version} - mvn:org.apache.archiva/archiva-scheduler-indexing/${project.version} - mvn:org.apache.archiva/archiva-scheduler-repository/${project.version} - - - - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-validator/${commons-validator.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcip-annotations/${jcip-annotations.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.beanlib/${beanlib.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stax-utils/${stax-utils.bundle.version} - wrap:mvn:org.codehaus.redback/redback-rbac-jdo/${redback.version} - wrap:mvn:org.codehaus.redback/redback-rbac-model/${redback.version} - wrap:mvn:org.codehaus.redback/redback-rbac-role-manager/${redback.version} - mvn:org.apache.archiva/archiva-repository-admin-default/${project.version} - - - - archiva-plexus-bridge - mvn:commons-io/commons-io/${commons-io.version} - mvn:org.apache.archiva/archiva-transaction/${project.version} - - - - archiva-transaction - mvn:commons-io/commons-io/${commons-io.version} - wrap:mvn:org.apache.maven/maven-model-v3/${maven-model-v3.version} - wrap:mvn:org.apache.maven/maven-model/${maven3x.version} - wrap:mvn:org.apache.maven.shared/maven-model-converter/${maven-model-converter.version} - wrap:mvn:org.apache.maven/maven-repository-metadata/${maven.version} - wrap:mvn:org.apache.maven/maven-artifact/${maven.version} - mvn:org.apache.archiva/archiva-artifact-converter/${project.version} - - - - archiva-consumers - archiva-scheduler - archiva-transaction - mvn:commons-io/commons-io/${commons-io.version} - wrap:mvn:org.apache.maven/maven-model-v3/${maven-model-v3.version} - wrap:mvn:org.apache.maven/maven-model/${maven3x.version} - wrap:mvn:org.apache.maven.shared/maven-model-converter/${maven-model-converter.version} - wrap:mvn:org.apache.maven/maven-repository-metadata/${maven.version} - mvn:org.apache.archiva/archiva-converter/${project.version} - - - - archiva-repository-admin-api - archiva-plexus-bridge - mvn:commons-io/commons-io/${commons-io.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version} - wrap:mvn:org.apache.maven.indexer/indexer-core/${maven.indexer.version} - mvn:org.apache.archiva/archiva-maven2-indexer/${project.version} - - - - mvn:org.apache.archiva/archiva-security-common/${project.version} - - - - archiva-repository-admin-api - cxf - wrap:mvn:org.codehaus.redback/redback-authorization-api/${redback.version} - mvn:org.apache.archiva/archiva-rest-api/${project.version} - - - - archiva-rest-api - archiva-audit - archiva-maven2-indexer - archiva-checksum - archiva-repository-layer - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream/${xstream.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jcip-annotations/${jcip-annotations.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.beanlib/${beanlib.bundle.version} - mvn:org.apache.archiva/archiva-rest-services/${project.version} - - - - archiva-metadata - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rome/${rome.bundle.version} - mvn:org.apache.archiva/archiva-rss/${project.version} - - - - archiva-configuration - http - wrap:mvn:org.codehaus.redback/redback-authentication-api/${redback.version} - wrap:mvn:org.codehaus.redback/redback-authorization-api/${redback.version} - wrap:mvn:org.codehaus.redback/redback-policy/${redback.version} - wrap:mvn:org.codehaus.redback/redback-rbac-jdo/${redback.version} - wrap:mvn:org.codehaus.redback/redback-rbac-model/${redback.version} - wrap:mvn:org.codehaus.redback/redback-rbac-role-manager/${redback.version} - wrap:mvn:org.codehaus.redback/redback-system/${redback.version} - wrap:mvn:org.codehaus.redback/redback-users-api/${redback.version} - wrap:mvn:org.codehaus.redback/redback-users-jdo/${redback.version} - mvn:org.apache.archiva/archiva-security/${project.version} - - - - archiva-audit - archiva-maven2-indexer - archiva-proxy - archiva-security - http - mvn:commons-io/commons-io/${commons-io.version} - mvn:org.apache.jackrabbit/jackrabbit-webdav/${jackrabbit.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${joda-time.bundle.version} - mvn:commons-codec/commons-codec/${commons-codec.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient.bundle.version} - wrap:mvn:org.codehaus.redback/redback-common-integrations/${redback.version} - mvn:org.apache.archiva/archiva-webdav/${project.version} - - - - archiva-repository-layer - mvn:commons-io/commons-io/${commons-io.version} - mvn:org.apache.archiva/stage-repository-merge/${project.version} - - - - archiva-metadata - mvn:org.apache.archiva/generic-metadata-support/${project.version} - - - - archiva-configuration - archiva-metadata - mvn:commons-io/commons-io/${commons-io.version} - mvn:org.apache.archiva/metadata-store-file/${project.version} - - - - archiva-configuration - archiva-metadata - mvn:javax.jcr/jcr/${javax.jcr.version} - mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version} - wrap:mvn:org.apache.jackrabbit/jackrabbit-core/${jackrabbit.version} - mvn:org.apache.archiva/metadata-store-jcr/${project.version} - - - - war - spring - spring-web - archiva-rss - archiva-plexus-bridge - archiva-configuration - archiva-scheduler - archiva-security-common - archiva-security - mvn:commons-codec/commons-codec/${commons-codec.version} - wrap:mvn:org.codehaus.redback/redback-common-integrations/${redback.version} - mvn:org.apache.archiva/archiva-webapp-common/${project.version} - - - - archiva-common - archiva-repository-admin-default - archiva-repository-admin-api - archiva-audit - archiva-plexus-bridge - archiva-configuration - archiva-repository-statistics - archiva-scheduler - archiva-maven2-indexer - archiva-generic-metadata-support - archiva-rest-api - archiva-rss - archiva-security - archiva-stage-repository-merge - war - spring-web - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ognl/${ognl.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javassist/${javassist.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.freemarker/${freemarker.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oro/${oro.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version} - mvn:commons-collections/commons-collections/${commons-collections.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-digester/${commons-digester.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.version} - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rome/${rome.bundle.version} - wrap:mvn:org.apache.velocity.tools/velocity-tools/${velocity-tools.version} - mvn:org.testng/testng/${testng.version} - mvn:commons-io/commons-io/${commons-io.version} - mvn:commons-fileupload/commons-fileupload/${commons-fileupload.version} - mvn:org.apache.struts/struts2-core/${struts.version} - mvn:org.apache.struts.xwork/xwork-core/${struts.version} - wrap:mvn:org.codehaus.redback/redback-common-integrations/${redback.version} - wrap:mvn:org.codehaus.redback/redback-rest-services/${redback.version} - mvn:org.apache.archiva/archiva-webapp/${project.version}/war - - - diff --git a/archiva-modules/archiva-karaf/pom.xml b/archiva-modules/archiva-karaf/pom.xml deleted file mode 100644 index 167e825f9..000000000 --- a/archiva-modules/archiva-karaf/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - org.apache.archiva - archiva-modules - 3.0.0-SNAPSHOT - - 4.0.0 - archiva-karaf - pom - Archiva :: Karaf - - - - ${project.parent.basedir} - - - - archiva-features - - - - \ No newline at end of file diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml index 1dd81b4ec..558749b0e 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT archiva-scheduler-api - bundle Archiva Scheduler :: API @@ -42,25 +41,4 @@ spring-taskqueue - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.scheduler.api - ${project.version} - - org.apache.archiva.scheduler;version=${project.version} - - - org.apache.archiva.redback.components.taskqueue, - org.apache.archiva.admin.model.beans - - - - - - diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml index 8a0867501..f1f04f2e9 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing-maven2/pom.xml @@ -36,7 +36,7 @@ archiva-scheduler-indexing-maven2 Archiva Scheduler :: Maven Indexing - bundle + Scheduler for downloading remote Maven indexes. @@ -164,33 +164,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.scheduler.indexing - ${project.version} - - org.apache.archiva.scheduler.indexing;version=${project.version} - - - javax.annotation, - javax.inject, - org.apache.archiva.admin.model*;version=${project.version}, - org.apache.archiva.common*;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.proxy.common;version=${project.version}, - org.apache.archiva.scheduler;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang*;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.apache.archiva.redback.components.taskqueue*, - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml index a56a57fc3..caad124cc 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT archiva-scheduler-indexing - bundle Archiva Scheduler :: Indexing @@ -75,33 +74,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.scheduler.indexing - ${project.version} - - org.apache.archiva.scheduler.indexing;version=${project.version} - - - javax.annotation, - javax.inject, - org.apache.archiva.admin.model*;version=${project.version}, - org.apache.archiva.common*;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.proxy.common;version=${project.version}, - org.apache.archiva.scheduler;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang*;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.apache.archiva.redback.components.taskqueue*, - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml index 46bdc4749..4a081bb77 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository-api/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT archiva-scheduler-repository-api - bundle Archiva Scheduler :: Repository Scanning Api @@ -81,37 +80,6 @@ - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.scheduler.repository - ${project.version} - - org.apache.archiva.scheduler.repository;version=${project.version} - - - javax.annotation, - javax.inject, - org.apache.archiva.admin.model;version=${project.version}, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.admin.model.managed;version=${project.version}, - org.apache.archiva.common;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.repository.scanner;version=${project.version}, - org.apache.archiva.scheduler;version=${project.version}, - org.apache.commons.lang;version="[2.4,3)", - org.codehaus.plexus.personality.plexus.lifecycle.phase, - org.apache.archiva.redback.components.taskqueue*, - org.apache.archiva.redback.components.scheduler, - org.slf4j;resolution:=optional - - - - - diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml index 4dbe2afb9..ed918ba82 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT archiva-scheduler-repository - bundle Archiva Scheduler :: Repository Scanning @@ -128,42 +127,6 @@ - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.scheduler.repository - ${project.version} - - org.apache.archiva.scheduler.repository;version=${project.version} - - - javax.annotation, - javax.inject, - org.apache.archiva.admin.model;version=${project.version}, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.admin.model.managed;version=${project.version}, - org.apache.archiva.common;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.metadata.repository*;version=${project.version}, - org.apache.archiva.repository.scanner;version=${project.version}, - org.apache.archiva.scheduler.repository.model;version=${project.version}, - org.apache.archiva.scheduler;version=${project.version}, - org.apache.commons.lang;version="[2.4,3)", - org.codehaus.plexus.personality.plexus.lifecycle.phase, - org.apache.archiva.redback.components.taskqueue*, - org.apache.archiva.redback.components.scheduler, - org.quartz*;version="[2,3)", - org.springframework*;version="[3,4)", - org.slf4j;resolution:=optional, - org.apache.commons.lang.time - - - - - diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml index ccbbd37a4..e4ee61e5a 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT archiva-rest-api - jar Archiva Web :: REST support :: Api @@ -95,41 +94,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.rest.api - ${project.version} - - org.apache.archiva.rest.api.model;version=${project.version};-split-package:=merge-first, - org.apache.archiva.rest.api.services;version=${project.version};-split-package:=merge-first - - - javax.ws.rs, - javax.xml.bind.annotation, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.redback.authorization, - org.apache.archiva.metadata.model, - org.apache.archiva.repository.scanner, - org.apache.archiva.metadata.repository.stats, - org.apache.archiva.reports, - org.apache.archiva.maven2.model - - - - - - - create-manifest - process-test-classes - - manifest - - - - org.apache.maven.plugins maven-source-plugin @@ -143,17 +107,7 @@ - - org.apache.maven.plugins - maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - \ No newline at end of file + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index f423f12f2..4a46d4745 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT archiva-rest-services - bundle Archiva Web :: REST support :: Services @@ -447,17 +446,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.rest.services - ${project.version} - org.apache.cxf.bundle,org.springframework.beans,org.apache.archiva.rest.api - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index 96046a4cf..ec536bc79 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -26,7 +26,6 @@ 4.0.0 archiva-rss - bundle Archiva Web :: RSS @@ -82,29 +81,4 @@ test - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.rss - ${project.version} - - org.apache.archiva.rss*;version=${project.version};-split-package:=merge-first - - - javax.inject, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - com.sun.syndication*;version="[0.9,2)", - org.springframework*;version="[3,4)", - org.slf4j;resolution:=optional - - - - - - diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index e6fe99ff7..e9b3f119c 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -26,7 +26,6 @@ 4.0.0 archiva-security - bundle Archiva Web :: Security Configuration ${project.parent.parent.basedir} @@ -215,38 +214,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.security - ${project.version} - - org.apache.archiva.security;version=${project.version};-split-package:=merge-first - - - com.google.common.collect, - javax.inject, - javax.servlet.http, - org.apache.archiva.common;version=${project.version}, - org.apache.archiva.admin.model;version=${project.version}, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.admin.model.managed;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.redback.authentication, - org.apache.archiva.redback.authorization, - org.apache.archiva.redback.policy, - org.apache.archiva.redback.rbac, - org.apache.archiva.redback.system*, - org.apache.archiva.redback.users, - org.apache.archiva.redback.role, - org.springframework*;version="[3,4)", - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index 3aa323705..f7b86786c 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -26,7 +26,6 @@ archiva-web-common - jar Archiva Web :: Web Common @@ -439,76 +438,10 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.web.common - ${project.version} - - org.apache.archiva.web.startup;version=${project.version} - - - javax.annotation, - javax.inject, - javax.servlet, - javax.servlet.http, - org.apache.archiva.common;version=${project.version}, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.repository.events;version=${project.version}, - org.apache.archiva.scheduler.repository;version=${project.version}, - org.apache.archiva.security.common;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.lang;version="[2.4,3)", - org.apache.commons.lang.math;version="[2.4,3)", - org.apache.maven.index, - org.apache.maven.index.context, - org.apache.archiva.redback.rbac, - org.apache.archiva.redback.role, - org.apache.archiva.redback.system.check, - org.apache.archiva.redback.components.registry, - org.apache.archiva.redback.components.taskqueue, - org.apache.archiva.redback.components.taskqueue.execution, - org.apache.archiva.redback.components.scheduler, - org.quartz;version="[2,3)", - org.slf4j;resolution:=optional, - org.springframework*;version="[3,4)", - com.sun.syndication.feed.synd, - com.sun.syndication.io, - org.apache.archiva.metadata.repository, - org.apache.archiva.rss.processor, - org.apache.archiva.security, - org.apache.commons.codec, - org.apache.commons.codec.binary, - org.apache.archiva.redback.authentication, - org.apache.archiva.redback.authorization, - org.apache.archiva.redback.policy, - org.apache.archiva.redback.system, - org.apache.archiva.redback.users, - org.apache.archiva.redback.integration.filter.authentication - - - - - - create-manifest - process-test-classes - - manifest - - - - + org.apache.maven.plugins maven-jar-plugin - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 4252ef068..6cd7c0a0f 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -27,7 +27,6 @@ archiva-webdav - bundle Archiva Web :: WebDAV @@ -292,52 +291,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.webdav - ${project.version} - - org.apache.archiva.webdav*;version=${project.version};-split-package:=merge-first - - - javax.annotation, - javax.inject, - javax.servlet*, - org.apache.archiva.admin.model*;version=${project.version}, - org.apache.archiva.maven2.metadata*;version=${project.version}, - org.apache.archiva.xml*;version=${project.version}, - org.apache.archiva.audit;version=${project.version}, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.archiva.common.utils;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.indexer.*;version=${project.version}, - org.apache.archiva.model;version=${project.version}, - org.apache.archiva.policies;version=${project.version}, - org.apache.archiva.proxy;version=${project.version}, - org.apache.archiva.repository*;version=${project.version}, - org.apache.archiva.scheduler*;version=${project.version}, - org.apache.archiva.security;version=${project.version}, - org.apache.archiva.proxy.model;version=${project.version}, - org.apache.archiva.metadata.repository.storage;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang;version="[2.4,3)", - org.joda.time*;version="[1.5,2)", - org.springframework*;version="[3,4)", - org.apache.maven.index*, - org.codehaus.plexus.digest, - org.apache.archiva.redback.*, - org.apache.archiva.redback.components.taskqueue, - org.apache.archiva.common.filelock, - org.codehaus.redback.integration.filter.authentication, - org.slf4j;resolution:=optional, - com.google.common.io - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/metadata/metadata-model-maven2/pom.xml b/archiva-modules/metadata/metadata-model-maven2/pom.xml index 1bb4a8a1a..ef1d0ade7 100644 --- a/archiva-modules/metadata/metadata-model-maven2/pom.xml +++ b/archiva-modules/metadata/metadata-model-maven2/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT metadata-model-maven2 - bundle Archiva Metadata :: Maven 2 Model @@ -43,26 +42,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.metadata.model.maven2 - ${project.version} - - org.apache.archiva.metadata.model.maven2;version=${project.version} - - - javax.xml.bind.annotation, - org.apache.commons.lang, - javax.persistence - - - - - - diff --git a/archiva-modules/metadata/metadata-model/pom.xml b/archiva-modules/metadata/metadata-model/pom.xml index 399198ecd..4faf4781f 100644 --- a/archiva-modules/metadata/metadata-model/pom.xml +++ b/archiva-modules/metadata/metadata-model/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT metadata-model - bundle Archiva Metadata :: Model @@ -39,24 +38,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.metadata.model - ${project.version} - - org.apache.archiva.metadata.model;version=${project.version};-split-package:=merge-first - - - javax.xml.bind.annotation,javax.persistence - - - - - - diff --git a/archiva-modules/metadata/metadata-repository-api/pom.xml b/archiva-modules/metadata/metadata-repository-api/pom.xml index 290f6f67b..af1af19ad 100644 --- a/archiva-modules/metadata/metadata-repository-api/pom.xml +++ b/archiva-modules/metadata/metadata-repository-api/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT metadata-repository-api - bundle Archiva Metadata :: Repository API @@ -80,34 +79,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.metadata.repository.api - ${project.version} - - org.apache.archiva.metadata.repository;version=${project.version};-split-package:=merge-first, - org.apache.archiva.metadata.repository.filter;version=${project.version};-split-package:=merge-first, - org.apache.archiva.metadata.repository.storage;version=${project.version};-split-package:=merge-first, - org.apache.archiva.repository.events;version=${project.version};-split-package:=merge-first - - - javax.inject, - org.apache.archiva.metadata.model;version=${project.version}, - org.springframework.stereotype;version="[3,4)", - org.slf4j;resolution:=optional, - org.apache.archiva.model, - org.apache.archiva.policies, - org.apache.archiva.repository, - org.apache.archiva.admin.model.beans, - org.apache.archiva.repository.layout, - org.apache.archiva.xml - - - - org.apache.maven.plugins maven-jar-plugin diff --git a/archiva-modules/metadata/metadata-statistics-api/pom.xml b/archiva-modules/metadata/metadata-statistics-api/pom.xml index 61bbfbf23..1fbbcc8b4 100644 --- a/archiva-modules/metadata/metadata-statistics-api/pom.xml +++ b/archiva-modules/metadata/metadata-statistics-api/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT metadata-statistics-api - bundle Archiva Metadata :: Statistics API @@ -42,26 +41,4 @@ metadata-model-maven2 - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.metadata.repository.api - ${project.version} - - org.apache.archiva.metadata.repository.stats.model;version=${project.version} - - - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.maven2.model;version=${project.version}, - org.slf4j;resolution:=optional, - - - - - - diff --git a/archiva-modules/plugins/audit/pom.xml b/archiva-modules/plugins/audit/pom.xml index be0268318..7a3292df0 100644 --- a/archiva-modules/plugins/audit/pom.xml +++ b/archiva-modules/plugins/audit/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT audit - bundle Archiva Core Plugins :: Audit Logging @@ -49,29 +48,4 @@ - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.audit - ${project.version} - - org.apache.archiva.audit;version=${project.version} - - - javax.inject, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.springframework.stereotype;version="[3,4)", - org.slf4j;resolution:=optional - - - - - - - diff --git a/archiva-modules/plugins/generic-metadata-support/pom.xml b/archiva-modules/plugins/generic-metadata-support/pom.xml index 68bd5cd17..4f2cb194a 100644 --- a/archiva-modules/plugins/generic-metadata-support/pom.xml +++ b/archiva-modules/plugins/generic-metadata-support/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT generic-metadata-support - bundle Archiva Core Plugins :: Generic Metadata Support @@ -47,25 +46,5 @@ test - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.metadata.generic - ${project.version} - - org.apache.archiva.metadata.generic;version=${project.version};-split-package:=merge-first - - - org.apache.archiva.metadata.model;version=${project.version}, - org.springframework*;version="[3,4)" - - - - - - + diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml index 9c6a4c28f..d91003805 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/plugins/maven2-repository/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT maven2-repository - bundle Archiva Core Plugins :: Maven 2.x Repository Support @@ -206,80 +205,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.maven2 - ${project.version} - - org.apache.archiva.dependency.tree.maven2;version=${project.version};-split-package:=merge-first, - org.apache.archiva.metadata.repository.storage.maven2;version=${project.version};-split-package:=merge-first, - - - !org.apache.archiva.metadata.repository.filter, - javax.annotation, - javax.xml.bind.annotation, - javax.inject, - org.apache.archiva.maven2.metadata*;version=${project.version}, - org.apache.archiva.model*;version=${project.version}, - org.apache.archiva.common*;version=${project.version}, - org.apache.archiva.checksum;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.archiva.metadata.repository.filter;version=${project.version}, - org.apache.archiva.metadata.repository.storage;version=${project.version}, - org.apache.archiva.proxy.common;version=${project.version}, - org.apache.archiva.reports;version=${project.version}, - org.apache.archiva.xml;version=${project.version}, - org.apache.archiva.admin.model;version=${project.version}, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.admin.model.managed;version=${project.version}, - org.apache.archiva.admin.model.networkproxy;version=${project.version}, - org.apache.archiva.admin.model.proxyconnector;version=${project.version}, - org.apache.archiva.admin.model.remote;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.configuration;version="[1.4,2)", - org.apache.commons.lang*;version="[2.4,3)", - org.apache.maven.artifact*, - org.apache.maven.model*, - org.apache.maven.wagon*, - org.codehaus.plexus*, - com.google.common.io, - org.springframework*;version="[3,4)", - org.slf4j;resolution:=optional, - org.apache.maven.repository.internal, - org.sonatype.aether.connector.file, - org.sonatype.aether.impl, - org.sonatype.aether.spi.connector, - org.sonatype.aether.transfer, - org.sonatype.aether, - org.sonatype.aether.artifact, - org.sonatype.aether.collection, - org.sonatype.aether.graph, - org.sonatype.aether.impl.internal, - org.sonatype.aether.repository, - org.sonatype.aether.util, - org.sonatype.aether.util.artifact, - org.modelmapper, - org.modelmapper.config, - org.modelmapper.convention, - org.modelmapper.spi, - org.apache.archiva.maven2.model, - org.sonatype.aether.util.graph.selector, - org.apache.archiva.metadata.model.maven2, - org.apache.archiva.policies, - org.apache.archiva.proxy, - org.apache.archiva.repository, - org.apache.archiva.repository.content, - org.apache.archiva.repository.layout, - org.apache.archiva.proxy.model - - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml index 3f2cafe65..bd905acc3 100644 --- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml +++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml @@ -26,7 +26,6 @@ 3.0.0-SNAPSHOT metadata-store-cassandra - bundle Archiva Core Plugins :: Cassandra Storage for Metadata @@ -191,45 +190,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.metadata.repository.cassandra - ${project.version} - - org.apache.archiva.metadata.repository.cassandra;version=${project.version};-split-package:=merge-first - - - javax.annotation, - javax.inject, - javax.persistence, - com.google.common.base, - com.google.common.collect, - com.netflix.astyanax, - com.netflix.astyanax.connectionpool, - com.netflix.astyanax.connectionpool.exceptions, - com.netflix.astyanax.connectionpool.impl, - com.netflix.astyanax.entitystore, - com.netflix.astyanax.impl, - com.netflix.astyanax.ddl, - com.netflix.astyanax.thrift, - net.sf.beanlib.provider.replicator, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.archiva.configuration, - org.apache.commons.lang;version="[2.4,3)", - org.slf4j;resolution:=optional, - org.springframework.context, - org.springframework.stereotype, - com.netflix.astyanax.serializers, - org.apache.commons.codec.binary, - org.apache.commons.io - - - - org.codehaus.mojo build-helper-maven-plugin diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml index 4e85c63ff..c4fabc35e 100644 --- a/archiva-modules/plugins/metadata-store-file/pom.xml +++ b/archiva-modules/plugins/metadata-store-file/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT metadata-store-file - bundle Archiva Core Plugins :: File System Backed Metadata Repository @@ -99,30 +98,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.metadata.repository.file - ${project.version} - - org.apache.archiva.metadata.repository.file;version=${project.version};-split-package:=merge-first - - - javax.annotation, - javax.inject, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml index 114bcb7dc..2b38ec7d6 100644 --- a/archiva-modules/plugins/metadata-store-jcr/pom.xml +++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml @@ -26,7 +26,6 @@ 3.0.0-SNAPSHOT metadata-store-jcr - bundle Archiva Core Plugins :: JCR Storage for Metadata @@ -202,32 +201,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.metadata.repository.jcr - ${project.version} - - org.apache.archiva.metadata.repository.jcr;version=${project.version};-split-package:=merge-first - - - javax.annotation, - javax.inject, - javax.jcr, - javax.jcr.nodetype, - javax.jcr.query, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.commons.lang;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.slf4j;resolution:=optional, - org.apache.commons.lang.time - - - - org.apache.maven.plugins maven-surefire-plugin diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml index ad15973c0..bb1ced84a 100644 --- a/archiva-modules/plugins/problem-reports/pom.xml +++ b/archiva-modules/plugins/problem-reports/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT problem-reports - bundle Archiva Core Plugins :: Problem Reporting Plugin @@ -95,35 +94,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.reports - ${project.version} - - org.apache.archiva.reports*;version=${project.version} - - - javax.annotation, - javax.inject, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.checksum;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.archiva.metadata.repository.storage;version=${project.version}, - org.apache.archiva.repository.events;version=${project.version}, - org.apache.archiva.consumers;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.springframework.*;version="[3,4)", - org.apache.archiva.redback.components.registry, - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml index 4fe10de2e..eeba93852 100644 --- a/archiva-modules/plugins/repository-statistics/pom.xml +++ b/archiva-modules/plugins/repository-statistics/pom.xml @@ -25,7 +25,6 @@ 3.0.0-SNAPSHOT repository-statistics - bundle Archiva Core Plugins :: Repository Statistics @@ -84,32 +83,5 @@ test - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.repository.statistics - ${project.version} - - org.apache.archiva.metadata.repository.stats;version=${project.version} - - - javax.jcr, - javax.jcr.query, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.archiva.metadata.repository.storage.maven2;version=${project.version}, - org.apache.archiva.metadata.model.maven2, - org.springframework*;version="[3,4)", - org.apache.commons.lang.time, - org.slf4j;resolution:=optional - - - - - - + diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index d77142822..bdf308224 100644 --- a/archiva-modules/plugins/stage-repository-merge/pom.xml +++ b/archiva-modules/plugins/stage-repository-merge/pom.xml @@ -26,7 +26,6 @@ org.apache.archiva stage-repository-merge - bundle Archiva Core Plugins :: Stage Repository Merge @@ -132,32 +131,6 @@ - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.stagerepository.merge - ${project.version} - - org.apache.archiva.stagerepository.merge;version=${project.version} - - - javax.inject, - org.apache.archiva.common.utils;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.metadata.*;version=${project.version}, - org.apache.archiva.model;version=${project.version}, - org.apache.archiva.repository*;version=${project.version}, - org.apache.archiva.maven2.metadata*;version=${project.version}, - org.apache.archiva.xml*;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.springframework*;version="[3,4)", - org.slf4j;resolution:=optional - - - - org.apache.maven.plugins maven-dependency-plugin diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index e06a90eff..0651397b9 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -42,7 +42,6 @@ archiva-scheduler archiva-web - archiva-karaf metadata plugins