From ac15a60c802997dd1ebb9c51341f88c1da81fa03 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Sun, 5 Jan 2025 19:37:50 -0500
Subject: [PATCH] variable update

---
 Core/ivy.xml                  | 29 +++++++--------
 Core/ivysettings.xml          |  4 +++
 CoreLibs/ivy.xml              | 68 ++++++++++++++++-------------------
 CoreLibs/ivysettings.xml      |  5 +++
 KeywordSearch/ivy.xml         | 18 ++++------
 KeywordSearch/ivysettings.xml |  3 ++
 6 files changed, 62 insertions(+), 65 deletions(-)

diff --git a/Core/ivy.xml b/Core/ivy.xml
index 8c9626fae5..fab897b728 100644
--- a/Core/ivy.xml
+++ b/Core/ivy.xml
@@ -1,8 +1,3 @@
-<!DOCTYPE ivy-module [
-    <!ENTITY httpcomponents.version "4.5.14">
-    <!ENTITY curator.version "5.7.1">
-    <!ENTITY batik.version "1.18">
-]>
 <ivy-module version="2.0">
     <info organisation="org.sleuthkit.autopsy" module="core"/>
     <configurations >
@@ -13,9 +8,9 @@
         <dependency conf="core->default" org="com.github.vlsi.mxgraph" name="jgraphx" rev="4.2.2" />
 
         <dependency conf="core->default" org="org.apache.activemq" name="activemq-all" rev="6.1.4"/>
-        <dependency conf="core->default" org="org.apache.curator" name="curator-client" rev="&curator.version;"/>
-        <dependency conf="core->default" org="org.apache.curator" name="curator-framework" rev="&curator.version;"/>
-        <dependency conf="core->default" org="org.apache.curator" name="curator-recipes" rev="&curator.version;"/>
+        <dependency conf="core->default" org="org.apache.curator" name="curator-client" rev="${curator.version}"/>
+        <dependency conf="core->default" org="org.apache.curator" name="curator-framework" rev="${curator.version}"/>
+        <dependency conf="core->default" org="org.apache.curator" name="curator-recipes" rev="${curator.version}"/>
 
         <dependency conf="core->default" org="org.python" name="jython-standalone" rev="2.7.4" />
 
@@ -64,12 +59,12 @@
             <exclude org="com.sun.media" module="jai_imageio"/>
         </dependency>
 
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-awt-util" rev="&batik.version;"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-dom" rev="&batik.version;"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svg-dom" rev="&batik.version;"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svggen" rev="&batik.version;"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-util" rev="&batik.version;"/>
-        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-xml" rev="&batik.version;"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-awt-util" rev="${batik.version}"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-dom" rev="${batik.version}"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svg-dom" rev="${batik.version}"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-svggen" rev="${batik.version}"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-util" rev="${batik.version}"/>
+        <dependency conf="core->default" org="org.apache.xmlgraphics" name="batik-xml" rev="${batik.version}"/>
 
         <!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api -->
         <dependency conf="core->default" org="javax.ws.rs" name="javax.ws.rs-api" rev="2.1.1"/>
@@ -79,9 +74,9 @@
 
         <dependency conf="core->default" org="com.license4j" name="license4j-runtime-library" rev="4.7.3"/>
 
-        <dependency conf="core->default" org="org.apache.httpcomponents" name="httpclient" rev="&httpcomponents.version;"/>
-        <dependency conf="core->default" org="org.apache.httpcomponents" name="httpmime" rev="&httpcomponents.version;"/>
-        <dependency conf="core->default" org="org.apache.httpcomponents" name="httpclient-win" rev="&httpcomponents.version;">
+        <dependency conf="core->default" org="org.apache.httpcomponents" name="httpclient" rev="${httpcomponents.version}"/>
+        <dependency conf="core->default" org="org.apache.httpcomponents" name="httpmime" rev="${httpcomponents.version}"/>
+        <dependency conf="core->default" org="org.apache.httpcomponents" name="httpclient-win" rev="${httpcomponents.version}">
             <exclude name="jna" />
             <exclude name="jna-platform" />
         </dependency>
diff --git a/Core/ivysettings.xml b/Core/ivysettings.xml
index 06c2d9308f..96578e6c40 100644
--- a/Core/ivysettings.xml
+++ b/Core/ivysettings.xml
@@ -1,4 +1,8 @@
 <ivysettings>
+  <property name="httpcomponents.version" value="4.5.14"/>
+  <property name="curator.version" value="5.7.1"/>
+  <property name="batik.version" value="1.18"/>
+
   <settings defaultResolver="main"/>
   <resolvers>
     <chain name="main">
diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml
index dc97173fcc..dca5ebb87e 100644
--- a/CoreLibs/ivy.xml
+++ b/CoreLibs/ivy.xml
@@ -1,9 +1,3 @@
-<!DOCTYPE ivy-module [
-    <!ENTITY javafx.version "17.0.14-ea+2">
-    <!ENTITY jackson.version "2.18.2">
-    <!ENTITY jfxtras.version "17-r1">
-    <!ENTITY twelvemonkeys.version "3.12.0">
-]>
 <ivy-module version="2.0" xmlns:e="http://ant.apache.org/ivy/extra">
     <info organisation="org.sleuthkit.autopsy" module="corelibs"/>
     <configurations >
@@ -12,43 +6,43 @@
         
     </configurations>
     <dependencies>
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-fxml" rev="&javafx.version;">
+        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-fxml" rev="${javafx.version}">
             <artifact name="javafx-fxml" type="jar" />
             <artifact name="javafx-fxml" type="jar" e:classifier="win"/>
             <artifact name="javafx-fxml" type="jar" e:classifier="mac"/>
             <artifact name="javafx-fxml" type="jar" e:classifier="linux"/>
         </dependency> 
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-graphics" rev="&javafx.version;">
+        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-graphics" rev="${javafx.version}">
             <artifact name="javafx-graphics" type="jar" />
             <artifact name="javafx-graphics" type="jar" e:classifier="win"/>
             <artifact name="javafx-graphics" type="jar" e:classifier="mac"/>
             <artifact name="javafx-graphics" type="jar" e:classifier="linux"/>
         </dependency>
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-controls" rev="&javafx.version;">
+        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-controls" rev="${javafx.version}">
             <artifact name="javafx-controls" type="jar" />
             <artifact name="javafx-controls" type="jar" e:classifier="win"/>
             <artifact name="javafx-controls" type="jar" e:classifier="mac"/>
             <artifact name="javafx-controls" type="jar" e:classifier="linux"/>
         </dependency> 
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-base" rev="&javafx.version;">
+        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-base" rev="${javafx.version}">
             <artifact name="javafx-base" type="jar" />
             <artifact name="javafx-base" type="jar" e:classifier="win"/>
             <artifact name="javafx-base" type="jar" e:classifier="mac"/>
             <artifact name="javafx-base" type="jar" e:classifier="linux"/>
         </dependency> 
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-swing" rev="&javafx.version;"  >
+        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-swing" rev="${javafx.version}"  >
             <artifact name="javafx-swing" type="jar" />
             <artifact name="javafx-swing" type="jar" e:classifier="win"/>
             <artifact name="javafx-swing" type="jar" e:classifier="mac"/>
             <artifact name="javafx-swing" type="jar" e:classifier="linux"/>
         </dependency> 
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-web" rev="&javafx.version;" >
+        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-web" rev="${javafx.version}" >
             <artifact name="javafx-web" type="jar" />
             <artifact name="javafx-web" type="jar" e:classifier="win"/>
             <artifact name="javafx-web" type="jar" e:classifier="mac"/>
             <artifact name="javafx-web" type="jar" e:classifier="linux"/>
         </dependency> 
-        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-media" rev="&javafx.version;">
+        <dependency conf="autopsy_core->default" org="org.openjfx" name="javafx-media" rev="${javafx.version}">
             <artifact name="javafx-media" type="jar" />
             <artifact name="javafx-media" type="jar" e:classifier="win"/>
             <artifact name="javafx-media" type="jar" e:classifier="mac"/>
@@ -90,8 +84,8 @@
 
         <dependency conf="autopsy_core->default" org="net.htmlparser.jericho" name="jericho-html" rev="3.4"/>
 
-        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-csv" rev="&jackson.version;"/>
-        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" rev="&jackson.version;"/>
+        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-csv" rev="${jackson.version}"/>
+        <dependency conf="autopsy_core->default" org="com.fasterxml.jackson.datatype" name="jackson-datatype-jsr310" rev="${jackson.version}"/>
         
         <!-- better image resizing -->
         <dependency conf="autopsy_core->default" org="org.imgscalr" name="imgscalr-lib" rev="4.2" />
@@ -108,30 +102,30 @@
         <dependency conf="autopsy_core->default" org="joda-time" name="joda-time" rev="2.13.0" />
 
         <!-- timeline  -->
-        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="&jfxtras.version;" />
-        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="&jfxtras.version;" />
-        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="&jfxtras.version;" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-fxml" rev="${jfxtras.version}" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-controls" rev="${jfxtras.version}" />
+        <dependency conf="autopsy_core->default" org="org.jfxtras" name="jfxtras-common" rev="${jfxtras.version}" />
         <!-- 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.14" />
         
         <!-- image support for autopsy and image gallery -->
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-lang" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-io" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-image" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-jpeg" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-bmp" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tiff" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pnm" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-psd" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-iff" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pcx" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pict" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-sgi" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tga" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-icns" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-thumbsdb" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-core" rev="&twelvemonkeys.version;" />
-        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-metadata" rev="&twelvemonkeys.version;" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-lang" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-io" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.common" name="common-image" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-jpeg" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-bmp" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tiff" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pnm" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-psd" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-iff" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pcx" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-pict" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-sgi" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-tga" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-icns" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-thumbsdb" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-core" rev="${twelvemonkeys.version}" />
+        <dependency conf="autopsy_core->default" org="com.twelvemonkeys.imageio" name="imageio-metadata" rev="${twelvemonkeys.version}" />
         <dependency conf="autopsy_core->default" org="org.sejda.webp-imageio" name="webp-imageio-sejda" rev="0.1.0"/>
         <dependency conf="autopsy_core->default" org="com.googlecode.plist" name="dd-plist" rev="1.28"/>
         <dependency conf="autopsy_core->default" org="org.slf4j" name="slf4j-reload4j" rev="2.0.16"/>
@@ -146,8 +140,8 @@
         
         <override org="com.google.code.gson" module="gson" rev="2.9.0"/>
         <override org="com.google.guava" module="guava" rev="32.0.1-jre"/>
-        <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="&jackson.version;"/>
-        <override org="com.fasterxml.jackson.core" module="jackson-core" rev="&jackson.version;"/>
+        <override org="com.fasterxml.jackson.core" module="jackson-databind" rev="${jackson.version}"/>
+        <override org="com.fasterxml.jackson.core" module="jackson-core" rev="${jackson.version}"/>
         
         // changes to bouncy castle version may also be reflected in thirdparty/IcePDF 6.2.2 
         <override org="org.bouncycastle" module="bcprov-jdk15on" rev="1.70"/>
diff --git a/CoreLibs/ivysettings.xml b/CoreLibs/ivysettings.xml
index da1e8e957b..23bab824f7 100644
--- a/CoreLibs/ivysettings.xml
+++ b/CoreLibs/ivysettings.xml
@@ -1,4 +1,9 @@
 <ivysettings>
+    <property name="javafx.version" value="17.0.14-ea+2"/>
+    <property name="jackson.version" value="2.18.2"/>
+    <property name="jfxtras.version" value="17-r1"/>
+    <property name="twelvemonkeys.version" value="3.12.0"/>
+    
     <settings defaultResolver="main"/>
     <resolvers>
         <chain name="main">
diff --git a/KeywordSearch/ivy.xml b/KeywordSearch/ivy.xml
index a5e9af68a0..eb3c42ba71 100644
--- a/KeywordSearch/ivy.xml
+++ b/KeywordSearch/ivy.xml
@@ -1,8 +1,4 @@
 
-<!DOCTYPE ivy-module [
-    <!ENTITY jetty.version "12.0.16">
-    <!ENTITY slf4j.version "2.0.16">
-]>
 <ivy-module version="2.0">
     <info organisation="org.sleuthkit.autopsy" module="keywordsearch"/>
     <configurations >
@@ -35,15 +31,15 @@
         <dependency conf="autopsy->default" org="junit" name="junit" rev="4.13.2"/>
 
         <!-- Jetty -->
-		<dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="&jetty.version;"/>
-        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="&jetty.version;"/>
-        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="&jetty.version;"/>
+		<dependency conf="start-solr->default" org="org.eclipse.jetty" name="jetty-start" rev="${jetty.version}"/>
+        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-server" rev="${jetty.version}"/>
+        <dependency conf="jetty-libs->default" org="org.eclipse.jetty" name="jetty-deploy" rev="${jetty.version}"/>
         <dependency conf="servlet->default" org="org.eclipse.jetty.orbit" name="javax.servlet" rev="3.0.0.v201112011016"/>
 
         <!-- logging -->
-        <dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="&slf4j.version;"/>
-        <dependency conf="slf4j-libs->default" org="org.slf4j" name="jcl-over-slf4j" rev="&slf4j.version;"/>
-        <dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="&slf4j.version;"/> 
+        <dependency conf="slf4j-libs->default" org="org.slf4j" name="slf4j-log4j12" rev="${slf4j.version}"/>
+        <dependency conf="slf4j-libs->default" org="org.slf4j" name="jcl-over-slf4j" rev="${slf4j.version}"/>
+        <dependency conf="slf4j-libs->default" org="org.slf4j" name="jul-to-slf4j" rev="${slf4j.version}"/> 
 
         <!-- <exclude org="*" ext="*" type="javadoc"/>
         
@@ -53,7 +49,7 @@
         <override org="org.apache.logging.log4j" module="log4j-layout-template-json" rev="2.17.2"/>
         <override org="org.apache.logging.log4j" module="log4j-slf4j-impl" rev="2.17.2"/>
         <override org="org.apache.logging.log4j" module="log4j-web" rev="2.17.2"/>
-        <override org="org.slf4j" module="slf4j-api" rev="&slf4j.version;"/>
+        <override org="org.slf4j" module="slf4j-api" rev="${slf4j.version}"/>
 
         <override org="org.apache.zookeeper" module="zookeeper" rev="3.8.0"/>
         <override org="org.apache.zookeeper" module="zookeeper-jute" rev="3.8.0"/>
diff --git a/KeywordSearch/ivysettings.xml b/KeywordSearch/ivysettings.xml
index a776ab49c3..3ee6f5cba1 100644
--- a/KeywordSearch/ivysettings.xml
+++ b/KeywordSearch/ivysettings.xml
@@ -1,4 +1,7 @@
 <ivysettings>
+  <property name="jetty.version" value="12.0.16"/>
+  <property name="slf4j.version" value="2.0.16"/>
+  
   <settings defaultResolver="main"/>
   <resolvers>
     <chain name="main">