karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: [KARAF-2889] Upgrade to Equinox 3.9.1-v20140110-1610
Date Mon, 19 May 2014 17:21:48 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x 9b2461a3e -> 133d8c139


[KARAF-2889] Upgrade to Equinox 3.9.1-v20140110-1610


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/133d8c13
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/133d8c13
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/133d8c13

Branch: refs/heads/karaf-3.0.x
Commit: 133d8c1391f095df4d55e4dd3054f3820039c5d3
Parents: 9b2461a
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Mon May 19 19:20:58 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon May 19 19:20:58 2014 +0200

----------------------------------------------------------------------
 assemblies/features/framework/pom.xml                          | 6 +++---
 .../main/filtered-resources/resources/etc/config.properties    | 2 +-
 pom.xml                                                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/133d8c13/assemblies/features/framework/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml
index 1622ac7..dc649d7 100644
--- a/assemblies/features/framework/pom.xml
+++ b/assemblies/features/framework/pom.xml
@@ -61,7 +61,7 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
+            <artifactId>osgi</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -369,8 +369,8 @@
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.eclipse</groupId>
-                                    <artifactId>org.eclipse.osgi</artifactId>
-                                    <outputDirectory>target/classes/resources/system/org/eclipse/org.eclipse.osgi/${equinox.version}</outputDirectory>
+                                    <artifactId>osgi</artifactId>
+                                    <outputDirectory>target/classes/resources/system/org/eclipse/osgi/${equinox.version}</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.apache.felix</groupId>

http://git-wip-us.apache.org/repos/asf/karaf/blob/133d8c13/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
index 3aeac29..998147f 100644
--- a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
@@ -50,7 +50,7 @@ karaf.framework=felix
 #
 # Location of the OSGi frameworks
 #
-karaf.framework.equinox=mvn\:org.eclipse/org.eclipse.osgi/${equinox.version}
+karaf.framework.equinox=mvn\:org.eclipse/osgi/${equinox.version}
 karaf.framework.felix=mvn\:org.apache.felix/org.apache.felix.framework/${felix.framework.version}
 
 #

http://git-wip-us.apache.org/repos/asf/karaf/blob/133d8c13/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b157f69..c4407be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
         <geronimo.annotation-spec.version>1.0.1</geronimo.annotation-spec.version>
         <geronimo.jaspic-spec.version>1.1</geronimo.jaspic-spec.version>
         <easymock.version>3.2</easymock.version>
-        <equinox.version>3.8.2.v20130124-134944</equinox.version>
+        <equinox.version>3.9.1-v20140110-1610</equinox.version>
         <bndlib.version>2.2.0</bndlib.version>
         <equinox.region.version>1.0.0.v20110506</equinox.region.version>
         <felix.bundlerepository.version>1.6.6</felix.bundlerepository.version>
@@ -1487,7 +1487,7 @@
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>
-                <artifactId>org.eclipse.osgi</artifactId>
+                <artifactId>osgi</artifactId>
                 <version>${equinox.version}</version>
             </dependency>
             <dependency>


Mime
View raw message