diff --git a/Core/nbproject/project.properties b/Core/nbproject/project.properties index 07dc595f2f..0e9ee55515 100644 --- a/Core/nbproject/project.properties +++ b/Core/nbproject/project.properties @@ -1,7 +1,13 @@ file.reference.activemq-all-5.16.4.jar=release/modules/ext/activemq-all-5.16.4.jar file.reference.audience-annotations-0.12.0.jar=release/modules/ext/audience-annotations-0.12.0.jar file.reference.batik-awt-util-1.14.jar=release/modules/ext/batik-awt-util-1.14.jar +file.reference.batik-constants-1.14.jar=release/modules/ext/batik-constants-1.14.jar +file.reference.batik-css-1.14.jar=release/modules/ext/batik-css-1.14.jar file.reference.batik-dom-1.14.jar=release/modules/ext/batik-dom-1.14.jar +file.reference.batik-ext-1.14.jar=release/modules/ext/batik-ext-1.14.jar +file.reference.batik-i18n-1.14.jar=release/modules/ext/batik-i18n-1.14.jar +file.reference.batik-parser-1.14.jar=release/modules/ext/batik-parser-1.14.jar +file.reference.batik-shared-resources-1.14.jar=release/modules/ext/batik-shared-resources-1.14.jar file.reference.batik-svg-dom-1.14.jar=release/modules/ext/batik-svg-dom-1.14.jar file.reference.batik-svggen-1.14.jar=release/modules/ext/batik-svggen-1.14.jar file.reference.batik-util-1.14.jar=release/modules/ext/batik-util-1.14.jar @@ -9,6 +15,7 @@ file.reference.batik-xml-1.14.jar=release/modules/ext/batik-xml-1.14.jar file.reference.bcpkix-jdk15on-1.70.jar=release/modules/ext/bcpkix-jdk15on-1.70.jar file.reference.bcprov-ext-jdk15on-1.70.jar=release/modules/ext/bcprov-ext-jdk15on-1.70.jar file.reference.bcprov-jdk15on-1.70.jar=release/modules/ext/bcprov-jdk15on-1.70.jar +file.reference.bcutil-jdk15on-1.70.jar=release/modules/ext/bcutil-jdk15on-1.70.jar file.reference.c3p0-0.9.5.5.jar=release/modules/ext/c3p0-0.9.5.5.jar file.reference.checker-qual-3.12.0.jar=release/modules/ext/checker-qual-3.12.0.jar file.reference.commons-dbcp2-2.9.0.jar=release/modules/ext/commons-dbcp2-2.9.0.jar @@ -26,13 +33,19 @@ file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.j file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar file.reference.icepdf-core-6.2.2.jar=release/modules/ext/icepdf-core-6.2.2.jar file.reference.icepdf-viewer-6.2.2.jar=release/modules/ext/icepdf-viewer-6.2.2.jar +file.reference.istack-commons-runtime-3.0.11.jar=release/modules/ext/istack-commons-runtime-3.0.11.jar file.reference.j2objc-annotations-1.3.jar=release/modules/ext/j2objc-annotations-1.3.jar file.reference.jackcess-4.0.1.jar=release/modules/ext/jackcess-4.0.1.jar file.reference.jackcess-encrypt-4.0.1.jar=release/modules/ext/jackcess-encrypt-4.0.1.jar file.reference.jai_core-1.1.3.jar=release/modules/ext/jai_core-1.1.3.jar file.reference.jai_imageio-1.1.jar=release/modules/ext/jai_imageio-1.1.jar +file.reference.jakarta.activation-1.2.2.jar=release/modules/ext/jakarta.activation-1.2.2.jar +file.reference.jakarta.xml.bind-api-2.3.3.jar=release/modules/ext/jakarta.xml.bind-api-2.3.3.jar file.reference.java-diff-utils-4.11.jar=release/modules/ext/java-diff-utils-4.11.jar +file.reference.javax.activation-api-1.2.0.jar=release/modules/ext/javax.activation-api-1.2.0.jar file.reference.javax.ws.rs-api-2.1.1.jar=release/modules/ext/javax.ws.rs-api-2.1.1.jar +file.reference.jaxb-api-2.3.1.jar=release/modules/ext/jaxb-api-2.3.1.jar +file.reference.jaxb-runtime-2.3.3.jar=release/modules/ext/jaxb-runtime-2.3.3.jar file.reference.jdom-2.0.5.jar=release/modules/ext/jdom-2.0.5.jar file.reference.jfreechart-1.5.3.jar=release/modules/ext/jfreechart-1.5.3.jar file.reference.jgraphx-4.2.2.jar=release/modules/ext/jgraphx-4.2.2.jar @@ -62,14 +75,21 @@ file.reference.okhttp-2.7.5.jar=release/modules/ext/okhttp-2.7.5.jar file.reference.okio-1.6.0.jar=release/modules/ext/okio-1.6.0.jar file.reference.postgresql-42.3.5.jar=release/modules/ext/postgresql-42.3.5.jar file.reference.Rejistry-1.1-SNAPSHOT.jar=release/modules/ext/Rejistry-1.1-SNAPSHOT.jar +file.reference.serializer-2.7.2.jar=release/modules/ext/serializer-2.7.2.jar file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbinding-AllPlatforms.jar file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar file.reference.sleuthkit-4.11.1.jar=release/modules/ext/sleuthkit-4.11.1.jar file.reference.sleuthkit-caseuco-4.11.1.jar=release/modules/ext/sleuthkit-caseuco-4.11.1.jar +file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar file.reference.snakeyaml-1.30.jar=release/modules/ext/snakeyaml-1.30.jar file.reference.SparseBitSet-1.1.jar=release/modules/ext/SparseBitSet-1.1.jar file.reference.spotbugs-annotations-4.6.0.jar=release/modules/ext/spotbugs-annotations-4.6.0.jar file.reference.sqlite-jdbc-3.36.0.3.jar=release/modules/ext/sqlite-jdbc-3.36.0.3.jar +file.reference.txw2-2.3.3.jar=release/modules/ext/txw2-2.3.3.jar +file.reference.xalan-2.7.2.jar=release/modules/ext/xalan-2.7.2.jar +file.reference.xml-apis-1.4.01.jar=release/modules/ext/xml-apis-1.4.01.jar +file.reference.xml-apis-ext-1.3.04.jar=release/modules/ext/xml-apis-ext-1.3.04.jar +file.reference.xmlgraphics-commons-2.6.jar=release/modules/ext/xmlgraphics-commons-2.6.jar file.reference.xmpcore-6.1.11.jar=release/modules/ext/xmpcore-6.1.11.jar file.reference.YaraJNIWrapper.jar=release/modules/ext/YaraJNIWrapper.jar file.reference.zookeeper-3.8.0.jar=release/modules/ext/zookeeper-3.8.0.jar diff --git a/Core/nbproject/project.xml b/Core/nbproject/project.xml index 79f393466c..ca300572d5 100644 --- a/Core/nbproject/project.xml +++ b/Core/nbproject/project.xml @@ -362,10 +362,34 @@ ext/batik-awt-util-1.14.jar release/modules/ext/batik-awt-util-1.14.jar + + ext/batik-constants-1.14.jar + release/modules/ext/batik-constants-1.14.jar + + + ext/batik-css-1.14.jar + release/modules/ext/batik-css-1.14.jar + ext/batik-dom-1.14.jar release/modules/ext/batik-dom-1.14.jar + + ext/batik-ext-1.14.jar + release/modules/ext/batik-ext-1.14.jar + + + ext/batik-i18n-1.14.jar + release/modules/ext/batik-i18n-1.14.jar + + + ext/batik-parser-1.14.jar + release/modules/ext/batik-parser-1.14.jar + + + ext/batik-shared-resources-1.14.jar + release/modules/ext/batik-shared-resources-1.14.jar + ext/batik-svg-dom-1.14.jar release/modules/ext/batik-svg-dom-1.14.jar @@ -394,6 +418,10 @@ ext/bcprov-jdk15on-1.70.jar release/modules/ext/bcprov-jdk15on-1.70.jar + + ext/bcutil-jdk15on-1.70.jar + release/modules/ext/bcutil-jdk15on-1.70.jar + ext/c3p0-0.9.5.5.jar release/modules/ext/c3p0-0.9.5.5.jar @@ -431,17 +459,8 @@ release/modules/ext/curator-framework-5.2.1.jar -<<<<<<< HEAD - ext/jython-standalone-2.7.2.jar - release\modules\ext\jython-standalone-2.7.2.jar - - - ext/jline-0.9.94.jar - release\modules\ext\jline-0.9.94.jar -======= ext/curator-recipes-5.2.1.jar release/modules/ext/curator-recipes-5.2.1.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 ext/DatCon.jar @@ -471,6 +490,10 @@ ext/icepdf-viewer-6.2.2.jar release/modules/ext/icepdf-viewer-6.2.2.jar + + ext/istack-commons-runtime-3.0.11.jar + release/modules/ext/istack-commons-runtime-3.0.11.jar + ext/j2objc-annotations-1.3.jar release/modules/ext/j2objc-annotations-1.3.jar @@ -492,22 +515,33 @@ release/modules/ext/jai_imageio-1.1.jar -<<<<<<< HEAD - ext/jaxb-api-2.3.1.jar - release\modules\ext\jaxb-api-2.3.1.jar + ext/jakarta.activation-1.2.2.jar + release/modules/ext/jakarta.activation-1.2.2.jar + + + ext/jakarta.xml.bind-api-2.3.3.jar + release/modules/ext/jakarta.xml.bind-api-2.3.3.jar - ext/commons-collections-3.2.2.jar - release\modules\ext\commons-collections-3.2.2.jar -======= ext/java-diff-utils-4.11.jar release/modules/ext/java-diff-utils-4.11.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 + + + ext/javax.activation-api-1.2.0.jar + release/modules/ext/javax.activation-api-1.2.0.jar ext/javax.ws.rs-api-2.1.1.jar release/modules/ext/javax.ws.rs-api-2.1.1.jar + + ext/jaxb-api-2.3.1.jar + release/modules/ext/jaxb-api-2.3.1.jar + + + ext/jaxb-runtime-2.3.3.jar + release/modules/ext/jaxb-runtime-2.3.3.jar + ext/jdom-2.0.5.jar release/modules/ext/jdom-2.0.5.jar @@ -524,6 +558,10 @@ ext/jsoup-1.14.3.jar release/modules/ext/jsoup-1.14.3.jar + + ext/jsr305-3.0.2.jar + release/modules/ext/jsr305-3.0.2.jar + ext/jutf7-1.0.0.jar release/modules/ext/jutf7-1.0.0.jar @@ -545,34 +583,20 @@ release/modules/ext/listenablefuture-1.0.jar -<<<<<<< HEAD - ext/jaxb-runtime-2.3.3.jar - release\modules\ext\jaxb-runtime-2.3.3.jar - - - ext/opencensus-contrib-http-util-0.19.2.jar - release\modules\ext\opencensus-contrib-http-util-0.19.2.jar -======= ext/logback-classic-1.2.10.jar release/modules/ext/logback-classic-1.2.10.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 ext/logback-core-1.2.10.jar release/modules/ext/logback-core-1.2.10.jar -<<<<<<< HEAD - ext/commons-lang-2.6.jar - release\modules\ext\commons-lang-2.6.jar -======= ext/mchange-commons-java-0.2.20.jar release/modules/ext/mchange-commons-java-0.2.20.jar ext/metadata-extractor-2.17.0.jar release/modules/ext/metadata-extractor-2.17.0.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 ext/netty-buffer-4.1.73.Final.jar @@ -595,34 +619,16 @@ release/modules/ext/netty-resolver-4.1.73.Final.jar -<<<<<<< HEAD - ext/activemq-all-5.16.0.jar - release\modules\ext\activemq-all-5.16.0.jar - - - ext/jai_imageio-1.1.jar - release\modules\ext\jai_imageio-1.1.jar -======= ext/netty-tcnative-2.0.48.Final.jar release/modules/ext/netty-tcnative-2.0.48.Final.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 ext/netty-tcnative-classes-2.0.48.Final.jar release/modules/ext/netty-tcnative-classes-2.0.48.Final.jar -<<<<<<< HEAD - ext/istack-commons-runtime-3.0.11.jar - release/modules/ext/istack-commons-runtime-3.0.11.jar - - - ext/curator-client-2.8.0.jar - release\modules\ext\curator-client-2.8.0.jar -======= ext/netty-transport-4.1.73.Final.jar release/modules/ext/netty-transport-4.1.73.Final.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 ext/netty-transport-classes-epoll-4.1.73.Final.jar @@ -641,22 +647,21 @@ release/modules/ext/okhttp-2.7.5.jar -<<<<<<< HEAD - ext/google-cloud-core-http-1.70.0.jar - release\modules\ext\google-cloud-core-http-1.70.0.jar -======= ext/okio-1.6.0.jar release/modules/ext/okio-1.6.0.jar ext/postgresql-42.3.5.jar release/modules/ext/postgresql-42.3.5.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 ext/Rejistry-1.1-SNAPSHOT.jar release/modules/ext/Rejistry-1.1-SNAPSHOT.jar + + ext/serializer-2.7.2.jar + release/modules/ext/serializer-2.7.2.jar + ext/sevenzipjbinding-AllPlatforms.jar release/modules/ext/sevenzipjbinding-AllPlatforms.jar @@ -673,6 +678,10 @@ ext/sleuthkit-caseuco-4.11.1.jar release/modules/ext/sleuthkit-caseuco-4.11.1.jar + + ext/slf4j-api-1.7.36.jar + release/modules/ext/slf4j-api-1.7.36.jar + ext/snakeyaml-1.30.jar release/modules/ext/snakeyaml-1.30.jar @@ -689,6 +698,26 @@ ext/sqlite-jdbc-3.36.0.3.jar release/modules/ext/sqlite-jdbc-3.36.0.3.jar + + ext/txw2-2.3.3.jar + release/modules/ext/txw2-2.3.3.jar + + + ext/xalan-2.7.2.jar + release/modules/ext/xalan-2.7.2.jar + + + ext/xml-apis-1.4.01.jar + release/modules/ext/xml-apis-1.4.01.jar + + + ext/xml-apis-ext-1.3.04.jar + release/modules/ext/xml-apis-ext-1.3.04.jar + + + ext/xmlgraphics-commons-2.6.jar + release/modules/ext/xmlgraphics-commons-2.6.jar + ext/xmpcore-6.1.11.jar release/modules/ext/xmpcore-6.1.11.jar diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/CustomFileTypesManager.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/CustomFileTypesManager.java index 2c476b06f5..dda4416ee6 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/CustomFileTypesManager.java +++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/CustomFileTypesManager.java @@ -26,6 +26,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; +import javax.xml.bind.DatatypeConverter; import javax.xml.parsers.ParserConfigurationException; import org.apache.commons.codec.DecoderException; import org.apache.commons.codec.binary.Hex; diff --git a/Core/src/org/sleuthkit/autopsy/test/CustomArtifactType.java b/Core/src/org/sleuthkit/autopsy/test/CustomArtifactType.java index 7451e65d18..2bb2fd732a 100644 --- a/Core/src/org/sleuthkit/autopsy/test/CustomArtifactType.java +++ b/Core/src/org/sleuthkit/autopsy/test/CustomArtifactType.java @@ -96,8 +96,7 @@ final class CustomArtifactType { * @throws Blackboard.BlackboardException If there is an error posting the * artifact to the blackboard. */ - static BlackboardArtifact createInstance(Content source) throws TskCoreException, DecoderException { - BlackboardArtifact artifact = source.newArtifact(artifactType.getTypeID()); + static BlackboardArtifact createAndPostInstance(Content source, long ingestJobId) throws TskCoreException, Blackboard.BlackboardException, DecoderException { List attributes = new ArrayList<>(); attributes.add(new BlackboardAttribute(intAttrType, MODULE_NAME, 0)); attributes.add(new BlackboardAttribute(doubleAttrType, MODULE_NAME, 0.0)); diff --git a/Core/src/org/sleuthkit/autopsy/test/CustomArtifactsCreatorDataSourceIngestModule.java b/Core/src/org/sleuthkit/autopsy/test/CustomArtifactsCreatorDataSourceIngestModule.java index e3273f0c1e..ac1309539c 100644 --- a/Core/src/org/sleuthkit/autopsy/test/CustomArtifactsCreatorDataSourceIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/test/CustomArtifactsCreatorDataSourceIngestModule.java @@ -74,7 +74,7 @@ public class CustomArtifactsCreatorDataSourceIngestModule extends DataSourceInge public ProcessResult process(Content dataSource, DataSourceIngestModuleProgress progressBar) { try { CustomArtifactType.createAndPostInstance(dataSource, context.getJobId()); - } catch (TskCoreException | Blackboard.BlackboardException ex) { + } catch (TskCoreException | Blackboard.BlackboardException | DecoderException ex) { logger.log(Level.SEVERE, String.format("Failed to process data source (obj_id = %d)", dataSource.getId()), ex); return ProcessResult.ERROR; } diff --git a/Core/src/org/sleuthkit/autopsy/test/CustomArtifactsCreatorFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/test/CustomArtifactsCreatorFileIngestModule.java index f30282dcab..d57b78e8c6 100644 --- a/Core/src/org/sleuthkit/autopsy/test/CustomArtifactsCreatorFileIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/test/CustomArtifactsCreatorFileIngestModule.java @@ -75,7 +75,7 @@ final class CustomArtifactsCreatorFileIngestModule extends FileIngestModuleAdapt } try { CustomArtifactType.createAndPostInstance(file, context.getJobId()); - } catch (TskCoreException | Blackboard.BlackboardException ex) { + } catch (TskCoreException | Blackboard.BlackboardException | DecoderException ex) { logger.log(Level.SEVERE, String.format("Failed to process file (obj_id = %d)", file.getId()), ex); return ProcessResult.ERROR; } diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 0e63f2a71f..a2cbf7f555 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -60,7 +60,6 @@ - diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 5c0d915eba..836df339b8 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -4,6 +4,7 @@ file.reference.ant-1.10.12.jar=release/modules/ext/ant-1.10.12.jar file.reference.ant-launcher-1.10.12.jar=release/modules/ext/ant-launcher-1.10.12.jar file.reference.api-common-2.1.4.jar=release/modules/ext/api-common-2.1.4.jar file.reference.AppleJavaExtensions-1.4.jar=release/modules/ext/AppleJavaExtensions-1.4.jar +file.reference.assertj-core-3.13.2.jar=release/modules/ext/assertj-core-3.13.2.jar file.reference.auto-value-annotations-1.9.jar=release/modules/ext/auto-value-annotations-1.9.jar file.reference.bcpkix-jdk15on-1.70.jar=release/modules/ext/bcpkix-jdk15on-1.70.jar file.reference.bcprov-jdk15on-1.70.jar=release/modules/ext/bcprov-jdk15on-1.70.jar @@ -20,55 +21,13 @@ file.reference.commons-csv-1.9.0.jar=release/modules/ext/commons-csv-1.9.0.jar file.reference.commons-digester-2.1.jar=release/modules/ext/commons-digester-2.1.jar file.reference.commons-io-2.11.0.jar=release/modules/ext/commons-io-2.11.0.jar file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar -<<<<<<< HEAD -file.reference.commons-lang3-3.4.jar=release\\modules\\ext\\commons-lang3-3.4.jar -file.reference.commons-logging-1.1.2.jar=release/modules/ext/commons-logging-1.1.2.jar -file.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1.jar -file.reference.controlsfx-11.0.2.jar=release\\modules\\ext\\controlsfx-11.0.2.jar -file.reference.controlsfx-9.0.0.jar=release\\modules\\ext\\controlsfx-9.0.0.jar -file.reference.dom4j-1.6.1.jar=release/modules/ext/dom4j-1.6.1.jar -file.reference.geronimo-jms_1.1_spec-1.0.jar=release/modules/ext/geronimo-jms_1.1_spec-1.0.jar -file.reference.gson-2.8.5.jar=release/modules/ext/gson-2.8.5.jar -file.reference.gst1-java-core-1.0.0.jar=release\\modules\\ext\\gst1-java-core-1.0.0.jar -file.reference.guava-19.0.jar=release/modules/ext/guava-19.0.jar -file.reference.imageio-bmp-3.2.jar=release/modules/ext/imageio-bmp-3.2.jar -file.reference.imageio-core-3.2.jar=release/modules/ext/imageio-core-3.2.jar -file.reference.imageio-icns-3.2.jar=release/modules/ext/imageio-icns-3.2.jar -file.reference.imageio-iff-3.2.jar=release/modules/ext/imageio-iff-3.2.jar -file.reference.imageio-jpeg-3.2.jar=release/modules/ext/imageio-jpeg-3.2.jar -file.reference.imageio-metadata-3.2.jar=release/modules/ext/imageio-metadata-3.2.jar -file.reference.imageio-pcx-3.2.jar=release/modules/ext/imageio-pcx-3.2.jar -file.reference.imageio-pict-3.2.jar=release/modules/ext/imageio-pict-3.2.jar -file.reference.imageio-pnm-3.2.jar=release/modules/ext/imageio-pnm-3.2.jar -file.reference.imageio-psd-3.2.jar=release/modules/ext/imageio-psd-3.2.jar -file.reference.imageio-sgi-3.2.jar=release/modules/ext/imageio-sgi-3.2.jar -file.reference.imageio-tga-3.2.jar=release/modules/ext/imageio-tga-3.2.jar -file.reference.imageio-thumbsdb-3.2.jar=release/modules/ext/imageio-thumbsdb-3.2.jar -file.reference.imageio-tiff-3.2.jar=release/modules/ext/imageio-tiff-3.2.jar -file.reference.imgscalr-lib-4.2.jar=release/modules/ext/imgscalr-lib-4.2.jar -file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.jar -file.reference.jfxtras-common-10.0-r1.jar=release/modules/ext/jfxtras-common-10.0-r1.jar -file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-10.0-r1.jar -file.reference.jfxtras-controls-10.0-r1.jar=release/modules/ext/jfxtras-controls-10.0-r1.jar -file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-10.0-r1.jar -file.reference.jfxtras-fxml-10.0-r1.jar=release/modules/ext/jfxtras-fxml-10.0-r1.jar -file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-10.0-r1.jar -file.reference.jna-5.6.0.jar=release\\modules\\ext\\jna-5.6.0.jar -file.reference.jna-platform-5.6.0.jar=release\\modules\\ext\\jna-platform-5.6.0.jar -file.reference.joda-time-2.4.jar=release/modules/ext/joda-time-2.4.jar -file.reference.jsr305-1.3.9.jar=release/modules/ext/jsr305-1.3.9.jar -file.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1.jar -file.reference.log4j-1.2.17.jar=release/modules/ext/log4j-1.2.17.jar -file.reference.logkit-1.0.1.jar=release/modules/ext/logkit-1.0.1.jar -file.reference.mail-1.4.3.jar=release/modules/ext/mail-1.4.3.jar -======= file.reference.commons-lang3-3.12.0.jar=release/modules/ext/commons-lang3-3.12.0.jar file.reference.commons-logging-1.2.jar=release/modules/ext/commons-logging-1.2.jar file.reference.commons-text-1.9.jar=release/modules/ext/commons-text-1.9.jar file.reference.commons-validator-1.7.jar=release/modules/ext/commons-validator-1.7.jar file.reference.compiler-0.9.10.jar=release/modules/ext/compiler-0.9.10.jar file.reference.conscrypt-openjdk-uber-2.5.1.jar=release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar -file.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11.jar +file.reference.controlsfx-9.0.0.jar=release/modules/ext/controlsfx-9.0.0.jar file.reference.dd-plist-1.23.jar=release/modules/ext/dd-plist-1.23.jar file.reference.error_prone_annotations-2.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar @@ -103,6 +62,7 @@ file.reference.grpc-xds-1.44.1.jar=release/modules/ext/grpc-xds-1.44.1.jar file.reference.gson-2.9.0.jar=release/modules/ext/gson-2.9.0.jar file.reference.gst1-java-core-1.4.0.jar=release/modules/ext/gst1-java-core-1.4.0.jar file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar +file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar file.reference.httpclient-4.5.13.jar=release/modules/ext/httpclient-4.5.13.jar file.reference.httpcore-4.4.15.jar=release/modules/ext/httpcore-4.4.15.jar file.reference.imageio-bmp-3.8.2.jar=release/modules/ext/imageio-bmp-3.8.2.jar @@ -127,22 +87,23 @@ file.reference.jackson-databind-2.13.2.jar=release/modules/ext/jackson-databind- file.reference.jackson-dataformat-csv-2.13.2.jar=release/modules/ext/jackson-dataformat-csv-2.13.2.jar file.reference.javax.annotation-api-1.3.2.jar=release/modules/ext/javax.annotation-api-1.3.2.jar file.reference.jericho-html-3.4.jar=release/modules/ext/jericho-html-3.4.jar -file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4.jar -file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar -file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar +file.reference.jfxtras-common-11-r1.jar=release/modules/ext/jfxtras-common-11-r1.jar +file.reference.jfxtras-controls-11-r1.jar=release/modules/ext/jfxtras-controls-11-r1.jar +file.reference.jfxtras-fxml-11-r1.jar=release/modules/ext/jfxtras-fxml-11-r1.jar +file.reference.jfxtras-test-support-11-r1.jar=release/modules/ext/jfxtras-test-support-11-r1.jar file.reference.jna-5.12.1.jar=release/modules/ext/jna-5.12.1.jar file.reference.jna-platform-5.12.0.jar=release/modules/ext/jna-platform-5.12.0.jar file.reference.joda-time-2.10.14.jar=release/modules/ext/joda-time-2.10.14.jar file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar +file.reference.junit-4.13.2.jar=release/modules/ext/junit-4.13.2.jar file.reference.LGoodDatePicker-11.2.1.jar=release/modules/ext/LGoodDatePicker-11.2.1.jar file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar file.reference.log4j-api-2.17.2.jar=release/modules/ext/log4j-api-2.17.2.jar file.reference.log4j-core-2.17.2.jar=release/modules/ext/log4j-core-2.17.2.jar -file.reference.ooxml-schemas-1.4.jar=release/modules/ext/ooxml-schemas-1.4.jar +file.reference.mockito-all-1.9.5.jar=release/modules/ext/mockito-all-1.9.5.jar file.reference.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31.0.jar file.reference.opencensus-contrib-http-util-0.31.0.jar=release/modules/ext/opencensus-contrib-http-util-0.31.0.jar file.reference.opencensus-proto-0.2.0.jar=release/modules/ext/opencensus-proto-0.2.0.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 file.reference.opencv-248.jar=release/modules/ext/opencv-248.jar file.reference.perfmark-api-0.23.0.jar=release/modules/ext/perfmark-api-0.23.0.jar file.reference.proto-google-cloud-translate-v3-2.1.11.jar=release/modules/ext/proto-google-cloud-translate-v3-2.1.11.jar @@ -154,38 +115,12 @@ file.reference.protobuf-java-util-3.19.4.jar=release/modules/ext/protobuf-java-u file.reference.re2j-1.5.jar=release/modules/ext/re2j-1.5.jar file.reference.reload4j-1.2.19.jar=release/modules/ext/reload4j-1.2.19.jar file.reference.sigar-1.6.4.jar=release/modules/ext/sigar-1.6.4.jar -<<<<<<< HEAD -file.reference.slf4j-api-1.6.1.jar=release/modules/ext/slf4j-api-1.6.1.jar -file.reference.slf4j-simple-1.6.1.jar=release/modules/ext/slf4j-simple-1.6.1.jar -file.reference.xml-apis-1.0.b2.jar=release/modules/ext/xml-apis-1.0.b2.jar -file.reference.xmlbeans-3.0.2.jar=release/modules/ext/xmlbeans-3.0.2.jar -file.reference.dd-plist-1.20.jar=release/modules/ext/dd-plist-1.20.jar -javac.source=11 -javac.compilerargs=-Xlint -Xlint:-serial -javadoc.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4-javadoc.jar -javadoc.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5-javadoc.jar -javadoc.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1-javadoc.jar -javadoc.reference.guava-19.0.jar=release/modules/ext/guava-19.0-javadoc.jar -javadoc.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4-javadoc.jar -javadoc.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-javadoc.jar -javadoc.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4-javadoc.jar -javadoc.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-javadoc.jar -nbm.needs.restart=true -source.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4-sources.jar -source.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5-sources.jar -source.reference.compiler-0.9.1.jar=release/modules/ext/compiler-0.9.1-sources.jar -source.reference.guava-19.0.jar=release/modules/ext/guava-19.0-sources.jar -source.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4-sources.jar -source.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4-sources.jar -source.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4-sources.jar -source.reference.LGoodDatePicker-10.3.1.jar=release/modules/ext/LGoodDatePicker-10.3.1-sources.jar -======= file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar file.reference.slf4j-reload4j-1.7.36.jar=release/modules/ext/slf4j-reload4j-1.7.36.jar +file.reference.testfx-core-4.0.16-alpha.jar=release/modules/ext/testfx-core-4.0.16-alpha.jar +file.reference.testfx-junit-4.0.15-alpha.jar=release/modules/ext/testfx-junit-4.0.15-alpha.jar file.reference.threetenbp-1.5.2.jar=release/modules/ext/threetenbp-1.5.2.jar file.reference.webp-imageio-sejda-0.1.0.jar=release/modules/ext/webp-imageio-sejda-0.1.0.jar -javac.source=1.8 +javac.source=11 javac.compilerargs=-Xlint -Xlint:-serial nbm.needs.restart=true - ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 7da778f972..19d52c7e08 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -246,7 +246,6 @@ javax.annotation javax.annotation.concurrent javax.annotation.meta -<<<<<<< HEAD javax.jms javax.mail javax.mail.event @@ -260,8 +259,6 @@ javax.xml.transform.dom javax.xml.transform.sax javax.xml.transform.stream -======= ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 jfxtras.animation jfxtras.css jfxtras.css.converters @@ -329,7 +326,6 @@ org.apache.commons.lang3.tuple org.apache.commons.logging org.apache.commons.logging.impl -<<<<<<< HEAD org.apache.log org.apache.log.filter org.apache.log.format @@ -340,11 +336,9 @@ org.apache.log.output.jms org.apache.log.output.net org.apache.log.util -======= org.apache.commons.text org.apache.commons.validator.routines org.apache.commons.validator.routines.checkdigit ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 org.apache.log4j org.apache.log4j.chainsaw org.apache.log4j.config @@ -512,6 +506,10 @@ ext/AppleJavaExtensions-1.4.jar release/modules/ext/AppleJavaExtensions-1.4.jar + + ext/assertj-core-3.13.2.jar + release/modules/ext/assertj-core-3.13.2.jar + ext/auto-value-annotations-1.9.jar release/modules/ext/auto-value-annotations-1.9.jar @@ -537,17 +535,12 @@ release/modules/ext/common-image-3.8.2.jar -<<<<<<< HEAD - ext/jsr305-1.3.9.jar - release/modules/ext/jsr305-1.3.9.jar -======= ext/common-io-3.8.2.jar release/modules/ext/common-io-3.8.2.jar ext/common-lang-3.8.2.jar release/modules/ext/common-lang-3.8.2.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 ext/commons-beanutils-1.9.4.jar @@ -558,17 +551,8 @@ release/modules/ext/commons-codec-1.15.jar -<<<<<<< HEAD - ext/jfxtras-fxml-10.0-r1.jar - release/modules/ext/jfxtras-fxml-10.0-r1.jar - - - ext/commons-lang3-3.4.jar - release\modules\ext\commons-lang3-3.4.jar -======= ext/commons-collections-3.2.2.jar release/modules/ext/commons-collections-3.2.2.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 ext/commons-collections4-4.4.jar @@ -615,8 +599,8 @@ release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar - ext/controlsfx-8.40.11.jar - release/modules/ext/controlsfx-8.40.11.jar + ext/controlsfx-9.0.0.jar + release/modules/ext/controlsfx-9.0.0.jar ext/dd-plist-1.23.jar @@ -635,18 +619,6 @@ release/modules/ext/gax-2.12.2.jar -<<<<<<< HEAD - ext/commons-csv-1.4.jar - release/modules/ext/commons-csv-1.4.jar - - - ext/controlsfx-9.0.0.jar - release\modules\ext\controlsfx-9.0.0.jar - - - ext/imageio-sgi-3.2.jar - release/modules/ext/imageio-sgi-3.2.jar -======= ext/gax-grpc-2.12.2.jar release/modules/ext/gax-grpc-2.12.2.jar @@ -761,12 +733,15 @@ ext/gst1-java-core-1.4.0.jar release/modules/ext/gst1-java-core-1.4.0.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 ext/guava-31.1-jre.jar release/modules/ext/guava-31.1-jre.jar + + ext/hamcrest-core-1.3.jar + release/modules/ext/hamcrest-core-1.3.jar + ext/httpclient-4.5.13.jar release/modules/ext/httpclient-4.5.13.jar @@ -864,25 +839,24 @@ release/modules/ext/jericho-html-3.4.jar - ext/jfxtras-common-8.0-r4.jar - release/modules/ext/jfxtras-common-8.0-r4.jar + ext/jfxtras-common-11-r1.jar + release/modules/ext/jfxtras-common-11-r1.jar - ext/jfxtras-controls-8.0-r4.jar - release/modules/ext/jfxtras-controls-8.0-r4.jar + ext/jfxtras-controls-11-r1.jar + release/modules/ext/jfxtras-controls-11-r1.jar -<<<<<<< HEAD - ext/joda-time-2.4.jar - release/modules/ext/joda-time-2.4.jar -======= - ext/jfxtras-fxml-8.0-r4.jar - release/modules/ext/jfxtras-fxml-8.0-r4.jar + ext/jfxtras-fxml-11-r1.jar + release/modules/ext/jfxtras-fxml-11-r1.jar + + + ext/jfxtras-test-support-11-r1.jar + release/modules/ext/jfxtras-test-support-11-r1.jar ext/jna-5.12.1.jar release/modules/ext/jna-5.12.1.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 ext/jna-platform-5.12.0.jar @@ -896,22 +870,17 @@ ext/jsr305-3.0.2.jar release/modules/ext/jsr305-3.0.2.jar + + ext/junit-4.13.2.jar + release/modules/ext/junit-4.13.2.jar + ext/LGoodDatePicker-11.2.1.jar release/modules/ext/LGoodDatePicker-11.2.1.jar -<<<<<<< HEAD - ext/jfxtras-common-10.0-r1.jar - release/modules/ext/jfxtras-common-10.0-r1.jar - - - ext/guava-19.0.jar - release/modules/ext/guava-19.0.jar -======= ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 ext/log4j-api-2.17.2.jar @@ -922,8 +891,8 @@ release/modules/ext/log4j-core-2.17.2.jar - ext/ooxml-schemas-1.4.jar - release/modules/ext/ooxml-schemas-1.4.jar + ext/mockito-all-1.9.5.jar + release/modules/ext/mockito-all-1.9.5.jar ext/opencensus-api-0.31.0.jar @@ -962,17 +931,12 @@ release/modules/ext/proto-google-iam-v1-1.2.6.jar -<<<<<<< HEAD - ext/jfxtras-controls-10.0-r1.jar - release/modules/ext/jfxtras-controls-10.0-r1.jar -======= ext/protobuf-java-3.19.4.jar release/modules/ext/protobuf-java-3.19.4.jar ext/protobuf-java-util-3.19.4.jar release/modules/ext/protobuf-java-util-3.19.4.jar ->>>>>>> c8f546a0d7078b675a4eb673ba25e4acd1523985 ext/re2j-1.5.jar @@ -994,6 +958,14 @@ ext/slf4j-reload4j-1.7.36.jar release/modules/ext/slf4j-reload4j-1.7.36.jar + + ext/testfx-core-4.0.16-alpha.jar + release/modules/ext/testfx-core-4.0.16-alpha.jar + + + ext/testfx-junit-4.0.15-alpha.jar + release/modules/ext/testfx-junit-4.0.15-alpha.jar + ext/threetenbp-1.5.2.jar release/modules/ext/threetenbp-1.5.2.jar diff --git a/CoreTestLibs/nbproject/project.properties b/CoreTestLibs/nbproject/project.properties index 2b50b4d9f9..6e49261763 100644 --- a/CoreTestLibs/nbproject/project.properties +++ b/CoreTestLibs/nbproject/project.properties @@ -4,5 +4,5 @@ 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 +javac.source=11 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/KeywordSearch/nbproject/project.properties b/KeywordSearch/nbproject/project.properties index 73a9e75c73..1e28a98062 100644 --- a/KeywordSearch/nbproject/project.properties +++ b/KeywordSearch/nbproject/project.properties @@ -6,6 +6,7 @@ file.reference.commons-math3-3.6.1.jar=release/modules/ext/commons-math3-3.6.1.j file.reference.error_prone_annotations-2.11.0.jar=release/modules/ext/error_prone_annotations-2.11.0.jar file.reference.failureaccess-1.0.1.jar=release/modules/ext/failureaccess-1.0.1.jar file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.jar +file.reference.hamcrest-core-1.3.jar=release/modules/ext/hamcrest-core-1.3.jar file.reference.http2-client-9.4.44.v20210927.jar=release/modules/ext/http2-client-9.4.44.v20210927.jar file.reference.http2-common-9.4.44.v20210927.jar=release/modules/ext/http2-common-9.4.44.v20210927.jar file.reference.http2-hpack-9.4.44.v20210927.jar=release/modules/ext/http2-hpack-9.4.44.v20210927.jar @@ -24,6 +25,8 @@ file.reference.jetty-http-9.4.44.v20210927.jar=release/modules/ext/jetty-http-9. file.reference.jetty-io-9.4.44.v20210927.jar=release/modules/ext/jetty-io-9.4.44.v20210927.jar file.reference.jetty-util-9.4.44.v20210927.jar=release/modules/ext/jetty-util-9.4.44.v20210927.jar file.reference.jsonic-1.2.11.jar=release/modules/ext/jsonic-1.2.11.jar +file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar +file.reference.junit-4.13.2.jar=release/modules/ext/junit-4.13.2.jar file.reference.language-detector-0.6.jar=release/modules/ext/language-detector-0.6.jar file.reference.listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar=release/modules/ext/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar file.reference.logback-classic-1.2.10.jar=release/modules/ext/logback-classic-1.2.10.jar @@ -38,6 +41,7 @@ file.reference.netty-tcnative-classes-2.0.48.Final.jar=release/modules/ext/netty file.reference.netty-transport-4.1.68.Final.jar=release/modules/ext/netty-transport-4.1.68.Final.jar file.reference.netty-transport-native-epoll-4.1.68.Final.jar=release/modules/ext/netty-transport-native-epoll-4.1.68.Final.jar file.reference.netty-transport-native-unix-common-4.1.68.Final.jar=release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.jar +file.reference.slf4j-api-1.7.36.jar=release/modules/ext/slf4j-api-1.7.36.jar file.reference.snappy-java-1.1.7.6.jar=release/modules/ext/snappy-java-1.1.7.6.jar file.reference.solr-solrj-8.11.2.jar=release/modules/ext/solr-solrj-8.11.2.jar file.reference.stax2-api-4.2.1.jar=release/modules/ext/stax2-api-4.2.1.jar diff --git a/KeywordSearch/nbproject/project.xml b/KeywordSearch/nbproject/project.xml index 9b8fa50bda..223d47484d 100644 --- a/KeywordSearch/nbproject/project.xml +++ b/KeywordSearch/nbproject/project.xml @@ -266,6 +266,10 @@ ext/guava-31.1-jre.jar release/modules/ext/guava-31.1-jre.jar + + ext/hamcrest-core-1.3.jar + release/modules/ext/hamcrest-core-1.3.jar + ext/http2-client-9.4.44.v20210927.jar release/modules/ext/http2-client-9.4.44.v20210927.jar @@ -338,6 +342,14 @@ ext/jsonic-1.2.11.jar release/modules/ext/jsonic-1.2.11.jar + + ext/jsr305-3.0.2.jar + release/modules/ext/jsr305-3.0.2.jar + + + ext/junit-4.13.2.jar + release/modules/ext/junit-4.13.2.jar + ext/language-detector-0.6.jar release/modules/ext/language-detector-0.6.jar @@ -394,6 +406,10 @@ ext/netty-transport-native-unix-common-4.1.68.Final.jar release/modules/ext/netty-transport-native-unix-common-4.1.68.Final.jar + + ext/slf4j-api-1.7.36.jar + release/modules/ext/slf4j-api-1.7.36.jar + ext/snappy-java-1.1.7.6.jar release/modules/ext/snappy-java-1.1.7.6.jar diff --git a/ScalpelCarver/nbproject/project.properties b/ScalpelCarver/nbproject/project.properties index 815054aa0d..7507726237 100644 --- a/ScalpelCarver/nbproject/project.properties +++ b/ScalpelCarver/nbproject/project.properties @@ -1,4 +1,4 @@ -javac.source=1.8 +javac.source=11 javac.compilerargs=-Xlint -Xlint:-serial license.file=../LICENSE-2.0.txt nbm.homepage=http://www.sleuthkit.org/autopsy/ diff --git a/Tika/nbproject/project.properties b/Tika/nbproject/project.properties index f040facd2f..10f526b3e8 100755 --- a/Tika/nbproject/project.properties +++ b/Tika/nbproject/project.properties @@ -116,5 +116,5 @@ file.reference.xmlschema-core-2.3.0.jar=release/modules/ext/xmlschema-core-2.3.0 file.reference.xmpbox-2.0.25.jar=release/modules/ext/xmpbox-2.0.25.jar file.reference.xmpcore-shaded-6.1.11.jar=release/modules/ext/xmpcore-shaded-6.1.11.jar file.reference.xz-1.9.jar=release/modules/ext/xz-1.9.jar -javac.source=1.8 +javac.source=11 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/Tools/ZookeeperNodeMigration/nbproject/project.properties b/Tools/ZookeeperNodeMigration/nbproject/project.properties index 26892390a5..e594c12201 100755 --- a/Tools/ZookeeperNodeMigration/nbproject/project.properties +++ b/Tools/ZookeeperNodeMigration/nbproject/project.properties @@ -60,8 +60,8 @@ javac.modulepath= javac.processormodulepath= javac.processorpath=\ ${javac.classpath} -javac.source=1.8 -javac.target=1.8 +javac.source=11 +javac.target=11 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/nbproject/platform.properties b/nbproject/platform.properties index 27861745ed..00172f9228 100644 --- a/nbproject/platform.properties +++ b/nbproject/platform.properties @@ -1,4 +1,5 @@ branding.token=autopsy +nbjdk.active=default # Version of platform that is automatically downloaded # IMPORTANT: autopsy/build.xml has a netbeans-plat-version property that MUST be kept in sync (manually) netbeans-plat-version=11.3 @@ -11,332 +12,6 @@ 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=\ - 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 +disabled.modules= diff --git a/nbproject/project.properties b/nbproject/project.properties index 73e3059b4d..6eb0846dfe 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -12,6 +12,7 @@ build.type=DEVELOPMENT project.org.netbeans.progress=org-netbeans-api-progress project.org.sleuthkit.autopsy.experimental=Experimental project.org.sleuthkit.autopsy.imagegallery=ImageGallery +project.org.sleuthkit.autopsy.testing=Testing project.org.sleuthkit.autopsy.Tika=Tika update_versions=false #custom JVM options @@ -27,17 +28,16 @@ auxiliary.org-netbeans-modules-apisupport-installer.pack200-enabled=false modules=\ ${project.org.sleuthkit.autopsy.keywordsearch}:\ ${project.org.sleuthkit.autopsy.recentactivity}:\ - ${project.org.sleuthkit.autopsy.testing}:\ ${project.org.sleuthkit.autopsy.thunderbirdparser}:\ ${project.org.sleuthkit.autopsy.core}:\ ${project.org.sleuthkit.autopsy.corelibs}:\ ${project.org.sleuthkit.autopsy.imagegallery}:\ ${project.org.sleuthkit.autopsy.experimental}:\ - ${project.org.sleuthkit.autopsy.Tika} + ${project.org.sleuthkit.autopsy.Tika}:\ + ${project.org.sleuthkit.autopsy.testing} 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/yara/YaraJNIWrapper/nbproject/project.properties b/thirdparty/yara/YaraJNIWrapper/nbproject/project.properties index 0af470a2bf..56689f272f 100755 --- a/thirdparty/yara/YaraJNIWrapper/nbproject/project.properties +++ b/thirdparty/yara/YaraJNIWrapper/nbproject/project.properties @@ -48,8 +48,8 @@ javac.modulepath= javac.processormodulepath= javac.processorpath=\ ${javac.classpath} -javac.source=1.8 -javac.target=1.8 +javac.source=11 +javac.target=1 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/thirdparty/yara/YaraWrapperTest/nbproject/project.properties b/thirdparty/yara/YaraWrapperTest/nbproject/project.properties index b7874aae82..8e109ffd1f 100755 --- a/thirdparty/yara/YaraWrapperTest/nbproject/project.properties +++ b/thirdparty/yara/YaraWrapperTest/nbproject/project.properties @@ -48,8 +48,8 @@ javac.modulepath= javac.processormodulepath= javac.processorpath=\ ${javac.classpath} -javac.source=1.8 -javac.target=1.8 +javac.source=11 +javac.target=11 javac.test.classpath=\ ${javac.classpath}:\ ${build.classes.dir} diff --git a/thunderbirdparser/nbproject/project.properties b/thunderbirdparser/nbproject/project.properties index 9f01f8ac6d..ac1d87e418 100644 --- a/thunderbirdparser/nbproject/project.properties +++ b/thunderbirdparser/nbproject/project.properties @@ -1,7 +1,9 @@ file.reference.apache-mime4j-mbox-iterator-0.8.4.jar=release/modules/ext/apache-mime4j-mbox-iterator-0.8.4.jar -file.reference.commons-lang3-3.12.0.jar=release/modules/ext/commons-lang3-3.12.0.jar file.reference.ez-vcard-0.11.3.jar=release/modules/ext/ez-vcard-0.11.3.jar +file.reference.freemarker-2.3.31.jar=release/modules/ext/freemarker-2.3.31.jar +file.reference.jackson-core-2.13.2.jar=release/modules/ext/jackson-core-2.13.2.jar file.reference.java-libpst-0.9.5-SNAPSHOT.jar=release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar +file.reference.jsoup-1.14.3.jar=release/modules/ext/jsoup-1.14.3.jar file.reference.vinnie-2.0.2.jar=release/modules/ext/vinnie-2.0.2.jar javac.source=11 javac.compilerargs=-Xlint -Xlint:-serial diff --git a/thunderbirdparser/nbproject/project.xml b/thunderbirdparser/nbproject/project.xml index 6c138cc4df..df2cc40d2d 100644 --- a/thunderbirdparser/nbproject/project.xml +++ b/thunderbirdparser/nbproject/project.xml @@ -81,18 +81,26 @@ ext/apache-mime4j-mbox-iterator-0.8.4.jar release/modules/ext/apache-mime4j-mbox-iterator-0.8.4.jar - - ext/commons-lang3-3.12.0.jar - release/modules/ext/commons-lang3-3.12.0.jar - ext/ez-vcard-0.11.3.jar release/modules/ext/ez-vcard-0.11.3.jar + + ext/freemarker-2.3.31.jar + release/modules/ext/freemarker-2.3.31.jar + + + ext/jackson-core-2.13.2.jar + release/modules/ext/jackson-core-2.13.2.jar + ext/java-libpst-0.9.5-SNAPSHOT.jar release/modules/ext/java-libpst-0.9.5-SNAPSHOT.jar + + ext/jsoup-1.14.3.jar + release/modules/ext/jsoup-1.14.3.jar + ext/vinnie-2.0.2.jar release/modules/ext/vinnie-2.0.2.jar