diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 6fb4115f1be842d205bfe43aa0010b2b5d5c095e..f3c2f32d00f1f5e5520889062785f26e509d6bf3 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,5 +1,5 @@ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=a21aee8e +nbproject/build-impl.xml.data.CRC32=6fbe5857 nbproject/build-impl.xml.script.CRC32=b33f34e1 nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.100.0.48 diff --git a/nbproject/project.properties b/nbproject/project.properties index 16f310dda4c8c73d41f1be19fbc1745c81c2841b..eb2074a0486dc4cba2aa18bbbe38ea09a3c41295 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -42,6 +42,7 @@ dist.jlink.output=${dist.jlink.dir}/open-dis7-java endorsed.classpath= excludes=**/logs/ **/X3dInterpolators/ file.reference.apiguardian-api-1.1.0.jar=testlibs/apiguardian-api-1.1.0.jar +file.reference.classes-edu=build/classes/edu file.reference.commons-io-2.6.jar=lib/commons-io-2.6.jar file.reference.guava-28.0-jre.jar=lib/guava-28.0-jre.jar file.reference.junit-jupiter-api-5.7.0.jar=testlibs/junit-jupiter-api-5.7.0.jar @@ -68,12 +69,13 @@ javac.processorpath=\ javac.source=1.8 javac.target=1.8 javac.test.classpath=\ - ${file.reference.apiguardian-api-1.1.0.jar}:\ - ${javac.classpath}:\ ${build.classes.dir}:\ + ${javac.classpath}:\ + ${file.reference.apiguardian-api-1.1.0.jar}:\ ${file.reference.junit-jupiter-api-5.7.0.jar}:\ ${file.reference.junit-jupiter-engine-5.7.0.jar}:\ - ${libs.junit_5.classpath} + ${libs.junit_5.classpath}:\ + ${file.reference.classes-edu} javac.test.modulepath=\ ${javac.modulepath} javac.test.processorpath=\ @@ -116,12 +118,11 @@ manifest.custom.codebase= manifest.custom.permissions= meta.inf.dir=${src.dir}/META-INF mkdist.disabled=false -no.dependencies=true platform.active=JDK_16 project.licensePath=./license.txt run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir} + ${build.classes.dir}:\ + ${javac.classpath} # Space-separated list of JVM arguments used when running the project. # 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: @@ -129,10 +130,10 @@ run.jvmargs= run.modulepath=\ ${javac.modulepath} run.test.classpath=\ - ${file.reference.opentest4j-1.2.0.jar}:\ ${javac.test.classpath}:\ - ${file.reference.junit-platform-console-standalone-1.7.0.jar}:\ - ${build.test.classes.dir} + ${build.test.classes.dir}:\ + ${file.reference.opentest4j-1.2.0.jar}:\ + ${file.reference.junit-platform-console-standalone-1.7.0.jar} run.test.modulepath=\ ${javac.test.modulepath} source.encoding=UTF-8