db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From an...@apache.org
Subject svn commit: r703671 - in /db/jdo/trunk/tck2: build.properties maven.xml project.properties project.xml
Date Sat, 11 Oct 2008 14:59:19 GMT
Author: andyj
Date: Sat Oct 11 07:59:19 2008
New Revision: 703671

URL: http://svn.apache.org/viewvc?rev=703671&view=rev
Log:
JDO-608 Remove need for "java5" jar. Swap to datanucleus-core/datanucleus-rdbms "1.1-SNAPSHOT"
jars

Modified:
    db/jdo/trunk/tck2/build.properties
    db/jdo/trunk/tck2/maven.xml
    db/jdo/trunk/tck2/project.properties
    db/jdo/trunk/tck2/project.xml

Modified: db/jdo/trunk/tck2/build.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/build.properties?rev=703671&r1=703670&r2=703671&view=diff
==============================================================================
--- db/jdo/trunk/tck2/build.properties (original)
+++ db/jdo/trunk/tck2/build.properties Sat Oct 11 07:59:19 2008
@@ -29,7 +29,7 @@
 # Properties for the execution of the TCK
 #
 iut.runtck.sysproperties = -Xmx512m
-iut.runtck.classpath = ${datanucleus.jdori.jarfile}${path.separator}${datanucleus.enhancer.jarfile}${path.separator}${datanucleus.rdbms.jarfile}${path.separator}${datanucleus.javafive.jarfile}${path.separator}${jta.jarfile}${path.separator}${xmlparser}${path.separator}${asm.jarfile}${path.separator}${logging.log4j.jarfile}${path.separator}${datanucleus.connectionpool.jarfile}
+iut.runtck.classpath = ${datanucleus.jdori.jarfile}${path.separator}${datanucleus.enhancer.jarfile}${path.separator}${datanucleus.rdbms.jarfile}${path.separator}${jta.jarfile}${path.separator}${xmlparser}${path.separator}${asm.jarfile}${path.separator}${logging.log4j.jarfile}${path.separator}${datanucleus.connectionpool.jarfile}
 
 ##
 # Properties for the execution of the IUT enhancer

Modified: db/jdo/trunk/tck2/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/maven.xml?rev=703671&r1=703670&r2=703671&view=diff
==============================================================================
--- db/jdo/trunk/tck2/maven.xml (original)
+++ db/jdo/trunk/tck2/maven.xml Sat Oct 11 07:59:19 2008
@@ -648,8 +648,7 @@
                     <path refid="jdori.enhancer.classpath"/>
                     <pathelement location="${enhanced.dir}"/>
                 </path>
-                <echo> datanucleus.enhancer.jarfile is ${datanucleus.enhancer.jarfile}</echo>
-                <echo> datanucleus.javafive.jarfile is ${datanucleus.javafive.jarfile}</echo>
+                <echo>datanucleus.enhancer.jarfile is ${datanucleus.enhancer.jarfile}</echo>
                 <echo>jdori.enhancer.classpath is ${jdori.enhancer.classpath}</echo>
                 <echo>enhance.classpath is ${enhance.classpath}</echo>
                 <java fork="yes" failonerror="yes" 
@@ -716,7 +715,6 @@
         <pathelement location="${datanucleus.jdori.jarfile}" />
         <pathelement location="${datanucleus.enhancer.jarfile}" />
         <pathelement location="${datanucleus.rdbms.jarfile}" />
-        <pathelement location="${datanucleus.javafive.jarfile}" />
         <pathelement location="${jta.jarfile}" />
         <pathelement location="${xmlparser}" />
         <pathelement location="${asm.jarfile}" />
@@ -748,8 +746,6 @@
         <pathelement location="${junit.jarfile}"/>
         <!-- Commons-logging jar file (for compiling pa/pc classes) -->
         <pathelement location="${logging.commons.jarfile}"/>
-        <!-- Java 1.5 jar file -->
-        <pathelement location="${datanucleus.javafive.jarfile}" />
         <!-- JPA jar file -->
         <pathelement location="${jpa.jarfile}" />
     </path>

Modified: db/jdo/trunk/tck2/project.properties
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.properties?rev=703671&r1=703670&r2=703671&view=diff
==============================================================================
--- db/jdo/trunk/tck2/project.properties (original)
+++ db/jdo/trunk/tck2/project.properties Sat Oct 11 07:59:19 2008
@@ -63,7 +63,6 @@
 datanucleus.jdori.jarfile = ${pom.getDependencyPath('org.datanucleus:datanucleus-core')}
 datanucleus.enhancer.jarfile = ${pom.getDependencyPath('org.datanucleus:datanucleus-enhancer')}
 datanucleus.rdbms.jarfile = ${pom.getDependencyPath('org.datanucleus:datanucleus-rdbms')}
-datanucleus.javafive.jarfile = ${pom.getDependencyPath('org.datanucleus:datanucleus-java5')}
 asm.jarfile = ${pom.getDependencyPath('asm:asm')}
 junit.jarfile = ${pom.getDependencyPath('junit:junit')}
 jta.jarfile = ${pom.getDependencyPath('javax.transaction:transaction-api')}

Modified: db/jdo/trunk/tck2/project.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/project.xml?rev=703671&r1=703670&r2=703671&view=diff
==============================================================================
--- db/jdo/trunk/tck2/project.xml (original)
+++ db/jdo/trunk/tck2/project.xml Sat Oct 11 07:59:19 2008
@@ -59,13 +59,13 @@
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-core</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1-SNAPSHOT</version>
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
             <groupId>org.datanucleus</groupId>
             <artifactId>datanucleus-rdbms</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1-SNAPSHOT</version>
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
@@ -75,12 +75,6 @@
             <url>http://www.datanucleus.org/downloads/maven-nightly</url>
         </dependency>
         <dependency>
-            <groupId>org.datanucleus</groupId>
-            <artifactId>datanucleus-java5</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <url>http://www.datanucleus.org/downloads/maven-nightly</url>
-        </dependency>
-        <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
             <version>10.4.1.3</version>



Mime
View raw message