Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > e1ede4ae82e0ebd0d0daf93b05303e1b > files > 1

jbosgi-resolver-2.0.0-0.3.Beta2.2.mga3.src.rpm

From 683b1908ced48e8ed2b799a410f1c548a76b96ae Mon Sep 17 00:00:00 2001
From: Marek Goldmann <goldmann@fedoraproject.org>
Date: Thu, 14 Jun 2012 12:22:40 +0200
Subject: [PATCH 1/2] Use felix directly

---
 api/pom.xml   |    4 ++--
 felix/pom.xml |    4 ++--
 pom.xml       |    7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/api/pom.xml b/api/pom.xml
index 6e0dce9..a3815c2 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -48,8 +48,8 @@
 
         <!-- OSGi Dependencies -->
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/felix/pom.xml b/felix/pom.xml
index 08a7be1..4b71c16 100644
--- a/felix/pom.xml
+++ b/felix/pom.xml
@@ -48,8 +48,8 @@
 
         <!-- OSGi Dependencies -->
         <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index 2de87d4..97f0d1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,6 @@
         <version.jboss.osgi.vfs>1.0.6</version.jboss.osgi.vfs>
         <version.jboss.shrinkwrap>1.0.0-cr-1</version.jboss.shrinkwrap>
         <version.junit>4.10</version.junit>
-        <version.osgi.core>4.2.0</version.osgi.core>
     </properties>
 
     <!-- Dependency Management -->
@@ -81,9 +80,9 @@
                 <version>${version.jboss.osgi.spi}</version>
             </dependency>
             <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>${version.osgi.core}</version>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.framework</artifactId>
+                <version>4.0.2</version>
             </dependency>
 
             <!-- Test Dependencies -->
-- 
1.7.10.2