[#181074188] Migrate to java 17

DNAstack · Nov 15, 2022 · f0090d8 · f0090d8
1 parent b8ce146
commit f0090d8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/ci/impl/Dockerfile b/ci/impl/Dockerfile
@@ -4,7 +4,7 @@
 ## Stage 1: Build and test the Java Sources
 ##
 
-FROM openjdk:11-jdk-slim AS build
+FROM azul/zulu-openjdk:17.0.3 AS build
 ARG APP_NAME
 ARG APP_VERSION
 WORKDIR /build
@@ -34,7 +34,7 @@ RUN ./mvnw -B -X package
 
 # This stage uses a JRE rather than JDK because it doesn't have to build anything; it just runs the fat jar
 # produced by the previous stage.
-FROM openjdk:11-slim
+FROM azul/zulu-openjdk:17.0.3-jre
 ARG APP_NAME
 ARG APP_VERSION
 

diff --git a/e2e-tests/pom.xml b/e2e-tests/pom.xml
@@ -10,7 +10,7 @@
 	<name>Data Connect End-to-end tests</name>
 
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<actuator-e2e-test.version>1.0.3</actuator-e2e-test.version>

diff --git a/pom.xml b/pom.xml
@@ -58,12 +58,12 @@
   </dependencyManagement>
 
   <properties>
-    <java.version>11</java.version>
+    <java.version>17</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-    <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
-    <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
+    <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
+    <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
     <spring-cloud.version>2021.0.3</spring-cloud.version>
     <spring-boot.version>2.7.2</spring-boot.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>