From 4b83d459545857a22c11ab6bd081dc57235da416 Mon Sep 17 00:00:00 2001
From: esaunders <esaunders@basistech.com>
Date: Tue, 25 Aug 2020 14:17:02 -0400
Subject: [PATCH] Upgrade to ControlsFX 11.0.2
---
CoreLibs/ivy.xml | 2 +-
CoreLibs/nbproject/project.properties | 12 +++++-------
CoreLibs/nbproject/project.xml | 9 ++++-----
3 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index 1c83e48a09..d2ea6e404b 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -41,7 +41,7 @@
<dependency conf="autopsy_core->*" org="org.imgscalr" name="imgscalr-lib" rev="4.2" />
<!-- timeline and image analyzer -->
- <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="8.40.11" />
+ <dependency conf="autopsy_core->*" org="org.controlsfx" name="controlsfx" rev="11.0.2" />
<!-- timeline -->
<dependency conf="autopsy_core->*" org="joda-time" name="joda-time" rev="2.4" />
diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties
index fb53508bb4..589dcd0f68 100644
--- a/CoreLibs/nbproject/project.properties
+++ b/CoreLibs/nbproject/project.properties
@@ -13,10 +13,10 @@ file.reference.commons-csv-1.4.jar=release/modules/ext/commons-csv-1.4.jar
file.reference.commons-io-2.4.jar=release/modules/ext/commons-io-2.4.jar
file.reference.commons-io-2.5.jar=release/modules/ext/commons-io-2.5.jar
file.reference.commons-lang-2.6.jar=release/modules/ext/commons-lang-2.6.jar
-file.reference.commons-lang3-3.4.jar=release/modules/ext/commons-lang3-3.4.jar
+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-8.40.11.jar=release/modules/ext/controlsfx-8.40.11.jar
+file.reference.controlsfx-11.0.2.jar=release\\modules\\ext\\controlsfx-11.0.2.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
@@ -42,8 +42,8 @@ file.reference.javassist-3.12.1.GA.jar=release/modules/ext/javassist-3.12.1.GA.j
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.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.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
@@ -65,12 +65,11 @@ 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=1.8
+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.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11-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
@@ -80,7 +79,6 @@ 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.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11-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
diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml
index f697a317ee..37cc29ffd1 100644
--- a/CoreLibs/nbproject/project.xml
+++ b/CoreLibs/nbproject/project.xml
@@ -635,7 +635,6 @@
<package>org.controlsfx.control.action</package>
<package>org.controlsfx.control.cell</package>
<package>org.controlsfx.control.decoration</package>
- <package>org.controlsfx.control.spreadsheet</package>
<package>org.controlsfx.control.table</package>
<package>org.controlsfx.control.table.model</package>
<package>org.controlsfx.control.textfield</package>
@@ -838,6 +837,10 @@
<runtime-relative-path>ext/xmlbeans-3.0.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/xmlbeans-3.0.2.jar</binary-origin>
</class-path-extension>
+ <class-path-extension>
+ <runtime-relative-path>ext/controlsfx-11.0.2.jar</runtime-relative-path>
+ <binary-origin>release\modules\ext\controlsfx-11.0.2.jar</binary-origin>
+ </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/mail-1.4.3.jar</runtime-relative-path>
<binary-origin>release/modules/ext/mail-1.4.3.jar</binary-origin>
@@ -986,10 +989,6 @@
<runtime-relative-path>ext/commons-logging-1.1.2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/commons-logging-1.1.2.jar</binary-origin>
</class-path-extension>
- <class-path-extension>
- <runtime-relative-path>ext/controlsfx-8.40.11.jar</runtime-relative-path>
- <binary-origin>release/modules/ext/controlsfx-8.40.11.jar</binary-origin>
- </class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/javaee-api-5.0-2.jar</runtime-relative-path>
<binary-origin>release/modules/ext/javaee-api-5.0-2.jar</binary-origin>
--
GitLab