geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r927174 - in /geronimo/server/trunk: plugins/openjpa2/geronimo-persistence-jpa20/pom.xml plugins/openjpa2/openjpa2/pom.xml plugins/openjpa2/openjpa2/src/main/history/dependencies.xml plugins/openjpa2/pom.xml pom.xml
Date Wed, 24 Mar 2010 20:34:20 GMT
Author: gawor
Date: Wed Mar 24 20:34:19 2010
New Revision: 927174

URL: http://svn.apache.org/viewvc?rev=927174&view=rev
Log:
GERONIMO-5205: Install Aries JPA bundles and blueprint extensions

Modified:
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
    geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml
    geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openjpa2/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml?rev=927174&r1=927173&r2=927174&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml Wed Mar 24 20:34:19
2010
@@ -81,8 +81,8 @@
         </dependency>
 
         <dependency>
-            <groupId>net.sourceforge.serp</groupId>
-            <artifactId>serp</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.serp</artifactId>
             <scope>test</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml?rev=927174&r1=927173&r2=927174&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml Wed Mar 24 20:34:19 2010
@@ -53,8 +53,8 @@
         </dependency>
 
         <dependency>
-            <groupId>net.sourceforge.serp</groupId>
-            <artifactId>serp</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.serp</artifactId>
         </dependency>
 
         <dependency>
@@ -73,6 +73,26 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
+       <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>org.apache.aries.jpa.api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>org.apache.aries.jpa.container</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.aries.jpa</groupId>
+            <artifactId>org.apache.aries.jpa.container.context</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml?rev=927174&r1=927173&r2=927174&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/openjpa2/src/main/history/dependencies.xml Wed
Mar 24 20:34:19 2010
@@ -22,8 +22,23 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>net.sourceforge.serp</groupId>
-        <artifactId>serp</artifactId>
+        <groupId>org.apache.aries.jpa</groupId>
+        <artifactId>org.apache.aries.jpa.api</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.jpa</groupId>
+        <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.jpa</groupId>
+        <artifactId>org.apache.aries.jpa.container</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.aries.jpa</groupId>
+        <artifactId>org.apache.aries.jpa.container.context</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -58,7 +73,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+        <artifactId>org.apache.servicemix.bundles.serp</artifactId>
         <type>jar</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/pom.xml?rev=927174&r1=927173&r2=927174&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/pom.xml Wed Mar 24 20:34:19 2010
@@ -36,13 +36,6 @@
         OpenJPA2 plugin
     </description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
-        </dependency>
-    </dependencies>
-
 <!-- These are in the geronimo-parent PM for now
     <properties>
         <openjpaVersion>2.0.0-beta</openjpaVersion>
@@ -119,7 +112,7 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.openjpa</groupId>
+                <groupId>org.apache.openjpa</groupId>-
                 <artifactId>openjpa-persistence-jdbc</artifactId>
                 <version>${openjpaVersion}</version>
             </dependency>
@@ -147,4 +140,32 @@
         <module>persistence-jpa20-deployer</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.aries.jpa</groupId>
+                <artifactId>org.apache.aries.jpa.api</artifactId>
+                <version>0.1-incubating-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.aries.jpa</groupId>
+                <artifactId>org.apache.aries.jpa.blueprint.aries</artifactId>
+                <version>0.1-incubating-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.aries.jpa</groupId>
+                <artifactId>org.apache.aries.jpa.container</artifactId>
+                <version>0.1-incubating-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.aries.jpa</groupId>
+                <artifactId>org.apache.aries.jpa.container.context</artifactId>
+                <version>0.1-incubating-SNAPSHOT</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=927174&r1=927173&r2=927174&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Mar 24 20:34:19 2010
@@ -445,9 +445,9 @@
             </dependency>
 
             <dependency>
-                <groupId>net.sourceforge.serp</groupId>
-                <artifactId>serp</artifactId>
-                <version>1.13.1</version>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.serp</artifactId>
+                <version>1.13.1_2</version>
             </dependency>
 
             <dependency>



Mime
View raw message