diff --git a/build.xml b/build.xml
index 9afd881ede..348aa9d5ec 100644
--- a/build.xml
+++ b/build.xml
@@ -12,20 +12,15 @@
     <property name="nbplatform.active.dir" value="${basedir}/netbeans-plat/${netbeans-plat-version}" />
     <!-- Supported java versions.-->
 
-    <echo message="Java version is ${java.version} and ant java version is ${ant.java.version}"/>
     <condition property="supported-java-versions">
         <or>
-            <matches string="${java.version}" pattern="11\.0\.*"/>
-            <equals arg1="${ant.java.version}" arg2="11"/>
-            <matches string="${java.version}" pattern="14\.0\.*"/>
-            <equals arg1="${ant.java.version}" arg2="14"/>
-            <matches string="${java.version}" pattern="17\.0\.*"/>
-            <equals arg1="${ant.java.version}" arg2="17"/>
+            <matches string="${java.version}" pattern="[1-9][0-9]\.*\.*"/>
+            <matches string="${ant.java.version}" pattern="[1-9][0-9]"/>
         </or>
     </condition>
     
     <!-- Verify that the java version running is . -->
-    <fail message="Unsupported Java version: ${ant.java.version}. 
+    <fail message="Unsupported Java version: ${ant.java.version} with Ant java version ${ant.java.version}. 
             Make sure that the Java version is 11 or higher."
           unless="supported-java-versions"/>
 
@@ -144,8 +139,8 @@
         <echo file="${zip-tmp}/autopsy/autopsy/.lastModified" message="" />
 
         <!-- step (3) do your copying stuff here, check the ant doc for copy, move, etc file -->
-        <copy file="${nbplatform.active.dir}/platform/modules/ext/junit-4.10.jar"
-              tofile="${zip-tmp}/${app.name}/platform/modules/ext/junit-4.10.jar"/>
+        <!-- <copy file="${nbplatform.active.dir}/platform/modules/ext/junit-4.10.jar"
+              tofile="${zip-tmp}/${app.name}/platform/modules/ext/junit-4.10.jar"/> -->
         <copy file="${basedir}/README.txt" tofile="${zip-tmp}/${app.name}/README.txt"/>
         <copy file="${basedir}/LICENSE-2.0.txt" tofile="${zip-tmp}/${app.name}/LICENSE-2.0.txt"/>
         <copy file="${basedir}/NEWS.txt" tofile="${zip-tmp}/${app.name}/NEWS.txt"/>
diff --git a/nbproject/platform.properties b/nbproject/platform.properties
index 00172f9228..4fa71d2054 100644
--- a/nbproject/platform.properties
+++ b/nbproject/platform.properties
@@ -12,6 +12,332 @@ bootstrap.url=https://netbeans-vm1.apache.org/uc/${netbeans-plat-version}/tasks.
 # Where we get the platform from. To see what versions are available, open URL in browser up to the .../updates part of the URL
 autoupdate.catalog.url=https://netbeans-vm1.apache.org/uc/${netbeans-plat-version}/updates.xml.gz
 cluster.path=\
+    ${nbplatform.active.dir}/harness:\
+    ${nbplatform.active.dir}/java:\
     ${nbplatform.active.dir}/platform:\
+    ${nbplatform.active.dir}/cluster:\
     CoreTestLibs/build/cluster
-disabled.modules=
+disabled.modules=\
+    org.eclipse.core.contenttype,\
+    org.eclipse.core.jobs,\
+    org.eclipse.core.net,\
+    org.eclipse.core.runtime,\
+    org.eclipse.core.runtime.compatibility.auth,\
+    org.eclipse.equinox.app,\
+    org.eclipse.equinox.common,\
+    org.eclipse.equinox.preferences,\
+    org.eclipse.equinox.registry,\
+    org.eclipse.equinox.security,\
+    org.eclipse.jgit,\
+    org.eclipse.jgit.java7,\
+    org.eclipse.mylyn.bugzilla.core,\
+    org.eclipse.mylyn.commons.core,\
+    org.eclipse.mylyn.commons.net,\
+    org.eclipse.mylyn.commons.repositories.core,\
+    org.eclipse.mylyn.commons.xmlrpc,\
+    org.eclipse.mylyn.tasks.core,\
+    org.eclipse.mylyn.wikitext.confluence.core,\
+    org.eclipse.mylyn.wikitext.core,\
+    org.eclipse.mylyn.wikitext.markdown.core,\
+    org.eclipse.mylyn.wikitext.textile.core,\
+    org.netbeans.api.debugger,\
+    org.netbeans.api.debugger.jpda,\
+    org.netbeans.api.htmlui,\
+    org.netbeans.api.java,\
+    org.netbeans.api.maven,\
+    org.netbeans.core.browser,\
+    org.netbeans.core.browser.webview,\
+    org.netbeans.core.multitabs,\
+    org.netbeans.core.multitabs.project,\
+    org.netbeans.core.nativeaccess,\
+    org.netbeans.core.netigso,\
+    org.netbeans.core.network,\
+    org.netbeans.core.osgi,\
+    org.netbeans.html.ko4j,\
+    org.netbeans.html.xhr4j,\
+    org.netbeans.lib.terminalemulator,\
+    org.netbeans.lib.uihandler,\
+    org.netbeans.libs.antlr3.runtime,\
+    org.netbeans.libs.bytelist,\
+    org.netbeans.libs.cglib,\
+    org.netbeans.libs.commons_compress,\
+    org.netbeans.libs.commons_net,\
+    org.netbeans.libs.felix,\
+    org.netbeans.libs.git,\
+    org.netbeans.libs.graalsdk,\
+    org.netbeans.libs.ini4j,\
+    org.netbeans.libs.javafx,\
+    org.netbeans.libs.jaxb,\
+    org.netbeans.libs.jna,\
+    org.netbeans.libs.jna.platform,\
+    org.netbeans.libs.jsch.agentproxy,\
+    org.netbeans.libs.json_simple,\
+    org.netbeans.libs.jsr223,\
+    org.netbeans.libs.junit5,\
+    org.netbeans.libs.jvyamlb,\
+    org.netbeans.libs.osgi,\
+    org.netbeans.libs.smack,\
+    org.netbeans.libs.springframework,\
+    org.netbeans.libs.svnClientAdapter,\
+    org.netbeans.libs.svnClientAdapter.javahl,\
+    org.netbeans.libs.testng,\
+    org.netbeans.libs.xerces,\
+    org.netbeans.modules.ant.browsetask,\
+    org.netbeans.modules.ant.debugger,\
+    org.netbeans.modules.ant.freeform,\
+    org.netbeans.modules.ant.grammar,\
+    org.netbeans.modules.ant.kit,\
+    org.netbeans.modules.beans,\
+    org.netbeans.modules.bugtracking,\
+    org.netbeans.modules.bugtracking.bridge,\
+    org.netbeans.modules.bugtracking.commons,\
+    org.netbeans.modules.bugzilla,\
+    org.netbeans.modules.core.kit,\
+    org.netbeans.modules.css.editor,\
+    org.netbeans.modules.css.lib,\
+    org.netbeans.modules.css.model,\
+    org.netbeans.modules.css.prep,\
+    org.netbeans.modules.css.visual,\
+    org.netbeans.modules.db,\
+    org.netbeans.modules.db.core,\
+    org.netbeans.modules.db.dataview,\
+    org.netbeans.modules.db.drivers,\
+    org.netbeans.modules.db.kit,\
+    org.netbeans.modules.db.metadata.model,\
+    org.netbeans.modules.db.mysql,\
+    org.netbeans.modules.db.sql.editor,\
+    org.netbeans.modules.db.sql.visualeditor,\
+    org.netbeans.modules.dbapi,\
+    org.netbeans.modules.dbschema,\
+    org.netbeans.modules.debugger.jpda,\
+    org.netbeans.modules.debugger.jpda.ant,\
+    org.netbeans.modules.debugger.jpda.js,\
+    org.netbeans.modules.debugger.jpda.jsui,\
+    org.netbeans.modules.debugger.jpda.kit,\
+    org.netbeans.modules.debugger.jpda.projects,\
+    org.netbeans.modules.debugger.jpda.projectsui,\
+    org.netbeans.modules.debugger.jpda.truffle,\
+    org.netbeans.modules.debugger.jpda.trufflenode,\
+    org.netbeans.modules.debugger.jpda.ui,\
+    org.netbeans.modules.debugger.jpda.visual,\
+    org.netbeans.modules.derby,\
+    org.netbeans.modules.dlight.nativeexecution,\
+    org.netbeans.modules.dlight.nativeexecution.nb,\
+    org.netbeans.modules.dlight.terminal,\
+    org.netbeans.modules.docker.api,\
+    org.netbeans.modules.docker.editor,\
+    org.netbeans.modules.docker.ui,\
+    org.netbeans.modules.editor.bookmarks,\
+    org.netbeans.modules.editor.htmlui,\
+    org.netbeans.modules.editor.kit,\
+    org.netbeans.modules.editor.macros,\
+    org.netbeans.modules.editor.structure,\
+    org.netbeans.modules.extexecution.impl,\
+    org.netbeans.modules.extexecution.process,\
+    org.netbeans.modules.extexecution.process.jdk9,\
+    org.netbeans.modules.findbugs.installer,\
+    org.netbeans.modules.form,\
+    org.netbeans.modules.form.kit,\
+    org.netbeans.modules.form.nb,\
+    org.netbeans.modules.form.refactoring,\
+    org.netbeans.modules.git,\
+    org.netbeans.modules.gsf.codecoverage,\
+    org.netbeans.modules.html,\
+    org.netbeans.modules.html.custom,\
+    org.netbeans.modules.html.editor,\
+    org.netbeans.modules.html.editor.lib,\
+    org.netbeans.modules.html.lexer,\
+    org.netbeans.modules.html.parser,\
+    org.netbeans.modules.html.validation,\
+    org.netbeans.modules.hudson,\
+    org.netbeans.modules.hudson.ant,\
+    org.netbeans.modules.hudson.git,\
+    org.netbeans.modules.hudson.maven,\
+    org.netbeans.modules.hudson.mercurial,\
+    org.netbeans.modules.hudson.subversion,\
+    org.netbeans.modules.hudson.tasklist,\
+    org.netbeans.modules.hudson.ui,\
+    org.netbeans.modules.i18n,\
+    org.netbeans.modules.i18n.form,\
+    org.netbeans.modules.ide.kit,\
+    org.netbeans.modules.j2ee.core.utilities,\
+    org.netbeans.modules.j2ee.eclipselink,\
+    org.netbeans.modules.j2ee.eclipselinkmodelgen,\
+    org.netbeans.modules.j2ee.jpa.refactoring,\
+    org.netbeans.modules.j2ee.jpa.verification,\
+    org.netbeans.modules.j2ee.metadata,\
+    org.netbeans.modules.j2ee.metadata.model.support,\
+    org.netbeans.modules.j2ee.persistence,\
+    org.netbeans.modules.j2ee.persistence.kit,\
+    org.netbeans.modules.j2ee.persistenceapi,\
+    org.netbeans.modules.java.api.common,\
+    org.netbeans.modules.java.completion,\
+    org.netbeans.modules.java.debug,\
+    org.netbeans.modules.java.editor,\
+    org.netbeans.modules.java.editor.base,\
+    org.netbeans.modules.java.editor.lib,\
+    org.netbeans.modules.java.examples,\
+    org.netbeans.modules.java.freeform,\
+    org.netbeans.modules.java.graph,\
+    org.netbeans.modules.java.hints,\
+    org.netbeans.modules.java.hints.declarative,\
+    org.netbeans.modules.java.hints.declarative.test,\
+    org.netbeans.modules.java.hints.legacy.spi,\
+    org.netbeans.modules.java.hints.test,\
+    org.netbeans.modules.java.hints.ui,\
+    org.netbeans.modules.java.j2sedeploy,\
+    org.netbeans.modules.java.j2seembedded,\
+    org.netbeans.modules.java.j2semodule,\
+    org.netbeans.modules.java.j2seplatform,\
+    org.netbeans.modules.java.j2seprofiles,\
+    org.netbeans.modules.java.j2seproject,\
+    org.netbeans.modules.java.kit,\
+    org.netbeans.modules.java.lexer,\
+    org.netbeans.modules.java.lsp.server,\
+    org.netbeans.modules.java.metrics,\
+    org.netbeans.modules.java.module.graph,\
+    org.netbeans.modules.java.navigation,\
+    org.netbeans.modules.java.openjdk.project,\
+    org.netbeans.modules.java.platform,\
+    org.netbeans.modules.java.project.ui,\
+    org.netbeans.modules.java.preprocessorbridge,\
+    org.netbeans.modules.java.project,\
+    org.netbeans.modules.java.source,\
+    org.netbeans.modules.java.source.ant,\
+    org.netbeans.modules.java.source.base,\
+    org.netbeans.modules.java.source.compat8,\
+    org.netbeans.modules.java.source.nbjavac,\
+    org.netbeans.modules.java.sourceui,\
+    org.netbeans.modules.java.testrunner,\
+    org.netbeans.modules.java.testrunner.ant,\
+    org.netbeans.modules.java.testrunner.ui,\
+    org.netbeans.modules.javadoc,\
+    org.netbeans.modules.javaee.injection,\
+    org.netbeans.modules.javascript2.debug,\
+    org.netbeans.modules.javascript2.debug.ui,\
+    org.netbeans.modules.javawebstart,\
+    org.netbeans.modules.jellytools.ide,\
+    org.netbeans.modules.jshell.support,\
+    org.netbeans.modules.junit,\
+    org.netbeans.modules.junit.ant,\
+    org.netbeans.modules.junit.ant.ui,\
+    org.netbeans.modules.junit.ui,\
+    org.netbeans.modules.junitlib,\
+    org.netbeans.modules.keyring.fallback,\
+    org.netbeans.modules.keyring.impl,\
+    org.netbeans.modules.kotlin.editor,\
+    org.netbeans.modules.languages,\
+    org.netbeans.modules.languages.diff,\
+    org.netbeans.modules.languages.manifest,\
+    org.netbeans.modules.languages.yaml,\
+    org.netbeans.modules.localhistory,\
+    org.netbeans.modules.localtasks,\
+    org.netbeans.modules.lsp.client,\
+    org.netbeans.modules.masterfs.linux,\
+    org.netbeans.modules.masterfs.macosx,\
+    org.netbeans.modules.masterfs.windows,\
+    org.netbeans.modules.maven,\
+    org.netbeans.modules.maven.checkstyle,\
+    org.netbeans.modules.maven.coverage,\
+    org.netbeans.modules.maven.embedder,\
+    org.netbeans.modules.maven.grammar,\
+    org.netbeans.modules.maven.graph,\
+    org.netbeans.modules.maven.hints,\
+    org.netbeans.modules.maven.htmlui,\
+    org.netbeans.modules.maven.indexer,\
+    org.netbeans.modules.maven.indexer.ui,\
+    org.netbeans.modules.maven.junit,\
+    org.netbeans.modules.maven.junit.ui,\
+    org.netbeans.modules.maven.kit,\
+    org.netbeans.modules.maven.model,\
+    org.netbeans.modules.maven.osgi,\
+    org.netbeans.modules.maven.persistence,\
+    org.netbeans.modules.maven.refactoring,\
+    org.netbeans.modules.maven.repository,\
+    org.netbeans.modules.maven.search,\
+    org.netbeans.modules.maven.spring,\
+    org.netbeans.modules.mercurial,\
+    org.netbeans.modules.mylyn.util,\
+    org.netbeans.modules.nashorn.execution,\
+    org.netbeans.modules.netbinox,\
+    org.netbeans.modules.notifications,\
+    org.netbeans.modules.performance,\
+    org.netbeans.modules.performance.java,\
+    org.netbeans.modules.project.ant.compat8,\
+    org.netbeans.modules.projectimport.eclipse.core,\
+    org.netbeans.modules.projectimport.eclipse.j2se,\
+    org.netbeans.modules.properties,\
+    org.netbeans.modules.properties.syntax,\
+    org.netbeans.modules.refactoring.java,\
+    org.netbeans.modules.schema2beans,\
+    org.netbeans.modules.selenium2,\
+    org.netbeans.modules.selenium2.java,\
+    org.netbeans.modules.selenium2.maven,\
+    org.netbeans.modules.selenium2.server,\
+    org.netbeans.modules.server,\
+    org.netbeans.modules.spellchecker,\
+    org.netbeans.modules.spellchecker.apimodule,\
+    org.netbeans.modules.spellchecker.bindings.htmlxml,\
+    org.netbeans.modules.spellchecker.bindings.java,\
+    org.netbeans.modules.spellchecker.bindings.properties,\
+    org.netbeans.modules.spellchecker.dictionary_en,\
+    org.netbeans.modules.spellchecker.kit,\
+    org.netbeans.modules.spring.beans,\
+    org.netbeans.modules.subversion,\
+    org.netbeans.modules.swing.validation,\
+    org.netbeans.modules.target.iterator,\
+    org.netbeans.modules.tasklist.kit,\
+    org.netbeans.modules.tasklist.projectint,\
+    org.netbeans.modules.tasklist.todo,\
+    org.netbeans.modules.tasklist.ui,\
+    org.netbeans.modules.team.commons,\
+    org.netbeans.modules.team.ide,\
+    org.netbeans.modules.templatesui,\
+    org.netbeans.modules.terminal,\
+    org.netbeans.modules.terminal.nb,\
+    org.netbeans.modules.testng,\
+    org.netbeans.modules.testng.ant,\
+    org.netbeans.modules.testng.maven,\
+    org.netbeans.modules.testng.ui,\
+    org.netbeans.modules.textmate.lexer,\
+    org.netbeans.modules.uihandler,\
+    org.netbeans.modules.usersguide,\
+    org.netbeans.modules.versioning,\
+    org.netbeans.modules.versioning.core,\
+    org.netbeans.modules.versioning.indexingbridge,\
+    org.netbeans.modules.versioning.masterfs,\
+    org.netbeans.modules.versioning.system.cvss.installer,\
+    org.netbeans.modules.versioning.ui,\
+    org.netbeans.modules.versioning.util,\
+    org.netbeans.modules.web.browser.api,\
+    org.netbeans.modules.web.common,\
+    org.netbeans.modules.web.common.ui,\
+    org.netbeans.modules.web.indent,\
+    org.netbeans.modules.web.webkit.debugging,\
+    org.netbeans.modules.websvc.jaxws21,\
+    org.netbeans.modules.websvc.jaxws21api,\
+    org.netbeans.modules.websvc.saas.codegen.java,\
+    org.netbeans.modules.whitelist,\
+    org.netbeans.modules.xml,\
+    org.netbeans.modules.xml.axi,\
+    org.netbeans.modules.xml.jaxb,\
+    org.netbeans.modules.xml.jaxb.api,\
+    org.netbeans.modules.xml.multiview,\
+    org.netbeans.modules.xml.retriever,\
+    org.netbeans.modules.xml.schema.completion,\
+    org.netbeans.modules.xml.schema.model,\
+    org.netbeans.modules.xml.tax,\
+    org.netbeans.modules.xml.text,\
+    org.netbeans.modules.xml.text.obsolete90,\
+    org.netbeans.modules.xml.tools,\
+    org.netbeans.modules.xml.tools.java,\
+    org.netbeans.modules.xml.wsdl.model,\
+    org.netbeans.modules.xsl,\
+    org.netbeans.spi.debugger.jpda.ui,\
+    org.netbeans.spi.debugger.ui,\
+    org.netbeans.spi.java.hints,\
+    org.openide.compat,\
+    org.openide.execution.compat8,\
+    org.openide.options,\
+    org.openide.util.enumerations,\
+    org.openidex.util
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 6eb0846dfe..8b8c63dc72 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -39,5 +39,6 @@ project.org.sleuthkit.autopsy.core=Core
 project.org.sleuthkit.autopsy.corelibs=CoreLibs
 project.org.sleuthkit.autopsy.keywordsearch=KeywordSearch
 project.org.sleuthkit.autopsy.recentactivity=RecentActivity
+project.org.sleuthkit.autopsy.testing=Testing
 project.org.sleuthkit.autopsy.thunderbirdparser=thunderbirdparser
 
diff --git a/thirdparty/junit/15/junit.zip b/thirdparty/junit/15/junit.zip
new file mode 100644
index 0000000000..db1b83aea2
Binary files /dev/null and b/thirdparty/junit/15/junit.zip differ
diff --git a/thirdparty/yara/YaraJNIWrapper/nbproject/project.properties b/thirdparty/yara/YaraJNIWrapper/nbproject/project.properties
index 56689f272f..4d2fbfea14 100755
--- a/thirdparty/yara/YaraJNIWrapper/nbproject/project.properties
+++ b/thirdparty/yara/YaraJNIWrapper/nbproject/project.properties
@@ -49,7 +49,7 @@ javac.processormodulepath=
 javac.processorpath=\
     ${javac.classpath}
 javac.source=11
-javac.target=1
+javac.target=11
 javac.test.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}