From: Roland Häder Date: Thu, 24 Nov 2022 01:23:43 +0000 (+0100) Subject: Don't cherry-pick: X-Git-Url: https://git.mxchange.org/?p=jshop-lib.git;a=commitdiff_plain;h=dde4ff3cc38fee15e7bdf1296f07d5df92c13d1f Don't cherry-pick: - upgraded project files for Apache NetBeans IDE 15 - remvoed 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 cce36f6..d9bff66 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: @@ -30,7 +34,6 @@ dist.jar=${dist.dir}/jshop-lib.jar dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= -file.reference.jcoreee.jar=lib/jcoreee.jar file.reference.jcustomer-core.jar=lib/jcustomer-core.jar file.reference.jproduct-core.jar=lib/jproduct-core.jar includes=** @@ -38,15 +41,16 @@ 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.jproduct-core.jar}:\ ${reference.jshop-core.jar}:\ ${libs.javaee-api-7.0.classpath} # Space-separated list of extra javac options -javac.compilerargs= +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 @@ -54,11 +58,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 @@ -67,6 +74,8 @@ javadoc.splitindex=true javadoc.use=true javadoc.version=true javadoc.windowtitle=Java Shop EE Library +jlink.launcher=false +jlink.launcher.name=jshop-lib jnlp.codebase.type=no.codebase jnlp.descriptor=application jnlp.enabled=false @@ -93,11 +102,14 @@ 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.jcoreee.jar=../jcoreee/src/ source.reference.jcustomer-core.jar=../jcustomer-core/src/ source.reference.jproduct-core.jar=../jproduct-core/src/ src.dir=src