Skip to content

Commit dc68b2e

Browse files
VenkatasivareddyTRJithendar12
VenkatasivareddyTR
and
Jithendar12
authored
Upgrade to JDK17. (#2342)
Co-authored-by: Jithendar Trianz <[email protected]> Co-authored-by: Jithendar Trianz <[email protected]>
1 parent 56494cf commit dc68b2e

File tree

40 files changed

+344
-89
lines changed

40 files changed

+344
-89
lines changed

‎athena-aws-cmdb/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-aws-cmdb-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-clickhouse/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-clickhouse-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-cloudera-hive/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-cloudera-hive-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-cloudera-impala/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-cloudera-impala-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-cloudwatch-metrics/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-cloudwatch-metrics-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-cloudwatch/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-cloudwatch-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-datalakegen2/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-datalakegen2-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-db2-as400/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-db2-as400-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-db2/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-db2-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-docdb/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Install necessary tools
412
RUN yum update -y && yum install -y curl perl openssl

‎athena-dynamodb/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-dynamodb-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-elasticsearch/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-elasticsearch-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-federation-sdk/pom.xml

-15
Original file line numberDiff line numberDiff line change
@@ -310,21 +310,6 @@
310310
</compilerArgs>
311311
</configuration>
312312
</plugin>
313-
<plugin>
314-
<artifactId>maven-surefire-plugin</artifactId>
315-
<version>${surefire.failsafe.version}</version>
316-
<configuration>
317-
<!--<groups>fast</groups>-->
318-
<excludedGroups>slow</excludedGroups>
319-
<properties>
320-
<!--
321-
<configurationParameters>
322-
junit.jupiter.conditions.deactivate = *
323-
</configurationParameters>
324-
-->
325-
</properties>
326-
</configuration>
327-
</plugin>
328313
<plugin>
329314
<groupId>org.apache.maven.plugins</groupId>
330315
<artifactId>maven-shade-plugin</artifactId>

‎athena-gcs/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-gcs.zip ${LAMBDA_TASK_ROOT}

‎athena-google-bigquery/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-google-bigquery-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-hbase/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-hbase-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-hbase/pom.xml

-11
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,6 @@
134134
</execution>
135135
</executions>
136136
</plugin>
137-
<plugin>
138-
<groupId>org.apache.maven.plugins</groupId>
139-
<artifactId>maven-surefire-plugin</artifactId>
140-
<version>${surefire.failsafe.version}</version>
141-
<configuration>
142-
<argLine>-Xmx4g</argLine>
143-
<excludes>
144-
<exclude>*IntegTest</exclude>
145-
</excludes>
146-
</configuration>
147-
</plugin>
148137
</plugins>
149138
</build>
150139
</project>

‎athena-hortonworks-hive/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-hortonworks-hive-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-kafka/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-kafka-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-msk/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-msk-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-mysql/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-mysql-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-neptune/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-neptune-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-neptune/pom.xml

-9
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,6 @@
163163
</dependencies>
164164
<build>
165165
<plugins>
166-
<plugin>
167-
<groupId>org.apache.maven.plugins</groupId>
168-
<artifactId>maven-surefire-plugin</artifactId>
169-
<configuration>
170-
<environmentVariables>
171-
<publishing>${publishing}</publishing>
172-
</environmentVariables>
173-
</configuration>
174-
</plugin>
175166
<plugin>
176167
<groupId>org.apache.maven.plugins</groupId>
177168
<artifactId>maven-shade-plugin</artifactId>

‎athena-oracle/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Install necessary tools
412
RUN yum update -y && yum install -y curl perl openssl

‎athena-postgresql/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-postgresql-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-redis/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-redis-2022.47.1.jar ${LAMBDA_TASK_ROOT}

‎athena-redshift/Dockerfile

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
FROM public.ecr.aws/lambda/java:11
1+
# Argument for Java version, defaulting to 11
2+
ARG JAVA_VERSION=11
3+
# Use the specified version of Java
4+
FROM public.ecr.aws/lambda/java:${JAVA_VERSION}
5+
6+
# Argument for Java tool options, defaulting to an empty string
7+
ARG JAVA_TOOL_OPTIONS=""
8+
# Set the JAVA_TOOL_OPTIONS environment variable for Java 17
9+
ENV JAVA_TOOL_OPTIONS=${JAVA_TOOL_OPTIONS}
210

311
# Copy function code and runtime dependencies from Maven layout
412
COPY target/athena-redshift-2022.47.1.jar ${LAMBDA_TASK_ROOT}

0 commit comments

Comments
 (0)