svn commit: r160318 - in incubator/jdo/trunk: api11/project.properties api20/project.properties btree/project.properties ri11/maven.xml ri11/project.properties ri11/test/fsuid2/build.xml

[btopping]

Author: btopping
Date: Wed Apr  6 12:10:28 2005
New Revision: 160318

URL: http://svn.apache.org/viewcvs?view=rev&rev=160318
Log:
Update build to work with JDK 1.5

Added:
    incubator/jdo/trunk/api11/project.properties
    incubator/jdo/trunk/api20/project.properties
Modified:
    incubator/jdo/trunk/btree/project.properties
    incubator/jdo/trunk/ri11/maven.xml
    incubator/jdo/trunk/ri11/project.properties
    incubator/jdo/trunk/ri11/test/fsuid2/build.xml

Added: incubator/jdo/trunk/api11/project.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api11/project.properties?view=auto&rev=160318
==============================================================================
--- incubator/jdo/trunk/api11/project.properties (added)
+++ incubator/jdo/trunk/api11/project.properties Wed Apr  6 12:10:28 2005
@@ -0,0 +1,2 @@
+maven.compile.source=1.3
+maven.compile.target=1.3

Added: incubator/jdo/trunk/api20/project.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/api20/project.properties?view=auto&rev=160318
==============================================================================
--- incubator/jdo/trunk/api20/project.properties (added)
+++ incubator/jdo/trunk/api20/project.properties Wed Apr  6 12:10:28 2005
@@ -0,0 +1,2 @@
+maven.compile.source=1.3
+maven.compile.target=1.3

Modified: incubator/jdo/trunk/btree/project.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/btree/project.properties?view=diff&r1=160317&r2=160318
==============================================================================
--- incubator/jdo/trunk/btree/project.properties (original)
+++ incubator/jdo/trunk/btree/project.properties Wed Apr  6 12:10:28 2005
@@ -28,3 +28,5 @@
 # so use a specific btree version
 netbeans.cvs.tag=-r release36-BLD200409100900
 
+maven.compile.source=1.3
+maven.compile.target=1.3

Modified: incubator/jdo/trunk/ri11/maven.xml
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/maven.xml?view=diff&r1=160317&r2=160318
==============================================================================
--- incubator/jdo/trunk/ri11/maven.xml (original)
+++ incubator/jdo/trunk/ri11/maven.xml Wed Apr  6 12:10:28 2005
@@ -362,7 +362,8 @@
     <goal name="fsuid2.build">
         <ant dir="${basedir}/test/fsuid2" target="build">
             <property name="jdoapi" value="${jdo.jdoapi.jarfile}"/>
-            <property name="jdori" value="${maven.build.dest}"/>
+            <property name="jdori" value="${maven.build
+            .dest}"/>
             <property name="logging" value="${logging.jarfile}"/>
             <property name="fsuid2.jarfile" value="${jdo.fsuid.jarfile}"/>
         </ant>

Modified: incubator/jdo/trunk/ri11/project.properties
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/project.properties?view=diff&r1=160317&r2=160318
==============================================================================
--- incubator/jdo/trunk/ri11/project.properties (original)
+++ incubator/jdo/trunk/ri11/project.properties Wed Apr  6 12:10:28 2005
@@ -202,3 +202,6 @@
 
 jdo.pawareclasses.test.files= \
   ${jdo.testclasses.dir}/org/apache/jdo/test/Test_PCDerived.class
+
+maven.compile.source=1.3
+maven.compile.target=1.3

Modified: incubator/jdo/trunk/ri11/test/fsuid2/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/jdo/trunk/ri11/test/fsuid2/build.xml?view=diff&r1=160317&r2=160318
==============================================================================
--- incubator/jdo/trunk/ri11/test/fsuid2/build.xml (original)
+++ incubator/jdo/trunk/ri11/test/fsuid2/build.xml Wed Apr  6 12:10:28 2005
@@ -35,12 +35,12 @@
 </target>
 
 <target name="fsuid2.jar" unless="fsuid2.enhancement.notRequired">
-    <javac srcdir="org/apache/jdo/pc" debug="on" includes="PCPoint.java"/>
+    <javac srcdir="org/apache/jdo/pc" debug="on" includes="PCPoint.java" 
source="${maven.compile.source}" target="${maven.compile.target}"/>
 
     <mkdir dir="${enhanceDir}"/>
     <java fork="yes" failonerror="yes" 
           classname="${enhancer}" 
-          classpath="${jdoapi};${jdori};${xerces};${antlr};${logging}">
+          
classpath="${maven.build.dest}:${jdoapi};${jdori};${xerces};${antlr};${logging}">
         <arg line="-f -d ${enhanceDir} -s . org/apache/jdo/pc/PCPoint.class"/>
     </java>
 
@@ -52,7 +52,7 @@
 
     <java fork="yes" failonerror="yes" 
           classname="org.apache.jdo.impl.enhancer.util.AugmentationTest"
-          classpath=".;${jdoapi};${jdori}">
+          classpath=".;${maven.build.dest}:${jdoapi};${jdori}">
         <arg line="-s"/>
         <arg path=".;${jdoapi};${jdori}"/>
         <arg line="--properties org/apache/jdo/pc/fsuid2.jdoproperties 
org.apache.jdo.pc.PCPoint"/>
@@ -60,7 +60,7 @@
 
     <java fork="yes" failonerror="yes"
           classname="org.apache.jdo.impl.enhancer.util.AnnotationTest"
-          classpath="${jdori}">
+          classpath="${maven.build.dest}:${jdori}">
         <arg line="--properties org/apache/jdo/pc/fsuid2.jdoproperties 
org/apache/jdo/pc/PCPoint.class"/>
     </java>