From 6cdc14733eee75cd461b8cf0d5fb0523e7aea99e Mon Sep 17 00:00:00 2001
From: ThanKarab <tkarabatsis@hotmail.com>
Date: Thu, 20 Jul 2023 06:13:12 -0700
Subject: [PATCH] Upgrade to Java 17.
---
Dockerfile | 6 +++---
pom.xml | 4 ++--
.../eu/hbp/mip/configurations/SecurityConfiguration.java | 1 -
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index fabf7f0c4..4449ffa07 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,8 @@
#######################################################
# Build the spring boot maven project
#######################################################
-FROM maven:3.8.5-openjdk-11 as mvn-build-env
+FROM maven:3.9.3-amazoncorretto-17 as mvn-build-env
+MAINTAINER Thanasis Karampatsis <tkarabatsis@athenarc.gr>
ENV CODE_PATH="/opt/code"
WORKDIR $CODE_PATH
@@ -17,8 +18,7 @@ RUN mvn clean package
#######################################################
# Setup the running container
#######################################################
-FROM openjdk:11.0.15-jdk
-MAINTAINER Thanasis Karampatsis <tkarabatsis@athenarc.gr>
+FROM amazoncorretto:17.0.8-alpine3.18
#######################################################
# Setting up timezone
diff --git a/pom.xml b/pom.xml
index 6a2af84f2..54473e10a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,12 +18,12 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <java.version>1.8</java.version>
+ <java.version>17</java.version>
<spring-context.version>5.3.29</spring-context.version>
<postgresql.version>42.6.0</postgresql.version>
<hibernate.version>5.6.15.Final</hibernate.version>
<flyway-core.version>4.2.0</flyway-core.version>
- <keycloak-spring.version>11.0.2</keycloak-spring.version>
+ <keycloak-spring.version>13.0.1</keycloak-spring.version>
<gson.version>2.10.1</gson.version>
<commons-dbcp.version>2.9.0</commons-dbcp.version>
<lombok.version>1.18.28</lombok.version>
diff --git a/src/main/java/eu/hbp/mip/configurations/SecurityConfiguration.java b/src/main/java/eu/hbp/mip/configurations/SecurityConfiguration.java
index 733eb1dcf..b04621933 100644
--- a/src/main/java/eu/hbp/mip/configurations/SecurityConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configurations/SecurityConfiguration.java
@@ -112,5 +112,4 @@ public class SecurityConfiguration extends KeycloakWebSecurityConfigurerAdapter
keycloakAuthenticationProvider.setGrantedAuthoritiesMapper(grantedAuthorityMapper);
auth.authenticationProvider(keycloakAuthenticationProvider);
}
-
}
--
GitLab