Author: jbonofre
Date: Wed Sep 7 12:12:19 2011
New Revision: 1166145
URL: http://svn.apache.org/viewvc?rev=1166145&view=rev
Log:
[KARAF-793] Upgrade to Pax Runner 1.7.5
[KARAF-791] Upgrade to Pax URL 1.3.5
Modified:
karaf/trunk/itests/dependencies/pom.xml
karaf/trunk/pom.xml
Modified: karaf/trunk/itests/dependencies/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/itests/dependencies/pom.xml?rev=1166145&r1=1166144&r2=1166145&view=diff
==============================================================================
--- karaf/trunk/itests/dependencies/pom.xml (original)
+++ karaf/trunk/itests/dependencies/pom.xml Wed Sep 7 12:12:19 2011
@@ -42,7 +42,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>3.0.2</version>
</dependency>
<!--
<dependency>
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1166145&r1=1166144&r2=1166145&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Wed Sep 7 12:12:19 2011
@@ -152,8 +152,8 @@
<osgi.version>4.2.0</osgi.version>
<pax.exam.version>1.2.4</pax.exam.version>
<pax.logging.version>1.6.3</pax.logging.version>
- <pax.runner.version>1.6.1</pax.runner.version>
- <pax.url.version>1.3.4</pax.url.version>
+ <pax.runner.version>1.7.5</pax.runner.version>
+ <pax.url.version>1.3.5</pax.url.version>
<pax.web.version>1.1.1</pax.web.version>
<pax.tinybundles.version>1.3.0</pax.tinybundles.version>
<servlet.api.version>2.5</servlet.api.version>
@@ -526,6 +526,17 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>${felix.framework.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
