1.1 --- a/java/sql-dk/nbproject/build-impl.xml Fri Jan 05 23:53:23 2018 +0100
1.2 +++ b/java/sql-dk/nbproject/build-impl.xml Tue Feb 26 15:47:43 2019 +0100
1.3 @@ -46,8 +46,8 @@
1.4 <property file="${user.properties.file}"/>
1.5 <!-- The two properties below are usually overridden -->
1.6 <!-- by the active platform. Just a fallback. -->
1.7 - <property name="default.javac.source" value="1.4"/>
1.8 - <property name="default.javac.target" value="1.4"/>
1.9 + <property name="default.javac.source" value="1.6"/>
1.10 + <property name="default.javac.target" value="1.6"/>
1.11 </target>
1.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
1.13 <property file="nbproject/configs/${config}.properties"/>
1.14 @@ -76,7 +76,7 @@
1.15 <and>
1.16 <isset property="javac.profile"/>
1.17 <length length="0" string="${javac.profile}" when="greater"/>
1.18 - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
1.19 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
1.20 </and>
1.21 </condition>
1.22 <condition property="do.archive">
1.23 @@ -157,6 +157,7 @@
1.24 <property name="application.args" value=""/>
1.25 <property name="source.encoding" value="${file.encoding}"/>
1.26 <property name="runtime.encoding" value="${source.encoding}"/>
1.27 + <property name="manifest.encoding" value="${source.encoding}"/>
1.28 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
1.29 <and>
1.30 <isset property="javadoc.encoding"/>
1.31 @@ -192,7 +193,12 @@
1.32 </not>
1.33 </and>
1.34 </condition>
1.35 - <property name="javac.fork" value="${jdkBug6558476}"/>
1.36 + <condition else="false" property="javac.fork">
1.37 + <or>
1.38 + <istrue value="${jdkBug6558476}"/>
1.39 + <istrue value="${javac.external.vm}"/>
1.40 + </or>
1.41 + </condition>
1.42 <property name="jar.index" value="false"/>
1.43 <property name="jar.index.metainf" value="${jar.index}"/>
1.44 <property name="copylibs.rebase" value="true"/>
1.45 @@ -218,6 +224,7 @@
1.46 <condition else="" property="testng.debug.mode" value="-mixed">
1.47 <istrue value="${junit+testng.available}"/>
1.48 </condition>
1.49 + <property name="java.failonerror" value="true"/>
1.50 </target>
1.51 <target name="-post-init">
1.52 <!-- Empty placeholder for easier customization. -->
1.53 @@ -695,7 +702,7 @@
1.54 <sequential>
1.55 <property environment="env"/>
1.56 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
1.57 - <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
1.58 + <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
1.59 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.60 <jvmarg value="${profiler.info.jvmargs.agent}"/>
1.61 <jvmarg line="${profiler.info.jvmargs}"/>
1.62 @@ -770,7 +777,7 @@
1.63 <attribute default="${debug.classpath}" name="classpath"/>
1.64 <element name="customize" optional="true"/>
1.65 <sequential>
1.66 - <java classname="@{classname}" dir="${work.dir}" fork="true">
1.67 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
1.68 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.69 <jvmarg line="${debug-args-line}"/>
1.70 <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
1.71 @@ -797,7 +804,7 @@
1.72 <attribute default="jvm" name="jvm"/>
1.73 <element name="customize" optional="true"/>
1.74 <sequential>
1.75 - <java classname="@{classname}" dir="${work.dir}" fork="true">
1.76 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
1.77 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
1.78 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
1.79 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
1.80 @@ -836,7 +843,7 @@
1.81 </chainedmapper>
1.82 </pathconvert>
1.83 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
1.84 - <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
1.85 + <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" manifestencoding="UTF-8" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
1.86 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
1.87 <manifest>
1.88 <attribute name="Class-Path" value="${jar.classpath}"/>
1.89 @@ -848,7 +855,7 @@
1.90 </target>
1.91 <target name="-init-presetdef-jar">
1.92 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
1.93 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
1.94 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
1.95 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
1.96 </jar>
1.97 </presetdef>
1.98 @@ -972,15 +979,15 @@
1.99 </target>
1.100 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
1.101 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
1.102 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
1.103 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
1.104 </target>
1.105 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
1.106 - <manifest file="${tmp.manifest.file}" mode="update">
1.107 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.108 <attribute name="Main-Class" value="${main.class}"/>
1.109 </manifest>
1.110 </target>
1.111 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
1.112 - <manifest file="${tmp.manifest.file}" mode="update">
1.113 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.114 <attribute name="Profile" value="${javac.profile}"/>
1.115 </manifest>
1.116 </target>
1.117 @@ -988,7 +995,7 @@
1.118 <basename file="${application.splash}" property="splashscreen.basename"/>
1.119 <mkdir dir="${build.classes.dir}/META-INF"/>
1.120 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
1.121 - <manifest file="${tmp.manifest.file}" mode="update">
1.122 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
1.123 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
1.124 </manifest>
1.125 </target>
1.126 @@ -1183,7 +1190,7 @@
1.127 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
1.128 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
1.129 <startprofiler/>
1.130 - <antcal target="run-test-with-main"/>
1.131 + <antcall target="run-test-with-main"/>
1.132 </target>
1.133 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
1.134 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>