revert javafx dependencies

CoreLibs/ivy.xml

@@ -54,14 +54,17 @@
         <!-- better image resizing -->
         <dependency conf="autopsy_core->default" org="org.imgscalr" name="imgscalr-lib" rev="4.2" />
         
-        <!-- timeline and image analyzer -->
-        <dependency conf="autopsy_core->default" org="org.controlsfx" name="controlsfx" rev="8.40.18" />
+        <dependency conf="autopsy_core->default" org="joda-time" name="joda-time" rev="2.10.14" />
+
 
         <!-- timeline  -->
-        <dependency conf="autopsy_core->default" org="joda-time" name="joda-time" rev="2.10.14" />
-        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="8.0-r6" />
-        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="8.0-r6" />
-        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="8.0-r6" />
+        <!-- NOTE: the version of these dependencies appears to be tied to javafx / java version -->
+        <dependency conf="autopsy_core->default" org="org.controlsfx" name="controlsfx" rev="8.40.11" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="8.0-r4" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="8.0-r4" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="8.0-r4" />
+
+
         <!-- templateing engine used by timeline to generate its snapshot report -->
         <dependency conf="autopsy_core->default" org="com.github.spullara.mustache.java" name="compiler" rev="0.9.10" />
         

CoreLibs/nbproject/project.properties

@@ -26,7 +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-8.40.18.jar=release/modules/ext/controlsfx-8.40.18.jar
+file.reference.controlsfx-8.40.11.jar=release/modules/ext/controlsfx-8.40.11.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
@@ -85,9 +85,9 @@ 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-r6.jar=release/modules/ext/jfxtras-common-8.0-r6.jar
-file.reference.jfxtras-controls-8.0-r6.jar=release/modules/ext/jfxtras-controls-8.0-r6.jar
-file.reference.jfxtras-fxml-8.0-r6.jar=release/modules/ext/jfxtras-fxml-8.0-r6.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.jna-5.11.0.jar=release/modules/ext/jna-5.11.0.jar
 file.reference.jna-platform-5.11.0.jar=release/modules/ext/jna-platform-5.11.0.jar
 file.reference.joda-time-2.10.14.jar=release/modules/ext/joda-time-2.10.14.jar

CoreLibs/nbproject/project.xml

@@ -608,8 +608,8 @@
                 <binary-origin>release/modules/ext/conscrypt-openjdk-uber-2.5.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/controlsfx-8.40.18.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/controlsfx-8.40.18.jar</binary-origin>
+                <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/dd-plist-1.23.jar</runtime-relative-path>
@@ -844,16 +844,16 @@
                 <binary-origin>release/modules/ext/jericho-html-3.4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jfxtras-common-8.0-r6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jfxtras-common-8.0-r6.jar</binary-origin>
+                <runtime-relative-path>ext/jfxtras-common-8.0-r4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jfxtras-common-8.0-r4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jfxtras-controls-8.0-r6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jfxtras-controls-8.0-r6.jar</binary-origin>
+                <runtime-relative-path>ext/jfxtras-controls-8.0-r4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jfxtras-controls-8.0-r4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/jfxtras-fxml-8.0-r6.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/jfxtras-fxml-8.0-r6.jar</binary-origin>
+                <runtime-relative-path>ext/jfxtras-fxml-8.0-r4.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/jfxtras-fxml-8.0-r4.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/jna-5.11.0.jar</runtime-relative-path>