From 32984b52abcfa886114e1b86a4cab09da7e761fb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 31 Jan 2023 14:31:31 +0100
Subject: [PATCH] Continued: - jcustomer-core was placed wrong here, jproduct
 doesn't reference it anywhere - added jproduct-core as a JAR dependency (not
 direct project reference)

---
 lib/jcustomer-core.jar       | Bin 29534 -> 0 bytes
 lib/jproduct-core.jar        | Bin 0 -> 49830 bytes
 nbproject/build-impl.xml     | 714 +++++++++++++++++++++++++----------
 nbproject/project.properties |  12 +-
 nbproject/project.xml        |  11 +-
 5 files changed, 532 insertions(+), 205 deletions(-)
 delete mode 100644 lib/jcustomer-core.jar
 create mode 100644 lib/jproduct-core.jar

diff --git a/lib/jcustomer-core.jar b/lib/jcustomer-core.jar
deleted file mode 100644
index 5d71532a31daccdc5e3caa69139f3f3043f85685..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 29534
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

diff --git a/lib/jproduct-core.jar b/lib/jproduct-core.jar
new file mode 100644
index 0000000000000000000000000000000000000000..82c38d470705ef9c2ae8b5840c524dad6d65de43
GIT binary patch
literal 49830
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
JRKz13`fuN9Yx4jA

literal 0
HcmV?d00001

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 0eab2eb..bcc2390 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -19,7 +19,7 @@ is divided into following sections:
   - cleanup
 
         -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="jproduct-lib-impl">
+<project xmlns:if="ant:if" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" xmlns:unless="ant:unless" basedir=".." default="default" name="jproduct-lib-impl">
     <fail message="Please build using Ant 1.8.0 or higher.">
         <condition>
             <not>
@@ -71,14 +71,79 @@ is divided into following sections:
         <property file="${user.properties.file}"/>
         <!-- The two properties below are usually overridden -->
         <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
+        <property name="default.javac.source" value="1.8"/>
+        <property name="default.javac.target" value="1.8"/>
     </target>
     <target depends="-pre-init,-init-private,-init-libraries,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
         <property file="nbproject/project.properties"/>
     </target>
-    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+    <target name="-init-modules-supported">
+        <condition property="modules.supported.internal" value="true">
+            <not>
+                <matches pattern="1\.[0-8](\..*)?" string="${javac.source}"/>
+            </not>
+        </condition>
+    </target>
+    <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-modulename">
+        <macrodef name="modulename" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute name="property"/>
+            <attribute name="sourcepath"/>
+            <sequential>
+                <loadresource property="@{property}" quiet="true">
+                    <javaresource classpath="@{sourcepath}" name="module-info.java" parentFirst="false"/>
+                    <filterchain>
+                        <stripjavacomments/>
+                        <linecontainsregexp>
+                            <regexp pattern="module .* \{"/>
+                        </linecontainsregexp>
+                        <tokenfilter>
+                            <linetokenizer/>
+                            <replaceregex flags="s" pattern="(\s*module\s+)(\S*)(\s*\{.*)" replace="\2"/>
+                        </tokenfilter>
+                        <striplinebreaks/>
+                    </filterchain>
+                </loadresource>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-modules-supported,-init-macrodef-modulename" if="modules.supported.internal" name="-init-source-module-properties">
+        <fail message="Java 9 support requires Ant 1.10.0 or higher.">
+            <condition>
+                <not>
+                    <antversion atleast="1.10.0"/>
+                </not>
+            </condition>
+        </fail>
+        <j2seproject3:modulename property="module.name" sourcepath="${src.dir}"/>
+        <condition property="named.module.internal">
+            <and>
+                <isset property="module.name"/>
+                <length length="0" string="${module.name}" when="greater"/>
+            </and>
+        </condition>
+        <condition property="unnamed.module.internal">
+            <not>
+                <isset property="named.module.internal"/>
+            </not>
+        </condition>
+        <property name="javac.modulepath" value=""/>
+        <property name="run.modulepath" value="${javac.modulepath}"/>
+        <property name="module.build.classes.dir" value="${build.classes.dir}"/>
+        <property name="debug.modulepath" value="${run.modulepath}"/>
+        <property name="javac.upgrademodulepath" value=""/>
+        <property name="run.upgrademodulepath" value="${javac.upgrademodulepath}"/>
+        <condition else="" property="javac.systemmodulepath.cmd.line.arg" value="--system '${javac.systemmodulepath}'">
+            <and>
+                <isset property="javac.systemmodulepath"/>
+                <length length="0" string="${javac.systemmodulepath}" when="greater"/>
+            </and>
+        </condition>
+        <property name="dist.jlink.dir" value="${dist.dir}/jlink"/>
+        <property name="dist.jlink.output" value="${dist.jlink.dir}/${application.title}"/>
+        <property name="module.name" value=""/>
+    </target>
+    <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
         <property name="platform.java" value="${java.home}/bin/java"/>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="splashscreen.available">
@@ -101,7 +166,9 @@ is divided into following sections:
             <and>
                 <isset property="javac.profile"/>
                 <length length="0" string="${javac.profile}" when="greater"/>
-                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
+                <not>
+                    <matches pattern="1\.[0-7](\..*)?" string="${javac.source}"/>
+                </not>
             </and>
         </condition>
         <condition property="do.archive">
@@ -112,15 +179,6 @@ is divided into following sections:
                 <istrue value="${not.archive.disabled}"/>
             </or>
         </condition>
-        <condition property="do.mkdist">
-            <and>
-                <isset property="do.archive"/>
-                <isset property="libs.CopyLibs.classpath"/>
-                <not>
-                    <istrue value="${mkdist.disabled}"/>
-                </not>
-            </and>
-        </condition>
         <condition property="do.archive+manifest.available">
             <and>
                 <isset property="manifest.available"/>
@@ -181,6 +239,7 @@ is divided into following sections:
         <property name="application.args" value=""/>
         <property name="source.encoding" value="${file.encoding}"/>
         <property name="runtime.encoding" value="${source.encoding}"/>
+        <property name="manifest.encoding" value="${source.encoding}"/>
         <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
             <and>
                 <isset property="javadoc.encoding"/>
@@ -274,11 +333,80 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
+    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal" name="-init-macrodef-javac-with-module">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.modulepath}" name="modulepath"/>
+            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
+            <attribute default="${javac.processorpath}" name="processorpath"/>
+            <attribute default="${javac.processormodulepath}" name="processormodulepath"/>
+            <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="${javac.debug}" name="debug"/>
+            <attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
+            <attribute default="${src.dir}" if:set="named.module.internal" name="sourcepath"/>
+            <attribute default="${empty.dir}" name="gensrcdir"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <condition property="warn.excludes.internal">
+                    <and>
+                        <isset property="named.module.internal"/>
+                        <length length="0" string="@{excludes}" trim="true" when="greater"/>
+                    </and>
+                </condition>
+                <echo if:set="warn.excludes.internal" level="warning" message="The javac excludes are not supported in the JDK 9 Named Module."/>
+                <property location="${build.dir}/empty" name="empty.dir"/>
+                <mkdir dir="${empty.dir}"/>
+                <mkdir dir="@{apgeneratedsrcdir}"/>
+                <condition property="processormodulepath.set">
+                    <resourcecount count="0" when="greater">
+                        <path>
+                            <pathelement path="@{processormodulepath}"/>
+                        </path>
+                    </resourcecount>
+                </condition>
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+                    <src>
+                        <dirset dir="@{gensrcdir}" erroronmissingdir="false">
+                            <include name="*"/>
+                        </dirset>
+                    </src>
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <modulepath>
+                        <path path="@{modulepath}"/>
+                    </modulepath>
+                    <upgrademodulepath>
+                        <path path="@{upgrademodulepath}"/>
+                    </upgrademodulepath>
+                    <compilerarg line="${javac.systemmodulepath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
+                    <compilerarg line="${javac.compilerargs}"/>
+                    <compilerarg if:set="processormodulepath.set" value="--processor-module-path"/>
+                    <compilerarg if:set="processormodulepath.set" path="@{processormodulepath}"/>
+                    <compilerarg unless:set="processormodulepath.set" value="-processorpath"/>
+                    <compilerarg path="@{processorpath}:${empty.dir}" unless:set="processormodulepath.set"/>
+                    <compilerarg line="${ap.processors.internal}"/>
+                    <compilerarg line="${annotation.processing.processor.options}"/>
+                    <compilerarg value="-s"/>
+                    <compilerarg path="@{apgeneratedsrcdir}"/>
+                    <compilerarg line="${ap.proc.none.internal}"/>
+                    <customize/>
+                </javac>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors" unless="modules.supported.internal">
+        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${build.classes.dir}" name="destdir"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.modulepath}" name="modulepath"/>
+            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
             <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
             <attribute default="${includes}" name="includes"/>
@@ -315,11 +443,13 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
+    <target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.modulepath}" name="modulepath"/>
+            <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
             <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
             <attribute default="${includes}" name="includes"/>
@@ -348,7 +478,7 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
+    <target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
@@ -403,59 +533,99 @@ is divided into following sections:
         <property name="test.binarytestincludes" value=""/>
         <property name="test.binaryexcludes" value=""/>
     </target>
-    <target if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+    <target depends="-init-modules-supported" if="modules.supported.internal" name="-init-macrodef-junit-prototype-with-module">
+        <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
+            <element name="customizePrototype" optional="true"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
                     </syspropertyset>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <modulepath>
+                        <path path="${run.test.modulepath}"/>
+                    </modulepath>
                     <formatter type="brief" usefile="false"/>
                     <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-ea"/>
-                    <customize/>
+                    <jvmarg line="${run.test.jvmargs}"/>
+                    <customizePrototype/>
                 </junit>
             </sequential>
         </macrodef>
     </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+    <target depends="-init-modules-supported" name="-init-macrodef-junit-prototype-without-module" unless="modules.supported.internal">
+        <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
+            <element name="customizePrototype" optional="true"/>
             <sequential>
                 <property name="junit.forkmode" value="perTest"/>
                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
                     <syspropertyset>
                         <propertyref prefix="test-sys-prop."/>
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
                     </syspropertyset>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
                     <formatter type="brief" usefile="false"/>
                     <formatter type="xml"/>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-ea"/>
-                    <customize/>
+                    <customizePrototype/>
                 </junit>
             </sequential>
         </macrodef>
     </target>
+    <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:junit-prototype>
+                    <customizePrototype>
+                        <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                        <customize/>
+                    </customizePrototype>
+                </j2seproject3:junit-prototype>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-test-properties,-init-macrodef-junit-prototype-with-module,-init-macrodef-junit-prototype-without-module" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${includes}" name="includes"/>
+            <attribute default="${excludes}" name="excludes"/>
+            <attribute default="**" name="testincludes"/>
+            <attribute default="" name="testmethods"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <j2seproject3:junit-prototype>
+                    <customizePrototype>
+                        <batchtest todir="${build.test.results.dir}">
+                            <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                                <filename name="@{testincludes}"/>
+                            </fileset>
+                            <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+                                <filename name="${test.binarytestincludes}"/>
+                            </fileset>
+                        </batchtest>
+                        <customize/>
+                    </customizePrototype>
+                </j2seproject3:junit-prototype>
+            </sequential>
+        </macrodef>
+    </target>
     <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
     <target if="${testng.available}" name="-init-macrodef-testng">
         <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-project/3">
@@ -480,6 +650,10 @@ is divided into following sections:
                         <propertyref prefix="test-sys-prop."/>
                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
                     </propertyset>
+                    <classpath>
+                        <path path="${run.test.classpath}"/>
+                    </classpath>
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <customize/>
                 </testng>
             </sequential>
@@ -534,10 +708,6 @@ is divided into following sections:
             <sequential>
                 <j2seproject3:test-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
                     <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                         <jvmarg line="${run.jvmargs}"/>
                         <jvmarg line="${run.jvmargs.ide}"/>
                     </customize>
@@ -545,74 +715,20 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target if="${junit.available}" name="-init-macrodef-junit-debug" unless="${nb.junit.batch}">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-test-properties" if="${nb.junit.batch}" name="-init-macrodef-junit-debug-batch">
-        <macrodef name="junit-debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <attribute default="" name="testmethods"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <property name="junit.forkmode" value="perTest"/>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                        <fileset dir="${build.test.classes.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
-                            <filename name="${test.binarytestincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
-                    <customize/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target depends="-init-macrodef-junit-debug,-init-macrodef-junit-debug-batch" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
+    <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
         <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="**" name="testincludes"/>
             <attribute default="" name="testmethods"/>
-            <element implicit="true" name="customize" optional="true"/>
+            <element name="customizeDebuggee" optional="true"/>
             <sequential>
-                <j2seproject3:junit-debug excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize/>
-                </j2seproject3:junit-debug>
+                <j2seproject3:junit excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                    <customize>
+                        <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                        <customizeDebuggee/>
+                    </customize>
+                </j2seproject3:junit>
             </sequential>
         </macrodef>
     </target>
@@ -631,14 +747,14 @@ is divided into following sections:
                 <delete dir="${build.test.results.dir}" quiet="true"/>
                 <mkdir dir="${build.test.results.dir}"/>
                 <j2seproject3:debug classname="org.testng.TestNG" classpath="${debug.test.classpath}">
-                    <customize>
+                    <customizeDebuggee>
                         <customize2/>
                         <jvmarg value="-ea"/>
                         <arg line="${testng.debug.mode}"/>
                         <arg line="-d ${build.test.results.dir}"/>
                         <arg line="-listener org.testng.reporters.VerboseReporter"/>
                         <arg line="${testng.cmd.args}"/>
-                    </customize>
+                    </customizeDebuggee>
                 </j2seproject3:debug>
             </sequential>
         </macrodef>
@@ -665,14 +781,10 @@ is divided into following sections:
             <attribute default="" name="testMethod"/>
             <sequential>
                 <j2seproject3:test-debug-impl excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
-                    <customize>
-                        <classpath>
-                            <path path="${run.test.classpath}"/>
-                        </classpath>
-                        <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <customizeDebuggee>
                         <jvmarg line="${run.jvmargs}"/>
                         <jvmarg line="${run.jvmargs.ide}"/>
-                    </customize>
+                    </customizeDebuggee>
                 </j2seproject3:test-debug-impl>
             </sequential>
         </macrodef>
@@ -752,10 +864,14 @@ is divided into following sections:
     <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
         <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
             <attribute default="${main.class}" name="name"/>
+            <attribute default="${debug.modulepath}" name="modulepath"/>
             <attribute default="${debug.classpath}" name="classpath"/>
             <attribute default="" name="stopclassname"/>
             <sequential>
                 <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                    <modulepath>
+                        <path path="@{modulepath}"/>
+                    </modulepath>
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -774,18 +890,6 @@ is divided into following sections:
         </macrodef>
     </target>
     <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
         <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
             <os family="windows"/>
         </condition>
@@ -795,21 +899,79 @@ is divided into following sections:
     </target>
     <target depends="-init-debug-args" name="-init-macrodef-debug">
         <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
+            <attribute default="${module.name}" name="modulename"/>
             <attribute default="${main.class}" name="classname"/>
+            <attribute default="${debug.modulepath}" name="modulepath"/>
             <attribute default="${debug.classpath}" name="classpath"/>
+            <element name="customizeDebuggee" optional="true"/>
+            <sequential>
+                <j2seproject1:java classname="@{classname}" classpath="@{classpath}" modulename="@{modulename}" modulepath="@{modulepath}">
+                    <customize>
+                        <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                        <customizeDebuggee/>
+                    </customize>
+                </j2seproject1:java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-macrodef-java-with-module">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="${module.name}" name="modulename"/>
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.modulepath}" name="modulepath"/>
+            <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
-                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
+                    <classpath>
+                        <path path="@{classpath}"/>
+                    </classpath>
+                    <modulepath>
+                        <pathelement path="@{modulepath}"/>
+                        <pathelement location="${module.build.classes.dir}"/>
+                    </modulepath>
+                    <upgrademodulepath>
+                        <path path="@{upgrademodulepath}"/>
+                    </upgrademodulepath>
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
                     <jvmarg line="${run.jvmargs}"/>
                     <jvmarg line="${run.jvmargs.ide}"/>
+                    <syspropertyset>
+                        <propertyref prefix="run-sys-prop."/>
+                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                    </syspropertyset>
+                    <customize/>
+                </java>
+            </sequential>
+        </macrodef>
+    </target>
+    <target depends="-init-source-module-properties" if="unnamed.module.internal" name="-init-macrodef-java-with-unnamed-module">
+        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="" name="modulename"/>
+            <attribute default="${main.class}" name="classname"/>
+            <attribute default="${run.modulepath}" name="modulepath"/>
+            <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
+            <attribute default="${run.classpath}" name="classpath"/>
+            <attribute default="jvm" name="jvm"/>
+            <element name="customize" optional="true"/>
+            <sequential>
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
+                    <modulepath>
+                        <path path="@{modulepath}"/>
+                    </modulepath>
+                    <upgrademodulepath>
+                        <path path="@{upgrademodulepath}"/>
+                    </upgrademodulepath>
+                    <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                    <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                    <jvmarg line="${run.jvmargs}"/>
+                    <jvmarg line="${run.jvmargs.ide}"/>
                     <syspropertyset>
                         <propertyref prefix="run-sys-prop."/>
                         <mapper from="run-sys-prop.*" to="*" type="glob"/>
@@ -819,9 +981,11 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-java">
+    <target depends="-init-source-module-properties" name="-init-macrodef-java-without-module" unless="modules.supported.internal">
         <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
+            <attribute default="" name="modulename"/>
             <attribute default="${main.class}" name="classname"/>
+            <attribute default="" name="modulepath"/>
             <attribute default="${run.classpath}" name="classpath"/>
             <attribute default="jvm" name="jvm"/>
             <element name="customize" optional="true"/>
@@ -844,6 +1008,7 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
+    <target depends="-init-macrodef-java-with-module, -init-macrodef-java-with-unnamed-module, -init-macrodef-java-without-module" name="-init-macrodef-java"/>
     <target name="-init-macrodef-copylibs">
         <macrodef name="copylibs" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${manifest.file}" name="manifest"/>
@@ -865,7 +1030,7 @@ is divided into following sections:
                     </chainedmapper>
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <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}">
+                <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}">
                     <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
                     <manifest>
                         <attribute name="Class-Path" value="${jar.classpath}"/>
@@ -877,7 +1042,7 @@ is divided into following sections:
     </target>
     <target name="-init-presetdef-jar">
         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
+            <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
                 <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
             </jar>
         </presetdef>
@@ -927,21 +1092,15 @@ is divided into following sections:
         <propertyfile file="${built-jar.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-jar.properties}"/>
-            <param location="${project.jproduct-core}" name="call.subproject"/>
-            <param location="${project.jproduct-core}/build.xml" name="call.script"/>
-            <param name="call.target" value="jar"/>
-            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
-            <param name="transfer.not.archive.disabled" value="true"/>
-        </antcall>
     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">
         <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
     </target>
     <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
-        <antcall target="clean"/>
+        <antcall target="clean">
+            <param name="no.dependencies" value="true"/>
+        </antcall>
     </target>
     <target depends="init,deps-jar" name="-pre-pre-compile">
         <mkdir dir="${build.classes.dir}"/>
@@ -982,7 +1141,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java" sourcepath="${src.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -1002,21 +1161,40 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
+    <target depends="init,compile" name="-check-module-main-class">
+        <pathconvert property="main.class.file">
+            <string value="${main.class}"/>
+            <unpackagemapper from="*" to="*.class"/>
+        </pathconvert>
+        <condition property="do.module.main.class">
+            <and>
+                <isset property="main.class.available"/>
+                <available file="${build.classes.dir}/module-info.class"/>
+                <available file="${build.classes.dir}/${main.class.file}"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <available classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="-check-module-main-class" if="do.module.main.class" name="-set-module-main-class">
+        <taskdef classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}" name="modulemainclass"/>
+        <modulemainclass failonerror="false" mainclass="${main.class}" moduleinfo="${build.classes.dir}/module-info.class"/>
+    </target>
     <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
         <touch file="${tmp.manifest.file}" verbose="false"/>
     </target>
     <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
-        <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
+        <copy encoding="${manifest.encoding}" file="${manifest.file}" outputencoding="UTF-8" tofile="${tmp.manifest.file}"/>
     </target>
     <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
-        <manifest file="${tmp.manifest.file}" mode="update">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
             <attribute name="Main-Class" value="${main.class}"/>
         </manifest>
     </target>
     <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
-        <manifest file="${tmp.manifest.file}" mode="update">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
             <attribute name="Profile" value="${javac.profile}"/>
         </manifest>
     </target>
@@ -1024,25 +1202,65 @@ is divided into following sections:
         <basename file="${application.splash}" property="splashscreen.basename"/>
         <mkdir dir="${build.classes.dir}/META-INF"/>
         <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
-        <manifest file="${tmp.manifest.file}" mode="update">
+        <manifest encoding="UTF-8" file="${tmp.manifest.file}" mode="update">
             <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
         </manifest>
     </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
+    <target depends="init,compile" name="-check-do-mkdist">
+        <condition property="do.mkdist">
+            <and>
+                <isset property="do.archive"/>
+                <isset property="libs.CopyLibs.classpath"/>
+                <not>
+                    <istrue value="${mkdist.disabled}"/>
+                </not>
+                <not>
+                    <available file="${build.classes.dir}/module-info.class"/>
+                </not>
+            </and>
+        </condition>
+    </target>
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.mkdist" name="-do-jar-copylibs">
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <echo level="info">java -jar "${dist.jar.resolved}"</echo>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
         <j2seproject1:jar manifest="${tmp.manifest.file}"/>
         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <condition else="${dist.jar.resolved}" property="jar.usage.message.class.path.replacement" value="">
+            <isset property="named.module.internal"/>
+        </condition>
         <pathconvert property="run.classpath.with.dist.jar">
             <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${jar.usage.message.class.path.replacement}"/>
+        </pathconvert>
+        <pathconvert property="run.modulepath.with.dist.jar">
+            <path location="${dist.jar.resolved}"/>
+            <path path="${run.modulepath}"/>
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
         </pathconvert>
-        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
+        <condition else="${run.modulepath}" property="jar.usage.message.run.modulepath.with.dist.jar" value="${run.modulepath.with.dist.jar}">
+            <isset property="named.module.internal"/>
+        </condition>
+        <condition else="" property="jar.usage.message.module.path" value=" -p ${jar.usage.message.run.modulepath.with.dist.jar}">
+            <and>
+                <isset property="modules.supported.internal"/>
+                <length length="0" string="${jar.usage.message.run.modulepath.with.dist.jar}" when="greater"/>
+            </and>
+        </condition>
+        <condition else="" property="jar.usage.message.class.path" value=" -cp ${run.classpath.with.dist.jar}">
+            <length length="0" string="${run.classpath.with.dist.jar}" when="greater"/>
+        </condition>
+        <condition else="/${main.class}" property="jar.usage.message.main.class.class.selector" value="">
+            <isset property="do.module.main.class"/>
+        </condition>
+        <condition else=" ${main.class}" property="jar.usage.message.main.class" value=" -m ${module.name}${jar.usage.message.main.class.class.selector}">
+            <isset property="named.module.internal"/>
+        </condition>
+        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java}${jar.usage.message.module.path}${jar.usage.message.class.path}${jar.usage.message.main.class}">
             <isset property="main.class.available"/>
         </condition>
         <condition else="debug" property="jar.usage.level" value="info">
@@ -1061,8 +1279,73 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
-    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
+    <target depends="init,compile,-pre-jar,-set-module-main-class,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar,-post-jar,deploy" description="Build JAR." name="jar"/>
+    <!--
+                =================
+                DEPLOY SECTION
+                =================
+            -->
+    <target name="-pre-deploy">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init" name="-check-jlink">
+        <condition property="do.jlink.internal">
+            <and>
+                <istrue value="${do.jlink}"/>
+                <isset property="do.archive"/>
+                <isset property="named.module.internal"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="init,-do-jar,-post-jar,-pre-deploy,-check-jlink" if="do.jlink.internal" name="-do-deploy">
+        <delete dir="${dist.jlink.dir}" failonerror="false" quiet="true"/>
+        <property name="jlink.launcher.name" value="${application.title}"/>
+        <condition else="${module.name}" property="jlink.add.modules" value="${module.name},${jlink.additionalmodules}">
+            <and>
+                <isset property="jlink.additionalmodules"/>
+                <length length="0" string="${jlink.additionalmodules}" when="greater"/>
+            </and>
+        </condition>
+        <condition property="jlink.do.strip.internal">
+            <and>
+                <isset property="jlink.strip"/>
+                <istrue value="${jlink.strip}"/>
+            </and>
+        </condition>
+        <condition property="jlink.do.additionalparam.internal">
+            <and>
+                <isset property="jlink.additionalparam"/>
+                <length length="0" string="${jlink.additionalparam}" when="greater"/>
+            </and>
+        </condition>
+        <condition property="jlink.do.launcher.internal">
+            <and>
+                <istrue value="${jlink.launcher}"/>
+                <isset property="main.class.available"/>
+            </and>
+        </condition>
+        <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
+        <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
+        <exec executable="${platform.jlink}">
+            <arg value="--module-path"/>
+            <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
+            <arg value="--add-modules"/>
+            <arg value="${jlink.add.modules}"/>
+            <arg if:set="jlink.do.strip.internal" value="--strip-debug"/>
+            <arg if:set="jlink.do.launcher.internal" value="--launcher"/>
+            <arg if:set="jlink.do.launcher.internal" value="${jlink.launcher.name}=${module.name}/${main.class}"/>
+            <arg if:set="jlink.do.additionalparam.internal" line="${jlink.additionalparam}"/>
+            <arg value="--output"/>
+            <arg value="${dist.jlink.output}"/>
+        </exec>
+    </target>
+    <target name="-post-deploy">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="-do-jar,-post-jar,-pre-deploy,-do-deploy,-post-deploy" name="deploy"/>
     <!--
                 =================
                 EXECUTION SECTION
@@ -1099,9 +1382,9 @@ is divided into following sections:
     </target>
     <target depends="init,compile" name="-debug-start-debuggee">
         <j2seproject3:debug>
-            <customize>
+            <customizeDebuggee>
                 <arg line="${application.args}"/>
-            </customize>
+            </customizeDebuggee>
         </j2seproject3:debug>
     </target>
     <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
@@ -1167,28 +1450,24 @@ is divided into following sections:
             </customize>
         </profile>
     </target>
-    <target depends="profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
+    <target depends="-init-macrodef-junit,profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
         <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
         <nbprofiledirect>
             <classpath>
                 <path path="${run.test.classpath}"/>
             </classpath>
         </nbprofiledirect>
-        <junit dir="${profiler.info.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${profiler.info.jvm}" showoutput="true">
-            <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-            <jvmarg line="${profiler.info.jvmargs}"/>
-            <test name="${profile.class}"/>
-            <classpath>
-                <path path="${run.test.classpath}"/>
-            </classpath>
-            <syspropertyset>
-                <propertyref prefix="test-sys-prop."/>
-                <mapper from="test-sys-prop.*" to="*" type="glob"/>
-            </syspropertyset>
-            <formatter type="brief" usefile="false"/>
-            <formatter type="xml"/>
-        </junit>
+        <j2seproject3:junit excludes="${excludes}" includes="${includes}" testincludes="${profile.class}" testmethods="">
+            <customize>
+                <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+                <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                <jvmarg line="${profiler.info.jvmargs}"/>
+                <classpath>
+                    <path path="${run.test.classpath}"/>
+                </classpath>
+            </customize>
+        </j2seproject3:junit>
     </target>
     <!--
                 end of pre NB72 profiling section
@@ -1219,7 +1498,7 @@ is divided into following sections:
     <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
         <startprofiler/>
-        <antcal target="run-test-with-main"/>
+        <antcall target="run-test-with-main"/>
     </target>
     <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
         <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
@@ -1244,6 +1523,12 @@ is divided into following sections:
         <condition else="" property="bug5101868workaround" value="*.java">
             <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
         </condition>
+        <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
+            <and>
+                <isset property="javadoc.html5"/>
+                <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
+            </and>
+        </condition>
         <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
@@ -1256,6 +1541,7 @@ is divided into following sections:
                 <exclude name="*.java"/>
             </fileset>
             <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
+            <arg line="${javadoc.html5.cmd.line.arg}"/>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
@@ -1282,11 +1568,63 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
+    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
+        <j2seproject3:modulename property="test.module.name" sourcepath="${test.src.dir}"/>
+        <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.src.dir}">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+        <condition else="--patch-module ${module.name}=${test.src.dir} --add-reads ${module.name}=ALL-UNNAMED" property="javac.test.compilerargs" value="--add-reads ${test.module.name}=ALL-UNNAMED">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-run-module-properties">
+        <condition else="${module.name}" property="run.test.addexport.source.module.internal" value="${test.module.name}">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+        <fileset dir="${build.test.classes.dir}" id="run.test.packages.internal" includes="**/*.class"/>
+        <property location="${build.test.classes.dir}" name="build.test.classes.dir.abs.internal"/>
+        <pathconvert pathsep=" " property="run.test.addexports.internal" refid="run.test.packages.internal">
+            <chainedmapper>
+                <regexpmapper from="^(.*)\Q${file.separator}\E.*\.class$$" to="\1"/>
+                <filtermapper>
+                    <uniqfilter/>
+                    <replacestring from="${build.test.classes.dir.abs.internal}" to=""/>
+                </filtermapper>
+                <cutdirsmapper dirs="1"/>
+                <packagemapper from="*" to="--add-exports ${run.test.addexport.source.module.internal}/*=ALL-UNNAMED"/>
+            </chainedmapper>
+        </pathconvert>
+        <condition else="--patch-module ${module.name}=${build.test.classes.dir} --add-modules ${module.name} --add-reads ${module.name}=ALL-UNNAMED ${run.test.addexports.internal}" property="run.test.jvmargs" value="--add-modules ${test.module.name} --add-reads ${test.module.name}=ALL-UNNAMED ${run.test.addexports.internal}">
+            <and>
+                <isset property="test.module.name"/>
+                <length length="0" string="${test.module.name}" when="greater"/>
+            </and>
+        </condition>
+    </target>
+    <target depends="-init-source-module-properties" name="-init-test-module-properties-without-module" unless="named.module.internal">
+        <property name="javac.test.sourcepath" value="${empty.dir}"/>
+        <property name="javac.test.compilerargs" value=""/>
+        <property name="run.test.jvmargs" value=""/>
+    </target>
+    <target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module" name="-init-test-module-properties"/>
     <target if="do.depend.true" name="-compile-test-depend">
         <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
     </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.src.dir}"/>
+    <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${javac.test.sourcepath}" srcdir="${test.src.dir}">
+            <customize>
+                <compilerarg line="${javac.test.compilerargs}"/>
+            </customize>
+        </j2seproject3:javac>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
@@ -1300,10 +1638,14 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+    <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}, module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}">
+            <customize>
+                <compilerarg line="${javac.test.compilerargs}"/>
+            </customize>
+        </j2seproject3:javac>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
@@ -1321,7 +1663,7 @@ is divided into following sections:
     <target depends="init" if="have.tests" name="-pre-test-run">
         <mkdir dir="${build.test.results.dir}"/>
     </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
+    <target depends="init,compile-test,-init-test-run-module-properties,-pre-test-run" if="have.tests" name="-do-test-run">
         <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
     </target>
     <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
@@ -1333,14 +1675,14 @@ is divided into following sections:
     <target depends="init" if="have.tests" name="-pre-test-run-single">
         <mkdir dir="${build.test.results.dir}"/>
     </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
         <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
         <j2seproject3:test excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
     </target>
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
     </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
     <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
         <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
         <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
@@ -1349,7 +1691,7 @@ is divided into following sections:
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
     </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
     <!--
                 =======================
                 TEST DEBUGGING SECTION
@@ -1367,8 +1709,9 @@ is divided into following sections:
     <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
         <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
     </target>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+    <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
+    <target depends="debug-test-method" name="debug-single-method"/>
     <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
         <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
     </target>
@@ -1394,9 +1737,9 @@ is divided into following sections:
     <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
         <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
         <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
+            <customizeDebuggee>
                 <arg value="${applet.url}"/>
-            </customize>
+            </customizeDebuggee>
         </j2seproject3:debug>
     </target>
     <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
@@ -1420,17 +1763,10 @@ is divided into following sections:
         <propertyfile file="${built-clean.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-clean.properties}"/>
-            <param location="${project.jproduct-core}" name="call.subproject"/>
-            <param location="${project.jproduct-core}/build.xml" name="call.script"/>
-            <param name="call.target" value="clean"/>
-            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
-            <param name="transfer.not.archive.disabled" value="true"/>
-        </antcall>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>
+        <delete dir="${dist.jlink.output}"/>
         <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
     </target>
     <target name="-post-clean">
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 463e88d..a4fbb49 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -34,14 +34,13 @@ dist.jar=${dist.dir}/jproduct-lib.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.jcustomer-core.jar=lib/jcustomer-core.jar
+file.reference.jproduct-core.jar=lib/jproduct-core.jar
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    ${file.reference.jcustomer-core.jar}:\
-    ${reference.jproduct-core.jar}:\
+    ${file.reference.jproduct-core.jar}:\
     ${libs.javaee-api-7.0.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=
@@ -63,6 +62,7 @@ javac.test.processorpath=\
 javadoc.additionalparam=
 javadoc.author=true
 javadoc.encoding=${source.encoding}
+javadoc.html5=false
 javadoc.noindex=false
 javadoc.nonavbar=false
 javadoc.notree=false
@@ -71,6 +71,8 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=true
 javadoc.windowtitle=Java Shop EE Library
+jlink.launcher=false
+jlink.launcher.name=jproduct-lib
 jnlp.codebase.type=no.codebase
 jnlp.descriptor=application
 jnlp.enabled=false
@@ -87,9 +89,7 @@ manifest.custom.permissions=
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 platform.active=default_platform
-project.jproduct-core=../jproduct-core
 project.license=gpl30
-reference.jproduct-core.jar=${project.jproduct-core}/dist/jproduct-core.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -105,6 +105,6 @@ run.test.classpath=\
 run.test.modulepath=\
     ${javac.test.modulepath}
 source.encoding=UTF-8
-source.reference.jcustomer-core.jar=../jcustomer-core/src/
+source.reference.jproduct-core.jar=../jproduct-core/src/
 src.dir=src
 test.src.dir=test
diff --git a/nbproject/project.xml b/nbproject/project.xml
index dca01e6..f40f68b 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -14,15 +14,6 @@
         <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
             <definitions>./lib/nblibraries.properties</definitions>
         </libraries>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-            <reference>
-                <foreign-project>jproduct-core</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>jar</target>
-                <clean-target>clean</clean-target>
-                <id>jar</id>
-            </reference>
-        </references>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
     </configuration>
 </project>
-- 
2.39.5