geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r822351 - in /geronimo/server/trunk: ./ framework/configs/jee-specs/ framework/configs/jee-specs/src/main/history/ plugins/ plugins/openjpa/ plugins/openjpa/geronimo-persistence-jpa10/ plugins/openjpa2/ plugins/openjpa2/geronimo-openjpa2/ p...
Date Tue, 06 Oct 2009 17:12:05 GMT
Author: dwoods
Date: Tue Oct  6 17:12:05 2009
New Revision: 822351

URL: http://svn.apache.org/viewvc?rev=822351&view=rev
Log:
first pass at updating build to JPA2

Modified:
    geronimo/server/trunk/framework/configs/jee-specs/pom.xml
    geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
    geronimo/server/trunk/plugins/openjpa/pom.xml
    geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
    geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml
    geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml
    geronimo/server/trunk/plugins/openjpa2/pom.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
    geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml

Modified: geronimo/server/trunk/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/pom.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/pom.xml Tue Oct  6 17:12:05 2009
@@ -110,7 +110,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/jee-specs/src/main/history/dependencies.xml Tue
Oct  6 17:12:05 2009
@@ -93,7 +93,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jpa_1.0_spec</artifactId>
+        <artifactId>geronimo-jpa_2.0_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/geronimo-persistence-jpa10/pom.xml Tue Oct  6 17:12:05
2009
@@ -30,7 +30,7 @@
     
     <groupId>org.apache.geronimo.modules</groupId>
     <artifactId>geronimo-persistence-jpa10</artifactId>
-    <name>Geronimo Plugins, OpenJPA :: Persistence 3.0</name>
+    <name>Geronimo Plugins, OpenJPA :: Persistence 1.0</name>
 
     <dependencies>
         <!-- g-transaction, g-system come from this -->

Modified: geronimo/server/trunk/plugins/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa/pom.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa/pom.xml Tue Oct  6 17:12:05 2009
@@ -36,6 +36,89 @@
         OpenJPA plugin
     </description>
 
+    <properties>
+        <openjpaVersion>1.2.1</openjpaVersion>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.openjpa</groupId>
+                <artifactId>openjpa</artifactId>
+                <version>${openjpaVersion}</version>
+                <!-- already listed as provided in openjpa 1.2.x -->
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-lib</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-kernel</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-jdbc</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-persistence</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-persistence-jdbc</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-xmlstore</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>net.sourceforge.serp</groupId>
+                        <artifactId>serp</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-lang</groupId>
+                        <artifactId>commons-lang</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-pool</groupId>
+                        <artifactId>commons-pool</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-jms_1.1_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-jta_1.1_spec</artifactId>
+                    </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>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.openjpa</groupId>
+                <artifactId>openjpa-persistence-jdbc</artifactId>
+                <version>${openjpaVersion}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <modules>
         <module>geronimo-openjpa</module>
         <module>geronimo-persistence-jpa10</module>

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-openjpa2/pom.xml Tue Oct  6 17:12:05 2009
@@ -24,13 +24,13 @@
     
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa2</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-openjpa</artifactId>
-    <name>Geronimo Plugins, OpenJPA :: Core</name>
+    <artifactId>geronimo-openjpa2</artifactId>
+    <name>Geronimo Plugins, OpenJPA2 :: Core</name>
     
     <dependencies>
         <dependency>

Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/pom.xml Tue
Oct  6 17:12:05 2009
@@ -24,13 +24,13 @@
     
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa2</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-persistence-jpa10-builder</artifactId>
-    <name>Geronimo Plugins, OpenJPA :: Persistence JPA 1.0 Builder</name>
+    <artifactId>geronimo-persistence-jpa20-builder</artifactId>
+    <name>Geronimo Plugins, OpenJPA2 :: Persistence 2.0 Builder</name>
 
     <dependencies>
         <!-- xbean-finder, g-service-builder, g-j2ee comes via g-j2ee-builder from this
-->
@@ -43,8 +43,8 @@
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-persistence-jpa10</artifactId>
-            <version>${version}</version>                                   
                                                                       
+            <artifactId>geronimo-persistence-jpa20</artifactId>
+            <version>${version}</version>
         </dependency>
     </dependencies>
 

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=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml Tue Oct  6 17:12:05
2009
@@ -24,13 +24,13 @@
     
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa2</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.modules</groupId>
-    <artifactId>geronimo-persistence-jpa10</artifactId>
-    <name>Geronimo Plugins, OpenJPA :: Persistence 3.0</name>
+    <artifactId>geronimo-persistence-jpa20</artifactId>
+    <name>Geronimo Plugins, OpenJPA2 :: Persistence 2.0</name>
 
     <dependencies>
         <!-- g-transaction, g-system come from this -->
@@ -55,34 +55,40 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>net.sourceforge.serp</groupId>
             <artifactId>serp</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>

Modified: geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/openjpa2/pom.xml Tue Oct  6 17:12:05 2009
@@ -24,17 +24,17 @@
     
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa2</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>openjpa</artifactId>
-    <name>Geronimo Plugins, OpenJPA :: OpenJPA</name>
+    <artifactId>openjpa2</artifactId>
+    <name>Geronimo Plugins, OpenJPA2 :: CAR</name>
     <packaging>car</packaging>
     
     <description>
-        This module provides OpenJPA together with all its dependencies.
+        This module provides OpenJPA2 together with all its dependencies.
     </description>
     
     <dependencies>
@@ -48,7 +48,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-openjpa</artifactId>
+            <artifactId>geronimo-openjpa2</artifactId>
             <version>${version}</version>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/persistence-jpa20-deployer/pom.xml Tue Oct  6 17:12:05
2009
@@ -24,16 +24,16 @@
     
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>openjpa</artifactId>
+        <artifactId>openjpa2</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     
     <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>persistence-jpa10-deployer</artifactId>
-    <name>Geronimo Plugins, OpenJPA :: Deployer</name>
+    <artifactId>persistence-jpa20-deployer</artifactId>
+    <name>Geronimo Plugins, OpenJPA2 :: Deployer</name>
     <packaging>car</packaging>
 
-    <description>Geronimo Persistence Unit deployer.</description>
+    <description>Geronimo Persistence Unit deployer</description>
 
     <dependencies>
         <dependency>
@@ -45,7 +45,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-persistence-jpa10-builder</artifactId>
+            <artifactId>geronimo-persistence-jpa20-builder</artifactId>
             <version>${version}</version>
         </dependency>
 
@@ -94,7 +94,7 @@
                                             <dependencies>
                                                 <dependency>
                                                     <groupId>org.apache.geronimo.configs</groupId>
-                                                    <artifactId>openjpa</artifactId>
+                                                    <artifactId>openjpa2</artifactId>
                                                     <type>car</type>
                                                 </dependency>
                                             </dependencies>
@@ -116,7 +116,7 @@
                                             <dependencies>
                                                 <dependency>
                                                     <groupId>org.apache.geronimo.configs</groupId>
-                                                    <artifactId>openjpa</artifactId>
+                                                    <artifactId>openjpa2</artifactId>
                                                     <type>car</type>
                                                 </dependency>
                                             </dependencies>

Modified: geronimo/server/trunk/plugins/openjpa2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/pom.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/pom.xml Tue Oct  6 17:12:05 2009
@@ -28,20 +28,99 @@
         <version>3.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>openjpa</artifactId>
-    <name>Geronimo Plugins, OpenJPA</name>
+    <artifactId>openjpa2</artifactId>
+    <name>Geronimo Plugins, OpenJPA2</name>
     <packaging>pom</packaging>
 
     <description>
-        OpenJPA plugin
+        OpenJPA2 plugin
     </description>
 
+    <properties>
+        <openjpaVersion>2.0.0-SNAPSHOT</openjpaVersion>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <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>
+                        <artifactId>openjpa-lib</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-kernel</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-jdbc</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-persistence</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-persistence-jdbc</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.openjpa</groupId>
+                        <artifactId>openjpa-xmlstore</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>net.sourceforge.serp</groupId>
+                        <artifactId>serp</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-lang</groupId>
+                        <artifactId>commons-lang</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-collections</groupId>
+                        <artifactId>commons-collections</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-pool</groupId>
+                        <artifactId>commons-pool</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-jms_1.1_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-jta_1.1_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-jpa_2.0_spec</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.openjpa</groupId>
+                <artifactId>openjpa-persistence-jdbc</artifactId>
+                <version>${openjpaVersion}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <modules>
-        <module>geronimo-openjpa</module>
-        <module>geronimo-persistence-jpa10</module>
-        <module>geronimo-persistence-jpa10-builder</module>
-        <module>openjpa</module>
-        <module>persistence-jpa10-deployer</module>
+        <module>geronimo-openjpa2</module>
+        <module>geronimo-persistence-jpa20</module>
+        <module>geronimo-persistence-jpa20-builder</module>
+        <module>openjpa2</module>
+        <module>persistence-jpa20-deployer</module>
     </modules>
 
 </project>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Tue Oct  6 17:12:05 2009
@@ -80,6 +80,7 @@
         <module>myfaces</module>
         <module>openejb</module>
         <module>openjpa</module>
+<!--        <module>openjpa2</module>-->
 <!--        <module>openwebbeans</module>-->
         <module>plancreator</module>
         <module>webservices</module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Oct  6 17:12:05 2009
@@ -82,7 +82,6 @@
         <axis2Version>1.5</axis2Version>
         <axiomVersion>1.2.8</axiomVersion>
         <springVersion>2.5.6</springVersion>
-        <openjpaVersion>1.2.1</openjpaVersion>
         <xbeanVersion>3.6</xbeanVersion>
         <jetty>jetty7</jetty>
 
@@ -248,6 +247,11 @@
                 <artifactId>geronimo-jpa_1.0_spec</artifactId>
                 <version>1.1.2</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jpa_2.0_spec</artifactId>
+                <version>1.0-PFD2-SNAPSHOT</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -328,11 +332,11 @@
                 <classifier>tests</classifier>
             </dependency>
 
+            <!--
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa</artifactId>
                 <version>${openjpaVersion}</version>
-                <!-- already listed as provided in openjpa 1.2.x -->
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.openjpa</groupId>
@@ -388,6 +392,10 @@
                     </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>
                     </exclusion>
                 </exclusions>
@@ -397,6 +405,7 @@
                 <artifactId>openjpa-persistence-jdbc</artifactId>
                 <version>${openjpaVersion}</version>
             </dependency>
+            -->
 
             <dependency>
                 <groupId>net.sourceforge.serp</groupId>

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Tue Oct
 6 17:12:05 2009
@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml?rev=822351&r1=822350&r2=822351&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml (original)
+++ geronimo/server/trunk/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml Tue Oct
 6 17:12:05 2009
@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         



Mime
View raw message