geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r825620 - in /geronimo/server/trunk: plugins/openjpa2/pom.xml pom.xml
Date Thu, 15 Oct 2009 19:11:16 GMT
Author: dwoods
Date: Thu Oct 15 19:11:16 2009
New Revision: 825620

URL: http://svn.apache.org/viewvc?rev=825620&view=rev
Log:
upgrade to released openejb-3.1.2 and use JPA2 PFD2 level of openjpa-2.0.0-M3

Modified:
    geronimo/server/trunk/plugins/openjpa2/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/pom.xml?rev=825620&r1=825619&r2=825620&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/pom.xml Thu Oct 15 19:11:16 2009
@@ -36,8 +36,9 @@
         OpenJPA2 plugin
     </description>
 
+<!-- These are in the geronimo-parent PM for now
     <properties>
-        <openjpaVersion>2.0.0-SNAPSHOT</openjpaVersion>
+        <openjpaVersion>2.0.0-M3</openjpaVersion>
     </properties>
 
     <dependencyManagement>
@@ -46,7 +47,6 @@
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa</artifactId>
                 <version>${openjpaVersion}</version>
-                <!-- already listed as provided in OpenJPA 2.x -->
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.openjpa</groupId>
@@ -116,8 +116,21 @@
                 <artifactId>openjpa-persistence-jdbc</artifactId>
                 <version>${openjpaVersion}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jpa_2.0_spec</artifactId>
+                <version>1.0-PFD2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-validation_1.0_spec</artifactId>
+                <version>1.0-CR5</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
+-->
 
     <modules>
         <module>geronimo-openjpa2</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=825620&r1=825619&r2=825620&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Oct 15 19:11:16 2009
@@ -76,7 +76,8 @@
         <tomcatVersion>6.0.20.0</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
-        <openejbVersion>3.1.2-SNAPSHOT</openejbVersion>
+        <openejbVersion>3.1.2</openejbVersion>
+        <openjpaVersion>2.0.0-M3</openjpaVersion>
         <derbyVersion>10.4.2.0</derbyVersion>
         <cxfVersion>2.1.4</cxfVersion>
         <axis2Version>1.5</axis2Version>
@@ -337,7 +338,6 @@
                 <classifier>tests</classifier>
             </dependency>
 
-            <!--
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa</artifactId>
@@ -365,6 +365,10 @@
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-slice</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openjpa</groupId>
                         <artifactId>openjpa-xmlstore</artifactId>
                     </exclusion>
                     <exclusion>
@@ -397,11 +401,7 @@
                     </exclusion>
                     <exclusion>
                         <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-jpa_1.0_spec</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-jpa_3.0_spec</artifactId>
+                        <artifactId>geronimo-jpa_2.0_spec</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -410,7 +410,6 @@
                 <artifactId>openjpa-persistence-jdbc</artifactId>
                 <version>${openjpaVersion}</version>
             </dependency>
-            -->
 
             <dependency>
                 <groupId>net.sourceforge.serp</groupId>



Mime
View raw message