Don't cherry-pick:

- upgraded project files for Apache NetBeans IDE 15

diff --git a/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar b/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
index eaf6790a221ad1983616f4c98377bd9876bc6224..174d1fcfa7325a5f9f1927055b019f286d066c0c 100644 (file)
Binary files a/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar and b/lib/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar differ

diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index 8d00141fd7458a9da3e4bf3eb846cbb5cebf83d2..6e889e29c0b9fb53ac0f33f37d9aa10b4133a6c7 100644 (file)
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -1,7 +1,7 @@
 libs.CopyLibs.classpath=\
     ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
 libs.CopyLibs.displayName=CopyLibs Task
-libs.CopyLibs.prop-version=2.0
+libs.CopyLibs.prop-version=3.0
 libs.jpa20-persistence.classpath=\
     ${base}/jpa20-persistence/javax.persistence_2.1.0.v201304241213.jar
 libs.jpa20-persistence.displayName=Persistence (JPA 2.1)

diff --git a/nbproject/project.properties b/nbproject/project.properties
index d6f4ca4d3b7556a9ac6ae3e843a720f70a3bb109..cc17ff9323adea19c5859983b57a802b69902c7d 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -20,8 +20,12 @@ build.test.results.dir=${build.dir}/test/results
 #debug.transport=dt_socket
 debug.classpath=\
     ${run.classpath}
+debug.modulepath=\
+    ${run.modulepath}
 debug.test.classpath=\
     ${run.test.classpath}
+debug.test.modulepath=\
+    ${run.test.modulepath}
 # Files in build.classes.dir which should be excluded from distribution jar
 dist.archive.excludes=
 # This directory is removed when the project is cleaned:
@@ -55,6 +59,8 @@ javac.classpath=\
 javac.compilerargs=-Xlint:deprecation -Xlint:unchecked
 javac.deprecation=true
 javac.external.vm=false
+javac.modulepath=
+javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.7
@@ -62,11 +68,14 @@ javac.target=1.7
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
+javac.test.modulepath=\
+    ${javac.modulepath}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=
 javadoc.author=true
 javadoc.encoding=${source.encoding}
+javadoc.html5=false
 javadoc.noindex=false
 javadoc.nonavbar=false
 javadoc.notree=false
@@ -75,6 +84,8 @@ javadoc.splitindex=true
 javadoc.use=true
 javadoc.version=true
 javadoc.windowtitle=Addressbook Swing Application
+jlink.launcher=false
+jlink.launcher.name=addressbook-swing
 jnlp.codebase.type=no.codebase
 jnlp.descriptor=application
 jnlp.enabled=false
@@ -105,9 +116,13 @@ run.classpath=\
 # You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
 # To set system properties for unit tests define test-sys-prop.name=value:
 run.jvmargs=-ea
+run.modulepath=\
+    ${javac.modulepath}
 run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
+run.test.modulepath=\
+    ${javac.test.modulepath}
 source.encoding=UTF-8
 source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
 source.reference.jcontacts-core.jar=../jcontacts-core/src/