Author: gmcdonald
Date: Sat Mar 13 09:19:04 2010
New Revision: 922509
URL: http://svn.apache.org/viewvc?rev=922509&view=rev
Log:
Upgrade required java version for Forrest to 1.5
Modified:
forrest/trunk/main/build.xml
forrest/trunk/main/forrest.build.xml
forrest/trunk/plugins/build.xml
Modified: forrest/trunk/main/build.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?rev=922509&r1=922508&r2=922509&view=diff
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Sat Mar 13 09:19:04 2010
@@ -43,7 +43,7 @@
<property name="build.compiler.deprecation" value="on"/>
<property name="build.compiler.nowarn" value="on"/>
<property name="build.compiler.type" value="classic"/>
- <property name="build.compiler.vm" value="1.4"/>
+ <property name="build.compiler.vm" value="1.5"/>
<property name="name" value="apache-forrest"/>
<property name="forrest.version" value="0.9-dev"/>
<property name="forrest.core" location="."/>
Modified: forrest/trunk/main/forrest.build.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/forrest.build.xml?rev=922509&r1=922508&r2=922509&view=diff
==============================================================================
--- forrest/trunk/main/forrest.build.xml (original)
+++ forrest/trunk/main/forrest.build.xml Sat Mar 13 09:19:04 2010
@@ -280,9 +280,10 @@ The skin that most likely resembles thes
<equals arg1="${ant.java.version}" arg2="1.1"/>
<equals arg1="${ant.java.version}" arg2="1.2"/>
<equals arg1="${ant.java.version}" arg2="1.3"/>
+ <equals arg1="${ant.java.version}" arg2="1.4"/>
</or>
<then>
- <fail>Java 1.4 or higher is required; found Java ${ant.java.version}
in ${java.home}</fail>
+ <fail>Java 1.5 or higher is required; found Java ${ant.java.version}
in ${java.home}</fail>
</then>
</if>
<echo level="info" message="This is apache-forrest-${forrest.version}"/>
Modified: forrest/trunk/plugins/build.xml
URL:
http://svn.apache.org/viewvc/forrest/trunk/plugins/build.xml?rev=922509&r1=922508&r2=922509&view=diff
==============================================================================
--- forrest/trunk/plugins/build.xml (original)
+++ forrest/trunk/plugins/build.xml Sat Mar 13 09:19:04 2010
@@ -80,7 +80,7 @@
<property name="build.compiler.deprecation" value="on"/>
<property name="build.compiler.nowarn" value="on"/>
<property name="build.compiler.type" value="classic"/>
- <property name="build.compiler.vm" value="1.4"/>
+ <property name="build.compiler.vm" value="1.5"/>
<mkdir dir="${build.dir}"/>
<path id="classpath">
<fileset dir="${forrest.home}/lib" includes="**/*.jar"/>
