Return-Path: 
 <scm-return-46657-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
X-Original-To: apmail-geronimo-scm-archive@www.apache.org
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 13B72411D
	for <apmail-geronimo-scm-archive@www.apache.org>;
 Thu,  7 Jul 2011 21:13:25 +0000 (UTC)
Received: (qmail 69811 invoked by uid 500); 7 Jul 2011 21:13:24 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 69758 invoked by uid 500); 7 Jul 2011 21:13:24 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 69751 invoked by uid 99); 7 Jul 2011 21:13:23 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jul 2011 21:13:23 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jul 2011 21:13:22 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 444BA23888FE;
	Thu,  7 Jul 2011 21:13:02 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: 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...
Date: Thu, 07 Jul 2011 21:13:02 -0000
To: scm@geronimo.apache.org
From: kevan@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110707211302.444BA23888FE@eris.apache.org>

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>