Commit 8e6f0bac authored by Florian Schmaus's avatar Florian Schmaus

Add javac.source and javac.target to build.xml

and raise those values to 1.7

OF-466
parent c26568e2
......@@ -9,7 +9,7 @@
Build Requirements:
* Ant 1.6 or 1.7 (including optional tasks)
* JDK 1.5 or higher
* JDK 1.7 or higher
* jUnit in your Ant or Java classpath
-->
......@@ -27,6 +27,9 @@
<property name="version.minor" value="10"/>
<property name="version.revision" value="0"/>
<property name="version.extra" value="alpha"/> <!-- For 'beta' or 'alpha' -->
<property name="javac.source" value="1.7"/>
<property name="javac.target" value="1.7"/>
<property name="dist.prefix" value="openfire"/>
<property file="${basedir}/build/build.properties"/>
......@@ -219,8 +222,6 @@
<condition property="java.not.ok" value="true">
<not>
<or>
<contains string="${ant.java.version}" substring="1.5"/>
<contains string="${ant.java.version}" substring="1.6"/>
<contains string="${ant.java.version}" substring="1.7"/>
<contains string="${ant.java.version}" substring="1.8"/>
</or>
......@@ -265,8 +266,8 @@
destdir="${compile.dir}"
includeAntRuntime="no"
debug="on"
source="1.5"
target="1.5"
source="${javac.source}"
target="${javac.target}"
>
<src path="${src.java.dir}"/>
<patternset refid="compile.sources"/>
......@@ -285,8 +286,8 @@
destdir="${overlay.compile.dir}"
includeAntRuntime="no"
debug="on"
source="1.5"
target="1.5"
source="${javac.source}"
target="${javac.target}"
>
<src path="${overlay.src.dir}"/>
<patternset refid="compile.sources"/>
......@@ -490,7 +491,7 @@
<classpath>
<path refid="javadoc.dependencies"/>
</classpath>
<link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/"
<link offline="true" href="http://docs.oracle.com/javase/7/docs/api/"
packagelistLoc="${javadoc.src.dir}/jdk15"/>
</javadoc>
</target>
......@@ -543,8 +544,8 @@
destdir="${jspc.classes.dest.dir}"
includeAntRuntime="no"
debug="on"
source="1.5"
target="1.5"
source="${javac.source}"
target="${javac.target}"
includes="org/jivesoftware/openfire/admin/**/*.java"
>
<src path="${jspc.java.dest.dir}"/>
......@@ -593,8 +594,8 @@
destdir="${test.classes.dest.dir}"
includeAntRuntime="no"
debug="on"
source="1.5"
target="1.5"
source="${javac.source}"
target="${javac.target}"
>
<src path="${src.test.java.dir}"/>
<patternset refid="test.sources"/>
......@@ -1329,8 +1330,8 @@
destdir="${plugin.dev.dest.dir}/@{plugin}/target/classes"
includeAntRuntime="no"
debug="on"
source="1.5"
target="1.5"
source="${javac.source}"
target="${javac.target}"
>
<src path="@{pluginsrc}/@{plugin}/src/java"/>
<classpath>
......@@ -1369,7 +1370,7 @@
destdir="@{pluginlib}/classes"
includeAntRuntime="no"
debug="on"
source="1.5"
source="${javac.source}"
includes="**/*.java"
>
<src path="@{pluginlib}/source"/>
......@@ -1537,8 +1538,8 @@
destdir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/classes"
includeAntRuntime="no"
debug="on"
source="1.5"
target="1.5"
source="${javac.source}"
target="${javac.target}"
>
<src path="${plugin.dev.dest.dir}/@{plugin}/target/jspc/java"/>
<classpath>
......@@ -1650,7 +1651,7 @@
<javac
destdir="${anttools.target.dir}/classes"
debug="on"
source="1.4"
source="${javac.source}"
>
<src path="${anttools.src.dir}"/>
<patternset refid="compile.sources"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment