Author: rwhitcomb
Date: Mon Aug 5 22:48:39 2013
New Revision: 1510790
URL: http://svn.apache.org/r1510790
Log:
PIVOT-895: Update requirements to JDK 1.7 for "trunk" (version 2.1 and later).
Modified:
pivot/trunk/build.properties
pivot/trunk/build.xml
Modified: pivot/trunk/build.properties
URL:
http://svn.apache.org/viewvc/pivot/trunk/build.properties?rev=1510790&r1=1510789&r2=1510790&view=diff
==============================================================================
--- pivot/trunk/build.properties (original)
+++ pivot/trunk/build.properties Mon Aug 5 22:48:39 2013
@@ -23,8 +23,8 @@ local.server=http://localhost:8080
# Compiler properties
compiler.deprecation=true
compiler.debug=true
-compiler.source=1.6
-compiler.target=1.6
+compiler.source=1.7
+compiler.target=1.7
compiler.encoding=UTF-8
compiler.indexJars=true
compiler.arg=-Xlint
Modified: pivot/trunk/build.xml
URL:
http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=1510790&r1=1510789&r2=1510790&view=diff
==============================================================================
--- pivot/trunk/build.xml (original)
+++ pivot/trunk/build.xml Mon Aug 5 22:48:39 2013
@@ -111,7 +111,6 @@ limitations under the License.
<condition>
<not>
<or>
- <equals arg1="${ant.java.version}" arg2="1.6"/>
<equals arg1="${ant.java.version}" arg2="1.7"/>
</or>
</not>
@@ -119,7 +118,7 @@ limitations under the License.
<![CDATA[
Error:
- Building Pivot requires JDK 1.6 or greater. Please see the
+ Building Pivot requires JDK 1.7 or greater. Please see the
BUILD file for more information.
]]>
</fail>
