Author: jbonofre
Date: Tue Jun 26 12:04:31 2012
New Revision: 1353979
URL: http://svn.apache.org/viewvc?rev=1353979&view=rev
Log:
[KARAF-1582] Upgrade to Felix BundleRepository 1.6.6
Modified:
karaf/trunk/pom.xml
karaf/trunk/tooling/karaf-maven-plugin/pom.xml
Modified: karaf/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1353979&r1=1353978&r2=1353979&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Tue Jun 26 12:04:31 2012
@@ -148,7 +148,7 @@
<equinox.version>3.7.1.R37x_v20110808-1106</equinox.version>
<bndlib.version>1.50.0</bndlib.version>
<equinox.region.version>1.0.0.v20110506</equinox.region.version>
- <felix.bundlerepository.version>1.6.4</felix.bundlerepository.version>
+ <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version>
<felix.configadmin.version>1.4.0</felix.configadmin.version>
<felix.fileinstall.version>3.2.4</felix.fileinstall.version>
<felix.framework.version>4.0.2</felix.framework.version>
Modified: karaf/trunk/tooling/karaf-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/karaf/trunk/tooling/karaf-maven-plugin/pom.xml?rev=1353979&r1=1353978&r2=1353979&view=diff
==============================================================================
--- karaf/trunk/tooling/karaf-maven-plugin/pom.xml (original)
+++ karaf/trunk/tooling/karaf-maven-plugin/pom.xml Tue Jun 26 12:04:31 2012
@@ -88,6 +88,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>