Merge pull request #7601 from eugene7646/merge_dev

Merge develop

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>

Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java

@@ -151,7 +151,8 @@ public class PlasoIngestModule implements DataSourceIngestModule {
             currentCase = Case.getCurrentCase();
             fileManager = currentCase.getServices().getFileManager();
 
-            String currentTime = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss z", Locale.US).format(System.currentTimeMillis());//NON-NLS
+            // Use Z here for timezone since the other formats can include a colon on some systems
+            String currentTime = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss Z", Locale.US).format(System.currentTimeMillis());//NON-NLS
             Path moduleOutputPath = Paths.get(currentCase.getModuleDirectory(), PLASO, currentTime);
             try {
                 Files.createDirectories(moduleOutputPath);

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>

CoreTestLibs/ivy.xml

@@ -4,10 +4,10 @@
         <conf name="coretestlibs"/>
     </configurations>
     <dependencies >
-        <dependency conf="coretestlibs->default" org="org.mockito" name="mockito-core" rev="4.4.0"/>
+        <dependency conf="coretestlibs->default" org="org.mockito" name="mockito-core" rev="3.5.7"/>
-        <dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy" rev="1.12.8"/>
+        <dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy" rev="1.10.13"/>
-        <dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy-agent" rev="1.12.8"/>
+        <dependency conf="coretestlibs->default" org="net.bytebuddy" name="byte-buddy-agent" rev="1.10.13"/>
-        <dependency conf="coretestlibs->default" org="org.objenesis" name="objenesis" rev="3.2"/>
+        <dependency conf="coretestlibs->default" org="org.objenesis" name="objenesis" rev="3.1"/>
-
+        <dependency conf="coretestlibs->default" org="junit" name="junit" rev="4.13.2"/>
     </dependencies>
 </ivy-module>

CoreTestLibs/ivysettings.xml

@@ -6,4 +6,5 @@
         <ibiblio name="maven.restlet.org" root="http://maven.restlet.com" m2compatible="true" />  
     </chain>
   </resolvers>
+  <property name="packaging.type" value="jar" />
 </ivysettings>

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

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>

KeywordSearch/ivy.xml

@@ -27,6 +27,7 @@
         
         <!-- 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"/>

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>

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/>

build.xml

@@ -79,6 +79,12 @@
         <delete includeemptydirs="true" failonerror="false">
             <fileset dir="${basedir}/docs/doxygen-dev/build-docs" includes="**/*"/>
         </delete>
+
+        <!-- build core test libs -->
+        <subant buildpath="${basedir}/CoreTestLibs/build.xml" target="clean" inheritrefs="false" inheritall="false">
+            <property name="nbplatform.active.dir" value="${nbplatform.active.dir}" />
+            <property name="nbplatform.default.harness.dir" value="${nbplatform.default.harness.dir}" />
+        </subant>
     </target>
     
     <!-- This target is similar to the regular test target that calls test on all nbm's, 
@@ -266,8 +272,15 @@
         <echo>File moved to ${build-minimal-platform-renamed}</echo>
     </target>
 
+    <target name="build-core-test-libs">
+        <subant buildpath="${basedir}/CoreTestLibs/build.xml" target="build" inheritrefs="false" inheritall="false">
+            <property name="nbplatform.active.dir" value="${nbplatform.active.dir}" />
+            <property name="nbplatform.default.harness.dir" value="${nbplatform.default.harness.dir}" />
+        </subant>
+    </target>
+    
     <!-- override build to add branding -->
-    <target name="build" depends="build-brand,suite.build,chmod_executables" description="Compiles autopsy and produces a basic branded build that can run on a dev system" />
+    <target name="build" depends="build-core-test-libs,build-brand,suite.build,chmod_executables" description="Compiles autopsy and produces a basic branded build that can run on a dev system" />
  
     <target name="build-brand" depends="-init">
         

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