diff options
54 files changed, 7 insertions, 2115 deletions
diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 95a20f4b5..4b8bb255f 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -25,7 +25,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-checksum</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Checksum</name> <properties> @@ -71,26 +70,6 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.checksum</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.checksum;version=${project.version} - </Export-Package> - <Import-Package> - org.apache.commons.io*;version="[1.4,2)", - org.apache.commons.lang;version="[2.4,3)", - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> <pluginManagement> <plugins> <plugin> diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index e0458d407..22ae3ba75 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-common</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Common</name> <properties> @@ -63,26 +62,6 @@ </dependency> </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.common</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.common*;version=${project.version} - </Export-Package> - <Import-Package> - org.apache.commons.lang*;version="[2,3)", - org.codehaus.plexus.logging, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> <pluginManagement> <plugins> <plugin> diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 11d2270e4..e03bebe1d 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-configuration</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Configuration</name> <properties> @@ -199,38 +198,6 @@ </systemPropertyVariables> </configuration> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.configuration</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.configuration*;version=${project.version} - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - org.apache.archiva.common;version=${project.version}, - org.apache.archiva.policies;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.lang;version="[2.4,3)", - org.apache.commons.configuration;version="[1.3,2)", - org.apache.commons.io;version="[1.4,2)", - org.apache.archiva.redback.components.evaluator*, - org.apache.archiva.redback.components.registry, - org.codehaus.plexus.util, - org.apache.tools.ant.types.selectors, - org.apache.archiva.redback.components.registry, - org.apache.archiva.redback.components.registry.commons, - org.apache.archiva.redback.components.springutils, - org.springframework.stereotype;version="[3,4)", - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> </plugins> <pluginManagement> <plugins> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml index deb832d49..a9c22d35e 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-api/pom.xml @@ -26,7 +26,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-consumer-api</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Consumers :: API</name> <properties> @@ -55,31 +54,4 @@ <artifactId>ant</artifactId> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.consumers.api</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.consumers*;version=${project.version} - </Export-Package> - <Import-Package> - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.common*;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.io;version="[1.4,2)", - org.codehaus.plexus.util, - org.apache.tools.ant.types.selectors, - org.apache.commons.lang, - org.slf4j - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index 4f2e3a082..6e3db0cb9 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -26,7 +26,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-core-consumers</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Consumers :: Core Consumers</name> <properties> @@ -226,40 +225,6 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.consumers.core</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.consumers.core*;version=${project.version} - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - org.apache.archiva.checksum;version=${project.version}, - org.apache.archiva.common.utils;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.archiva.consumers;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.archiva.model;version=${project.version}, - org.apache.archiva.repository;version=${project.version}, - org.apache.archiva.repository.events;version=${project.version}, - org.apache.archiva.repository.layout;version=${project.version}, - org.apache.archiva.repository.metadata;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang*;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.apache.archiva.redback.components.registry, - org.apache.archiva.metadata.model*;version=${project.version}, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml index 24e3e9b12..03c9c1277 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml @@ -26,7 +26,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-lucene-consumers</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Consumers :: Lucene</name> <properties> @@ -154,34 +153,6 @@ </dependency> </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.consumers.lucene</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.consumers.lucene;version=${project.version} - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.consumers;version=${project.version}, - org.apache.archiva.scheduler*;version=${project.version}, - org.springframework*;version="[3,4)", - org.apache.maven.index*, - org.apache.archiva.redback.components.registry, - org.apache.archiva.redback.components.taskqueue, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> <pluginManagement> <plugins> <plugin> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml index b56bf1b05..845f0943a 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml @@ -26,7 +26,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-metadata-consumer</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Consumers :: Metadata</name> <properties> @@ -63,35 +62,4 @@ <artifactId>spring-registry-api</artifactId> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.consumers.metadata</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.consumers.metadata;version=${project.version} - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.common.utils;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.consumers;version=${project.version}, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.archiva.metadata.repository.storage;version=${project.version}, - org.springframework*;version="[3,4)", - org.apache.archiva.redback.components.registry, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index 8186e6be5..c2e9a5fc8 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-converter</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Repository Converter</name> <properties> @@ -153,41 +152,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.converter</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.converter*;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.archiva.common.utils;version=${project.version}, - org.apache.archiva.model;version=${project.version}, - org.apache.archiva.consumers;version=${project.version}, - org.apache.archiva.repository;version=${project.version}, - org.apache.archiva.repository.content;version=${project.version}, - org.apache.archiva.repository.layout;version=${project.version}, - org.apache.archiva.repository.scanner;version=${project.version}, - org.apache.archiva.transaction;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.springframework*;version="[3,4)", - org.apache.maven.artifact*, - org.apache.maven.model*, - org.codehaus.plexus.digest, - org.codehaus.plexus.util*, - org.apache.archiva.repository.content.maven2, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/archiva-modules/archiva-base/archiva-filelock/pom.xml b/archiva-modules/archiva-base/archiva-filelock/pom.xml index c8891194f..fb369c652 100644 --- a/archiva-modules/archiva-base/archiva-filelock/pom.xml +++ b/archiva-modules/archiva-base/archiva-filelock/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-filelock</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: FileLock</name> <properties> @@ -102,25 +101,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.common</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.common*;version=${project.version} - </Export-Package> - <Import-Package> - org.slf4j, - org.springframework.stereotype, - org.springframework.util, - org.apache.commons.lang.time - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml b/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml index 1cc6b0f2e..16df6c316 100644 --- a/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-maven2-indexer/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-maven2-indexer</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Maven2 Indexer</name> <properties> @@ -272,34 +271,6 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.indexer</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.indexer.*;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - com.google.common.io, - org.apache.archiva.admin.model*;version=${project.version}, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang*;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.apache.maven.index*, - org.apache.archiva.redback.components.scheduler, - org.quartz, - org.apache.archiva.scheduler, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml b/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml index fbf7f1efb..c32019ebf 100644 --- a/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml +++ b/archiva-modules/archiva-base/archiva-maven2-metadata/pom.xml @@ -26,7 +26,6 @@ </parent> <artifactId>archiva-maven2-metadata</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Maven 2 Metadata</name> @@ -55,28 +54,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.maven2.metadata</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.maven2.metadata*;version=${project.version} - </Export-Package> - <Import-Package> - org.apache.archiva.model;version=${project.version}, - org.apache.archiva.xml;version=${project.version}, - org.apache.commons.lang.math, - org.dom4j - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - </project> diff --git a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml index 2a3a01506..7007ae50b 100644 --- a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml @@ -26,7 +26,6 @@ </parent> <artifactId>archiva-maven2-model</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Maven 2 Model</name> @@ -42,26 +41,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.maven2.model</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Import-Package> - javax.xml.bind.annotation, - com.fasterxml.jackson.annotation - </Import-Package> - <Export-Package> - org.apache.archiva.maven2.model*;version=${project.version} - </Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - </project> diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index 49bb61dad..a30d7d01d 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-model</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Model</name> <properties> @@ -80,23 +79,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.model</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.model;version=${project.version} - </Export-Package> - <Import-Package> - org.apache.archiva.common.utils;version=${project.version}, - org.apache.commons.lang;version="[2.4,3)" - </Import-Package> - </instructions> - </configuration> - </plugin> </plugins> </build> </project> diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml index eaee92067..b6c2fe296 100644 --- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml +++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml @@ -26,7 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-plexus-bridge</artifactId> - <packaging>bundle</packaging> + <name>Archiva Base :: Plexus Bridge</name> <properties> @@ -88,34 +88,4 @@ </dependency> --> </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.common.plexusbridge</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.common.plexusbridge;version=${project.version} - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - org.codehaus.plexus, - org.codehaus.plexus.classworlds*, - org.codehaus.plexus.component.repository.exception, - org.codehaus.plexus.digest, - org.springframework.stereotype;version="[3,4)", - org.apache.maven.index.context;resolution:=optional, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - </project> diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index 267c001ea..63acd6750 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -26,7 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-policies</artifactId> - <packaging>bundle</packaging> + <name>Archiva Base :: Policies</name> <properties> @@ -123,28 +123,6 @@ </systemPropertyVariables> </configuration> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.policies</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.policies*;version=${project.version} - </Export-Package> - <Import-Package> - javax.inject, - org.apache.archiva.checksum;version=${project.version}, - org.apache.archiva.common*;version=${project.version}, - org.apache.commons.lang;version="[2,3)", - org.springframework.stereotype;version="[3,4)", - org.apache.archiva.redback.components.cache, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> </plugins> <pluginManagement> <plugins> diff --git a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml b/archiva-modules/archiva-base/archiva-proxy-api/pom.xml index 15e70cb4f..2bc408482 100644 --- a/archiva-modules/archiva-base/archiva-proxy-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy-api/pom.xml @@ -25,7 +25,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-proxy-api</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Proxy Api</name> @@ -40,21 +39,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.proxy.model</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.proxy;version=${project.version} - </Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml index 733c599a3..fa95a18cf 100644 --- a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml @@ -25,7 +25,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-proxy-common</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Proxy Common</name> <properties> @@ -88,32 +87,4 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.proxy.common</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.proxy.common;version=${project.version} - </Export-Package> - <Import-Package> - javax.inject, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.commons.lang;version="[2.4,3)", - org.springframework.stereotype;version="[3,4)", - org.springframework.context;version="[3,4)", - org.springframework.beans;version="[3,4)", - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.maven.wagon*, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index a27897df6..d55959f3a 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-proxy</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Proxy</name> <properties> @@ -252,48 +251,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.proxy</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.proxy;version=${project.version} - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - com.google.common.collect, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.model;version=${project.version}, - org.apache.archiva.policies*;version=${project.version}, - org.apache.archiva.proxy.common;version=${project.version}, - org.apache.archiva.repository*;version=${project.version}, - org.apache.archiva.scheduler*;version=${project.version}, - org.apache.archiva.admin.model;version=${project.version}, - org.apache.archiva.admin.model.networkproxy;version=${project.version}, - org.apache.archiva.proxy.model;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang;version="[2.4,3)", - org.springframework.stereotype;version="[3,4)", - org.apache.archiva.redback.components.registry, - org.apache.archiva.redback.components.taskqueue, - org.apache.tools.ant.types.selectors, - org.apache.maven.wagon, - org.apache.maven.wagon.authentication, - org.apache.maven.wagon.proxy, - org.apache.maven.wagon.repository, - com.google.common.io, - org.apache.archiva.common.filelock, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml index c912c182c..7b1604ae8 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml @@ -26,7 +26,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-repository-admin-api</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Repository Admin Api</name> <properties> @@ -98,26 +97,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.repository.admin.api</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.admin.model*;version=${project.version} - </Export-Package> - <Import-Package> - javax.xml.bind.annotation, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.lang;version="[2.4,3)", - org.apache.archiva.redback.users, - org.apache.maven.index.context;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <executions> diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml index b752f2810..4f7c70627 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml @@ -26,7 +26,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-repository-admin-default</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Repository Admin Default</name> <properties> @@ -276,49 +275,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.repository.admin.default</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.admin.repository*;version=${project.version} - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - org.modelmapper, - org.apache.archiva.admin.model*;version=${project.version}, - org.apache.archiva.audit;version=${project.version}, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.archiva.configuration*;version=${project.version}, - org.apache.archiva.metadata*;version=${project.version}, - org.apache.archiva.scheduler*;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang*;version="[2.4,3)", - org.apache.commons.validator;version="[1.3,2)", - org.apache.http*;version="[4,5)", - org.springframework*;version="[3,4)", - org.apache.maven.index*, - org.apache.maven.wagon*, - org.modelmapper.config, - org.modelmapper.convention, - org.modelmapper.spi, - org.apache.archiva.redback.role, - org.apache.archiva.redback.users, - org.apache.archiva.redback.components.registry, - org.apache.archiva.redback.components.taskqueue, - org.apache.archiva.redback.components.scheduler, - org.apache.archiva.redback.configuration, - org.apache.archiva.redback.components.cache, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/archiva-modules/archiva-base/archiva-repository-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-api/pom.xml index 6aa2d7676..b5f10a7db 100644 --- a/archiva-modules/archiva-base/archiva-repository-api/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-api/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-repository-api</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Repository API</name> <properties> @@ -74,25 +73,6 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.indexer.api</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.indexer.*;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - org.apache.commons.lang*;version="[2.4,3)", - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 1af1ab065..b134f243e 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-repository-layer</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Repository Interface Layer</name> <properties> @@ -134,40 +133,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.repository.layer</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.repository;version=${project.version};-split-package:=merge-first, - org.apache.archiva.repository.connector;version=${project.version};-split-package:=merge-first, - org.apache.archiva.repository.content;version=${project.version};-split-package:=merge-first, - org.apache.archiva.repository.layout;version=${project.version};-split-package:=merge-first, - org.apache.archiva.repository.metadata;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - org.apache.archiva.model*;version=${project.version}, - org.apache.archiva.maven2.metadata*;version=${project.version}, - org.apache.archiva.common*;version=${project.version}, - org.apache.archiva.checksum;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.xml;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang*;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.dom4j;version="[1.6,2)", - org.apache.archiva.redback.components.registry, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml index 7136844d7..e7e317225 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml @@ -26,7 +26,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-repository-scanner</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Repository Scanner</name> <properties> @@ -68,32 +67,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.repository.scanner</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.repository.scanner*;version=${project.version} - </Export-Package> - <Import-Package> - javax.inject, - org.apache.archiva.admin.model*;version=${project.version}, - org.apache.archiva.common*;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.consumers*;version=${project.version}, - org.apache.commons.collections*;version="[3.2,4)", - org.apache.commons.lang;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.codehaus.plexus.util, - org.slf4j;resolution:=optional, - javax.xml.bind.annotation - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/archiva-modules/archiva-base/archiva-security-common/pom.xml b/archiva-modules/archiva-base/archiva-security-common/pom.xml index f9ebb9e9e..60806b572 100644 --- a/archiva-modules/archiva-base/archiva-security-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-security-common/pom.xml @@ -26,31 +26,10 @@ </parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-security-common</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Security Common</name> <properties> <site.staging.base>${project.parent.parent.basedir}</site.staging.base> </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.security.common</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.security.common;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml index a9eee95f9..b63aecc3c 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -25,7 +25,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-transaction</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: Transactions</name> <description>API for managing transaction.</description> @@ -87,25 +86,4 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.transaction</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.transaction;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - org.apache.commons.io;version="[1.4,2)", - org.codehaus.plexus.digest - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml index f962aed3f..8dc755071 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -26,7 +26,6 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-xml-tools</artifactId> - <packaging>bundle</packaging> <name>Archiva Base :: XML Tools</name> <properties> @@ -66,28 +65,6 @@ </dependency> </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.xml.tools</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.xml;version=${project.version} - </Export-Package> - <Import-Package> - org.apache.archiva.common;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang;version="[2.4,3)", - org.dom4j*;version="[1.6,2)" - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> <pluginManagement> <plugins> <plugin> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-karaf</artifactId> - <version>3.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.archiva.karaf</groupId> - <artifactId>apache-archiva</artifactId> - <packaging>pom</packaging> - <name>Archiva :: Karaf Features</name> - - <properties> - <site.staging.base>${project.parent.parent.basedir}</site.staging.base> - - <aopalliance.bundle.version>1.0_5</aopalliance.bundle.version> - <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-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-jxpath.bundle.version>1.2_5</commons-jxpath.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> - <plexus-interpolation.version>1.14</plexus-interpolation.version> - <plexus-velocity.version>1.1.8</plexus-velocity.version> - <quartz.bundle.version>2.1.0_1-SNAPSHOT</quartz.bundle.version> - <rome.bundle.version>1.0_2</rome.bundle.version> - <servicemix.specs.version>1.9.0</servicemix.specs.version> - <sisu-inject-bean.version>2.3.0</sisu-inject-bean.version> - <guava.version>14.0.1</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> - </properties> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <configuration> - <useDefaultDelimiters>false</useDefaultDelimiters> - <delimiters> - <delimiter>${*}</delimiter> - </delimiters> - </configuration> - <executions> - <execution> - <id>filter</id> - <phase>generate-resources</phase> - <goals> - <goal>resources</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>attach-artifact</id> - <phase>package</phase> - <goals> - <goal>attach-artifact</goal> - </goals> - <configuration> - <artifacts> - <artifact> - <file>target/classes/features.xml</file> - <type>xml</type> - <classifier>features</classifier> - </artifact> - </artifacts> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>validate</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.karaf.tooling</groupId> - <artifactId>features-maven-plugin</artifactId> - <version>2.4.1</version> - <configuration> - <file>${project.build.directory}/classes/features.xml</file> - <karafConfig>${project.build.directory}/classes/config.properties</karafConfig> - <jreVersion>jre-1.6</jreVersion> - </configuration> - <executions> - <execution> - <id>validate</id> - <phase>process-resources</phase> - <goals> - <goal>validate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<features name="archiva-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"> - - <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: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 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:com.google.guava/guava/${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> - - <feature name="archiva-checksum" description="Archiva Checksum module" version="${project.version}" resolver="(obr)"> - <feature version="${project.version}">archiva-common</feature> - <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle> - <bundle>mvn:org.apache.archiva/archiva-checksum/${project.version}</bundle> - </feature> - - <feature name="archiva-policies" description="Archiva Policies module" version="${project.version}" resolver="(obr)"> - <feature version="${project.version}">archiva-checksum</feature> - <feature version="[3,4)">spring</feature> - <bundle>wrap:mvn:org.apache.archiva.redback.components.cache/spring-cache-api/${redback.cache.version}</bundle> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ehcache/${ehcache.bundle.version}</bundle> - <bundle>wrap:mvn:org.apache.archiva.redback.components.cache/spring-cache-ehcache/${redback.cache.version}</bundle> - <bundle>mvn:org.apache.archiva/archiva-policies/${project.version}</bundle> - </feature> - - <feature name="archiva-configuration" description="Archiva Configuration module" version="${project.version}" resolver="(obr)"> - <feature version="${project.version}">archiva-policies</feature> - <feature>http</feature> - <feature version="[3,4)">spring-web</feature> - <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.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: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 dependency="true">wrap:mvn:org.codehaus.plexus/plexus-interpolation/${plexus-interpolation.version}</bundle> - <bundle dependency="true">wrap:mvn:org.apache.archiva.redback.components.registry/spring-registry-api/${redback.registry.version}</bundle> - <bundle dependency="true">wrap:mvn:org.apache.archiva.redback.components.registry/spring-registry-commons/${redback.registry.version}</bundle> - <bundle>mvn:org.apache.archiva/archiva-configuration/${project.version}</bundle> - </feature> - - <feature name="archiva-model" description="Archiva Model module" version="${project.version}" resolver="(obr)"> - <feature version="${project.version}">archiva-common</feature> - <bundle>mvn:org.apache.archiva/archiva-model/${project.version}</bundle> - </feature> - - <feature name="archiva-plexus-bridge" description="Archive Plexus Bridge module" version="${project.version}" resolver="(obr)"> - <feature version="${project.version}">archiva-common</feature> - <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 dependency="true">mvn:commons-collections/commons-collections/${commons-collections.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> - - <feature name="archiva-metadata" description="Archiva Metadata module" version="${project.version}" resolver="(obr)"> - <feature version="${project.version}">archiva-common</feature> - <feature version="[3,4)">spring</feature> - <bundle>mvn:org.apache.archiva/metadata-model/${project.version}</bundle> - <bundle>mvn:org.apache.archiva/metadata-repository-api/${project.version}</bundle> - <bundle>mvn:org.apache.archiva/metadata-statistics-api/${project.version}</bundle> - </feature> - - <feature name="archiva-audit" description="Archiva Audit module" version="${project.version}" resolver="(obr)"> - <feature version="${project.version}">archiva-metadata</feature> - <bundle>mvn:org.apache.archiva/audit/${project.version}</bundle> - </feature> - - <feature name="archiva-xml-tools" description="Archiva XML Tools module" version="${project.version}" resolver="(obr)"> - <feature version="${project.version}">archiva-common</feature> - <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle> - <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle> - <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle> - <bundle>mvn:org.apache.archiva/archiva-xml-tools/${project.version}</bundle> - </feature> - - <feature name="archiva-maven2-repository" description="Archiva Maven 2 Repository module" version="${project.version}" resolver="(obr)"> - <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 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 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:commons-collections/commons-collections/${commons-collections.version}</bundle> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/${velocity.bundle.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-repository-admin-api</feature> - <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle> - <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle> - <bundle>mvn:org.apache.archiva/archiva-consumer-api/${project.version}</bundle> - </feature> - - <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-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-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-configuration</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-configuration</feature> - <feature version="${project.version}">archiva-metadata</feature> - <feature version="${project.version}">archiva-repository-admin-api</feature> - <feature version="${project.version}">archiva-maven2-repository</feature> - <feature version="${project.version}">archiva-model</feature> - <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle> - <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle> - <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle> - <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j.bundle.version}</bundle> - <bundle>mvn:org.apache.archiva/archiva-repository-layer/${project.version}</bundle> - </feature> - - <feature name="archiva-proxy-common" description="Archiva Proxy Common module" version="${project.version}" resolver="(obr)"> - <feature version="${project.version}">archiva-plexus-bridge</feature> - <bundle dependency="true">mvn:commons-collections/commons-collections/${commons-collections.version}</bundle> - <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.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 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)"> - <bundle dependency="true">wrap:mvn:org.apache.archiva.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-repository-layer</feature> - <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-repository-admin-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-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> - <bundle dependency="true">wrap:mvn:org.apache.archiva.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 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)"> - <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> - <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 dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.stax-utils/${stax-utils.bundle.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-plexus-bridge</feature> - <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.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-transaction</feature> - <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.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-consumers</feature> - <feature version="${project.version}">archiva-scheduler</feature> - <feature version="${project.version}">archiva-transaction</feature> - <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.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-maven2-indexer" description="Archiva Maven2 Indexer module" version="${project.version}" resolver="(obr)"> - <feature version="${project.version}">archiva-repository-admin-api</feature> - <feature version="${project.version}">archiva-plexus-bridge</feature> - <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.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-maven2-indexer/${project.version}</bundle> - </feature> - - <feature name="archiva-security-common" description="Archiva Security Common module" version="${project.version}" resolver="(obr)"> - <bundle>mvn:org.apache.archiva/archiva-security-common/${project.version}</bundle> - </feature> - - <feature name="archiva-rest-api" description="Archiva REST API module" version="${project.version}" resolver="(obr)"> - <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-maven2-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-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 version="${project.version}">archiva-configuration</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-audit</feature> - <feature version="${project.version}">archiva-maven2-indexer</feature> - <feature version="${project.version}">archiva-proxy</feature> - <feature version="${project.version}">archiva-security</feature> - <feature>http</feature> - <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.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-repository-layer</feature> - <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.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-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-configuration</feature> - <feature version="${project.version}">archiva-metadata</feature> - <bundle dependency="true">mvn:commons-io/commons-io/${commons-io.version}</bundle> - <bundle>mvn:org.apache.archiva/metadata-store-file/${project.version}</bundle> - </feature> - - <feature name="archiva-metadata-store-jcr" description="Archiva Metadata Store JCR module" version="${project.version}" resolver="(obr)"> - <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">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-webapp-common" description="Archiva WebApp Common" version="${project.version}" resolver="(obr)"> - <feature>war</feature> - <feature version="[3,4)">spring</feature> - <feature version="[3,4)">spring-web</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-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-repository-admin-default</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-configuration</feature> - <feature version="${project.version}">archiva-repository-statistics</feature> - <feature version="${project.version}">archiva-scheduler</feature> - <feature version="${project.version}">archiva-maven2-indexer</feature> - <feature version="${project.version}">archiva-generic-metadata-support</feature> - <feature version="${project.version}">archiva-rest-api</feature> - <feature version="${project.version}">archiva-rss</feature> - <feature version="${project.version}">archiva-security</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:commons-collections/commons-collections/${commons-collections.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.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> - -</features> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-modules</artifactId> - <version>3.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>archiva-karaf</artifactId> - <packaging>pom</packaging> - <name>Archiva :: Karaf</name> - - - <properties> - <site.staging.base>${project.parent.basedir}</site.staging.base> - </properties> - - <modules> - <module>archiva-features</module> - <!-- <module>archiva-commands</module> --> - </modules> - -</project>
\ 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 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-scheduler-api</artifactId> - <packaging>bundle</packaging> <name>Archiva Scheduler :: API</name> <properties> @@ -42,25 +41,4 @@ <artifactId>spring-taskqueue</artifactId> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.scheduler.api</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.scheduler;version=${project.version} - </Export-Package> - <Import-Package> - org.apache.archiva.redback.components.taskqueue, - org.apache.archiva.admin.model.beans - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> 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 @@ <artifactId>archiva-scheduler-indexing-maven2</artifactId> <name>Archiva Scheduler :: Maven Indexing</name> - <packaging>bundle</packaging> + <description>Scheduler for downloading remote Maven indexes.</description> <dependencies> @@ -165,33 +165,6 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.scheduler.indexing</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.scheduler.indexing;version=${project.version} - </Export-Package> - <Import-Package> - 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 - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> 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 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-scheduler-indexing</artifactId> - <packaging>bundle</packaging> <name>Archiva Scheduler :: Indexing</name> <properties> @@ -76,33 +75,6 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.scheduler.indexing</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.scheduler.indexing;version=${project.version} - </Export-Package> - <Import-Package> - 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 - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> 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 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-scheduler-repository-api</artifactId> - <packaging>bundle</packaging> <name>Archiva Scheduler :: Repository Scanning Api</name> <properties> @@ -81,37 +80,6 @@ </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.scheduler.repository</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.scheduler.repository;version=${project.version} - </Export-Package> - <Import-Package> - 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 - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> <pluginManagement> <plugins> <plugin> 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 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-scheduler-repository</artifactId> - <packaging>bundle</packaging> <name>Archiva Scheduler :: Repository Scanning</name> <properties> @@ -128,42 +127,6 @@ </dependency> </dependencies> <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.scheduler.repository</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.scheduler.repository;version=${project.version} - </Export-Package> - <Import-Package> - 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 - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> <pluginManagement> <plugins> <plugin> 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 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-rest-api</artifactId> - <!-- DO NOT USE bundle packaging generated documentation is not included in the jar !!! --> <packaging>jar</packaging> <name>Archiva Web :: REST support :: Api</name> @@ -96,41 +95,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.rest.api</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - 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 - </Export-Package> - <Import-Package> - 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 - </Import-Package> - </instructions> - - </configuration> - <executions> - <execution> - <id>create-manifest</id> - <phase>process-test-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> <executions> @@ -143,17 +107,7 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - </plugin> - </plugins> </build> -</project>
\ No newline at end of file +</project> 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 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>archiva-rest-services</artifactId> - <packaging>bundle</packaging> <name>Archiva Web :: REST support :: Services</name> <properties> @@ -448,17 +447,6 @@ </pluginManagement> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.rest.services</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Require-Bundle>org.apache.cxf.bundle,org.springframework.beans,org.apache.archiva.rest.api</Require-Bundle> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> 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 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-rss</artifactId> - <packaging>bundle</packaging> <name>Archiva Web :: RSS</name> <properties> @@ -82,29 +81,4 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.rss</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.rss*;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - 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 - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> 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 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-security</artifactId> - <packaging>bundle</packaging> <name>Archiva Web :: Security Configuration</name> <properties> <site.staging.base>${project.parent.parent.basedir}</site.staging.base> @@ -216,38 +215,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.security</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.security;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - 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 - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> 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 @@ </parent> <artifactId>archiva-web-common</artifactId> - <!-- DO NOT USE bundle packaging generated documentation is not included in the jar !!! --> <packaging>jar</packaging> <name>Archiva Web :: Web Common</name> @@ -439,76 +438,10 @@ </plugins> </pluginManagement> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.web.common</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.web.startup;version=${project.version} - </Export-Package> - <Import-Package> - 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 - </Import-Package> - </instructions> - </configuration> - <executions> - <execution> - <id>create-manifest</id> - <phase>process-test-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> <executions> <execution> <goals> 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 @@ </parent> <artifactId>archiva-webdav</artifactId> - <packaging>bundle</packaging> <name>Archiva Web :: WebDAV</name> <properties> @@ -293,52 +292,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.webdav</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.webdav*;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - 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 - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> 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 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>metadata-model-maven2</artifactId> - <packaging>bundle</packaging> <name>Archiva Metadata :: Maven 2 Model</name> <properties> @@ -43,26 +42,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.metadata.model.maven2</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.metadata.model.maven2;version=${project.version} - </Export-Package> - <Import-Package> - javax.xml.bind.annotation, - org.apache.commons.lang, - javax.persistence - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> 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 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>metadata-model</artifactId> - <packaging>bundle</packaging> <name>Archiva Metadata :: Model</name> <properties> @@ -39,24 +38,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.metadata.model</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.metadata.model;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - javax.xml.bind.annotation,javax.persistence - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> 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 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>metadata-repository-api</artifactId> - <packaging>bundle</packaging> <name>Archiva Metadata :: Repository API</name> <properties> @@ -81,34 +80,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.metadata.repository.api</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - 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 - </Export-Package> - <Import-Package> - 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 - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> 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 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>metadata-statistics-api</artifactId> - <packaging>bundle</packaging> <name>Archiva Metadata :: Statistics API</name> <properties> @@ -42,26 +41,4 @@ <artifactId>metadata-model-maven2</artifactId> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.metadata.repository.api</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.metadata.repository.stats.model;version=${project.version} - </Export-Package> - <Import-Package> - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.maven2.model;version=${project.version}, - org.slf4j;resolution:=optional, - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/archiva-modules/plugins/audit/pom.xml b/archiva-modules/plugins/audit/pom.xml index be0268318..7a3292df0 100644 --- a/archiva-modules/plugins/audit/pom.xml +++ b/archiva-modules/plugins/audit/pom.xml @@ -25,7 +25,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>audit</artifactId> - <packaging>bundle</packaging> <name>Archiva Core Plugins :: Audit Logging</name> <properties> @@ -49,29 +48,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.audit</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.audit;version=${project.version} - </Export-Package> - <Import-Package> - javax.inject, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.springframework.stereotype;version="[3,4)", - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - </project> diff --git a/archiva-modules/plugins/generic-metadata-support/pom.xml b/archiva-modules/plugins/generic-metadata-support/pom.xml index 68bd5cd17..4f2cb194a 100644 --- a/archiva-modules/plugins/generic-metadata-support/pom.xml +++ b/archiva-modules/plugins/generic-metadata-support/pom.xml @@ -25,7 +25,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>generic-metadata-support</artifactId> - <packaging>bundle</packaging> <name>Archiva Core Plugins :: Generic Metadata Support</name> <properties> @@ -47,25 +46,5 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.metadata.generic</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.metadata.generic;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - org.apache.archiva.metadata.model;version=${project.version}, - org.springframework*;version="[3,4)" - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + </project> diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml index 9c6a4c28f..d91003805 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/plugins/maven2-repository/pom.xml @@ -25,7 +25,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>maven2-repository</artifactId> - <packaging>bundle</packaging> <name>Archiva Core Plugins :: Maven 2.x Repository Support</name> <properties> @@ -207,80 +206,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.maven2</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.dependency.tree.maven2;version=${project.version};-split-package:=merge-first, - org.apache.archiva.metadata.repository.storage.maven2;version=${project.version};-split-package:=merge-first, - </Export-Package> - <Import-Package> - !org.apache.archiva.metadata.repository.filter, - javax.annotation, - javax.xml.bind.annotation, - javax.inject, - org.apache.archiva.maven2.metadata*;version=${project.version}, - org.apache.archiva.model*;version=${project.version}, - org.apache.archiva.common*;version=${project.version}, - org.apache.archiva.checksum;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.archiva.metadata.repository.filter;version=${project.version}, - org.apache.archiva.metadata.repository.storage;version=${project.version}, - org.apache.archiva.proxy.common;version=${project.version}, - org.apache.archiva.reports;version=${project.version}, - org.apache.archiva.xml;version=${project.version}, - org.apache.archiva.admin.model;version=${project.version}, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.admin.model.managed;version=${project.version}, - org.apache.archiva.admin.model.networkproxy;version=${project.version}, - org.apache.archiva.admin.model.proxyconnector;version=${project.version}, - org.apache.archiva.admin.model.remote;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.apache.commons.configuration;version="[1.4,2)", - org.apache.commons.lang*;version="[2.4,3)", - org.apache.maven.artifact*, - org.apache.maven.model*, - org.apache.maven.wagon*, - org.codehaus.plexus*, - com.google.common.io, - org.springframework*;version="[3,4)", - org.slf4j;resolution:=optional, - org.apache.maven.repository.internal, - org.sonatype.aether.connector.file, - org.sonatype.aether.impl, - org.sonatype.aether.spi.connector, - org.sonatype.aether.transfer, - org.sonatype.aether, - org.sonatype.aether.artifact, - org.sonatype.aether.collection, - org.sonatype.aether.graph, - org.sonatype.aether.impl.internal, - org.sonatype.aether.repository, - org.sonatype.aether.util, - org.sonatype.aether.util.artifact, - org.modelmapper, - org.modelmapper.config, - org.modelmapper.convention, - org.modelmapper.spi, - org.apache.archiva.maven2.model, - org.sonatype.aether.util.graph.selector, - org.apache.archiva.metadata.model.maven2, - org.apache.archiva.policies, - org.apache.archiva.proxy, - org.apache.archiva.repository, - org.apache.archiva.repository.content, - org.apache.archiva.repository.layout, - org.apache.archiva.proxy.model - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml index 3f2cafe65..bd905acc3 100644 --- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml +++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml @@ -26,7 +26,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>metadata-store-cassandra</artifactId> - <packaging>bundle</packaging> <name>Archiva Core Plugins :: Cassandra Storage for Metadata</name> <properties> @@ -192,45 +191,6 @@ </testResources> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.metadata.repository.cassandra</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.metadata.repository.cassandra;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - javax.persistence, - com.google.common.base, - com.google.common.collect, - com.netflix.astyanax, - com.netflix.astyanax.connectionpool, - com.netflix.astyanax.connectionpool.exceptions, - com.netflix.astyanax.connectionpool.impl, - com.netflix.astyanax.entitystore, - com.netflix.astyanax.impl, - com.netflix.astyanax.ddl, - com.netflix.astyanax.thrift, - net.sf.beanlib.provider.replicator, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.archiva.configuration, - org.apache.commons.lang;version="[2.4,3)", - org.slf4j;resolution:=optional, - org.springframework.context, - org.springframework.stereotype, - com.netflix.astyanax.serializers, - org.apache.commons.codec.binary, - org.apache.commons.io - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> <executions> diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml index 4e85c63ff..c4fabc35e 100644 --- a/archiva-modules/plugins/metadata-store-file/pom.xml +++ b/archiva-modules/plugins/metadata-store-file/pom.xml @@ -25,7 +25,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>metadata-store-file</artifactId> - <packaging>bundle</packaging> <name>Archiva Core Plugins :: File System Backed Metadata Repository</name> <properties> @@ -100,30 +99,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.metadata.repository.file</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.metadata.repository.file;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.apache.commons.lang;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml index 114bcb7dc..2b38ec7d6 100644 --- a/archiva-modules/plugins/metadata-store-jcr/pom.xml +++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml @@ -26,7 +26,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>metadata-store-jcr</artifactId> - <packaging>bundle</packaging> <name>Archiva Core Plugins :: JCR Storage for Metadata</name> <properties> @@ -203,32 +202,6 @@ </testResources> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.metadata.repository.jcr</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.metadata.repository.jcr;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - javax.jcr, - javax.jcr.nodetype, - javax.jcr.query, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.commons.lang;version="[2.4,3)", - org.springframework*;version="[3,4)", - org.slf4j;resolution:=optional, - org.apache.commons.lang.time - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml index ad15973c0..bb1ced84a 100644 --- a/archiva-modules/plugins/problem-reports/pom.xml +++ b/archiva-modules/plugins/problem-reports/pom.xml @@ -25,7 +25,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>problem-reports</artifactId> - <packaging>bundle</packaging> <name>Archiva Core Plugins :: Problem Reporting Plugin</name> <properties> @@ -96,35 +95,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.reports</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.reports*;version=${project.version} - </Export-Package> - <Import-Package> - javax.annotation, - javax.inject, - org.apache.archiva.admin.model.beans;version=${project.version}, - org.apache.archiva.checksum;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.archiva.metadata.repository.storage;version=${project.version}, - org.apache.archiva.repository.events;version=${project.version}, - org.apache.archiva.consumers;version=${project.version}, - org.apache.commons.collections;version="[3.2,4)", - org.springframework.*;version="[3,4)", - org.apache.archiva.redback.components.registry, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml index 4fe10de2e..eeba93852 100644 --- a/archiva-modules/plugins/repository-statistics/pom.xml +++ b/archiva-modules/plugins/repository-statistics/pom.xml @@ -25,7 +25,6 @@ <version>3.0.0-SNAPSHOT</version> </parent> <artifactId>repository-statistics</artifactId> - <packaging>bundle</packaging> <name>Archiva Core Plugins :: Repository Statistics</name> <properties> @@ -84,32 +83,5 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.repository.statistics</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.metadata.repository.stats;version=${project.version} - </Export-Package> - <Import-Package> - javax.jcr, - javax.jcr.query, - org.apache.archiva.metadata.model;version=${project.version}, - org.apache.archiva.metadata.repository;version=${project.version}, - org.apache.archiva.metadata.repository.storage.maven2;version=${project.version}, - org.apache.archiva.metadata.model.maven2, - org.springframework*;version="[3,4)", - org.apache.commons.lang.time, - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + </project> diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index d77142822..bdf308224 100644 --- a/archiva-modules/plugins/stage-repository-merge/pom.xml +++ b/archiva-modules/plugins/stage-repository-merge/pom.xml @@ -26,7 +26,6 @@ </parent> <groupId>org.apache.archiva</groupId> <artifactId>stage-repository-merge</artifactId> - <packaging>bundle</packaging> <name>Archiva Core Plugins :: Stage Repository Merge</name> <properties> @@ -133,32 +132,6 @@ <build> <plugins> <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.stagerepository.merge</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.stagerepository.merge;version=${project.version} - </Export-Package> - <Import-Package> - javax.inject, - org.apache.archiva.common.utils;version=${project.version}, - org.apache.archiva.configuration;version=${project.version}, - org.apache.archiva.metadata.*;version=${project.version}, - org.apache.archiva.model;version=${project.version}, - org.apache.archiva.repository*;version=${project.version}, - org.apache.archiva.maven2.metadata*;version=${project.version}, - org.apache.archiva.xml*;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.springframework*;version="[3,4)", - org.slf4j;resolution:=optional - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <executions> 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 @@ <module>archiva-scheduler</module> <module>archiva-web</module> - <module>archiva-karaf</module> <module>metadata</module> <module>plugins</module> </modules> |