From: Roland Häder Date: Thu, 24 Nov 2022 01:13:03 +0000 (+0100) Subject: Don't cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=83e29acead9457e427be1b399016d863abf351a6;p=jcountry-lib.git 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 2cc00f0..174d1fc 100644 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 167f5fe..0ff5358 100644 --- 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 8554a27..9d4c8e6 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -19,8 +19,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: @@ -41,6 +45,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 @@ -48,6 +54,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= @@ -72,9 +80,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= +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.jcountry-core.jar=../jcountry-core/src/ src.dir=src