Upgrade to JDK17. (awslabs#2342)

Co-authored-by: Jithendar Trianz <[email protected]> Co-authored-by: Jithendar Trianz <[email protected]>
Trianz-Akshay · Jan 31, 2025 · dc68b2e · dc68b2e
1 parent 56494cf
commit dc68b2e
Show file tree

Hide file tree

Showing 40 changed files with 344 additions and 89 deletions.
diff --git a/athena-aws-cmdb/Dockerfile b/athena-aws-cmdb/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-aws-cmdb-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-clickhouse/Dockerfile b/athena-clickhouse/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-clickhouse-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-cloudera-hive/Dockerfile b/athena-cloudera-hive/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-cloudera-hive-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-cloudera-impala/Dockerfile b/athena-cloudera-impala/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-cloudera-impala-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-cloudwatch-metrics/Dockerfile b/athena-cloudwatch-metrics/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-cloudwatch-metrics-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-cloudwatch/Dockerfile b/athena-cloudwatch/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-cloudwatch-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-datalakegen2/Dockerfile b/athena-datalakegen2/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-datalakegen2-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-db2-as400/Dockerfile b/athena-db2-as400/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-db2-as400-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-db2/Dockerfile b/athena-db2/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-db2-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-docdb/Dockerfile b/athena-docdb/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Install necessary tools
 RUN yum update -y && yum install -y curl perl openssl

diff --git a/athena-dynamodb/Dockerfile b/athena-dynamodb/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-dynamodb-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-elasticsearch/Dockerfile b/athena-elasticsearch/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-elasticsearch-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-federation-sdk/pom.xml b/athena-federation-sdk/pom.xml
@@ -310,21 +310,6 @@
                     </compilerArgs>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.failsafe.version}</version>
-                <configuration>
-                    <!--<groups>fast</groups>-->
-                    <excludedGroups>slow</excludedGroups>
-                    <properties>
-                        <!--
-                    <configurationParameters>
-                        junit.jupiter.conditions.deactivate = *
-                    </configurationParameters>
-                    -->
-                    </properties>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

diff --git a/athena-gcs/Dockerfile b/athena-gcs/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-gcs.zip ${LAMBDA_TASK_ROOT}

diff --git a/athena-google-bigquery/Dockerfile b/athena-google-bigquery/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-google-bigquery-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-hbase/Dockerfile b/athena-hbase/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-hbase-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-hbase/pom.xml b/athena-hbase/pom.xml
@@ -134,17 +134,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${surefire.failsafe.version}</version>
-                <configuration>
-                    <argLine>-Xmx4g</argLine>
-                    <excludes>
-                        <exclude>*IntegTest</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/athena-hortonworks-hive/Dockerfile b/athena-hortonworks-hive/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-hortonworks-hive-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-kafka/Dockerfile b/athena-kafka/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-kafka-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-msk/Dockerfile b/athena-msk/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-msk-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-mysql/Dockerfile b/athena-mysql/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-mysql-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-neptune/Dockerfile b/athena-neptune/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-neptune-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-neptune/pom.xml b/athena-neptune/pom.xml
@@ -163,15 +163,6 @@
     </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <environmentVariables>
-                        <publishing>${publishing}</publishing>
-                    </environmentVariables>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

diff --git a/athena-oracle/Dockerfile b/athena-oracle/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Install necessary tools
 RUN yum update -y && yum install -y curl perl openssl

diff --git a/athena-postgresql/Dockerfile b/athena-postgresql/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-postgresql-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-redis/Dockerfile b/athena-redis/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-redis-2022.47.1.jar ${LAMBDA_TASK_ROOT}

diff --git a/athena-redshift/Dockerfile b/athena-redshift/Dockerfile
@@ -1,4 +1,12 @@
-FROM public.ecr.aws/lambda/java:11
+# Argument for Java version, defaulting to 11
+ARG JAVA_VERSION=11
+# Use the specified version of Java
+FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
+
+# Argument for Java tool options, defaulting to an empty string
+ARG JAVA_TOOL_OPTIONS=""
+# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
+ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
 
 # Copy function code and runtime dependencies from Maven layout
 COPY target/athena-redshift-2022.47.1.jar ${LAMBDA_TASK_ROOT}