aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hugh...@apache.org
Subject svn commit: r1141478 - in /aries/trunk/jpa: jpa-container/pom.xml jpa-tmp/ pom.xml
Date Thu, 30 Jun 2011 11:08:09 GMT
Author: hughesj
Date: Thu Jun 30 11:08:09 2011
New Revision: 1141478

URL: http://svn.apache.org/viewvc?rev=1141478&view=rev
Log:
ARIES-692 Use OSGi 4.3 instead of APIs from Equinox 3.7 build

Removed:
    aries/trunk/jpa/jpa-tmp/
Modified:
    aries/trunk/jpa/jpa-container/pom.xml
    aries/trunk/jpa/pom.xml

Modified: aries/trunk/jpa/jpa-container/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container/pom.xml?rev=1141478&r1=1141477&r2=1141478&view=diff
==============================================================================
--- aries/trunk/jpa/jpa-container/pom.xml (original)
+++ aries/trunk/jpa/jpa-container/pom.xml Thu Jun 30 11:08:09 2011
@@ -61,25 +61,16 @@
     </properties>
     
     <dependencies>
-        <!-- Use the Eclipse version of OSGi until the core 4.3 OSGi jar is available
in Maven. -->        
         <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>3.7M6</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/../jpa-tmp/target/downloaded/org.eclipse.osgi_3.7.0.jar</systemPath>
-        </dependency>
-    
-        <!-- <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId> -->
+            <artifactId>org.osgi.core</artifactId>
             <!-- 
                  We override the version here because we need it
                  to compile our weaving hook. We still want our
                  bundles to be able to run with 4.2 though!
             -->
-            <!-- <version>4.3</version>
-        </dependency> -->
+            <version>4.3.0</version>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>

Modified: aries/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/jpa/pom.xml?rev=1141478&r1=1141477&r2=1141478&view=diff
==============================================================================
--- aries/trunk/jpa/pom.xml (original)
+++ aries/trunk/jpa/pom.xml Thu Jun 30 11:08:09 2011
@@ -31,7 +31,6 @@
     <name>Aries JPA Component</name>
 
     <modules>
-        <module>jpa-tmp</module>
         <module>jpa-api</module>
         <module>jpa-container</module>
         <module>jpa-container-context</module>



Mime
View raw message