You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ks...@apache.org on 2014/09/22 22:29:47 UTC
git commit: SM-2321: Upgrade to Pax Url 2.2.0, correct OSGi version
Repository: servicemix
Updated Branches:
refs/heads/master 270b3eca3 -> 5d896ae7d
SM-2321: Upgrade to Pax Url 2.2.0, correct OSGi version
Project: http://git-wip-us.apache.org/repos/asf/servicemix/repo
Commit: http://git-wip-us.apache.org/repos/asf/servicemix/commit/5d896ae7
Tree: http://git-wip-us.apache.org/repos/asf/servicemix/tree/5d896ae7
Diff: http://git-wip-us.apache.org/repos/asf/servicemix/diff/5d896ae7
Branch: refs/heads/master
Commit: 5d896ae7d0c7664c5706aac1c190716004fec432
Parents: 270b3ec
Author: Krzysztof Sobkowiak <kr...@gmail.com>
Authored: Mon Sep 22 22:27:46 2014 +0200
Committer: Krzysztof Sobkowiak <kr...@gmail.com>
Committed: Mon Sep 22 22:27:46 2014 +0200
----------------------------------------------------------------------
itests/pom.xml | 2 +-
pom.xml | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/servicemix/blob/5d896ae7/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 87cca30..853aa0a 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
+ <artifactId>pax-url-aether</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/servicemix/blob/5d896ae7/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4970a4e..88ded3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
<derby.bundle.version>10.9.1.0_1</derby.bundle.version>
<drools.bundle.version>${drools.version}_1</drools.bundle.version>
<jaxb.api.version>2.2</jaxb.api.version>
- <osgi.version>4.3.1</osgi.version>
+ <osgi.version>5.0.0</osgi.version>
<scala.bundle.version>2.10.2_1</scala.bundle.version>
<wsdl4j.bundle.version>1.6.2_6</wsdl4j.bundle.version>
<swagger.bundle.version>1.3.0_1</swagger.bundle.version>
@@ -126,7 +126,7 @@
<xml.api.version>2.11.0-20110622</xml.api.version>
<xalan.version>2.7.1</xalan.version>
<pax.exam.version>4.1.0</pax.exam.version>
- <pax.url.version>1.3.7</pax.url.version>
+ <pax.url.version>2.2.0</pax.url.version>
<postgresql.version>9.1-901</postgresql.version>
<slf4j.version>1.7.5</slf4j.version>
<spring.version>3.2.9.RELEASE_1</spring.version>
@@ -195,7 +195,7 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.url</groupId>
- <artifactId>pax-url-mvn</artifactId>
+ <artifactId>pax-url-aether</artifactId>
<version>${pax.url.version}</version>
</dependency>