You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2009/10/22 16:59:34 UTC

svn commit: r828735 - in /openjpa/branches/1.3.x: openjpa-integration/tck/pom.xml pom.xml

Author: dwoods
Date: Thu Oct 22 14:59:34 2009
New Revision: 828735

URL: http://svn.apache.org/viewvc?rev=828735&view=rev
Log:
use latest geronimo-jpa_1.0_spec for builds and TCK runs

Modified:
    openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml
    openjpa/branches/1.3.x/pom.xml

Modified: openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml?rev=828735&r1=828734&r2=828735&view=diff
==============================================================================
--- openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml (original)
+++ openjpa/branches/1.3.x/openjpa-integration/tck/pom.xml Thu Oct 22 14:59:34 2009
@@ -55,7 +55,7 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>tck</artifactId>
+    <artifactId>openjpa-integration-tck</artifactId>
     <packaging>pom</packaging>
     <name>OpenJPA Integration Tests - JPA TCK</name>
     <description>OpenJPA Integration Tests - JPA TCK</description>
@@ -102,7 +102,6 @@
                             <!-- use official JPA API instead of GM's -->
                             <fileset dir="${tck.dir}/lib">
                                 <include name="**/*.jar" />
-                                <exclude name="**/geronimo-jpa*" />
                             </fileset>
                             <pathelement path="${java.class.path}" />
                             <pathelement path="${db.jar}" />
@@ -280,12 +279,19 @@
     </repositories>
 
     <dependencies>
-        <!-- use the authoritative javax.persistence API for testing -->
+        <!-- use the authoritative javax.persistence API for testing
         <dependency>
             <groupId>javax.persistence</groupId>
             <artifactId>persistence-api</artifactId>
             <version>1.0b</version>
         </dependency>
+        -->
+        <!--  Use the JPA spec from Geronimo -->
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>

Modified: openjpa/branches/1.3.x/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.3.x/pom.xml?rev=828735&r1=828734&r2=828735&view=diff
==============================================================================
--- openjpa/branches/1.3.x/pom.xml (original)
+++ openjpa/branches/1.3.x/pom.xml Thu Oct 22 14:59:34 2009
@@ -523,8 +523,8 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_3.0_spec</artifactId>
-                <version>1.1.1</version>
+                <artifactId>geronimo-jpa_1.0_spec</artifactId>
+                <version>1.1.2</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>