Merge pull request #872 from amolenaar/java8

Upgrade to Java 8
unclebob · Feb 15, 2016 · 5c0c4bb · 5c0c4bb
2 parents 8be74c3 + b7a352a
commit 5c0c4bb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,5 @@
 language: java
 jdk:
- - openjdk6
- - oraclejdk7
  - oraclejdk8
 
 install: ant resolve

diff --git a/build.xml b/build.xml
@@ -6,6 +6,7 @@
 
     <property environment="env"/>
     <property name="env.FITNESSE_TEST_PORT" value="8080"/>
+    <property name="min.java.version" value="1.8"/>
     <property name="src.dir" location="src"/>
     <property name="test.src.dir" location="test"/>
     <property name="classes.dir" location="classes"/>
@@ -136,7 +137,7 @@
     <target name="compile-server" depends="stamp-version, resolve" description="compile FitNesse sources">
         <mkdir dir="${classes.dir}" />
         <ivy:cachepath pathid="compile.classpath" conf="default"/>
-        <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="true" source="1.6" target="1.6" includeantruntime="false" encoding="UTF-8">
+        <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="true" source="${min.java.version}" target="${min.java.version}" includeantruntime="false" encoding="UTF-8">
             <classpath>
                 <path refid="compile.classpath"/>
             </classpath>
@@ -151,7 +152,7 @@
 
     <target name="compile-fit" description="compile FIT sources only">
         <mkdir dir="${classes.dir}" />
-        <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="true" source="1.6" target="1.6" includeantruntime="false" encoding="UTF-8">
+        <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="true" source="${min.java.version}" target="${min.java.version}" includeantruntime="false" encoding="UTF-8">
             <include name="fit/**/*.java"/>
             <include name="util/*.java"/>
         </javac>
@@ -160,7 +161,7 @@
     <target name="compile-slim" depends="resolve" description="compile SLIM sources only">
         <mkdir dir="${classes.dir}" />
         <ivy:cachepath pathid="slim.classpath" conf="slim"/>
-        <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="slim.classpath" debug="true" source="1.6" target="1.6" includeantruntime="false">
+        <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="slim.classpath" debug="true" source="${min.java.version}" target="${min.java.version}" includeantruntime="false">
             <include name="fitnesse/html/*.java"/>
             <include name="fitnesse/slim/**/*.java"/>
             <include name="fitnesse/socketservice/*.java"/>
@@ -171,7 +172,7 @@
     <target name="test-compile" depends="compile" description="compile the tests">
         <mkdir dir="${test.classes.dir}" />
         <ivy:cachepath pathid="test.classpath" conf="test"/>
-        <javac srcdir="${test.src.dir}" destdir="${test.classes.dir}" debug="true" source="1.6" target="1.6" includeantruntime="false" >
+        <javac srcdir="${test.src.dir}" destdir="${test.classes.dir}" debug="true" source="${min.java.version}" target="${min.java.version}" includeantruntime="false" >
             <classpath>
                 <path refid="test.classpath"/>
                 <pathelement location="${classes.dir}"/>

diff --git a/ivy.xml b/ivy.xml
@@ -34,8 +34,8 @@
 		<dependency org="org.apache.velocity" name="velocity" rev="1.7" conf="default,standalone,maven->default" />
 		<dependency org="commons-lang" name="commons-lang" rev="2.6" conf="default,standalone,maven->default" />
 		<dependency org="commons-collections" name="commons-collections" rev="3.2.2" conf="default,standalone,maven->default" />
-		<dependency org="org.json" name="json" rev="20140107" conf="default,standalone,maven->default" />
-		<dependency org="org.apache.ant" name="ant" rev="1.9.4" conf="default" transitive="false" />
+		<dependency org="org.json" name="json" rev="20151123" conf="default,standalone,maven->default" />
+		<dependency org="org.apache.ant" name="ant" rev="1.9.6" conf="default" transitive="false" />
 		<dependency org="com.googlecode.java-diff-utils" name="diffutils" rev="1.3.0" conf="default,standalone,maven->default"/>
 		<dependency org="junit" name="junit" rev="4.12" conf="default,test->default" />
 		<!-- scope: test -->