From 45eb85ff6654ec5c1ded08562a0731917d70b91e Mon Sep 17 00:00:00 2001
From: Tamir Kamara <takamara@microsoft.com>
Date: Mon, 30 Dec 2024 12:58:32 +0000
Subject: [PATCH] Update Guacamole dependencies

---
 .../guacamole/guacamole-server/docker/Dockerfile            | 4 ++--
 .../guacamole/guacamole-server/docker/version.txt           | 2 +-
 .../guacamole/guacamole-server/guacamole-auth-azure/pom.xml | 6 +++---
 templates/workspace_services/guacamole/porter.yaml          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile b/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile
index fe0b8012a5..b46730523d 100644
--- a/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile
+++ b/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile
@@ -13,7 +13,7 @@ COPY --from=client_build /target/surefire-reports/* /
 
 FROM guacamole/guacd:1.5.5
 
-ARG GUACAMOLE_AZURE_VERSION=0.4.0
+ARG GUACAMOLE_AZURE_VERSION=0.4.1
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -26,7 +26,7 @@ RUN apk add --update --no-cache wget openssh openjdk11-jre \
 
 ENV CATALINA_BASE=/usr/share/tomcat9/
 RUN TOMCAT_ARCHIVE="tomcat.tar.gz" && \
-    TOMCAT_VER="9.0.97" && \
+    TOMCAT_VER="9.0.98" && \
     wget -O "$TOMCAT_ARCHIVE" -N "https://archive.apache.org/dist/tomcat/tomcat-9/v${TOMCAT_VER}/bin/apache-tomcat-${TOMCAT_VER}.tar.gz" --progress=dot:giga && \
     tar xzf "$TOMCAT_ARCHIVE" && \
     rm -f "$TOMCAT_ARCHIVE" && \
diff --git a/templates/workspace_services/guacamole/guacamole-server/docker/version.txt b/templates/workspace_services/guacamole/guacamole-server/docker/version.txt
index a2fecb4576..c5981731c5 100644
--- a/templates/workspace_services/guacamole/guacamole-server/docker/version.txt
+++ b/templates/workspace_services/guacamole/guacamole-server/docker/version.txt
@@ -1 +1 @@
-__version__ = "0.9.2"
+__version__ = "0.9.3"
diff --git a/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml b/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml
index f0ff33ecf7..6334d72f48 100644
--- a/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml
+++ b/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-tre</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.1</version>
     <packaging>jar</packaging>
     <name>guacamole-azure-tre</name>
 
@@ -48,12 +48,12 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-security-keyvault-secrets</artifactId>
-            <version>4.9.0</version>
+            <version>4.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-identity</artifactId>
-            <version>1.14.0</version>
+            <version>1.14.2</version>
         </dependency>
         <!-- Http and Json Components -->
         <dependency>
diff --git a/templates/workspace_services/guacamole/porter.yaml b/templates/workspace_services/guacamole/porter.yaml
index 8db6fbd1b2..e6f4164915 100644
--- a/templates/workspace_services/guacamole/porter.yaml
+++ b/templates/workspace_services/guacamole/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-guacamole
-version: 0.12.4
+version: 0.12.5
 description: "An Azure TRE service for Guacamole"
 dockerfile: Dockerfile.tmpl
 registry: azuretre