diff --git a/nbproject/project.properties b/nbproject/project.properties
index 5d7a26752ad41ea1506dbb290d398e3ddfe05765..c8b94ae5b53485ce2789a05ec07c037fa5bd54ad 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,149 +1,138 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=true
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.desc=Project to provide a type-safe Java implementation of the DIS Protocol version 7, IEEE 1278.1-2012 and SISO-REF-010 Enumerations specifications.
-application.homepage=https://github.com/open-dis/open-dis7-java
-application.splash=..\\images\\OpenDisSurferDude.png
-application.title=open-dis7-java
-application.vendor=Naval Postgraduate School (NPS)
-auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#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:
-dist.dir=dist
-dist.jar=${dist.dir}/open-dis7-java.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-dist.jlink.dir=${dist.dir}/jlink
-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.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-platform-commons-1.6.2.jar=testlibs/junit-platform-commons-1.6.2.jar
-file.reference.junit-platform-console-1.6.2.jar=testlibs/junit-platform-console-1.6.2.jar
-file.reference.junit-platform-engine-1.6.2.jar=testlibs/junit-platform-engine-1.6.2.jar
-file.reference.junit-platform-launcher-1.6.2.jar=testlibs/junit-platform-launcher-1.6.2.jar
-file.reference.junit-platform-reporting-1.6.2.jar=testlibs/junit-platform-reporting-1.6.2.jar
-file.reference.open-dis7-java-src=src
-file.reference.open-dis7-java-src-generated=src-generated
-file.reference.opentest4j-1.2.0.jar=testlibs/opentest4j-1.2.0.jar
-includes=**
-jar.archive.disabled=${jnlp.enabled}
-jar.compress=false
-jar.index=${jnlp.enabled}
-javac.classpath=\
-    ${file.reference.open-dis7-java-src}:\
-    ${file.reference.open-dis7-java-src-generated}:\
-    ${file.reference.commons-io-2.6.jar}:\
-    ${file.reference.guava-28.0-jre.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=-Xlint:unchecked
-javac.deprecation=true
-javac.external.vm=true
-javac.modulepath=
-javac.processormodulepath=
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.8
-javac.target=1.8
-javac.test.classpath=\
-    ${file.reference.open-dis7-java-src}:\
-    ${file.reference.open-dis7-java-src-generated}:\
-    ${libs.junit_5.classpath}:\
-    ${file.reference.apiguardian-api-1.1.0.jar}:\
-    ${libs.hamcrest.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
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-# The jlink additional root modules to resolve
-jlink.additionalmodules=
-# The jlink additional command line parameters
-jlink.additionalparam=
-jlink.launcher=true
-jlink.launcher.name=open-dis7-java
-jnlp.codebase.type=no.codebase
-jnlp.descriptor=application
-jnlp.enabled=false
-jnlp.mixed.code=default
-jnlp.offline-allowed=false
-jnlp.signed=false
-jnlp.signing=
-jnlp.signing.alias=
-jnlp.signing.keystore=
-main.class=edu.nps.moves.dis7.examples.PduReaderPlayer
-# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found.
-manifest.custom.application.library.allowable.codebase=
-# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts.
-manifest.custom.caller.allowable.codebase=
-# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
-manifest.custom.codebase=
-# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
-manifest.custom.permissions=
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=Open_JDK_14.0.2
-project.licensePath=./license.txt
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# 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:
-run.jvmargs=
-run.modulepath=\
-    ${javac.modulepath}
-run.test.classpath=\
-    ${file.reference.open-dis7-java-src}:\
-    ${file.reference.open-dis7-java-src-generated}:\
-    ${file.reference.junit-platform-commons-1.6.2.jar}:\
-    ${file.reference.junit-platform-console-1.6.2.jar}:\
-    ${file.reference.junit-platform-engine-1.6.2.jar}:\
-    ${file.reference.junit-platform-launcher-1.6.2.jar}:\
-    ${file.reference.junit-platform-reporting-1.6.2.jar}:\
-    ${file.reference.opentest4j-1.2.0.jar}:\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-run.test.modulepath=\
-    ${javac.test.modulepath}
-source.encoding=UTF-8
-src.dir=src
-src.src-generated.dir=src-generated
-test.src.dir=test
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=true
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.desc=Project to provide a type-safe Java implementation of the DIS Protocol version 7, IEEE 1278.1-2012 and SISO-REF-010 Enumerations specifications.
+application.homepage=https://github.com/open-dis/open-dis7-java
+application.splash=..\\images\\OpenDisSurferDude.png
+application.title=open-dis7-java
+application.vendor=Naval Postgraduate School (NPS)
+auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#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:
+dist.dir=dist
+dist.jar=${dist.dir}/open-dis7-java.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+dist.jlink.dir=${dist.dir}/jlink
+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.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
+file.reference.junit-jupiter-engine-5.7.0.jar=testlibs/junit-jupiter-engine-5.7.0.jar
+file.reference.junit-platform-console-standalone-1.7.0.jar=testlibs/junit-platform-console-standalone-1.7.0.jar
+file.reference.open-dis7-enumerations-classes.jar=dist/open-dis7-enumerations-classes.jar
+file.reference.opentest4j-1.2.0.jar=testlibs/opentest4j-1.2.0.jar
+file.reference.srm-4.4.0.jar=lib/srm-4.4.0.jar
+includes=**
+jar.archive.disabled=${jnlp.enabled}
+jar.compress=false
+jar.index=${jnlp.enabled}
+javac.classpath=\
+    ${file.reference.commons-io-2.6.jar}:\
+    ${file.reference.guava-28.0-jre.jar}:\
+    ${file.reference.open-dis7-enumerations-classes.jar}:\
+    ${file.reference.srm-4.4.0.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=-Xlint:unchecked
+javac.deprecation=true
+javac.external.vm=true
+javac.modulepath=
+javac.processormodulepath=
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.8
+javac.target=1.8
+javac.test.classpath=\
+    ${file.reference.apiguardian-api-1.1.0.jar}:\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${file.reference.junit-jupiter-api-5.7.0.jar}:\
+    ${file.reference.junit-jupiter-engine-5.7.0.jar}
+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
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+# The jlink additional root modules to resolve
+jlink.additionalmodules=
+# The jlink additional command line parameters
+jlink.additionalparam=
+jlink.launcher=true
+jlink.launcher.name=open-dis7-java
+jnlp.codebase.type=no.codebase
+jnlp.descriptor=application
+jnlp.enabled=false
+jnlp.mixed.code=default
+jnlp.offline-allowed=false
+jnlp.signed=false
+jnlp.signing=
+jnlp.signing.alias=
+jnlp.signing.keystore=
+main.class=edu.nps.moves.dis7.examples.PduReaderPlayer
+# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found.
+manifest.custom.application.library.allowable.codebase=
+# Optional override of default Caller-Allowable-Codebase attribute identifying the domains from which JavaScript code can make calls to your RIA without security prompts.
+manifest.custom.caller.allowable.codebase=
+# Optional override of default Codebase manifest attribute, use to prevent RIAs from being repurposed
+manifest.custom.codebase=
+# Optional override of default Permissions manifest attribute (supported values: sandbox, all-permissions)
+manifest.custom.permissions=
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+project.licensePath=./license.txt
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# 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:
+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}
+run.test.modulepath=\
+    ${javac.test.modulepath}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test