Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml?rev=1205009&r1=1205008&r2=1205009&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml (original) +++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml Tue Nov 22 14:17:04 2011 @@ -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>
Modified: archiva/trunk/archiva-modules/metadata/metadata-model/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-model/pom.xml?rev=1205009&r1=1205008&r2=1205009&view=diff ============================================================================== --- archiva/trunk/archiva-modules/metadata/metadata-model/pom.xml (original) +++ archiva/trunk/archiva-modules/metadata/metadata-model/pom.xml Tue Nov 22 14:17:04 2011 @@ -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> Modified: archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml?rev=1205009&r1=1205008&r2=1205009&view=diff ============================================================================== --- archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml (original) +++ archiva/trunk/archiva-modules/metadata/metadata-repository-api/pom.xml Tue Nov 22 14:17:04 2011 @@ -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> Modified: archiva/trunk/archiva-modules/plugins/audit/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/audit/pom.xml?rev=1205009&r1=1205008&r2=1205009&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/audit/pom.xml (original) +++ archiva/trunk/archiva-modules/plugins/audit/pom.xml Tue Nov 22 14:17:04 2011 @@ -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> Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml?rev=1205009&r1=1205008&r2=1205009&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml (original) +++ archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml Tue Nov 22 14:17:04 2011 @@ -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> Modified: archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml?rev=1205009&r1=1205008&r2=1205009&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml (original) +++ archiva/trunk/archiva-modules/plugins/problem-reports/pom.xml Tue Nov 22 14:17:04 2011 @@ -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> Modified: archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml?rev=1205009&r1=1205008&r2=1205009&view=diff ============================================================================== --- archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml (original) +++ archiva/trunk/archiva-modules/plugins/repository-statistics/pom.xml Tue Nov 22 14:17:04 2011 @@ -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> Modified: archiva/trunk/archiva-modules/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/pom.xml?rev=1205009&r1=1205008&r2=1205009&view=diff ============================================================================== --- archiva/trunk/archiva-modules/pom.xml (original) +++ archiva/trunk/archiva-modules/pom.xml Tue Nov 22 14:17:04 2011 @@ -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> Modified: archiva/trunk/pom.xml URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1205009&r1=1205008&r2=1205009&view=diff ============================================================================== --- archiva/trunk/pom.xml (original) +++ archiva/trunk/pom.xml Tue Nov 22 14:17:04 2011 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.archiva</groupId> <artifactId>archiva-parent</artifactId> - <version>7</version> + <version>8-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -65,22 +65,37 @@ <struts.version>2.2.3.1</struts.version> <maven3x.version>3.0.3</maven3x.version> <maven.version>2.0.8</maven.version> + <maven-dependency-tree.version>1.2</maven-dependency-tree.version> + <maven-model-converter.version>2.1</maven-model-converter.version> + <maven.indexer.version>4.1.2</maven.indexer.version> <wagon.version>2.0</wagon.version> <redback.version>1.4-SNAPSHOT</redback.version> + <redback.cache.version>1.0</redback.cache.version> + <redback.quartz.version>1.0</redback.quartz.version> + <redback.registry.version>1.0</redback.registry.version> + <redback.spring-utils.version>1.0</redback.spring-utils.version> + <redback.taskqueue.version>1.0</redback.taskqueue.version> <slf4j.version>1.6.4</slf4j.version> <binder.version>0.11</binder.version> <spring.version>3.0.5.RELEASE</spring.version> <jackrabbit.version>2.3.3</jackrabbit.version> + <javax.jcr.version>2.0</javax.jcr.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile> <lucene.version>3.0.3</lucene.version> <cxfVersion>2.4.4</cxfVersion> <derbyVersion>10.8.2.2</derbyVersion> + <httpclient.version>4.1.2</httpclient.version> <javaxMailVersion>1.4</javaxMailVersion> <jettyVersion>7.4.5.v20110725</jettyVersion> <!-- restore when we will be able to use a derby in memory database --> <redbackTestJdbcUrl>jdbc:derby:memory:users-test;create=true</redbackTestJdbcUrl> <redbackTestJdbcDriver>org.apache.derby.jdbc.EmbeddedDriver</redbackTestJdbcDriver> + <sisu-inject-plexus.version>2.2.2</sisu-inject-plexus.version> + <sisu-guice.version>3.0.1</sisu-guice.version> + <plexus-digest.version>1.1</plexus-digest.version> + <plexus-expression-evaluator.version>1.0-rc1</plexus-expression-evaluator.version> + <plexus-utils.version>1.5.5</plexus-utils.version> </properties> <dependencyManagement> @@ -263,7 +278,7 @@ <dependency> <groupId>org.apache.maven.indexer</groupId> <artifactId>indexer-core</artifactId> - <version>4.1.2</version> + <version>${maven.indexer.version}</version> <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId> @@ -417,7 +432,7 @@ <dependency> <groupId>org.codehaus.redback.components</groupId> <artifactId>spring-utils</artifactId> - <version>1.0</version> + <version>${redback.spring-utils.version}</version> </dependency> <dependency> <groupId>org.codehaus.redback.components</groupId> @@ -433,12 +448,12 @@ <dependency> <groupId>org.sonatype.sisu</groupId> <artifactId>sisu-inject-plexus</artifactId> - <version>2.2.2</version> + <version>${sisu-inject-plexus.version}</version> </dependency> <dependency> <groupId>org.sonatype.sisu</groupId> <artifactId>sisu-guice</artifactId> - <version>3.0.1</version> + <version>${sisu-guice.version}</version> </dependency> <dependency> @@ -696,12 +711,12 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> - <version>1.1</version> + <version>${plexus-digest.version}</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-expression-evaluator</artifactId> - <version>1.0-rc1</version> + <version>${plexus-expression-evaluator.version}</version> <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId> @@ -738,12 +753,12 @@ <dependency> <groupId>org.codehaus.redback.components</groupId> <artifactId>spring-taskqueue</artifactId> - <version>1.0</version> + <version>${redback.taskqueue.version}</version> </dependency> <dependency> <groupId>org.codehaus.redback.components</groupId> <artifactId>spring-quartz</artifactId> - <version>1.0</version> + <version>${redback.quartz.version}</version> </dependency> <dependency> <groupId>org.quartz-scheduler</groupId> @@ -763,17 +778,17 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>1.5.5</version> + <version>${plexus-utils.version}</version> </dependency> <dependency> <groupId>org.codehaus.redback.components.cache</groupId> <artifactId>spring-cache-api</artifactId> - <version>1.0</version> + <version>${redback.cache.version}</version> </dependency> <dependency> <groupId>org.codehaus.redback.components.cache</groupId> <artifactId>spring-cache-ehcache</artifactId> - <version>1.0</version> + <version>${redback.cache.version}</version> </dependency> <!-- redback --> @@ -991,12 +1006,12 @@ <dependency> <groupId>org.codehaus.redback.components.registry</groupId> <artifactId>spring-registry-api</artifactId> - <version>1.0</version> + <version>${redback.registry.version}</version> </dependency> <dependency> <groupId>org.codehaus.redback.components.registry</groupId> <artifactId>spring-registry-commons</artifactId> - <version>1.0</version> + <version>${redback.registry.version}</version> <exclusions> <exclusion> <groupId>ant</groupId> @@ -1084,7 +1099,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.1.2</version> + <version>${httpclient.version}</version> <exclusions> <exclusion> <groupId>commons-logging</groupId> @@ -1200,7 +1215,7 @@ <dependency> <groupId>javax.jcr</groupId> <artifactId>jcr</artifactId> - <version>2.0</version> + <version>${javax.jcr.version}</version> </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> @@ -1299,7 +1314,7 @@ <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-model-converter</artifactId> - <version>2.1</version> + <version>${maven-model-converter.version}</version> <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId> @@ -1310,7 +1325,7 @@ <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> - <version>1.2</version> + <version>${maven-dependency-tree.version}</version> <exclusions> <exclusion> <groupId>org.codehaus.plexus</groupId>
