killbill-aplcache

osgi: fix felix dependency conflict Signed-off-by: Pierre-Alexandre

2/15/2013 4:51:30 PM

Changes

osgi/pom.xml 7(+6 -1)

pom.xml 5(+5 -0)

Details

osgi/pom.xml 7(+6 -1)

diff --git a/osgi/pom.xml b/osgi/pom.xml
index e9386f8..41eb942 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -15,7 +15,8 @@
   ~ under the License.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.ning.billing</groupId>
@@ -33,6 +34,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
             <version>1.6.0</version>
         </dependency>

pom.xml 5(+5 -0)

diff --git a/pom.xml b/pom.xml
index 79f88a9..dc2b2e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,11 @@
                 <version>4.0.3</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>1.0.1</version>
+            </dependency>
+            <dependency>
                 <groupId>org.osgi</groupId>
                 <artifactId>org.osgi.core</artifactId>
                 <version>4.3.1</version>