From: Roland Häder Date: Thu, 24 Nov 2022 01:13:20 +0000 (+0100) Subject: Don't cherry-pick: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;ds=sidebyside;h=afa7ce30a2f757a3f10983413f8c7c4435cc7ada;p=jcustomer-lib.git Don't cherry-pick: - upgraded project files for Apache NetBeans IDE 15 - removed no longer needed jcoreee.jar --- 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/jcoreee.jar b/lib/jcoreee.jar deleted file mode 100644 index 7875d1e..0000000 Binary files a/lib/jcoreee.jar and /dev/null 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 0bc6ba9..f55bfcf 100644 --- 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: @@ -31,14 +35,12 @@ dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= file.reference.jcontacts-core.jar=lib/jcontacts-core.jar -file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jcustomer-core.jar=lib/jcustomer-core.jar includes=** jar.archive.disabled=${jnlp.enabled} jar.compress=false jar.index=${jnlp.enabled} javac.classpath=\ - ${file.reference.jcoreee.jar}:\ ${file.reference.jcustomer-core.jar}:\ ${file.reference.jcontacts-core.jar}:\ ${libs.javaee-api-7.0.classpath} @@ -46,6 +48,8 @@ javac.classpath=\ javac.compilerargs= javac.deprecation=true javac.external.vm=false +javac.modulepath= +javac.processormodulepath= javac.processorpath=\ ${javac.classpath} javac.source=1.7 @@ -53,6 +57,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= @@ -90,12 +96,15 @@ 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.jcontacts-core.jar=../jcontacts-core/src/ -source.reference.jcoreee.jar=../jcoreee/src/ source.reference.jcustomer-core.jar=../jcustomer-core/src/ src.dir=src test.src.dir=test