From 61356c9dc2f1b86831086d10615f00e1ed732fc4 Mon Sep 17 00:00:00 2001
From: Mike Jumper <mjumper@apache.org>
Date: Sat, 13 May 2023 10:30:09 -0700
Subject: [PATCH 1/2] GUACAMOLE-1788: Update Docker build to use latest release
 of Maven 3.

---
 .ratignore                            |  1 +
 Dockerfile                            | 15 +++++++++++++--
 guacamole-docker/mozilla-firefox.pref |  3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 guacamole-docker/mozilla-firefox.pref

diff --git a/.ratignore b/.ratignore
index c3f1957cd..ae1ea9c0d 100644
--- a/.ratignore
+++ b/.ratignore
@@ -1,3 +1,4 @@
 CONTRIBUTING
 doc/licenses/*/**/*
 doc/**/html/*.html
+guacamole-docker/*.pref
diff --git a/Dockerfile b/Dockerfile
index 586cf4136..ba540274c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,10 +28,21 @@ ARG TOMCAT_VERSION=8.5
 ARG TOMCAT_JRE=jdk8
 
 # Use official maven image for the build
-FROM maven:3-jdk-8 AS builder
+FROM maven:3-eclipse-temurin-8-focal AS builder
+
+# Use Mozilla's Firefox PPA (newer Ubuntu lacks a "firefox-esr" package and
+# provides only a transitional "firefox" package that actually requires Snap
+# and thus can't be used within Docker)
+RUN    apt-get update                                \
+    && apt-get upgrade -y                            \
+    && apt-get install -y software-properties-common \
+    && add-apt-repository -y ppa:mozillateam/ppa
+
+# Explicitly prefer packages from the Firefox PPA
+COPY guacamole-docker/mozilla-firefox.pref /etc/apt/preferences.d/
 
 # Install firefox browser for sake of JavaScript unit tests
-RUN apt-get update && apt-get install -y firefox-esr
+RUN apt-get update && apt-get install -y firefox
 
 # Arbitrary arguments that can be passed to the maven build. By default, an
 # argument will be provided to explicitly unskip any skipped tests. To, for
diff --git a/guacamole-docker/mozilla-firefox.pref b/guacamole-docker/mozilla-firefox.pref
new file mode 100644
index 000000000..f85404441
--- /dev/null
+++ b/guacamole-docker/mozilla-firefox.pref
@@ -0,0 +1,3 @@
+Package: *
+Pin: release o=LP-PPA-mozillateam
+Pin-Priority: 1001

From dacc08a8411b61e1425d287eb053bd35988e4c3a Mon Sep 17 00:00:00 2001
From: Mike Jumper <mjumper@apache.org>
Date: Sat, 13 May 2023 10:31:43 -0700
Subject: [PATCH 2/2] GUACAMOLE-1788: Manually add plexus-utils to dependencies
 of minify-maven-plugin (fix build).

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index fa3891b98..210ba9212 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,6 +248,13 @@
                     <groupId>com.github.buckelieg</groupId>
                     <artifactId>minify-maven-plugin</artifactId>
                     <version>2.0.1</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.codehaus.plexus</groupId>
+                            <artifactId>plexus-utils</artifactId>
+                            <version>3.5.1</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
 
                 <!-- Explicitly use latest versions of core plugins -->