You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2011/07/07 23:13:02 UTC
svn commit: r1144040 - in /geronimo/server/trunk/framework: ./
buildsupport/car-maven-plugin/ buildsupport/geronimo-osgi-plugin/
configs/karaf-framework/
configs/karaf-framework/src/main/filtered-resources/etc/
modules/geronimo-hook/ modules/geronimo-s...
Author: kevan
Date: Thu Jul 7 21:13:01 2011
New Revision: 1144040
URL: http://svn.apache.org/viewvc?rev=1144040&view=rev
Log:
move to released version of equinox 3.7
Modified:
geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/pom.xml
geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
geronimo/server/trunk/framework/modules/geronimo-hook/pom.xml
geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
geronimo/server/trunk/framework/pom.xml
Modified: geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml?rev=1144040&r1=1144039&r2=1144040&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/car-maven-plugin/pom.xml Thu Jul 7 21:13:01 2011
@@ -302,8 +302,8 @@
<dependencies>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/pom.xml?rev=1144040&r1=1144039&r2=1144040&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/pom.xml Thu Jul 7 21:13:01 2011
@@ -61,8 +61,8 @@
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
<scope>compile</scope>
</dependency>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=1144040&r1=1144039&r2=1144040&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Thu Jul 7 21:13:01 2011
@@ -381,8 +381,8 @@
<artifactId>sshd-core</artifactId>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties?rev=1144040&r1=1144039&r2=1144040&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties Thu Jul 7 21:13:01 2011
@@ -23,7 +23,7 @@
#karaf.framework=felix
karaf.framework=equinox
-karaf.framework.equinox=repository/org/eclipse/osgi/${equinox.version}/osgi-${equinox.version}.jar
+karaf.framework.equinox=repository/org/eclipse/osgi/org.eclipse.osgi/${equinox.version}/org.eclipse.osgi-${equinox.version}.jar
karaf.framework.felix=repository/org/apache/felix/org.apache.felix.framework/${felix.framework.version}/org.apache.felix.framework-${felix.framework.version}.jar
#
Modified: geronimo/server/trunk/framework/modules/geronimo-hook/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-hook/pom.xml?rev=1144040&r1=1144039&r2=1144040&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-hook/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-hook/pom.xml Thu Jul 7 21:13:01 2011
@@ -34,8 +34,8 @@
<dependencies>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml?rev=1144040&r1=1144039&r2=1144040&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-shell-diagnose/pom.xml Thu Jul 7 21:13:01 2011
@@ -54,8 +54,8 @@
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</dependency>
</dependencies>
Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=1144040&r1=1144039&r2=1144040&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Thu Jul 7 21:13:01 2011
@@ -34,7 +34,7 @@
<packaging>pom</packaging>
<properties>
- <equinox.version>3.7.0.v20110513</equinox.version>
+ <equinox.version>3.7.0.v20110613</equinox.version>
<felix.configadmin.version>1.2.4</felix.configadmin.version>
<felix.framework.version>3.0.2</felix.framework.version>
<pax.url.version>1.1.2</pax.url.version>
@@ -43,8 +43,8 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
+ <groupId>org.eclipse.osgi</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
<version>${equinox.version}</version>
</dependency>