From 93f35730e6d8eb6d329cdec31a6aea0218d467b4 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 27 Jun 2023 07:52:38 -0400 Subject: [PATCH 1/6] initial work --- CoreLibs/ivy.xml | 45 ++++++++++- CoreLibs/nbproject/project.properties | 18 ++++- CoreLibs/nbproject/project.xml | 104 ++++++++++++++++++++++++-- 3 files changed, 158 insertions(+), 9 deletions(-) diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index 017c3fbf7a..dda711f544 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -1,11 +1,52 @@ - + +]> + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 6a6ace6361..893842a478 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -60,7 +60,7 @@ file.reference.grpc-stub-1.44.1.jar=release/modules/ext/grpc-stub-1.44.1.jar 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.guava-31.1.jar=release/modules/ext/guava-31.1.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 @@ -83,6 +83,20 @@ file.reference.jackson-annotations-2.13.2.jar=release/modules/ext/jackson-annota file.reference.jackson-core-2.13.2.jar=release/modules/ext/jackson-core-2.13.2.jar file.reference.jackson-databind-2.13.2.jar=release/modules/ext/jackson-databind-2.13.2.jar file.reference.jackson-dataformat-csv-2.13.2.jar=release/modules/ext/jackson-dataformat-csv-2.13.2.jar +file.reference.javafx-base-17.0.7-win.jar=release/modules/ext/javafx-base-17.0.7-win.jar +file.reference.javafx-base-17.0.7.jar=release/modules/ext/javafx-base-17.0.7.jar +file.reference.javafx-controls-17.0.7-win.jar=release/modules/ext/javafx-controls-17.0.7-win.jar +file.reference.javafx-controls-17.0.7.jar=release/modules/ext/javafx-controls-17.0.7.jar +file.reference.javafx-fxml-17.0.7-win.jar=release/modules/ext/javafx-fxml-17.0.7-win.jar +file.reference.javafx-fxml-17.0.7.jar=release/modules/ext/javafx-fxml-17.0.7.jar +file.reference.javafx-graphics-17.0.7-win.jar=release/modules/ext/javafx-graphics-17.0.7-win.jar +file.reference.javafx-graphics-17.0.7.jar=release/modules/ext/javafx-graphics-17.0.7.jar +file.reference.javafx-media-17.0.7-win.jar=release/modules/ext/javafx-media-17.0.7-win.jar +file.reference.javafx-media-17.0.7.jar=release/modules/ext/javafx-media-17.0.7.jar +file.reference.javafx-swing-17.0.7-win.jar=release/modules/ext/javafx-swing-17.0.7-win.jar +file.reference.javafx-swing-17.0.7.jar=release/modules/ext/javafx-swing-17.0.7.jar +file.reference.javafx-web-17.0.7-win.jar=release/modules/ext/javafx-web-17.0.7-win.jar +file.reference.javafx-web-17.0.7.jar=release/modules/ext/javafx-web-17.0.7.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-17-r1.jar=release/modules/ext/jfxtras-common-17-r1.jar @@ -93,7 +107,7 @@ file.reference.jna-platform-5.13.0.jar=release/modules/ext/jna-platform-5.13.0.j 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.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.listenablefuture-9999.0.jar=release/modules/ext/listenablefuture-9999.0.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.opencensus-api-0.31.0.jar=release/modules/ext/opencensus-api-0.31.0.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 39c4e8786b..1794db756b 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -246,6 +246,44 @@ javax.annotation javax.annotation.concurrent javax.annotation.meta + javafx.animation + javafx.application + javafx.base + javafx.beans + javafx.beans.binding + javafx.beans.property + javafx.beans.property.adapter + javafx.beans.value + javafx.collections + javafx.collections.transformation + javafx.concurrent + javafx.css + javafx.css.converter + javafx.embed.swing + javafx.event + javafx.fxml + javafx.geometry + javafx.graphics + javafx.print + javafx.scene + javafx.scene.canvas + javafx.scene.chart + javafx.scene.control + javafx.scene.control.cell + javafx.scene.control.skin + javafx.scene.effect + javafx.scene.image + javafx.scene.input + javafx.scene.layout + javafx.scene.paint + javafx.scene.robot + javafx.scene.shape + javafx.scene.text + javafx.scene.transform + javafx.scene.web + javafx.stage + javafx.util + javafx.util.converter javax.jms javax.mail javax.mail.event @@ -471,7 +509,7 @@ org.slf4j.helpers org.slf4j.spi - + ext/animal-sniffer-annotations-1.21.jar release/modules/ext/animal-sniffer-annotations-1.21.jar @@ -720,8 +758,8 @@ release/modules/ext/gst1-java-core-1.4.0.jar - ext/guava-31.1-jre.jar - release/modules/ext/guava-31.1-jre.jar + ext/guava-31.1.jar + release/modules/ext/guava-31.1.jar ext/httpclient-4.5.13.jar @@ -811,6 +849,62 @@ ext/jackson-dataformat-csv-2.13.2.jar release/modules/ext/jackson-dataformat-csv-2.13.2.jar + + ext/javafx-base-17.0.7-win.jar + release/modules/ext/javafx-base-17.0.7-win.jar + + + ext/javafx-base-17.0.7.jar + release/modules/ext/javafx-base-17.0.7.jar + + + ext/javafx-controls-17.0.7-win.jar + release/modules/ext/javafx-controls-17.0.7-win.jar + + + ext/javafx-controls-17.0.7.jar + release/modules/ext/javafx-controls-17.0.7.jar + + + ext/javafx-fxml-17.0.7-win.jar + release/modules/ext/javafx-fxml-17.0.7-win.jar + + + ext/javafx-fxml-17.0.7.jar + release/modules/ext/javafx-fxml-17.0.7.jar + + + ext/javafx-graphics-17.0.7-win.jar + release/modules/ext/javafx-graphics-17.0.7-win.jar + + + ext/javafx-graphics-17.0.7.jar + release/modules/ext/javafx-graphics-17.0.7.jar + + + ext/javafx-media-17.0.7-win.jar + release/modules/ext/javafx-media-17.0.7-win.jar + + + ext/javafx-media-17.0.7.jar + release/modules/ext/javafx-media-17.0.7.jar + + + ext/javafx-swing-17.0.7-win.jar + release/modules/ext/javafx-swing-17.0.7-win.jar + + + ext/javafx-swing-17.0.7.jar + release/modules/ext/javafx-swing-17.0.7.jar + + + ext/javafx-web-17.0.7-win.jar + release/modules/ext/javafx-web-17.0.7-win.jar + + + ext/javafx-web-17.0.7.jar + release/modules/ext/javafx-web-17.0.7.jar + ext/javax.annotation-api-1.3.2.jar release/modules/ext/javax.annotation-api-1.3.2.jar @@ -852,8 +946,8 @@ release/modules/ext/LGoodDatePicker-11.2.1.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 + ext/listenablefuture-9999.0.jar + release/modules/ext/listenablefuture-9999.0.jar ext/log4j-api-2.17.2.jar From 98a0de8736a76b582c81c563a3d6778c99f80f6f Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 27 Jun 2023 08:30:36 -0400 Subject: [PATCH 2/6] updates to exposed packages --- CoreLibs/nbproject/project.properties | 6 +- CoreLibs/nbproject/project.xml | 104 +++++++++++++++++++++++--- 2 files changed, 99 insertions(+), 11 deletions(-) diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 893842a478..618817734e 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -26,6 +26,7 @@ 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-11.1.2-sources.jar=release/modules/ext/controlsfx-11.1.2-sources.jar file.reference.controlsfx-11.1.2.jar=release/modules/ext/controlsfx-11.1.2.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 @@ -60,7 +61,7 @@ file.reference.grpc-stub-1.44.1.jar=release/modules/ext/grpc-stub-1.44.1.jar 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.jar=release/modules/ext/guava-31.1.jar +file.reference.guava-31.1-jre.jar=release/modules/ext/guava-31.1-jre.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 @@ -107,12 +108,13 @@ file.reference.jna-platform-5.13.0.jar=release/modules/ext/jna-platform-5.13.0.j 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.LGoodDatePicker-11.2.1.jar=release/modules/ext/LGoodDatePicker-11.2.1.jar -file.reference.listenablefuture-9999.0.jar=release/modules/ext/listenablefuture-9999.0.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.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 +file.reference.opencv-2413.jar=release/modules/ext/opencv-2413.jar 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 diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 1794db756b..7507bc86ed 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -199,6 +199,83 @@ com.google.type com.microsoft.schemas.vml com.microsoft.schemas.vml.impl + com.sun.javafx + com.sun.javafx.animation + com.sun.javafx.application + com.sun.javafx.beans + com.sun.javafx.beans.event + com.sun.javafx.binding + com.sun.javafx.charts + com.sun.javafx.collections + com.sun.javafx.css + com.sun.javafx.css.parser + com.sun.javafx.cursor + com.sun.javafx.effect + com.sun.javafx.embed + com.sun.javafx.embed.swing + com.sun.javafx.embed.swing.newimpl + com.sun.javafx.event + com.sun.javafx.font + com.sun.javafx.font.coretext + com.sun.javafx.font.directwrite + com.sun.javafx.font.freetype + com.sun.javafx.fxml + com.sun.javafx.fxml.builder + com.sun.javafx.fxml.builder.web + com.sun.javafx.fxml.expression + com.sun.javafx.geom + com.sun.javafx.geom.transform + com.sun.javafx.geometry + com.sun.javafx.iio + com.sun.javafx.iio.bmp + com.sun.javafx.iio.common + com.sun.javafx.iio.gif + com.sun.javafx.iio.ios + com.sun.javafx.iio.jpeg + com.sun.javafx.iio.png + com.sun.javafx.image + com.sun.javafx.image.impl + com.sun.javafx.logging + com.sun.javafx.logging.jfr + com.sun.javafx.media + com.sun.javafx.menu + com.sun.javafx.perf + com.sun.javafx.print + com.sun.javafx.property + com.sun.javafx.property.adapter + com.sun.javafx.reflect + com.sun.javafx.runtime + com.sun.javafx.runtime.async + com.sun.javafx.runtime.eula + com.sun.javafx.scene + com.sun.javafx.scene.canvas + com.sun.javafx.scene.control + com.sun.javafx.scene.control.behavior + com.sun.javafx.scene.control.inputmap + com.sun.javafx.scene.control.skin + com.sun.javafx.scene.control.skin.resources + com.sun.javafx.scene.input + com.sun.javafx.scene.layout + com.sun.javafx.scene.layout.region + com.sun.javafx.scene.media + com.sun.javafx.scene.paint + com.sun.javafx.scene.shape + com.sun.javafx.scene.text + com.sun.javafx.scene.transform + com.sun.javafx.scene.traversal + com.sun.javafx.scene.web + com.sun.javafx.scene.web.behavior + com.sun.javafx.sg.prism + com.sun.javafx.sg.prism.web + com.sun.javafx.stage + com.sun.javafx.text + com.sun.javafx.tk + com.sun.javafx.tk.quantum + com.sun.javafx.util + com.sun.javafx.webkit + com.sun.javafx.webkit.prism + com.sun.javafx.webkit.prism.theme + com.sun.javafx.webkit.theme com.sun.jna com.sun.jna.platform com.sun.jna.platform.dnd @@ -208,6 +285,7 @@ com.sun.jna.platform.wince com.sun.jna.ptr com.sun.jna.win32 + com.sun.scenario.animation com.twelvemonkeys.image com.twelvemonkeys.imageio com.twelvemonkeys.imageio.color @@ -246,9 +324,8 @@ javax.annotation javax.annotation.concurrent javax.annotation.meta - javafx.animation +javafx.animation javafx.application - javafx.base javafx.beans javafx.beans.binding javafx.beans.property @@ -259,9 +336,9 @@ javafx.concurrent javafx.css javafx.css.converter - javafx.embed.swing + javafx.embed.swing javafx.event - javafx.fxml + javafx.fxml javafx.geometry javafx.graphics javafx.print @@ -275,12 +352,13 @@ javafx.scene.image javafx.scene.input javafx.scene.layout + javafx.scene.media javafx.scene.paint javafx.scene.robot javafx.scene.shape javafx.scene.text javafx.scene.transform - javafx.scene.web + javafx.scene.web javafx.stage javafx.util javafx.util.converter @@ -621,6 +699,10 @@ ext/conscrypt-openjdk-uber-2.5.1.jar release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar + + ext/controlsfx-11.1.2-sources.jar + release/modules/ext/controlsfx-11.1.2-sources.jar + ext/controlsfx-11.1.2.jar release/modules/ext/controlsfx-11.1.2.jar @@ -758,8 +840,8 @@ release/modules/ext/gst1-java-core-1.4.0.jar - ext/guava-31.1.jar - release/modules/ext/guava-31.1.jar + ext/guava-31.1-jre.jar + release/modules/ext/guava-31.1-jre.jar ext/httpclient-4.5.13.jar @@ -946,8 +1028,8 @@ release/modules/ext/LGoodDatePicker-11.2.1.jar - ext/listenablefuture-9999.0.jar - release/modules/ext/listenablefuture-9999.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 ext/log4j-api-2.17.2.jar @@ -969,6 +1051,10 @@ ext/opencensus-proto-0.2.0.jar release/modules/ext/opencensus-proto-0.2.0.jar + + ext/opencv-2413.jar + release/modules/ext/opencv-2413.jar + ext/opencv-248.jar release/modules/ext/opencv-248.jar From 64f7e0c5747e49a82577fb1d80c711e398807399 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 27 Jun 2023 08:47:13 -0400 Subject: [PATCH 3/6] updates for mac and linux --- CoreLibs/ivy.xml | 14 +++++++ CoreLibs/nbproject/project.properties | 14 +++++++ CoreLibs/nbproject/project.xml | 56 +++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index dda711f544..ee82543984 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -20,30 +20,44 @@ + + + + + + + + + + + + + + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 618817734e..7cff41ed03 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -84,18 +84,32 @@ file.reference.jackson-annotations-2.13.2.jar=release/modules/ext/jackson-annota file.reference.jackson-core-2.13.2.jar=release/modules/ext/jackson-core-2.13.2.jar file.reference.jackson-databind-2.13.2.jar=release/modules/ext/jackson-databind-2.13.2.jar file.reference.jackson-dataformat-csv-2.13.2.jar=release/modules/ext/jackson-dataformat-csv-2.13.2.jar +file.reference.javafx-base-17.0.7-linux.jar=release/modules/ext/javafx-base-17.0.7-linux.jar +file.reference.javafx-base-17.0.7-mac.jar=release/modules/ext/javafx-base-17.0.7-mac.jar file.reference.javafx-base-17.0.7-win.jar=release/modules/ext/javafx-base-17.0.7-win.jar file.reference.javafx-base-17.0.7.jar=release/modules/ext/javafx-base-17.0.7.jar +file.reference.javafx-controls-17.0.7-linux.jar=release/modules/ext/javafx-controls-17.0.7-linux.jar +file.reference.javafx-controls-17.0.7-mac.jar=release/modules/ext/javafx-controls-17.0.7-mac.jar file.reference.javafx-controls-17.0.7-win.jar=release/modules/ext/javafx-controls-17.0.7-win.jar file.reference.javafx-controls-17.0.7.jar=release/modules/ext/javafx-controls-17.0.7.jar +file.reference.javafx-fxml-17.0.7-linux.jar=release/modules/ext/javafx-fxml-17.0.7-linux.jar +file.reference.javafx-fxml-17.0.7-mac.jar=release/modules/ext/javafx-fxml-17.0.7-mac.jar file.reference.javafx-fxml-17.0.7-win.jar=release/modules/ext/javafx-fxml-17.0.7-win.jar file.reference.javafx-fxml-17.0.7.jar=release/modules/ext/javafx-fxml-17.0.7.jar +file.reference.javafx-graphics-17.0.7-linux.jar=release/modules/ext/javafx-graphics-17.0.7-linux.jar +file.reference.javafx-graphics-17.0.7-mac.jar=release/modules/ext/javafx-graphics-17.0.7-mac.jar file.reference.javafx-graphics-17.0.7-win.jar=release/modules/ext/javafx-graphics-17.0.7-win.jar file.reference.javafx-graphics-17.0.7.jar=release/modules/ext/javafx-graphics-17.0.7.jar +file.reference.javafx-media-17.0.7-linux.jar=release/modules/ext/javafx-media-17.0.7-linux.jar +file.reference.javafx-media-17.0.7-mac.jar=release/modules/ext/javafx-media-17.0.7-mac.jar file.reference.javafx-media-17.0.7-win.jar=release/modules/ext/javafx-media-17.0.7-win.jar file.reference.javafx-media-17.0.7.jar=release/modules/ext/javafx-media-17.0.7.jar +file.reference.javafx-swing-17.0.7-linux.jar=release/modules/ext/javafx-swing-17.0.7-linux.jar +file.reference.javafx-swing-17.0.7-mac.jar=release/modules/ext/javafx-swing-17.0.7-mac.jar file.reference.javafx-swing-17.0.7-win.jar=release/modules/ext/javafx-swing-17.0.7-win.jar file.reference.javafx-swing-17.0.7.jar=release/modules/ext/javafx-swing-17.0.7.jar +file.reference.javafx-web-17.0.7-linux.jar=release/modules/ext/javafx-web-17.0.7-linux.jar +file.reference.javafx-web-17.0.7-mac.jar=release/modules/ext/javafx-web-17.0.7-mac.jar file.reference.javafx-web-17.0.7-win.jar=release/modules/ext/javafx-web-17.0.7-win.jar file.reference.javafx-web-17.0.7.jar=release/modules/ext/javafx-web-17.0.7.jar file.reference.javax.annotation-api-1.3.2.jar=release/modules/ext/javax.annotation-api-1.3.2.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 7507bc86ed..f7818a9522 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -931,6 +931,14 @@ ext/jackson-dataformat-csv-2.13.2.jar release/modules/ext/jackson-dataformat-csv-2.13.2.jar + + ext/javafx-base-17.0.7-linux.jar + release/modules/ext/javafx-base-17.0.7-linux.jar + + + ext/javafx-base-17.0.7-mac.jar + release/modules/ext/javafx-base-17.0.7-mac.jar + ext/javafx-base-17.0.7-win.jar release/modules/ext/javafx-base-17.0.7-win.jar @@ -939,6 +947,14 @@ ext/javafx-base-17.0.7.jar release/modules/ext/javafx-base-17.0.7.jar + + ext/javafx-controls-17.0.7-linux.jar + release/modules/ext/javafx-controls-17.0.7-linux.jar + + + ext/javafx-controls-17.0.7-mac.jar + release/modules/ext/javafx-controls-17.0.7-mac.jar + ext/javafx-controls-17.0.7-win.jar release/modules/ext/javafx-controls-17.0.7-win.jar @@ -947,6 +963,14 @@ ext/javafx-controls-17.0.7.jar release/modules/ext/javafx-controls-17.0.7.jar + + ext/javafx-fxml-17.0.7-linux.jar + release/modules/ext/javafx-fxml-17.0.7-linux.jar + + + ext/javafx-fxml-17.0.7-mac.jar + release/modules/ext/javafx-fxml-17.0.7-mac.jar + ext/javafx-fxml-17.0.7-win.jar release/modules/ext/javafx-fxml-17.0.7-win.jar @@ -955,6 +979,14 @@ ext/javafx-fxml-17.0.7.jar release/modules/ext/javafx-fxml-17.0.7.jar + + ext/javafx-graphics-17.0.7-linux.jar + release/modules/ext/javafx-graphics-17.0.7-linux.jar + + + ext/javafx-graphics-17.0.7-mac.jar + release/modules/ext/javafx-graphics-17.0.7-mac.jar + ext/javafx-graphics-17.0.7-win.jar release/modules/ext/javafx-graphics-17.0.7-win.jar @@ -963,6 +995,14 @@ ext/javafx-graphics-17.0.7.jar release/modules/ext/javafx-graphics-17.0.7.jar + + ext/javafx-media-17.0.7-linux.jar + release/modules/ext/javafx-media-17.0.7-linux.jar + + + ext/javafx-media-17.0.7-mac.jar + release/modules/ext/javafx-media-17.0.7-mac.jar + ext/javafx-media-17.0.7-win.jar release/modules/ext/javafx-media-17.0.7-win.jar @@ -971,6 +1011,14 @@ ext/javafx-media-17.0.7.jar release/modules/ext/javafx-media-17.0.7.jar + + ext/javafx-swing-17.0.7-linux.jar + release/modules/ext/javafx-swing-17.0.7-linux.jar + + + ext/javafx-swing-17.0.7-mac.jar + release/modules/ext/javafx-swing-17.0.7-mac.jar + ext/javafx-swing-17.0.7-win.jar release/modules/ext/javafx-swing-17.0.7-win.jar @@ -979,6 +1027,14 @@ ext/javafx-swing-17.0.7.jar release/modules/ext/javafx-swing-17.0.7.jar + + ext/javafx-web-17.0.7-linux.jar + release/modules/ext/javafx-web-17.0.7-linux.jar + + + ext/javafx-web-17.0.7-mac.jar + release/modules/ext/javafx-web-17.0.7-mac.jar + ext/javafx-web-17.0.7-win.jar release/modules/ext/javafx-web-17.0.7-win.jar From f31b0c72c1799a07db5a9fb9db06e5f4e9d3f9ec Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 27 Jun 2023 15:42:56 -0400 Subject: [PATCH 4/6] updates for linux and mac --- .travis.yml | 61 ++++++++++++------- BUILDING.txt | 4 +- README.txt | 4 +- Running_Linux_OSX.md | 8 +-- appveyor.yml | 5 +- .../install_prereqs_macos.sh | 13 +--- .../install_prereqs_ubuntu.sh | 20 ++---- 7 files changed, 55 insertions(+), 60 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28218be2c9..569c9b9312 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,27 +15,50 @@ addons: apt: update: true packages: + - openjdk-17-jdk + - openjdk-17-jre + - build-essential + - autoconf + - libtool + - automake + - git + - zip + - wget + - ant + - libde265-dev + - libheif-dev + - libpq-dev - testdisk - libafflib-dev - libewf-dev - - libpq-dev - - autopoint - - libsqlite3-dev - - ant - - ant-optional - - libcppunit-dev - - wget + - libvhdi-dev + - libvmdk-dev + - libgstreamer1.0-0 + - gstreamer1.0-plugins-base + - gstreamer1.0-plugins-good + - gstreamer1.0-plugins-bad + - gstreamer1.0-plugins-ugly + - gstreamer1.0-libav + - gstreamer1.0-tools + - gstreamer1.0-x + - gstreamer1.0-alsa + - gstreamer1.0-gl + - gstreamer1.0-gtk3 + - gstreamer1.0-qt5 + - gstreamer1.0-pulseaudio homebrew: update: true packages: - - ant - - wget - - libpq - - libewf - - gettext - - cppunit + - openjdk@17 + - ant + - automake + - libtool - afflib + - libewf + - postgresql@15 - testdisk + - libheif + - gstreamer python: - 2.7 @@ -49,19 +72,11 @@ install: before_script: - if [ $TRAVIS_OS_NAME = linux ]; then - wget -q -O - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add -; - echo "deb [arch=amd64] https://apt.bell-sw.com/ stable main" | sudo tee /etc/apt/sources.list.d/bellsoft.list; - sudo apt-get update; - sudo apt-get install bellsoft-java17-full; export PATH=/usr/bin:$PATH; - export JAVA_HOME=/usr/lib/jvm/bellsoft-java17-full-amd64; + export JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64; fi - if [ $TRAVIS_OS_NAME = osx ]; then - brew uninstall java --force --ignore-dependencies; - brew cask uninstall java --force; - brew tap bell-sw/liberica; - brew install --cask liberica-jdk17-full; - export JAVA_HOME=/Library/Java/JavaVirtualMachines/liberica-jdk-17-full.jdk/Contents/Home; + export JAVA_HOME=$(/usr/libexec/java_home -v 17); fi - java -version diff --git a/BUILDING.txt b/BUILDING.txt index 8da32f6a76..ae1ab15d04 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -11,9 +11,9 @@ correct C libraries. STEPS: 1) Get Java Setup -1a) Download and install 64-bit JDK version 17 with JavaFX. +1a) Download and install 64-bit JDK version 17. -Autopsy has been used and tested with liberica java which can be downloaded from here: https://bell-sw.com/pages/downloads/. +Autopsy has been used and tested with java 17 which can be downloaded from here: https://www.oracle.com/java/technologies/downloads/#java17. 1b) Ensure that JDK_HOME is set to the root JDK directory. diff --git a/README.txt b/README.txt index 063d6bc7a7..9aabcd6fc3 100644 --- a/README.txt +++ b/README.txt @@ -43,8 +43,8 @@ This section lists the software components and libraries that are used by Autopsy. These tools are bundled with the Windows installer, unless specified otherwise. JRE (Java Runtime Environment) 17 -- Web page: https://bell-sw.com/pages/downloads/ -- License: https://bell-sw.com/liberica_eula/ +- Web page: https://www.oracle.com/java/technologies/downloads/#java17 +- License: https://www.oracle.com/a/tech/docs/jdk17-lium.pdf Netbeans 15 RCP platform and .jar files bundled with the platform - Web page: https://netbeans.apache.org/ diff --git a/Running_Linux_OSX.md b/Running_Linux_OSX.md index d6946d6c6e..fbc4828c29 100644 --- a/Running_Linux_OSX.md +++ b/Running_Linux_OSX.md @@ -13,7 +13,7 @@ When installing on Debian-based Linux or macOS systems, there are three general # Installing Autopsy - Download the Autopsy zip file from [repository releases](https://github.com/sleuthkit/autopsy/releases). The file will be marked as "autopsy-<release>.zip" (i.e. "autopsy-4.19.2.zip"). -- Run [`install_application.sh`](./linux_macos_install_scripts/install_application.sh) with the following parameters: `install_application.sh [-z zip_path] [-i install_directory] [-j java_home]`. An example would be `install_application.sh -z ~/Downloads/autopsy-4.19.2.zip -i ~/autopsy -j /usr/lib/jvm/bellsoft-java17-full-amd64`. The path to the Java 17 home is the last output from the [prequisites installation scripts](#installing-prerequisites), but typically, the path will be `/usr/lib/jvm/bellsoft-java17-full-amd64` on Debian-based Linux or the output of running `/usr/libexec/java_home -v 17` on macOS. +- Run [`install_application.sh`](./linux_macos_install_scripts/install_application.sh) with the following parameters: `install_application.sh [-z zip_path] [-i install_directory] [-j java_home]`. An example would be `install_application.sh -z ~/Downloads/autopsy-4.19.2.zip -i ~/autopsy -j /usr/lib/jvm/java-1.17.0-openjdk-amd64`. The path to the Java 17 home is the last output from the [prequisites installation scripts](#installing-prerequisites), but typically, the path will be in the result of running `update-java-alternatives -l | grep java-1.17` on Debian-based Linux or the output of running `/usr/libexec/java_home -v 17` on macOS. # Setup macOS JNA paths If you are on macOS, run [linux_macos_install_scripts/add_macos_jna.sh](./linux_macos_install_scripts/add_macos_jna.sh) to properly setup the jna path to get things like gstreamer working. An example would be `add_macos_jna.sh -i ~/autopsy`. @@ -26,9 +26,9 @@ If you are on macOS, run [linux_macos_install_scripts/add_macos_jna.sh](./linux_ the wrong version of Java is being used to run Autopsy. Check the version of Java reported in the `messages.log` file in the log directory. The log directory can be found by opening Autopsy, and, with no cases open, go to 'Help' > 'Open Log Folder'. `messages.log` should contain lines that looks like: ``` - Java; VM; Vendor = 17.0.7; OpenJDK 64-Bit Server VM 17.0.7+7-LTS; BellSoft - Runtime = OpenJDK Runtime Environment 17.0.7+7-LTS - Java Home = /usr/lib/jvm/bellsoft-java17-full-amd64 + Java; VM; Vendor = 17.0.7; OpenJDK 64-Bit Server VM 17.0.7+7-Ubuntu-0ubuntu122.04.2; Private Build + Runtime = OpenJDK Runtime Environment 17.0.7+7-Ubuntu-0ubuntu122.04.2 + Java Home = /usr/lib/jvm/java-17-openjdk-amd64 ``` If your `messages.log` file indicates that Java 17 is not being used: diff --git a/appveyor.yml b/appveyor.yml index d691bcd385..58c97ed5c2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,14 +11,13 @@ platform: x64 environment: global: TSK_HOME: "C:\\sleuthkit" - JDK_HOME: C:\Program Files\BellSoft\LibericaJDK-17-Full - JAVA_HOME: C:\Program Files\BellSoft\LibericaJDK-17-Full + JDK_HOME: C:\Program Files\Java\jdk17 + JAVA_HOME: C:\Program Files\Java\jdk17 PYTHON: "C:\\Python36-x64" install: - ps: choco install nuget.commandline - ps: choco install ant --ignore-dependencies - - ps: choco install liberica17jdkfull --force - git clone https://github.com/sleuthkit/sleuthkit - ps: $env:Path="$($env:JAVA_HOME)\bin;$($env:Path);C:\ProgramData\chocolatey\lib\ant" - set PATH=C:\Python36-x64\';%PATH% diff --git a/linux_macos_install_scripts/install_prereqs_macos.sh b/linux_macos_install_scripts/install_prereqs_macos.sh index 8a35cd819f..de9b3b22a3 100644 --- a/linux_macos_install_scripts/install_prereqs_macos.sh +++ b/linux_macos_install_scripts/install_prereqs_macos.sh @@ -1,15 +1,6 @@ #!/bin/bash -echo "Installing liberica java 17..." -brew tap bell-sw/liberica && \ -brew install --cask liberica-jdk17-full -if [[ $? -ne 0 ]] -then - echo "Unable to install liberica java" >> /dev/stderr - exit 1 -fi - -echo "Installing remaining dependencies..." -brew install ant automake libtool afflib libewf postgresql@15 testdisk libheif gstreamer +echo "Installing dependencies..." +brew install openjdk@17 ant automake libtool afflib libewf postgresql@15 testdisk libheif gstreamer if [[ $? -ne 0 ]] then diff --git a/linux_macos_install_scripts/install_prereqs_ubuntu.sh b/linux_macos_install_scripts/install_prereqs_ubuntu.sh index 498dd546a1..f5897e23d1 100644 --- a/linux_macos_install_scripts/install_prereqs_ubuntu.sh +++ b/linux_macos_install_scripts/install_prereqs_ubuntu.sh @@ -11,7 +11,9 @@ fi echo "Installing all apt dependencies..." sudo apt update && \ - sudo apt -y install build-essential autoconf libtool automake git zip wget ant \ + sudo apt -y install \ + openjdk-17-jdk openjdk-17-jre \ + build-essential autoconf libtool automake git zip wget ant \ libde265-dev libheif-dev \ libpq-dev \ testdisk libafflib-dev libewf-dev libvhdi-dev libvmdk-dev \ @@ -24,18 +26,6 @@ if [[ $? -ne 0 ]]; then exit 1 fi -echo "Installing bellsoft Java 17..." -pushd /usr/src/ && - wget -q -O - https://download.bell-sw.com/pki/GPG-KEY-bellsoft | sudo apt-key add - && - echo "deb [arch=amd64] https://apt.bell-sw.com/ stable main" | sudo tee /etc/apt/sources.list.d/bellsoft.list && - sudo apt update && - sudo apt -y install bellsoft-java17-full && - popd -if [[ $? -ne 0 ]]; then - echo "Failed to install bellsoft java 17" >>/dev/stderr - exit 1 -fi - echo "Autopsy prerequisites installed." -echo "Java path at /usr/lib/jvm/bellsoft-java17-full-amd64: " -ls /usr/lib/jvm/bellsoft-java17-full-amd64 \ No newline at end of file +echo "Java 17 instllation: " +update-java-alternatives -l | grep java-1.17 From 8195f5bf2d1ab1048c23f7c6bc51c5fc448c871f Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 27 Jun 2023 15:56:37 -0400 Subject: [PATCH 5/6] use oracle java for windows --- KeywordSearch/solr/bin/autopsy-solr.cmd | 2 +- developers/envvarsetup.py | 2 +- docs/doxygen-user/multi-user/installSolr.dox | 2 +- docs/doxygen-user_fr/multi-user/installSolr.dox | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/KeywordSearch/solr/bin/autopsy-solr.cmd b/KeywordSearch/solr/bin/autopsy-solr.cmd index 9e1ec90d88..4e7bbd047d 100755 --- a/KeywordSearch/solr/bin/autopsy-solr.cmd +++ b/KeywordSearch/solr/bin/autopsy-solr.cmd @@ -1,4 +1,4 @@ -@REM set JAVA_HOME=C:\Program Files\BellSoft\LibericaJDK-17-Full +@REM set JAVA_HOME=C:\Program Files\Java\jdk-17 @REM set SOLR_SERVER_DIR=C:\Bitnami\solr-8.2.0-2/apache-solr/server set SOLR_PORT=8983 set STOP_PORT=8079 diff --git a/developers/envvarsetup.py b/developers/envvarsetup.py index b0709ff004..bb9b8dcea7 100755 --- a/developers/envvarsetup.py +++ b/developers/envvarsetup.py @@ -34,7 +34,7 @@ open_jdk_64_home is the 64 bit jdk and is the assumed default source_base_path is the directory containing all necessary repos (i.e. autopsy, sleuthkit, etc.) open_jdk_32_home and postgres_32_home are only necessary if building binaries ''' -open_jdk_64_home = "C:\\Program Files\\BellSoft\\LibericaJDK-17-Full" +open_jdk_64_home = "C:\\Program Files\\Java\\jdk-17" postgres_home = "C:\\Program Files\\PostgreSQL\\9.5" ant_home = "C:\\Program Files\\NetBeans-17\\netbeans\\extide\\ant" open_jdk_home = open_jdk_64_home diff --git a/docs/doxygen-user/multi-user/installSolr.dox b/docs/doxygen-user/multi-user/installSolr.dox index 587eeca9cd..876a1f33e7 100644 --- a/docs/doxygen-user/multi-user/installSolr.dox +++ b/docs/doxygen-user/multi-user/installSolr.dox @@ -52,7 +52,7 @@ Follow these steps to configure Solr: Required Solr Configuration Parameters:
    -
  • JAVA_HOME – path to 64-bit JRE installation. For example \c "JAVA_HOME= C:\Program Files\BellSoft\LibericaJDK-17-Full" or \c "JAVA_HOME=C:\Program Files\BellSoft\LibericaJDK-17-Full" +
  • JAVA_HOME – path to 64-bit JRE installation. For example \c "JAVA_HOME=C:\Program Files\Java\jdk-17"
  • DEFAULT_CONFDIR – path to Autopsy configuration directory. If the Solr archive was extracted into \c "C:\solr-8.6.3" directory, then this path will be \c "C:\ solr-8.6.3\server\solr\configsets\AutopsyConfig\conf". Do not include quotes around the path.
  • SOLR_JAVA_MEM - Solr JVM heap size should be as large as the Solr machine’s resources allow, at least half of the total RAM available on the machine. A rule of thumb would be use "set SOLR_JAVA_MEM=-Xms2G -Xmx40G" for a machine with 64GB of RAM, "set SOLR_JAVA_MEM=-Xms2G -Xmx20G" for a machine with 32GB of RAM, and "set SOLR_JAVA_MEM=-Xms2G -Xmx8G" for a machine with 16GB of RAM. Please see the \ref install_solr_heap_usage "troubleshooting section" for more info regarding Solr heap usage and troubleshooting information.
  • SOLR_DATA_HOME – location where Solr indexes will be stored. If this is not configured, the indexes will be stored in the \c "C:\solr-8.6.3\server\solr" directory. NOTE: for Autopsy cases consisting of large number of data sources, Solr indexes can get very large (hundreds of GBs, or TBs) so they should probably be stored on a larger network share. diff --git a/docs/doxygen-user_fr/multi-user/installSolr.dox b/docs/doxygen-user_fr/multi-user/installSolr.dox index b22d831c96..140a6db0e6 100644 --- a/docs/doxygen-user_fr/multi-user/installSolr.dox +++ b/docs/doxygen-user_fr/multi-user/installSolr.dox @@ -52,7 +52,7 @@ Suivez ces étapes pour configurer Solr: Paramètres de configuration requis pour Solr:
      -
    • JAVA_HOME – chemin d'accès à l'installation du JRE 64 bits. Par exemple \c "JAVA_HOME=C:\Program Files\Java\jre1.8.0_151" ou \c "JAVA_HOME=C:\Program Files\BellSoft\LibericaJDK-17-Full" +
    • JAVA_HOME – chemin d'accès à l'installation du JRE 64 bits. Par exemple \c "JAVA_HOME=C:\Program Files\Java\jdk-17"
    • DEFAULT_CONFDIR – chemin vers le répertoire de configuration d'Autopsy. Si l'archive Solr a été extraite dans le répertoire \c "C:\solr-8.6.3", alors ce chemin sera \c "C:\ solr-8.6.3\server\solr\configsets\AutopsyConfig\conf". N'incluez pas de guillemets autour du chemin.
    • SOLR_JAVA_MEM - La taille du tas JVM Solr doit être aussi grande que les ressources de la machine Solr le permettent, au moins la moitié de la RAM totale disponible sur la machine. Une règle empirique serait d'utiliser "set SOLR_JAVA_MEM=-Xms2G -Xmx40G" pour une machine avec 64 Go de RAM, "set SOLR_JAVA_MEM=-Xms2G -Xmx20G" pour une machine avec 32 Go de RAM, et "set SOLR_JAVA_MEM=-Xms2G -Xmx8G" pour une machine avec 16 Go de RAM. Veuillez consulter la \ref install_solr_heap_usage "rubrique dépannage" pour plus d'informations sur l'utilisation du tas Solr et sur les informations de dépannage.
    • SOLR_DATA_HOME – emplacement où les index Solr seront stockés. Si ce n'est pas configuré, les index seront stockés dans le répertoire \c "C:\solr-8.6.3\server\solr". REMARQUE: pour les cas d'Autopsy composés d'un grand nombre de sources de données, les index Solr peuvent devenir très volumineux (des centaines de Go ou de To), ils devront donc probablement être stockés sur un partage réseau plus important. From 73d4a8d0d5f259ba2fe8b2cd5cd56d51f68399da Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 27 Jun 2023 15:58:05 -0400 Subject: [PATCH 6/6] remove commented code --- CoreLibs/ivy.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index ee82543984..f7f326b6e3 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -9,14 +9,6 @@ - -