Merge branch 'main' into dependabot/gradle/awsSdkVersion-2.30.10

otto-de · Feb 6, 2025 · 1ac43e7 · 1ac43e7
2 parents a2387e3 + 75395a3
commit 1ac43e7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/core/build.gradle b/core/build.gradle
@@ -11,7 +11,7 @@ dependencies {
     }
 
     api "com.google.guava:guava:33.4.0-jre"
-    api 'com.google.code.gson:gson:2.12.0'
+    api 'com.google.code.gson:gson:2.12.1'
 
     //Update netty (selenium has older version)
     implementation "io.netty:netty-codec:${nettyVersion}"

diff --git a/lambda/Dockerfile b/lambda/Dockerfile
@@ -23,6 +23,7 @@ RUN dnf install -y \
     glibc-devel \
     gtk3 \
     ipa-gothic-fonts \
+    jq \
     libdrm \
     libXScrnSaver \
     libXcomposite \
@@ -37,30 +38,30 @@ RUN dnf install -y \
     libxkbcommon \
     mesa-libgbm \
     libgbm \
+    libva \
+    nss \
     pango \
+    pulseaudio-libs \
     procps \
     tar \
     util-linux \
+    vulkan \
     wget \
     xorg-x11-fonts-100dpi \
     xorg-x11-fonts-75dpi \
     xorg-x11-fonts-Type1 \
     xorg-x11-fonts-misc \
     xorg-x11-utils \
     xdg-utils \
-    vulkan \
-    libva \
-    pulseaudio-libs \
-    nss \
-    jq
+    xz
 
 RUN mkdir ${LAMBDA_TASK_ROOT}/lib
 RUN mkdir ${LAMBDA_TASK_ROOT}/lib/firefox
-RUN wget --no-check-certificate -nv 'https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US' -O /tmp/firefox.tar.bz2
-RUN tar -xf /tmp/firefox.tar.bz2 --directory ${LAMBDA_TASK_ROOT}/lib/
+RUN wget --no-check-certificate -nv 'https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64&lang=en-US' -O /tmp/firefox.tar.xz
+RUN tar -xf /tmp/firefox.tar.xz --directory ${LAMBDA_TASK_ROOT}/lib/
 RUN ln -s ${LAMBDA_TASK_ROOT}/lib/firefox/firefox ${LAMBDA_TASK_ROOT}/firefox
 RUN ln -s ${LAMBDA_TASK_ROOT}/lib/firefox/firefox /usr/bin/firefox
-RUN rm /tmp/firefox.tar.bz2
+RUN rm /tmp/firefox.tar.xz
 
 #RUN CHROME_FOR_TESTING_RELEASE="$(curl --silent https://googlechromelabs.github.io/chrome-for-testing/last-known-good-versions-with-downloads.json | jq '.channels.Stable')"; \
 RUN curl --insecure https://googlechromelabs.github.io/chrome-for-testing/latest-versions-per-milestone-with-downloads.json

diff --git a/lambda/build.gradle b/lambda/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     implementation("software.amazon.awssdk:apache-client:${awsSdkVersion}")
     implementation("software.amazon.awssdk:s3:${awsSdkVersion}")
     implementation("software.amazon.awssdk:s3-transfer-manager:${awsSdkVersion}")
-    implementation("software.amazon.awssdk.crt:aws-crt:0.33.10")
+    implementation("software.amazon.awssdk.crt:aws-crt:0.33.11")
     implementation("com.amazonaws:aws-lambda-java-core:1.2.3")
     implementation("com.amazonaws:aws-lambda-java-events:3.14.0")
     implementation("com.amazonaws:aws-java-sdk-core:${amazonAwsJavaSdkVersion}")