KARAF-3031 - Upgrade to Pax URL 2.1.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b95c6502 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b95c6502 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b95c6502 Branch: refs/heads/karaf-2.x Commit: b95c65029d2c4014dc20ab6006cfd86fc5664770 Parents: e61248e Author: Jonathan Anstey <jans...@gmail.com> Authored: Tue Jun 17 12:22:21 2014 -0230 Committer: Jonathan Anstey <jans...@gmail.com> Committed: Fri Jun 20 12:02:58 2014 -0230 ---------------------------------------------------------------------- pom.xml | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 69 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/b95c6502/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 66d827c..fe6f3fa 100644 --- a/pom.xml +++ b/pom.xml @@ -202,7 +202,7 @@ <pax.cdi.version>0.7.0</pax.cdi.version> <pax.exam.version>3.5.0</pax.exam.version> <pax.logging.version>1.7.2</pax.logging.version> - <pax.url.version>2.0.0</pax.url.version> + <pax.url.version>2.1.0</pax.url.version> <pax.swissbox.version>1.7.1</pax.swissbox.version> <pax.web.version>3.0.7</pax.web.version> <pax.tinybundles.version>1.3.2</pax.tinybundles.version> @@ -937,30 +937,93 @@ </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-aether</artifactId> + <artifactId>pax-url-commons</artifactId> <version>${pax.url.version}</version> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-mvn</artifactId> - <version>1.3.7</version> + <artifactId>pax-url-obr</artifactId> + <version>${pax.url.version}</version> + <classifier>uber</classifier> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-maven-commons</artifactId> + <artifactId>pax-url-war</artifactId> <version>${pax.url.version}</version> + <classifier>uber</classifier> + </dependency> + <dependency> + <groupId>org.ops4j.pax.url</groupId> + <artifactId>pax-url-aether</artifactId> + <version>${pax.url.version}</version> + <exclusions> + <exclusion> + <groupId>org.sonatype.aether</groupId> + <artifactId>aether-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.sonatype.aether</groupId> + <artifactId>aether-spi</artifactId> + </exclusion> + <exclusion> + <groupId>org.sonatype.aether</groupId> + <artifactId>aether-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.sonatype.aether</groupId> + <artifactId>aether-impl</artifactId> + </exclusion> + <exclusion> + <groupId>org.sonatype.aether</groupId> + <artifactId>aether-connector-wagon</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-aether-provider</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-provider-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-file</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-http-lightweight</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> <artifactId>pax-url-wrap</artifactId> <version>${pax.url.version}</version> + <classifier>uber</classifier> </dependency> <dependency> <groupId>org.ops4j.pax.url</groupId> - <artifactId>pax-url-war</artifactId> + <artifactId>pax-url-wrap</artifactId> <version>${pax.url.version}</version> </dependency> <dependency> + <groupId>org.ops4j.pax.url</groupId> + <artifactId>pax-url-mvn</artifactId> + <version>1.3.7</version> + </dependency> + <dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jms_1.1_spec</artifactId> <version>${geronimo.jms-spec.version}</version>
