You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/03/21 16:02:54 UTC
[3/3] git commit: [KARAF-2829] Upgrade to pax-url 2.0.0
[KARAF-2829] Upgrade to pax-url 2.0.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2bee3c3c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2bee3c3c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2bee3c3c
Branch: refs/heads/master
Commit: 2bee3c3c374412fe7cf640c793c2bcb2a98fc9cd
Parents: f14efe1
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Mar 19 22:21:29 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri Mar 21 13:55:44 2014 +0100
----------------------------------------------------------------------
assemblies/features/framework/pom.xml | 46 +++++++++++++++-----
.../framework/src/main/feature/feature.xml | 1 -
itests/pom.xml | 6 +++
pom.xml | 13 +++---
4 files changed, 49 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/2bee3c3c/assemblies/features/framework/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml
index ed48318..d9be9f1 100644
--- a/assemblies/features/framework/pom.xml
+++ b/assemblies/features/framework/pom.xml
@@ -105,16 +105,6 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-maven-commons</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<exclusions>
<exclusion>
@@ -125,6 +115,42 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-connector-basic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-transport-wagon</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-sec-dispatcher</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.sonatype.plexus</groupId>
+ <artifactId>plexus-cipher</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/2bee3c3c/assemblies/features/framework/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/feature/feature.xml b/assemblies/features/framework/src/main/feature/feature.xml
index 563207a..018959c 100644
--- a/assemblies/features/framework/src/main/feature/feature.xml
+++ b/assemblies/features/framework/src/main/feature/feature.xml
@@ -25,7 +25,6 @@
<bundle start="true" start-level="5">mvn:org.ops4j.base/ops4j-base-lang/${pax.base.version}</bundle>
<bundle start="true" start-level="5">mvn:biz.aQute.bnd/bndlib/${bndlib.version}</bundle>
<bundle start="true" start-level="5">mvn:org.ops4j.pax.swissbox/pax-swissbox-bnd/${pax.swissbox.version}</bundle>
- <bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-maven-commons/${pax.url.version}</bundle>
<bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-aether/${pax.url.version}</bundle>
<bundle start="true" start-level="5">mvn:org.ops4j.pax.url/pax-url-wrap/${pax.url.version}</bundle>
<bundle start="true" start-level="8">mvn:org.ops4j.pax.logging/pax-logging-api/${pax.logging.version}</bundle>
http://git-wip-us.apache.org/repos/asf/karaf/blob/2bee3c3c/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index e705218..5b0c42e 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -68,6 +68,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/karaf/blob/2bee3c3c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 132768b..9cb9ba5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,6 +149,7 @@
<geronimo.jpa-spec.version>1.1</geronimo.jpa-spec.version>
<geronimo.jta-spec.version>1.1.1</geronimo.jta-spec.version>
<geronimo.annotation-spec.version>1.0.1</geronimo.annotation-spec.version>
+ <geronimo.atinject-spec.version>1.0</geronimo.atinject-spec.version>
<geronimo.jaspic-spec.version>1.1</geronimo.jaspic-spec.version>
<easymock.version>3.2</easymock.version>
<equinox.version>3.8.2.v20130124-134944</equinox.version>
@@ -228,7 +229,7 @@
<pax.exam.version>3.4.0</pax.exam.version>
<pax.logging.version>1.7.2</pax.logging.version>
<pax.base.version>1.4.0</pax.base.version>
- <pax.url.version>1.6.0</pax.url.version>
+ <pax.url.version>2.0.0-SNAPSHOT</pax.url.version>
<pax.web.version>3.0.7-SNAPSHOT</pax.web.version>
<pax.swissbox.version>1.7.0</pax.swissbox.version>
<pax.tinybundle.version>2.0.0</pax.tinybundle.version>
@@ -1210,6 +1211,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>${geronimo.atinject-spec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
<version>${geronimo.jaspic-spec.version}</version>
</dependency>
@@ -1362,11 +1368,6 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-maven-commons</artifactId>
- <version>${pax.url.version}</version>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
<version>${pax.url.version}</version>
<exclusions>