diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-11-22 14:17:04 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-11-22 14:17:04 +0000 |
| commit | 9d3a7193810cef52b0edc71cd2dd8f247bce5c96 (patch) | |
| tree | 7a8e368987016dca282c0cada5488d74d64b34cd /archiva-modules | |
| parent | 7328b600d5d4d8304c09f2c51d2e1691b104d09b (diff) | |
| download | archiva-9d3a7193810cef52b0edc71cd2dd8f247bce5c96.tar.gz archiva-9d3a7193810cef52b0edc71cd2dd8f247bce5c96.zip | |
[MRM-1562] Update to Archiva as OSGi compliant application.
Submitted by Jean-Baptiste Onofre.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1205009 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules')
36 files changed, 1347 insertions, 8 deletions
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index 345cc7832..5eff81f01 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -26,6 +26,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>archiva-artifact-converter</artifactId> + <packaging>bundle</packaging> <name>Archiva Artifact Converter</name> <description>Converts between Legacy and Modern Layout Artifacts.</description> <dependencies> @@ -83,6 +84,31 @@ <build> <plugins> <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-SymbolicName>org.apache.archiva.artifact.converter</Bundle-SymbolicName> + <Bundle-Version>${project.version}</Bundle-Version> + <Export-Package> + org.apache.archiva.converter.artifact*;version=${project.version};-split-package:=merge-first + </Export-Package> + <Import-Package> + javax.annotation, + javax.inject, + org.apache.archiva.common.plexusbridge;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* + </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-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml index 8e5f94d18..f06b385e8 100644 --- a/archiva-modules/archiva-base/archiva-checksum/pom.xml +++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml @@ -25,6 +25,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>archiva-checksum</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Checksum</name> <dependencies> @@ -52,6 +53,26 @@ </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 545662491..97bd943cc 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -26,6 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-common</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Common</name> <dependencies> <!-- TO OTHER DEVELOPERS: @@ -72,6 +73,26 @@ </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 78ae4c7f0..d9a84f1ed 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -26,6 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-configuration</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Configuration</name> <dependencies> <dependency> @@ -168,6 +169,36 @@ </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.codehaus.plexus.evaluator*, + org.codehaus.plexus.registry, + org.codehaus.plexus.util, + org.codehaus.redback.components.registry.commons, + org.codehaus.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 560fd4aff..38cf37cd9 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 @@ -25,10 +25,9 @@ <artifactId>archiva-consumers</artifactId> <version>1.4-M2-SNAPSHOT</version> </parent> - <artifactId>archiva-consumer-api</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Consumers :: API</name> - <dependencies> <dependency> <groupId>org.apache.archiva</groupId> @@ -43,4 +42,28 @@ <artifactId>commons-collections</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 + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml index 1ea1ec1a7..ffce72a73 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/pom.xml @@ -26,14 +26,12 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>archiva-consumer-archetype</artifactId> - <packaging>maven-archetype</packaging> <name>Archiva Consumers :: Consumers Archetype</name> <description>Simple archetype to create archiva consumers</description> <properties> <archivaVersion>${project.version}</archivaVersion> </properties> - <build> <resources> <resource> 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 0367aa66d..863b1eccc 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 @@ -25,10 +25,9 @@ <artifactId>archiva-consumers</artifactId> <version>1.4-M2-SNAPSHOT</version> </parent> - <artifactId>archiva-core-consumers</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Consumers :: Core Consumers</name> - <dependencies> <!-- TODO: remove this hard dependency by using an event mechanism --> <dependency> @@ -139,6 +138,41 @@ </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.admin.model*;version=${project.version}, + 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.codehaus.plexus.digest, + org.codehaus.plexus.registry, + 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 2146f3a26..f1dce8b69 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 @@ -25,10 +25,9 @@ <artifactId>archiva-consumers</artifactId> <version>1.4-M2-SNAPSHOT</version> </parent> - <artifactId>archiva-lucene-consumers</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Consumers :: Lucene</name> - <dependencies> <dependency> <groupId>org.apache.archiva</groupId> @@ -102,6 +101,35 @@ </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.admin.model*;version=${project.version}, + 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.codehaus.plexus.registry, + org.codehaus.plexus.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 3157a0e89..97c8101b9 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,6 +26,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>archiva-metadata-consumer</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Consumers :: Metadata</name> <dependencies> <dependency> @@ -57,4 +58,35 @@ <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.codehaus.plexus.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 433167e0e..be5162abe 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -26,6 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-converter</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Repository Converter</name> <dependencies> <dependency> @@ -63,6 +64,42 @@ </dependency> </dependencies> <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.slf4j;resolution:=optional + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> <pluginManagement> <plugins> <plugin> diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml index 426f6d34e..c589f4e8d 100644 --- a/archiva-modules/archiva-base/archiva-indexer/pom.xml +++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml @@ -26,6 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-indexer</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Indexer</name> <dependencies> @@ -163,6 +164,32 @@ </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.apache.lucene*;version="[3,4)", + org.springframework*;version="[3,4)", + org.apache.maven.index*, + 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-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml index eeb02c513..ad2ba2df1 100755 --- a/archiva-modules/archiva-base/archiva-model/pom.xml +++ b/archiva-modules/archiva-base/archiva-model/pom.xml @@ -26,6 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-model</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Model</name> <dependencies> <dependency> @@ -85,6 +86,23 @@ </instrumentation> </configuration> </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 0a20fcd39..78d1b10f2 100644 --- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml +++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml @@ -26,6 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-plexus-bridge</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Plexus Bridge</name> <dependencies> @@ -64,4 +65,34 @@ </exclusions> </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, + 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 e8600a0e4..fc6efe90e 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -26,6 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-policies</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Policies</name> <dependencies> <dependency> @@ -107,6 +108,28 @@ </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.codehaus.plexus.cache, + org.slf4j;resolution:=optional + </Import-Package> + </instructions> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> diff --git a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml index f84335d7d..7101710b5 100644 --- a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml @@ -25,6 +25,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>archiva-proxy-common</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Proxy Common</name> <dependencies> <dependency> @@ -61,4 +62,29 @@ <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.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 62e485ed2..942da4a43 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -26,6 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-proxy</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Proxy</name> <dependencies> <dependency> @@ -152,6 +153,43 @@ <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.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.codehaus.plexus.registry, + org.codehaus.plexus.taskqueue, + org.codehaus.plexus.util, + org.apache.maven.wagon, + org.apache.maven.wagon.authentication, + org.apache.maven.wagon.proxy, + org.apache.maven.wagon.repository, + 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 f27fc91d1..77a776831 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,6 +26,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>archiva-repository-admin-api</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Repository Admin Api</name> <dependencies> <dependency> @@ -83,6 +84,26 @@ <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.codehaus.plexus.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 4e4524e2d..1d0f5020c 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,6 +26,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>archiva-repository-admin-default</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Repository Admin Default</name> <dependencies> <dependency> @@ -205,6 +206,44 @@ <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, + net.sf.beanlib.provider.replicator, + 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.codehaus.plexus.redback.role, + org.codehaus.plexus.redback.users, + org.codehaus.plexus.registry, + org.codehaus.plexus.taskqueue, + org.codehaus.redback.components.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-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml index 5256cfbe2..e1289172b 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml @@ -26,6 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-repository-layer</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Repository Interface Layer</name> <dependencies> <dependency> @@ -78,6 +79,41 @@ <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.admin.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*;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.codehaus.plexus.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 330e95b9e..a6f4621d4 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml +++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml @@ -26,6 +26,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>archiva-repository-scanner</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Repository Scanner</name> <dependencies> <dependency> @@ -59,6 +60,33 @@ </dependency> </dependencies> <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 + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> <pluginManagement> <plugins> <plugin> diff --git a/archiva-modules/archiva-base/archiva-security-common/pom.xml b/archiva-modules/archiva-base/archiva-security-common/pom.xml index ef3241db8..bbfd3e2ab 100644 --- a/archiva-modules/archiva-base/archiva-security-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-security-common/pom.xml @@ -26,5 +26,26 @@ </parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-security-common</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Security Common</name> + <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 a6465856b..d685983c3 100644 --- a/archiva-modules/archiva-base/archiva-transaction/pom.xml +++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml @@ -25,6 +25,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>archiva-transaction</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: Transactions</name> <description>API for managing transaction.</description> <dependencies> @@ -61,4 +62,25 @@ <scope>runtime</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 fa54cdc1e..71d29cfe6 100644 --- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml +++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml @@ -26,6 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archiva-xml-tools</artifactId> + <packaging>bundle</packaging> <name>Archiva Base :: XML Tools</name> <dependencies> <dependency> @@ -54,6 +55,28 @@ </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 new file mode 100644 index 000000000..42804b796 --- /dev/null +++ b/archiva-modules/archiva-karaf/archiva-features/pom.xml @@ -0,0 +1,124 @@ +<?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>1.4-M2-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> + <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-codec.bundle.version>1.3_4</commons-codec.bundle.version> + <commons-collections.bundle.version>3.2.1_2</commons-collections.bundle.version> + <commons-configuration.bundle.version>1.4_3</commons-configuration.bundle.version> + <commons-digester.bundle.version>1.8_3</commons-digester.bundle.version> + <commons-io.bundle.version>1.4_2</commons-io.bundle.version> + <commons-jxpath.bundle.version>1.2_5</commons-jxpath.bundle.version> + <commons-lang.bundle.version>2.4_5</commons-lang.bundle.version> + <commons-validator.bundle.version>1.3.1_1-SNAPSHOT</commons-validator.bundle.version> + <dom4j.bundle.version>1.6.1_4</dom4j.bundle.version> + <ehcache.bundle.version>2.4.3_1</ehcache.bundle.version> + <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> + <jsoup.bundle.version>1.5.2_1</jsoup.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> + <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> + <servicemix.specs.version>1.9.0</servicemix.specs.version> + <sisu-inject-bean.version>2.3.0</sisu-inject-bean.version> + <sisu-guava.version>0.9.9</sisu-guava.version> + <stax-utils.bundle.version>20040917_2</stax-utils.bundle.version> + <velocity.bundle.version>1.7_3</velocity.bundle.version> + <xpp3.bundle.version>1.1.4c_5</xpp3.bundle.version> + <xstream.bundle.version>1.4_1</xstream.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> +</project>
\ No newline at end of file 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 new file mode 100644 index 000000000..8f8b8447e --- /dev/null +++ b/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml @@ -0,0 +1,313 @@ +<?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"> + + <feature name="archiva-common" description="Archiva Common module" version="${project.version}" resolver="(obr)"> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/${aopalliance.bundle.version}</bundle> + <bundle>wrap:mvn:org.codehaus.plexus/plexus-classworlds/${plexus-classworlds.version}</bundle> + <bundle>wrap:mvn:org.codehaus.plexus/plexus-component-annotations/${plexus-component-annotations.version}</bundle> + <bundle>wrap:mvn:org.codehaus.plexus/plexus-utils/${plexus-utils.version}</bundle> + <bundle>mvn:org.sonatype.sisu/sisu-guava/${sisu-guava.version}</bundle> + <bundle>mvn:org.sonatype.sisu/sisu-guice/${sisu-guice.version}</bundle> + <bundle>mvn:org.sonatype.sisu/sisu-inject-bean/${sisu-inject-bean.version}</bundle> + <bundle>mvn:org.sonatype.sisu/sisu-inject-plexus/${sisu-inject-plexus.version}</bundle> + <bundle>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:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.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-common</feature> + <feature version="${project.version}">archiva-checksum</feature> + <feature version="[3,4)">spring</feature> + <bundle>wrap:mvn:org.codehaus.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.codehaus.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:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/${commons-beanutils.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-digester/${commons-digester.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-jxpath/${commons-jxpath.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/${commons-configuration.bundle.version}</bundle> + <bundle>wrap:mvn:org.codehaus.plexus/plexus-expression-evaluator/${plexus-expression-evaluator.version}</bundle> + <bundle>wrap:mvn:org.codehaus.plexus/plexus-interpolation/${plexus-interpolation.version}</bundle> + <bundle>wrap:mvn:org.codehaus.redback.components.registry/spring-registry-api/${redback.registry.version}</bundle> + <bundle>wrap:mvn:org.codehaus.redback.components.registry/spring-registry-commons/${redback.registry.version}</bundle> + <bundle>wrap:mvn:org.codehaus.redback.components/spring-utils/${redback.spring-utils.version}</bundle> + <bundle>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> + <bundle>wrap:mvn:org.codehaus.plexus/plexus-digest/${plexus-digest.version}</bundle> + <bundle>mvn:org.apache.archiva/archiva-plexus-bridge/${project.version}</bundle> + </feature> + + <feature name="archiva-repository-admin-api" description="Archiva Repository Admin API module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-common</feature> + <bundle>wrap:mvn:org.codehaus.redback/redback-users-api/${redback.version}</bundle> + <bundle>wrap:mvn:org.codehaus.redback/redback-configuration/${redback.version}</bundle> + <bundle>wrap:mvn:org.codehaus.redback/redback-policy/${redback.version}</bundle> + <bundle>wrap:mvn:org.codehaus.redback/redback-users-memory/${redback.version}</bundle> + <bundle>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> + </feature> + + <feature name="archiva-audit" description="Archiva Audit module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-configuration</feature> + <feature version="${project.version}">archiva-metadata</feature> + <bundle>mvn:org.apache.archiva/audit/${project.version}</bundle> + </feature> + + <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:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle> + <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-common</feature> + <feature version="${project.version}">archiva-metadata</feature> + <feature version="${project.version}">archiva-proxy-common</feature> + <feature version="${project.version}">archiva-reports</feature> + <feature version="${project.version}">archiva-xml-tools</feature> + <bundle>wrap:mvn:org.apache.maven/maven-artifact/${maven.version}</bundle> + <bundle>wrap:mvn:org.apache.maven/maven-model/${maven.version}</bundle> + <bundle>wrap:mvn:org.apache.maven/maven-project/${maven.version}</bundle> + <bundle>wrap:mvn:org.apache.maven/maven-settings/${maven.version}</bundle> + <bundle>wrap:mvn:org.apache.maven/maven-artifact-manager/${maven.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.shared/maven-dependency-tree/${maven-dependency-tree.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.archetype/archetype-catalog/${maven.archetype.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.archetype/archetype-registry/${maven.archetype.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.archetype/archetype-descriptor/${maven.archetype.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.shared/maven-invoker/${maven.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.indexer/indexer-core/${maven.indexer.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.indexer/indexer-artifact/${maven.indexer.version}</bundle> + <bundle dependency="true">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.velocity/${velocity.bundle.version}</bundle> + <bundle>wrap:mvn:org.codehaus.plexus/plexus-velocity/${plexus-velocity.version}</bundle> + <bundle>wrap:mvn:net.sourceforge.jchardet/jchardet/${jcharset.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.archetype/archetype-common/${maven.archetype.version}</bundle> + <bundle>wrap:mvn:org.apache.maven/maven-model-builder/${maven3x.version}</bundle> + <bundle>mvn:org.apache.archiva/maven2-repository/${project.version}</bundle> + </feature> + + <feature name="archiva-consumers-api" description="Archiva Consumers API module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-common</feature> + <feature version="${project.version}">archiva-repository-admin-api</feature> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle> + <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-checksum</feature> + <feature version="${project.version}">archiva-plexus-bridge</feature> + <feature version="${project.version}">archiva-configuration</feature> + <feature version="${project.version}">archiva-metadata</feature> + <feature version="${project.version}">archiva-model</feature> + <feature version="${project.version}">archiva-scheduler-api</feature> + <bundle>mvn:org.apache.archiva/archiva-core-consumers/${project.version}</bundle> + <bundle>mvn:org.apache.archiva/archiva-lucene-consumers/${project.version}</bundle> + <bundle>mvn:org.apache.archiva/archiva-metadata-consumer/${project.version}</bundle> + </feature> + + <feature name="archiva-reports" description="Archiva Problem Reports module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-common</feature> + <feature version="${project.version}">archiva-checksum</feature> + <feature version="${project.version}">archiva-configuration</feature> + <feature version="${project.version}">archiva-repository-admin-api</feature> + <feature version="${project.version}">archiva-metadata</feature> + <feature version="${project.version}">archiva-consumers-api</feature> + <bundle>mvn:org.apache.archiva/problem-reports/${project.version}</bundle> + </feature> + + <feature name="archiva-repository-layer" description="Archiva Repository Layer module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-common</feature> + <feature version="${project.version}">archiva-checksum</feature> + <feature version="${project.version}">archiva-configuration</feature> + <feature version="${project.version}">archiva-metadata</feature> + <feature version="${project.version}">archiva-model</feature> + <feature version="${project.version}">archiva-repository-admin-api</feature> + <feature version="${project.version}">archiva-xml-tools</feature> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}</bundle> + <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-common</feature> + <feature version="${project.version}">archiva-repository-admin-api</feature> + <feature version="${project.version}">archiva-configuration</feature> + <feature version="${project.version}">archiva-model</feature> + <feature version="${project.version}">archiva-policies</feature> + <feature version="${project.version}">archiva-metadata</feature> + <feature version="${project.version}">archiva-scheduler-api</feature> + <feature version="${project.version}">archiva-repository-layer</feature> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-collections/${commons-collections.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.wagon/wagon-provider-api/${wagon.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.wagon/wagon-file/${wagon.version}</bundle> + <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${httpclient.version}</bundle> + <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsoup/${jsoup.bundle.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.wagon/wagon-http-shared4/${wagon.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.wagon/wagon-http/${wagon.version}</bundle> + <bundle>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-proxy-common</feature> + <bundle>mvn:org.apache.archiva/archiva-proxy/${project.version}</bundle> + </feature> + + <feature name="archiva-scheduler-api" description="Archiva Scheduler API module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-common</feature> + <feature version="${project.version}">archiva-plexus-bridge</feature> + <feature version="${project.version}">archiva-repository-admin-api</feature> + <feature version="${project.version}">archiva-configuration</feature> + <feature version="${project.version}">archiva-proxy</feature> + <bundle>wrap:mvn:org.codehaus.redback.components/spring-taskqueue/${redback.taskqueue.version}</bundle> + <bundle>mvn:org.apache.archiva/archiva-scheduler-api/${project.version}</bundle> + </feature> + + <feature name="archiva-repository-statistics" description="Archiva Repository Statistics module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-common</feature> + <feature version="${project.version}">archiva-maven2-repository</feature> + <bundle dependency="true">mvn:javax.jcr/jcr/${javax.jcr.version}</bundle> + <bundle dependency="true">mvn:org.apache.jackrabbit/jackrabbit-jcr-commons/${jackrabbit.version}</bundle> + <bundle>mvn:org.apache.archiva/repository-statistics/${project.version}</bundle> + </feature> + + <feature name="archiva-repository-scanner" description="Archiva Repository Scanner module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-common</feature> + <feature version="${project.version}">archiva-configuration</feature> + <feature version="${project.version}">archive-repository-layer</feature> + <feature version="${project.version}">archiva-repository-admin-api</feature> + <feature version="${project.version}">archiva-consumers-api</feature> + <bundle>mvn:org.apache.archiva/archiva-repository-scanner/${project.version}</bundle> + </feature> + + <feature name="archiva-scheduler" description="Archiva Scheduler module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-scheduler-api</feature> + <feature version="${project.version}">archiva-metadata</feature> + <feature version="${project.version}">archiva-repository-statistics</feature> + <feature version="${project.version}">archiva-proxy</feature> + <bundle>wrap:mvn:org.codehaus.redback.components/spring-quartz/${redback.quartz.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.quartz/${quartz.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.indexer/indexer-artifact/${maven.indexer.version}</bundle> + <bundle>mvn:org.apache.archiva/archiva-scheduler-indexing/${project.version}</bundle> + <bundle>mvn:org.apache.archiva/archiva-scheduler-repository/${project.version}</bundle> + </feature> + + <feature name="archiva-repository-admin-default" description="Archiva Repository Admin Default module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-repository-admin-api</feature> + <feature version="${project.version}">archiva-audit</feature> + <feature version="${project.version}">archiva-plexus-bridge</feature> + <feature version="${project.version}">archiva-scheduler</feature> + <feature version="${project.version}">archiva-metadata</feature> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-validator/${commons-validator.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3.bundle.version}</bundle> + <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>wrap:mvn:org.codehaus.redback/redback-rbac/${redback.version}</bundle> + <bundle>wrap:mvn:org.codehaus.redback/redback-rbac-role-manager/${redback.version}</bundle> + <bundle>mvn:org.apache.archiva/archiva-repository-admin-default/${project.version}</bundle> + </feature> + + <feature name="archiva-transaction" description="Archiva Transaction module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-common</feature> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle> + <bundle>mvn:org.apache.archiva/archiva-transaction/${project.version}</bundle> + </feature> + + <feature name="archiva-artifact-converter" description="Archiva Artifact Converter module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-common</feature> + <feature version="${project.version}">archiva-plexus-bridge</feature> + <feature version="${project.version}">archiva-transaction</feature> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle> + <bundle>wrap:mvn:org.apache.maven/maven-model-v3/${maven-model-v3.version}</bundle> + <bundle>wrap:mvn:org.apache.maven/maven-model/${maven3x.version}</bundle> + <bundle>wrap:mvn:org.apache.maven.shared/maven-model-converter/${maven-model-converter.version}</bundle> + <bundle>wrap:mvn:org.apache.maven/maven-repository-metadata/${maven.version}</bundle> + <bundle>mvn:org.apache.archiva/archiva-artifact-converter/${project.version}</bundle> + </feature> + + <feature name="archiva-converter" description="Archiva Converter module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-common</feature> + <feature version="${project.version}">archiva-repository-admin-api</feature> + <feature version="${project.version}">archiva-plexus-bridge</feature> + <feature version="${project.version}">archiva-model</feature> + <feature version="${project.version}">archiva-consumers-api</feature> + <feature version="${project.version}">archiva-repository-layer</feature> + <feature version="${project.version}">archiva-repository-scanner</feature> + <feature version="${project.version}">archiva-transaction</feature> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle> + <bundle>mvn:org.apache.archiva/archiva-converter/${project.version}</bundle> + </feature> + + <feature name="archiva-indexer" description="Archiva Indexer module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-common</feature> + <feature version="${project.version}">archiva-plexus-bridge</feature> + <feature version="${project.version}">archiva-repository-admin-api</feature> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-io/${commons-io.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lucene/${lucene.bundle.version}</bundle> + <bundle>mvn:org.apache.archiva/archiva-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> + + + +</features>
\ No newline at end of file diff --git a/archiva-modules/archiva-karaf/pom.xml b/archiva-modules/archiva-karaf/pom.xml new file mode 100644 index 000000000..b81fa14ef --- /dev/null +++ b/archiva-modules/archiva-karaf/pom.xml @@ -0,0 +1,36 @@ +<?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>1.4-M2-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>archiva-karaf</artifactId> + <packaging>pom</packaging> + <name>Archiva :: Karaf</name> + + <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 a56482cb3..5b050640f 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-api/pom.xml @@ -25,6 +25,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>archiva-scheduler-api</artifactId> + <packaging>bundle</packaging> <name>Archiva Scheduler :: API</name> <dependencies> <dependency> @@ -36,4 +37,24 @@ <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.codehaus.plexus.taskqueue + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml index 11d084e00..f7c5c2f05 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml @@ -25,6 +25,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>archiva-scheduler-indexing</artifactId> + <packaging>bundle</packaging> <name>Archiva Scheduler :: Indexing</name> <dependencies> @@ -140,6 +141,36 @@ </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.apache.lucene*;version="[3,4)", + org.springframework*;version="[3,4)", + org.codehaus.plexus.taskqueue*, + org.apache.maven.index*, + org.apache.maven.wagon*, + 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/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml index 4b63a5e96..e634eaea6 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml @@ -25,6 +25,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>archiva-scheduler-repository</artifactId> + <packaging>bundle</packaging> <name>Archiva Scheduler :: Repository Scanning</name> <dependencies> <dependency> @@ -82,6 +83,40 @@ </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;version=${project.version}, + org.apache.commons.lang;version="[2.4,3)", + org.codehaus.plexus.personality.plexus.lifecycle.phase, + org.codehaus.plexus.taskqueue*, + org.codehaus.redback.components.scheduler, + org.quartz*;version="[2,3)", + org.springframework*;version="[3,4)", + org.slf4j;resolution:=optional + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> <pluginManagement> <plugins> <plugin> diff --git a/archiva-modules/metadata/metadata-model/pom.xml b/archiva-modules/metadata/metadata-model/pom.xml index ada7ee84d..0154fcca5 100644 --- a/archiva-modules/metadata/metadata-model/pom.xml +++ b/archiva-modules/metadata/metadata-model/pom.xml @@ -24,5 +24,26 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>metadata-model</artifactId> + <packaging>bundle</packaging> <name>Archiva Metadata :: Model</name> + <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> + + </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 0ab8ae0aa..c87e9eba5 100644 --- a/archiva-modules/metadata/metadata-repository-api/pom.xml +++ b/archiva-modules/metadata/metadata-repository-api/pom.xml @@ -25,6 +25,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>metadata-repository-api</artifactId> + <packaging>bundle</packaging> <name>Archiva Metadata :: Repository API</name> <dependencies> <dependency> @@ -56,6 +57,28 @@ <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 + </Import-Package> + </instructions> + </configuration> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <executions> diff --git a/archiva-modules/plugins/audit/pom.xml b/archiva-modules/plugins/audit/pom.xml index a973c4981..2007de7ba 100644 --- a/archiva-modules/plugins/audit/pom.xml +++ b/archiva-modules/plugins/audit/pom.xml @@ -25,6 +25,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>audit</artifactId> + <packaging>bundle</packaging> <name>Archiva Core Plugins :: Audit Logging</name> <dependencies> <dependency> @@ -41,4 +42,30 @@ <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.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/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml index 5c44727e6..1f420af56 100644 --- a/archiva-modules/plugins/maven2-repository/pom.xml +++ b/archiva-modules/plugins/maven2-repository/pom.xml @@ -25,6 +25,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>maven2-repository</artifactId> + <packaging>bundle</packaging> <name>Archiva Core Plugins :: Maven 2.x Repository Support</name> <dependencies> <dependency> @@ -127,6 +128,50 @@ <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.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.commons.collections;version="[3.2,4)", + org.apache.commons.io*;version="[1.4,2)", + 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.shared.dependency.tree*, + org.apache.maven.index*, + org.apache.maven.wagon*, + org.codehaus.plexus*, + org.codehaus.redback.components*, + org.dom4j*;version="[1.6,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/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml index 284f1e3ea..3ad895ce6 100644 --- a/archiva-modules/plugins/problem-reports/pom.xml +++ b/archiva-modules/plugins/problem-reports/pom.xml @@ -25,6 +25,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>problem-reports</artifactId> + <packaging>bundle</packaging> <name>Archiva Core Plugins :: Problem Reporting Plugin</name> <dependencies> <dependency> @@ -71,6 +72,35 @@ <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.codehaus.plexus.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 9cf3320a2..c9ccef2f0 100644 --- a/archiva-modules/plugins/repository-statistics/pom.xml +++ b/archiva-modules/plugins/repository-statistics/pom.xml @@ -25,6 +25,7 @@ <version>1.4-M2-SNAPSHOT</version> </parent> <artifactId>repository-statistics</artifactId> + <packaging>bundle</packaging> <name>Archiva Core Plugins :: Repository Statistics</name> <dependencies> <dependency> @@ -69,4 +70,31 @@ <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.jackrabbit.commons;version="[2.3,3)", + 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.springframework*;version="[3,4)", + org.slf4j;resolution:=optional + </Import-Package> + </instructions> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml index 653798123..886d8b502 100644 --- a/archiva-modules/pom.xml +++ b/archiva-modules/pom.xml @@ -32,6 +32,7 @@ <module>archiva-base</module> <module>archiva-scheduler</module> <module>archiva-web</module> + <module>archiva-karaf</module> <module>metadata</module> <module>plugins</module> </modules> |