This is an automated email from the ASF dual-hosted git repository.
jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 62caea7 Always specify javac.target to allow compilation on JDK11+
and execution on JDK8
new 39902f2 Merge pull request #1561 from
JaroslavTulach/jtulach/JavaTarget
62caea7 is described below
commit 62caea74a197a126fd8d2786f4bf0cdf29779926
Author: Jaroslav Tulach <[email protected]>
AuthorDate: Wed Oct 9 07:14:41 2019 +0200
Always specify javac.target to allow compilation on JDK11+ and execution on
JDK8
---
ide/db/build.xml | 4 ++--
ide/xml.tax/build.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ide/db/build.xml b/ide/db/build.xml
index 156f134..11226c0 100644
--- a/ide/db/build.xml
+++ b/ide/db/build.xml
@@ -32,7 +32,7 @@
<target name="compile-lib" depends="init,fake-jdbc-40">
<mkdir dir="${build.dir}/lib-classes" />
- <javac srcdir="libsrc" destdir="${build.dir}/lib-classes"
deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}"
source="1.6">
+ <javac target="${javac.target}" srcdir="libsrc"
destdir="${build.dir}/lib-classes" deprecation="${build.compiler.deprecation}"
debug="${build.compiler.debug}" source="1.6">
<classpath>
<pathelement path="${lib.cp}"/>
</classpath>
@@ -50,7 +50,7 @@
public class RowIdLifetime {}
</echo>
<mkdir dir="${fake-jdbc-40.build}"/>
- <javac srcdir="${fake-jdbc-40.src}" destdir="${fake-jdbc-40.build}"/>
+ <javac target="${javac.target}" source="1.7"
srcdir="${fake-jdbc-40.src}" destdir="${fake-jdbc-40.build}"/>
</target>
<target name="jar-lib" depends="compile-lib">
diff --git a/ide/xml.tax/build.xml b/ide/xml.tax/build.xml
index 4121aea..ecc659f 100644
--- a/ide/xml.tax/build.xml
+++ b/ide/xml.tax/build.xml
@@ -25,7 +25,7 @@
<target name="lib-compile" depends="build-init">
<mkdir dir="${build.dir}/libclasses"/>
- <javac destdir="${build.dir}/libclasses"
debug="${build.compiler.debug}" debuglevel="${build.compiler.debuglevel}"
deprecation="${build.compiler.deprecation}"
optimize="${build.compiler.optimize}" source="${javac.source}"
includeantruntime="false">
+ <javac target="${javac.target}" destdir="${build.dir}/libclasses"
debug="${build.compiler.debug}" debuglevel="${build.compiler.debuglevel}"
deprecation="${build.compiler.deprecation}"
optimize="${build.compiler.optimize}" source="${javac.source}"
includeantruntime="false">
<src path="lib/src"/>
<classpath>
<pathelement
location="${netbeans.dest.dir}/ide/modules/ext/xerces-2.8.0.jar"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
