Dockerfile tomcat with jdk17

.github/workflows/build.yml

@@ -31,6 +31,6 @@ jobs:
       - name: Setup Scala
         uses: olafurpg/setup-scala@v10
         with:
-          java-version: "adopt@1.11"
+          java-version: "openjdk@1.17"
       - name: Build and run tests
         run: sbt +test +doc

.github/workflows/jacoco_check.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Setup Scala
         uses: olafurpg/setup-scala@v10
         with:
-          java-version: "adopt@1.11"
+          java-version: "openjdk@1.17"
       - name: Build and run tests
         run: sbt ++${{matrix.scala}} jacoco
       - name: Add JaCoCo Report in PR comments

api/Dockerfile

@@ -17,7 +17,7 @@
 # change to OFF to disable SSL
 ARG SSL=true
 # Tomcat OS base image, feel free to use another (e.g. your hardened one)
-ARG BASE_IMAGE=tomcat:9-jdk11-corretto
+ARG BASE_IMAGE=tomcat:9-jdk17-corretto
 
 # --- Base image part (common for SSL true|false) ---
 FROM $BASE_IMAGE as base
@@ -50,7 +50,7 @@ RUN mkdir -p /opt/certs
 # just PEMs are supported
 COPY $LDAP_SSL_CERTS_PATH/*.pem /opt/certs/
 
-# Java 11 paths used
+# Java 11+ paths used
 RUN for file in `ls /opt/certs/*.pem`; \
 do \
     echo yes | keytool -import -file $file -alias ldaps$RANDOM -keystore $JAVA_HOME/lib/security/cacerts -storepass changeit; \

api/src/test/resources/application.yaml

@@ -54,6 +54,14 @@ spring:
     name: "login-service"
   jmx:
     enabled: true
+  #  Spring Boot 2.7 + Java 17 have some compatibility issues around JMX and Micrometer
+  autoconfigure:
+    exclude:
+      - org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration
+      - org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration
+      - org.springframework.boot.actuate.autoconfigure.metrics.SystemMetricsAutoConfiguration
+      - org.springframework.boot.actuate.autoconfigure.metrics.web.tomcat.TomcatMetricsAutoConfiguration
+      - org.springframework.boot.actuate.autoconfigure.metrics.web.servlet.WebMvcMetricsAutoConfiguration
 server:
   port: 9090
 

api/src/test/scala/za/co/absa/loginsvc/rest/controller/TokenControllerTest.scala

@@ -96,7 +96,7 @@ class TokenControllerTest extends AnyFlatSpec
   )
 
   it should "return tokens generated by mocked JWTService for the authenticated user with group-prefixes (single)(case irrelevant)" in {
-    // `groups-prefixes` fill change the groups in user object passed to the jwtService.generateAccessToken
+    // `group-prefixes` fill change the groups in user object passed to the jwtService.generateAccessToken
     val fakeUserFilteredGroups = fakeUserWithGroups(groups = Seq("first-fake-group"))
     val fakeUserAuth = fakeUserAuthenticationForUser(fakeUserFilteredGroups)