diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml
index b4e201f0ac4484a81ae9384e40b3d4fa03795a34..a78165956f469e16c8eefff50ec30eb47fc9fd30 100644
--- a/Core/nbproject/project.xml
+++ b/Core/nbproject/project.xml
@@ -298,6 +298,10 @@
<recursive/>
<compile-dependency/>
</test-dependency>
+ <test-dependency>
+ <code-name-base>org.sleuthkit.autopsy.coretestlibs</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
</test-type>
</test-dependencies>
<public-packages>
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index 19f554e6c599affba866a4a90df301a435de9610..453062b61296316d7cfd99ae4985e1e587433096 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -26,10 +26,6 @@
<test-dependencies>
<test-type>
<name>unit</name>
- <test-dependency>
- <code-name-base>org.netbeans.libs.junit4</code-name-base>
- <compile-dependency/>
- </test-dependency>
</test-type>
</test-dependencies>
<public-packages>
diff --git a/CoreTestLibs/ivy.xml b/CoreTestLibs/ivy.xml
index 8dcb6e90294cc0419aaea5c696c444b376531154..5092faea883f87bd09a345f6a198daef33d9f214 100644
--- a/CoreTestLibs/ivy.xml
+++ b/CoreTestLibs/ivy.xml
@@ -8,6 +8,6 @@
<dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy" rev="1.12.8"/>
<dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy-agent" rev="1.12.8"/>
<dependency conf="coretestlibs->default" org="org.objenesis" name="objenesis" rev="3.2"/>
-
+ <dependency conf="coretestlibs->default" org="junit" name="junit" rev="4.13.2"/>
</dependencies>
</ivy-module>
\ No newline at end of file
diff --git a/CoreTestLibs/nbproject/project.properties b/CoreTestLibs/nbproject/project.properties
index bdd286b3eac791b21df955e5e50f76cd4ba60714..2b50b4d9f98df9df4bb20a3b2e03529ef7103992 100644
--- a/CoreTestLibs/nbproject/project.properties
+++ b/CoreTestLibs/nbproject/project.properties
@@ -1,5 +1,7 @@
file.reference.byte-buddy-1.10.13.jar=release/modules/ext/byte-buddy-1.10.13.jar
file.reference.byte-buddy-agent-1.10.13.jar=release/modules/ext/byte-buddy-agent-1.10.13.jar
+file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar
+file.reference.junit-4.13.2.jar=release/modules/ext/junit-4.13.2.jar
file.reference.mockito-core-3.5.7.jar=release/modules/ext/mockito-core-3.5.7.jar
file.reference.objenesis-3.1.jar=release/modules/ext/objenesis-3.1.jar
javac.source=1.8
diff --git a/CoreTestLibs/nbproject/project.xml b/CoreTestLibs/nbproject/project.xml
index b35da2269d15187344376029d87450c2a058dc12..f5e420ccedcba2995b1c72f1fff7f9d2a13c96e1 100644
--- a/CoreTestLibs/nbproject/project.xml
+++ b/CoreTestLibs/nbproject/project.xml
@@ -7,7 +7,41 @@
<standalone/>
<module-dependencies/>
<public-packages>
- <package>org.mockito</package>
+ <package>junit.extensions</package>
+ <package>junit.framework</package>
+ <package>junit.runner</package>
+ <package>junit.textui</package>
+ <package>org.hamcrest</package>
+ <package>org.hamcrest.core</package>
+ <package>org.hamcrest.internal</package>
+ <package>org.junit</package>
+ <package>org.junit.experimental</package>
+ <package>org.junit.experimental.categories</package>
+ <package>org.junit.experimental.max</package>
+ <package>org.junit.experimental.results</package>
+ <package>org.junit.experimental.runners</package>
+ <package>org.junit.experimental.theories</package>
+ <package>org.junit.experimental.theories.internal</package>
+ <package>org.junit.experimental.theories.suppliers</package>
+ <package>org.junit.function</package>
+ <package>org.junit.internal</package>
+ <package>org.junit.internal.builders</package>
+ <package>org.junit.internal.management</package>
+ <package>org.junit.internal.matchers</package>
+ <package>org.junit.internal.requests</package>
+ <package>org.junit.internal.runners</package>
+ <package>org.junit.internal.runners.model</package>
+ <package>org.junit.internal.runners.rules</package>
+ <package>org.junit.internal.runners.statements</package>
+ <package>org.junit.matchers</package>
+ <package>org.junit.rules</package>
+ <package>org.junit.runner</package>
+ <package>org.junit.runner.manipulation</package>
+ <package>org.junit.runner.notification</package>
+ <package>org.junit.runners</package>
+ <package>org.junit.runners.model</package>
+ <package>org.junit.runners.parameterized</package>
+ <package>org.junit.validator</package>
</public-packages>
<class-path-extension>
<runtime-relative-path>ext/byte-buddy-1.10.13.jar</runtime-relative-path>
@@ -17,6 +51,14 @@
<runtime-relative-path>ext/byte-buddy-agent-1.10.13.jar</runtime-relative-path>
<binary-origin>release/modules/ext/byte-buddy-agent-1.10.13.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/hamcrest-core-1.3.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/hamcrest-core-1.3.jar</binary-origin>
+ </class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/junit-4.13.2.jar</runtime-relative-path>
+ <binary-origin>release/modules/ext/junit-4.13.2.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/mockito-core-3.5.7.jar</runtime-relative-path>
<binary-origin>release/modules/ext/mockito-core-3.5.7.jar</binary-origin>
diff --git a/CoreTestLibs/release/modules/ext/byte-buddy-1.10.13.jar b/CoreTestLibs/release/modules/ext/byte-buddy-1.10.13.jar
deleted file mode 100644
index 8e2527892bd483102de4a55c4ce5b92bf89f4d71..0000000000000000000000000000000000000000
Binary files a/CoreTestLibs/release/modules/ext/byte-buddy-1.10.13.jar and /dev/null differ
diff --git a/CoreTestLibs/release/modules/ext/byte-buddy-1.12.8.jar b/CoreTestLibs/release/modules/ext/byte-buddy-1.12.8.jar
new file mode 100644
index 0000000000000000000000000000000000000000..8eec0c086a5b0c11d4735cb1f9ade91ee0339d50
Binary files /dev/null and b/CoreTestLibs/release/modules/ext/byte-buddy-1.12.8.jar differ
diff --git a/CoreTestLibs/release/modules/ext/byte-buddy-agent-1.10.13.jar b/CoreTestLibs/release/modules/ext/byte-buddy-agent-1.10.13.jar
deleted file mode 100644
index d7b4655e560b7f3c59e7c6b06f3f6275685cd7be..0000000000000000000000000000000000000000
Binary files a/CoreTestLibs/release/modules/ext/byte-buddy-agent-1.10.13.jar and /dev/null differ
diff --git a/CoreTestLibs/release/modules/ext/byte-buddy-agent-1.12.8.jar b/CoreTestLibs/release/modules/ext/byte-buddy-agent-1.12.8.jar
new file mode 100644
index 0000000000000000000000000000000000000000..01ef76e8e3e251992b8ed27d7274429311e93547
Binary files /dev/null and b/CoreTestLibs/release/modules/ext/byte-buddy-agent-1.12.8.jar differ
diff --git a/CoreTestLibs/release/modules/ext/hamcrest-core-1.3.jar b/CoreTestLibs/release/modules/ext/hamcrest-core-1.3.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9d5fe16e3dd37ebe79a36f61f5d0e1a69a653a8a
Binary files /dev/null and b/CoreTestLibs/release/modules/ext/hamcrest-core-1.3.jar differ
diff --git a/CoreTestLibs/release/modules/ext/junit-4.13.2.jar b/CoreTestLibs/release/modules/ext/junit-4.13.2.jar
new file mode 100644
index 0000000000000000000000000000000000000000..6da55d8b8520dcc03c250a605151cc0d23a45518
Binary files /dev/null and b/CoreTestLibs/release/modules/ext/junit-4.13.2.jar differ
diff --git a/CoreTestLibs/release/modules/ext/mockito-core-3.5.7.jar b/CoreTestLibs/release/modules/ext/mockito-core-3.5.7.jar
deleted file mode 100644
index 5fc0070ab7fcaabd888973c573db6d8932df4c57..0000000000000000000000000000000000000000
Binary files a/CoreTestLibs/release/modules/ext/mockito-core-3.5.7.jar and /dev/null differ
diff --git a/CoreTestLibs/release/modules/ext/mockito-core-4.4.0.jar b/CoreTestLibs/release/modules/ext/mockito-core-4.4.0.jar
new file mode 100644
index 0000000000000000000000000000000000000000..9fe552b60e3b8cf255c7279b3b633319fe61c2d0
Binary files /dev/null and b/CoreTestLibs/release/modules/ext/mockito-core-4.4.0.jar differ
diff --git a/CoreTestLibs/release/modules/ext/objenesis-3.1.jar b/CoreTestLibs/release/modules/ext/objenesis-3.1.jar
deleted file mode 100644
index e6be64224b826fccca7058f813849fd0be226a37..0000000000000000000000000000000000000000
Binary files a/CoreTestLibs/release/modules/ext/objenesis-3.1.jar and /dev/null differ
diff --git a/CoreTestLibs/release/modules/ext/objenesis-3.2.jar b/CoreTestLibs/release/modules/ext/objenesis-3.2.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1888e2ea10e8623acbbe6ceccc5a276b169b2d33
Binary files /dev/null and b/CoreTestLibs/release/modules/ext/objenesis-3.2.jar differ
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index 54f71b73f6896cc9ba48a754cbd51cca95686cab..1d1a6e22fe15a7ed6c9ba199aa84c5e56f46404e 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -27,7 +27,8 @@
<!-- icu4j for pdfbox bidirectional text support, needs to be defined explicitely (it is optional) -->
<dependency conf="autopsy->default" org="com.ibm.icu" name="icu4j" rev="70.1"/>
-
+ <dependency conf="autopsy->default" org="junit" name="junit" rev="4.13.2"/>
+
<!-- Jetty -->
<dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="11.0.8"/>
<dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="11.0.8"/>
diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml
index 7c864aa675aa2f8dd28b2ff22b518e09b7863af4..efdd08e8e34777e1558b6dce8be45ad9f67f2a31 100644
--- a/KeywordSearch/nbproject/project.xml
+++ b/KeywordSearch/nbproject/project.xml
@@ -141,6 +141,24 @@
</run-dependency>
</dependency>
</module-dependencies>
+ <test-dependencies>
+ <test-type>
+ <name>unit</name>
+ <test-dependency>
+ <code-name-base>org.netbeans.libs.junit4</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
+ <test-dependency>
+ <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
+ <recursive/>
+ <compile-dependency/>
+ </test-dependency>
+ <test-dependency>
+ <code-name-base>org.sleuthkit.autopsy.coretestlibs</code-name-base>
+ <compile-dependency/>
+ </test-dependency>
+ </test-type>
+ </test-dependencies>
<public-packages>
<package>org.apache.commons.logging.impl</package>
<package>org.apache.http</package>
diff --git a/Testing/nbproject/project.xml b/Testing/nbproject/project.xml
index 141594e95a4eec41c53a793bb6aadc0ce1db8842..745bff10dec49db51424c3e601ddac3286e9349e 100644
--- a/Testing/nbproject/project.xml
+++ b/Testing/nbproject/project.xml
@@ -50,6 +50,14 @@
<specification-version>10.24</specification-version>
</run-dependency>
</dependency>
+ <dependency>
+ <code-name-base>org.sleuthkit.autopsy.coretestlibs</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <specification-version>1.0</specification-version>
+ </run-dependency>
+ </dependency>
<dependency>
<code-name-base>org.sleuthkit.autopsy.keywordsearch</code-name-base>
<build-prerequisite/>
diff --git a/nbproject/platform.properties b/nbproject/platform.properties
index a27e7dfd124ad014a58b35ac468eeaf8528d2f7e..27861745ede2649b8d79f6d27fe7cc966e33a791 100644
--- a/nbproject/platform.properties
+++ b/nbproject/platform.properties
@@ -14,6 +14,7 @@ cluster.path=\
${nbplatform.active.dir}/harness:\
${nbplatform.active.dir}/java:\
${nbplatform.active.dir}/platform:\
+ ${nbplatform.active.dir}/cluster:\
CoreTestLibs/build/cluster
disabled.modules=\
org.eclipse.core.contenttype,\
@@ -339,5 +340,3 @@ disabled.modules=\
org.openide.options,\
org.openide.util.enumerations,\
org.openidex.util
- org.netbeans.modules.junit,\
- org.netbeans.modules.junitlib