1.1 --- a/java/jdbc-dk-driver/nbproject/build-impl.xml Fri Jan 05 23:53:23 2018 +0100
1.2 +++ b/java/jdbc-dk-driver/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 @@ -158,6 +158,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 @@ -193,7 +194,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 @@ -219,6 +225,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 @@ -697,7 +704,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 @@ -772,7 +779,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 @@ -799,7 +806,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 @@ -838,7 +845,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 @@ -850,7 +857,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 @@ -975,15 +982,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 @@ -991,7 +998,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 @@ -1186,7 +1193,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>
2.1 --- a/java/jdbc-dk-driver/nbproject/genfiles.properties Fri Jan 05 23:53:23 2018 +0100
2.2 +++ b/java/jdbc-dk-driver/nbproject/genfiles.properties Tue Feb 26 15:47:43 2019 +0100
2.3 @@ -4,5 +4,5 @@
2.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
2.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
2.6 nbproject/build-impl.xml.data.CRC32=50d83c90
2.7 -nbproject/build-impl.xml.script.CRC32=0d479eb1
2.8 -nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
2.9 +nbproject/build-impl.xml.script.CRC32=71784fcc
2.10 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
3.1 --- a/java/jdbc-loopback-driver/nbproject/build-impl.xml Fri Jan 05 23:53:23 2018 +0100
3.2 +++ b/java/jdbc-loopback-driver/nbproject/build-impl.xml Tue Feb 26 15:47:43 2019 +0100
3.3 @@ -46,8 +46,8 @@
3.4 <property file="${user.properties.file}"/>
3.5 <!-- The two properties below are usually overridden -->
3.6 <!-- by the active platform. Just a fallback. -->
3.7 - <property name="default.javac.source" value="1.4"/>
3.8 - <property name="default.javac.target" value="1.4"/>
3.9 + <property name="default.javac.source" value="1.6"/>
3.10 + <property name="default.javac.target" value="1.6"/>
3.11 </target>
3.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
3.13 <property file="nbproject/configs/${config}.properties"/>
3.14 @@ -76,7 +76,7 @@
3.15 <and>
3.16 <isset property="javac.profile"/>
3.17 <length length="0" string="${javac.profile}" when="greater"/>
3.18 - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
3.19 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
3.20 </and>
3.21 </condition>
3.22 <condition property="do.archive">
3.23 @@ -157,6 +157,7 @@
3.24 <property name="application.args" value=""/>
3.25 <property name="source.encoding" value="${file.encoding}"/>
3.26 <property name="runtime.encoding" value="${source.encoding}"/>
3.27 + <property name="manifest.encoding" value="${source.encoding}"/>
3.28 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
3.29 <and>
3.30 <isset property="javadoc.encoding"/>
3.31 @@ -192,7 +193,12 @@
3.32 </not>
3.33 </and>
3.34 </condition>
3.35 - <property name="javac.fork" value="${jdkBug6558476}"/>
3.36 + <condition else="false" property="javac.fork">
3.37 + <or>
3.38 + <istrue value="${jdkBug6558476}"/>
3.39 + <istrue value="${javac.external.vm}"/>
3.40 + </or>
3.41 + </condition>
3.42 <property name="jar.index" value="false"/>
3.43 <property name="jar.index.metainf" value="${jar.index}"/>
3.44 <property name="copylibs.rebase" value="true"/>
3.45 @@ -218,6 +224,7 @@
3.46 <condition else="" property="testng.debug.mode" value="-mixed">
3.47 <istrue value="${junit+testng.available}"/>
3.48 </condition>
3.49 + <property name="java.failonerror" value="true"/>
3.50 </target>
3.51 <target name="-post-init">
3.52 <!-- Empty placeholder for easier customization. -->
3.53 @@ -695,7 +702,7 @@
3.54 <sequential>
3.55 <property environment="env"/>
3.56 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
3.57 - <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
3.58 + <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
3.59 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
3.60 <jvmarg value="${profiler.info.jvmargs.agent}"/>
3.61 <jvmarg line="${profiler.info.jvmargs}"/>
3.62 @@ -770,7 +777,7 @@
3.63 <attribute default="${debug.classpath}" name="classpath"/>
3.64 <element name="customize" optional="true"/>
3.65 <sequential>
3.66 - <java classname="@{classname}" dir="${work.dir}" fork="true">
3.67 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
3.68 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
3.69 <jvmarg line="${debug-args-line}"/>
3.70 <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
3.71 @@ -797,7 +804,7 @@
3.72 <attribute default="jvm" name="jvm"/>
3.73 <element name="customize" optional="true"/>
3.74 <sequential>
3.75 - <java classname="@{classname}" dir="${work.dir}" fork="true">
3.76 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
3.77 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
3.78 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
3.79 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
3.80 @@ -836,7 +843,7 @@
3.81 </chainedmapper>
3.82 </pathconvert>
3.83 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
3.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}">
3.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}">
3.86 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
3.87 <manifest>
3.88 <attribute name="Class-Path" value="${jar.classpath}"/>
3.89 @@ -848,7 +855,7 @@
3.90 </target>
3.91 <target name="-init-presetdef-jar">
3.92 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
3.93 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
3.94 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
3.95 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
3.96 </jar>
3.97 </presetdef>
3.98 @@ -972,15 +979,15 @@
3.99 </target>
3.100 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
3.101 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
3.102 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
3.103 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
3.104 </target>
3.105 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
3.106 - <manifest file="${tmp.manifest.file}" mode="update">
3.107 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
3.108 <attribute name="Main-Class" value="${main.class}"/>
3.109 </manifest>
3.110 </target>
3.111 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
3.112 - <manifest file="${tmp.manifest.file}" mode="update">
3.113 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
3.114 <attribute name="Profile" value="${javac.profile}"/>
3.115 </manifest>
3.116 </target>
3.117 @@ -988,7 +995,7 @@
3.118 <basename file="${application.splash}" property="splashscreen.basename"/>
3.119 <mkdir dir="${build.classes.dir}/META-INF"/>
3.120 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
3.121 - <manifest file="${tmp.manifest.file}" mode="update">
3.122 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
3.123 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
3.124 </manifest>
3.125 </target>
3.126 @@ -1183,7 +1190,7 @@
3.127 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
3.128 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
3.129 <startprofiler/>
3.130 - <antcal target="run-test-with-main"/>
3.131 + <antcall target="run-test-with-main"/>
3.132 </target>
3.133 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
3.134 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
4.1 --- a/java/jdbc-loopback-driver/nbproject/genfiles.properties Fri Jan 05 23:53:23 2018 +0100
4.2 +++ b/java/jdbc-loopback-driver/nbproject/genfiles.properties Tue Feb 26 15:47:43 2019 +0100
4.3 @@ -4,5 +4,5 @@
4.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
4.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
4.6 nbproject/build-impl.xml.data.CRC32=09144cff
4.7 -nbproject/build-impl.xml.script.CRC32=1af5d34f
4.8 -nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
4.9 +nbproject/build-impl.xml.script.CRC32=0eb33566
4.10 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
5.1 --- a/java/sql-dk/nbproject/build-impl.xml Fri Jan 05 23:53:23 2018 +0100
5.2 +++ b/java/sql-dk/nbproject/build-impl.xml Tue Feb 26 15:47:43 2019 +0100
5.3 @@ -46,8 +46,8 @@
5.4 <property file="${user.properties.file}"/>
5.5 <!-- The two properties below are usually overridden -->
5.6 <!-- by the active platform. Just a fallback. -->
5.7 - <property name="default.javac.source" value="1.4"/>
5.8 - <property name="default.javac.target" value="1.4"/>
5.9 + <property name="default.javac.source" value="1.6"/>
5.10 + <property name="default.javac.target" value="1.6"/>
5.11 </target>
5.12 <target depends="-pre-init,-init-private,-init-user" name="-init-project">
5.13 <property file="nbproject/configs/${config}.properties"/>
5.14 @@ -76,7 +76,7 @@
5.15 <and>
5.16 <isset property="javac.profile"/>
5.17 <length length="0" string="${javac.profile}" when="greater"/>
5.18 - <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
5.19 + <matches pattern="((1\.[89])|9)(\..*)?" string="${javac.source}"/>
5.20 </and>
5.21 </condition>
5.22 <condition property="do.archive">
5.23 @@ -157,6 +157,7 @@
5.24 <property name="application.args" value=""/>
5.25 <property name="source.encoding" value="${file.encoding}"/>
5.26 <property name="runtime.encoding" value="${source.encoding}"/>
5.27 + <property name="manifest.encoding" value="${source.encoding}"/>
5.28 <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
5.29 <and>
5.30 <isset property="javadoc.encoding"/>
5.31 @@ -192,7 +193,12 @@
5.32 </not>
5.33 </and>
5.34 </condition>
5.35 - <property name="javac.fork" value="${jdkBug6558476}"/>
5.36 + <condition else="false" property="javac.fork">
5.37 + <or>
5.38 + <istrue value="${jdkBug6558476}"/>
5.39 + <istrue value="${javac.external.vm}"/>
5.40 + </or>
5.41 + </condition>
5.42 <property name="jar.index" value="false"/>
5.43 <property name="jar.index.metainf" value="${jar.index}"/>
5.44 <property name="copylibs.rebase" value="true"/>
5.45 @@ -218,6 +224,7 @@
5.46 <condition else="" property="testng.debug.mode" value="-mixed">
5.47 <istrue value="${junit+testng.available}"/>
5.48 </condition>
5.49 + <property name="java.failonerror" value="true"/>
5.50 </target>
5.51 <target name="-post-init">
5.52 <!-- Empty placeholder for easier customization. -->
5.53 @@ -695,7 +702,7 @@
5.54 <sequential>
5.55 <property environment="env"/>
5.56 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
5.57 - <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">
5.58 + <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
5.59 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
5.60 <jvmarg value="${profiler.info.jvmargs.agent}"/>
5.61 <jvmarg line="${profiler.info.jvmargs}"/>
5.62 @@ -770,7 +777,7 @@
5.63 <attribute default="${debug.classpath}" name="classpath"/>
5.64 <element name="customize" optional="true"/>
5.65 <sequential>
5.66 - <java classname="@{classname}" dir="${work.dir}" fork="true">
5.67 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
5.68 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
5.69 <jvmarg line="${debug-args-line}"/>
5.70 <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
5.71 @@ -797,7 +804,7 @@
5.72 <attribute default="jvm" name="jvm"/>
5.73 <element name="customize" optional="true"/>
5.74 <sequential>
5.75 - <java classname="@{classname}" dir="${work.dir}" fork="true">
5.76 + <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
5.77 <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
5.78 <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
5.79 <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
5.80 @@ -836,7 +843,7 @@
5.81 </chainedmapper>
5.82 </pathconvert>
5.83 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
5.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}">
5.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}">
5.86 <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
5.87 <manifest>
5.88 <attribute name="Class-Path" value="${jar.classpath}"/>
5.89 @@ -848,7 +855,7 @@
5.90 </target>
5.91 <target name="-init-presetdef-jar">
5.92 <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
5.93 - <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
5.94 + <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
5.95 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
5.96 </jar>
5.97 </presetdef>
5.98 @@ -972,15 +979,15 @@
5.99 </target>
5.100 <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
5.101 <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
5.102 - <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
5.103 + <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
5.104 </target>
5.105 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
5.106 - <manifest file="${tmp.manifest.file}" mode="update">
5.107 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
5.108 <attribute name="Main-Class" value="${main.class}"/>
5.109 </manifest>
5.110 </target>
5.111 <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
5.112 - <manifest file="${tmp.manifest.file}" mode="update">
5.113 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
5.114 <attribute name="Profile" value="${javac.profile}"/>
5.115 </manifest>
5.116 </target>
5.117 @@ -988,7 +995,7 @@
5.118 <basename file="${application.splash}" property="splashscreen.basename"/>
5.119 <mkdir dir="${build.classes.dir}/META-INF"/>
5.120 <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
5.121 - <manifest file="${tmp.manifest.file}" mode="update">
5.122 + <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
5.123 <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
5.124 </manifest>
5.125 </target>
5.126 @@ -1183,7 +1190,7 @@
5.127 <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
5.128 <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
5.129 <startprofiler/>
5.130 - <antcal target="run-test-with-main"/>
5.131 + <antcall target="run-test-with-main"/>
5.132 </target>
5.133 <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
5.134 <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
6.1 --- a/java/sql-dk/nbproject/genfiles.properties Fri Jan 05 23:53:23 2018 +0100
6.2 +++ b/java/sql-dk/nbproject/genfiles.properties Tue Feb 26 15:47:43 2019 +0100
6.3 @@ -4,5 +4,5 @@
6.4 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
6.5 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6.6 nbproject/build-impl.xml.data.CRC32=b51b939b
6.7 -nbproject/build-impl.xml.script.CRC32=a82494d4
6.8 -nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
6.9 +nbproject/build-impl.xml.script.CRC32=6a0815e1
6.10 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48