From e43db2cc404937779d6ed9bc2dc675adf78a6f43 Mon Sep 17 00:00:00 2001
From: Milan Dufek <milan.dufek@gooddata.com>
Date: Fri, 30 Oct 2026 16:52:58 +0100
Subject: [PATCH] revert(lcm): Revert Redshift JDBC 2.2.9 and CentOS base image

Revert #2115 and #2114 and release the result as 3.7.110.

With redshift-jdbc42 2.2.9 the driver ignores the UID property that
redshift_client.rb sets: Driver.loadDefaultProperties() defaults "user"
to the JVM user.name and Driver.user() reads UID only when "user" is
null. Every basic-auth Redshift connection therefore logs in as the
container user "apache". The users brick on na3 has failed hourly with
"password authentication failed for user apache" since 08:30Z.

The tree matches the 3.7.108 release (Fedora base image and
redshift-jdbc42-no-awssdk 1.2.36.1060). VERSION is bumped to 3.7.110
instead of restored to 3.7.108, because images are tagged with VERSION
and 3.7.108 already exists.

JIRA: GRIF-1221
---
 Dockerfile          |  6 +++---
 DockerfileOldImage  |  6 +++---
 VERSION             |  2 +-
 ci/redshift/pom.xml | 34 +++++++++++-----------------------
 4 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 547bfb257..9f9468b1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202607101511.b527cf7b
+FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre:202609300803.5ae07065-f44
 
 ARG RVM_VERSION=stable
 ARG JRUBY_VERSION=9.4.12.1
@@ -6,10 +6,10 @@ ARG JRUBY_VERSION=9.4.12.1
 LABEL image_name="GDC LCM Bricks"
 LABEL maintainer="LCM <lcm@gooddata.com>"
 LABEL git_repository_url="https://github.com/gooddata/gooddata-ruby/"
-LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202607101511.b527cf7b"
+LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre:202609300803.5ae07065-f44"
 
 # which is required by RVM
-RUN yum install -y gcc gcc-c++ which patch make unzip gnupg git maven procps gzip \
+RUN yum install -y gcc gcc-c++ which patch make unzip gnupg git maven procps gzip gawk bzip2 \
     && yum clean all \
     && rm -rf /var/cache/yum
 
diff --git a/DockerfileOldImage b/DockerfileOldImage
index 9d1e7921a..f361a4ace 100644
--- a/DockerfileOldImage
+++ b/DockerfileOldImage
@@ -1,4 +1,4 @@
-FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202607101511.b527cf7b
+FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre:202609300803.5ae07065-f44
 
 ARG RVM_VERSION=stable
 
@@ -8,10 +8,10 @@ ARG JRUBY_VERSION=9.2.20.0
 LABEL image_name="GDC LCM Bricks"
 LABEL maintainer="LCM <lcm@gooddata.com>"
 LABEL git_repository_url="https://github.com/gooddata/gooddata-ruby/"
-LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202607101511.b527cf7b"
+LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre:202609300803.5ae07065-f44"
 
 # which is required by RVM
-RUN yum install -y gcc gcc-c++ diffutils curl-minimal which patch make git maven procps \
+RUN yum install -y gcc gcc-c++ diffutils curl-minimal which patch make gnupg git maven procps gawk bzip2 \
     && yum clean all \
     && rm -rf /var/cache/yum
 
diff --git a/VERSION b/VERSION
index f05c78f23..630b9a3a1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.7.109
+3.7.110
diff --git a/ci/redshift/pom.xml b/ci/redshift/pom.xml
index 90fc5b808..c71b36c32 100644
--- a/ci/redshift/pom.xml
+++ b/ci/redshift/pom.xml
@@ -11,35 +11,23 @@
     <dependencies>
         <dependency>
             <groupId>com.amazon.redshift</groupId>
-            <artifactId>redshift-jdbc42</artifactId>
-            <version>2.2.9</version>
+            <artifactId>redshift-jdbc42-no-awssdk</artifactId>
+            <version>1.2.36.1060</version>
         </dependency>
-        <!-- AWS SDK v2 is an optional dependency of redshift-jdbc42 2.x, required for IAM authentication -->
         <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>auth</artifactId>
-            <version>2.31.2</version>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-core</artifactId>
+            <version>1.11.633</version>
         </dependency>
         <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>redshift</artifactId>
-            <version>2.31.2</version>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-redshift</artifactId>
+            <version>1.11.633</version>
         </dependency>
         <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>redshiftserverless</artifactId>
-            <version>2.31.2</version>
-        </dependency>
-        <dependency>
-            <groupId>software.amazon.awssdk</groupId>
-            <artifactId>sts</artifactId>
-            <version>2.31.2</version>
-        </dependency>
-        <!-- Used by redshift-jdbc42 2.x IAM authentication but not declared in its pom -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>2.16.0</version>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-sts</artifactId>
+            <version>1.11.633</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>