From 4885d3e6cdad76793d33be95f6685c00edbb7107 Mon Sep 17 00:00:00 2001
From: georgweiss <georg.weiss@ess.eu>
Date: Sat, 4 May 2024 11:56:38 +0200
Subject: [PATCH] Updating 3rd party dependencies based on Github security
 advice

---
 app/eslog/pom.xml                      | 2 +-
 app/logbook/elog/pom.xml               | 2 +-
 app/logbook/olog/ui/pom.xml            | 2 +-
 app/save-and-restore/app/pom.xml       | 2 +-
 core/pv-pva/pom.xml                    | 2 +-
 dependencies/phoebus-target/.classpath | 6 +++---
 dependencies/phoebus-target/pom.xml    | 4 ++--
 pom.xml                                | 6 ++++--
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/eslog/pom.xml b/app/eslog/pom.xml
index 6b884b9bae..0f0045aea8 100644
--- a/app/eslog/pom.xml
+++ b/app/eslog/pom.xml
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-client</artifactId>
-      <version>5.18.2</version>
+      <version>${activemq.client.version}</version>
     </dependency>
 
     <dependency>
diff --git a/app/logbook/elog/pom.xml b/app/logbook/elog/pom.xml
index bfa4e18c2f..3042b44be7 100644
--- a/app/logbook/elog/pom.xml
+++ b/app/logbook/elog/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
         <groupId>net.sourceforge.htmlcleaner</groupId>
         <artifactId>htmlcleaner</artifactId>
-        <version>2.24</version>
+        <version>2.29</version>
     </dependency>
 
   </dependencies>
diff --git a/app/logbook/olog/ui/pom.xml b/app/logbook/olog/ui/pom.xml
index 36101fdfe6..3adee8c0f0 100644
--- a/app/logbook/olog/ui/pom.xml
+++ b/app/logbook/olog/ui/pom.xml
@@ -43,7 +43,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>31.0.1-jre</version>
+            <version>${guava.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jfxtras</groupId>
diff --git a/app/save-and-restore/app/pom.xml b/app/save-and-restore/app/pom.xml
index 35a32b7d67..a53f581afc 100644
--- a/app/save-and-restore/app/pom.xml
+++ b/app/save-and-restore/app/pom.xml
@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>org.eclipse.jgit</groupId>
 			<artifactId>org.eclipse.jgit</artifactId>
-			<version>5.0.3.201809091024-r</version>
+			<version>${jgit.version}</version>
 		</dependency>
 
 
diff --git a/core/pv-pva/pom.xml b/core/pv-pva/pom.xml
index 899926433f..520b2bac0b 100644
--- a/core/pv-pva/pom.xml
+++ b/core/pv-pva/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-      <version>1.21</version>
+      <version>${commons.compress.version}</version>
     </dependency>
 
     <dependency>
diff --git a/dependencies/phoebus-target/.classpath b/dependencies/phoebus-target/.classpath
index 6f34d798eb..e668d5c0c4 100644
--- a/dependencies/phoebus-target/.classpath
+++ b/dependencies/phoebus-target/.classpath
@@ -22,7 +22,7 @@
     <classpathentry exported="true" kind="lib" path="target/lib/commonmark-ext-gfm-tables-0.15.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/commonmark-ext-image-attributes-0.15.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/commons-codec-1.14.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/commons-compress-1.21.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/commons-compress-1.26.1.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/commons-io-1.3.1.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/commons-lang3-3.14.0.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/commons-logging-1.1.3.jar"/>
@@ -46,7 +46,7 @@
     <classpathentry exported="true" kind="lib" path="target/lib/failureaccess-1.0.1.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/freetts-1.2.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/geronimo-spec-ejb-2.1-rc2.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/guava-32.1.1-jre.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/guava-33.2.0-jre.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/hamcrest-2.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/hamcrest-all-1.3.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/hamcrest-core-1.3.jar"/>
@@ -130,7 +130,7 @@
     <classpathentry exported="true" kind="lib" path="target/lib/objenesis-2.6.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/ojdbc8-12.2.0.1.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/opentest4j-1.2.0.jar"/>
-    <classpathentry exported="true" kind="lib" path="target/lib/org.eclipse.jgit-6.7.0.202309050840-r.jar"/>
+    <classpathentry exported="true" kind="lib" path="target/lib/org.eclipse.jgit-6.9.0.202403050737-r.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/org.eclipse.paho.client.mqttv3-1.2.2.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/parsson-1.0.0.jar"/>
     <classpathentry exported="true" kind="lib" path="target/lib/pbrawclient-0.0.10.jar"/>
diff --git a/dependencies/phoebus-target/pom.xml b/dependencies/phoebus-target/pom.xml
index 09e7970137..30d61714b1 100644
--- a/dependencies/phoebus-target/pom.xml
+++ b/dependencies/phoebus-target/pom.xml
@@ -126,7 +126,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-      <version>1.21</version>
+      <version>${commons.compress.version}</version>
     </dependency>
 
     <dependency>
@@ -522,7 +522,7 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-client</artifactId>
-      <version>5.18.2</version>
+      <version>${activemq.client.version}</version>
     </dependency>
 
     <!-- EPICS Jackie client for Jackie PV source -->
diff --git a/pom.xml b/pom.xml
index 2e06b14378..eeff50dd03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,12 +84,14 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <skipITTests>true</skipITTests>
-    <guava.version>32.1.1-jre</guava.version>
+    <guava.version>33.2.0-jre</guava.version>
     <log4j-to-slf4j.version>2.17.1</log4j-to-slf4j.version>
     <derby.version>10.16.1.1</derby.version>
     <jython.version>2.7.3</jython.version>
-    <jgit.version>6.7.0.202309050840-r</jgit.version>
+    <jgit.version>6.9.0.202403050737-r</jgit.version>
     <maven.compiler.target>17</maven.compiler.target>
+    <activemq.client.version>5.18.4</activemq.client.version>
+    <commons.compress.version>1.26.1</commons.compress.version>
   </properties>
   <build>
     <plugins>