Don't cherry-pick:

- upgraded project files for Apache NetBeans IDE 15
- updated jar(s)

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/jaddressbook-core.jar b/lib/jaddressbook-core.jar
index 31bec5167ed520491f381079a8fbe090970fa8a6..9768abf9d5427903e9c9db80fae6bd8a887a0b4c 100644 (file)
Binary files a/lib/jaddressbook-core.jar and b/lib/jaddressbook-core.jar differ

diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index cadf17c0bcbf3f50f5b253b95cf43c080dd5c639..b87aaf602eca29075fc35cbc047e28e538f302b8 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.javaee-api-7.0.classpath=\
     ${base}/javaee-api-7.0/javaee-api-7.0.jar
 libs.javaee-api-7.0.displayName=Java EE 7 API Library

diff --git a/nbproject/project.properties b/nbproject/project.properties
index f4797cc8312326bde8128f8f3806fc37e7a94680..c41b366986888ea76e3286ae9fc738a30193b623 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:
@@ -50,6 +54,8 @@ javac.classpath=\
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
 javac.deprecation=true
 javac.external.vm=false
+javac.modulepath=
+javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
 javac.source=1.7
@@ -57,6 +63,8 @@ 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=
@@ -95,9 +103,13 @@ project.license=gpl30
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
+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.jaddressbook-core.jar=../jaddressbook-core/src/
 source.reference.jaddressbook-share-core.jar=../jaddressbook-share-core/src