Merge pull request #729 from jesperancinha/update-java

Update java

Author: jesperancinha

.circleci/config.yml

@@ -18,22 +18,22 @@ jobs:
       - checkout
 
       - run:
-          name: Install SDK 20
-          command: wget https://download.java.net/java/GA/jdk20.0.1/b4887098932d415489976708ad6d1a4b/9/GPL/openjdk-20.0.1_linux-x64_bin.tar.gz &&
-            tar xvf openjdk-20.0.1_linux-x64_bin.tar.gz &&
-            sudo mv jdk-20*/ /opt/jdk20 &&
-            export JAVA_HOME=/opt/jdk20 &&
+          name: Install SDK 21
+          command: wget https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz &&
+            tar -xvf OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz &&
+            sudo mv jdk-21*/ /opt/jdk21 &&
+            export JAVA_HOME=/opt/jdk21 &&
             export PATH=$PATH:$JAVA_HOME/bin
 
       - run:
           name: Build
-          command: export JAVA_HOME=/opt/jdk20 &&
+          command: export JAVA_HOME=/opt/jdk21 &&
               export PATH=$PATH:$JAVA_HOME/bin &&
               mvn -B -DskipTests clean package
 
       - run:
           name: Test
-          command: export JAVA_HOME=/opt/jdk20 &&
+          command: export JAVA_HOME=/opt/jdk21 &&
               export PATH=$PATH:$JAVA_HOME/bin &&
               mvn test
 

.github/workflows/vma-archiver-e2e.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
       - name: Locust
         run: make install
@@ -40,10 +40,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
       - name: Locust
         run: make install
@@ -69,10 +69,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
       - name: Locust
         run: make install
@@ -99,10 +99,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'adopt'
       - name: Locust
         run: make install

.github/workflows/vma-archiver-pull-request.yml

@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
         - uses: actions/checkout@v4
-        - name: Set up JDK 17
+        - name: Set up JDK 21
           uses: actions/setup-java@v4
           with:
-            java-version: '17'
+            java-version: '21'
             distribution: 'adopt'
 
         - name: Build and Test

.github/workflows/vma-archiver.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
         - uses: actions/checkout@v4
-        - name: Set up JDK 17
+        - name: Set up JDK 21
           uses: actions/setup-java@v4
           with:
-            java-version: '17'
+            java-version: '21'
             distribution: 'adopt'
         - name: Build and Test
           run: mvn clean install jacoco:prepare-agent package jacoco:report

Makefile

@@ -1,5 +1,4 @@
-SHELL := /bin/bash
-GITHUB_RUN_ID ?=123
+include Makefile.mk
 
 b: build-npm build-maven
 buildw:

Makefile.mk

@@ -0,0 +1,5 @@
+SHELL := /bin/bash
+GITHUB_RUN_ID ?=123
+
+b:
+	mvn clean install

docker-compose-local.yml

@@ -159,7 +159,7 @@ services:
         reservations:
           memory: 400M
     healthcheck:
-      test: timeout 10s bash -c ':> /dev/tcp/127.0.0.1/8081' || exit 1
+      test: ["CMD", "sh", "-c", "(timeout 10s nc -z 127.0.0.1 8081 || [ $? -eq 4 ]) && exit 0 || exit 1"]
       interval: 30s
       timeout: 20m
       retries: 40
@@ -195,7 +195,7 @@ services:
         reservations:
           memory: 400M
     healthcheck:
-      test: timeout 10s bash -c ':> /dev/tcp/127.0.0.1/8082' || exit 1
+      test: ["CMD", "sh", "-c", "(timeout 10s nc -z 127.0.0.1 8082 || [ $? -eq 4 ]) && exit 0 || exit 1"]
       interval: 30s
       timeout: 20m
       retries: 40
@@ -229,7 +229,7 @@ services:
         reservations:
           memory: 400M
     healthcheck:
-      test: timeout 10s bash -c ':> /dev/tcp/127.0.0.1/8083' || exit 1
+      test: ["CMD", "sh", "-c", "(timeout 10s nc -z 127.0.0.1 8083 || [ $? -eq 4 ]) && exit 0 || exit 1"]
       interval: 30s
       timeout: 20m
       retries: 40
@@ -263,7 +263,7 @@ services:
         reservations:
           memory: 400M
     healthcheck:
-      test: timeout 10s bash -c ':> /dev/tcp/127.0.0.1/8084' || exit 1
+      test: ["CMD", "sh", "-c", "(timeout 10s nc -z 127.0.0.1 8084 || [ $? -eq 4 ]) && exit 0 || exit 1"]
       interval: 30s
       timeout: 20m
       retries: 40

docker-compose.yml

@@ -149,7 +149,7 @@ services:
       jofisaes-vma-control:
         condition: service_healthy
     healthcheck:
-      test: timeout 10s bash -c ':> /dev/tcp/127.0.0.1/8081' || exit 1
+      test: ["CMD", "sh", "-c", "(timeout 10s nc -z 127.0.0.1 8081 || [ $? -eq 4 ]) && exit 0 || exit 1"]
       interval: 30s
       timeout: 20m
       retries: 40
@@ -180,7 +180,7 @@ services:
       jofisaes-vma-control:
         condition: service_healthy
     healthcheck:
-      test: timeout 10s bash -c ':> /dev/tcp/127.0.0.1/8082' || exit 1
+      test: ["CMD", "sh", "-c", "(timeout 10s nc -z 127.0.0.1 8082 || [ $? -eq 4 ]) && exit 0 || exit 1"]
       interval: 30s
       timeout: 20m
       retries: 40
@@ -209,7 +209,7 @@ services:
       jofisaes-vma-control:
         condition: service_healthy
     healthcheck:
-      test: timeout 10s bash -c ':> /dev/tcp/127.0.0.1/8083' || exit 1
+      test: ["CMD", "sh", "-c", "(timeout 10s nc -z 127.0.0.1 8083 || [ $? -eq 4 ]) && exit 0 || exit 1"]
       interval: 30s
       timeout: 20m
       retries: 40
@@ -238,7 +238,7 @@ services:
       jofisaes-vma-control:
         condition: service_healthy
     healthcheck:
-      test: timeout 10s bash -c ':> /dev/tcp/127.0.0.1/8084' || exit 1
+      test: ["CMD", "sh", "-c", "(timeout 10s nc -z 127.0.0.1 8084 || [ $? -eq 4 ]) && exit 0 || exit 1"]
       interval: 30s
       timeout: 20m
       retries: 40

docker-images/nginx/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 sed -i 's/${VMA_BACKEND_1}/'"$(getent hosts jofisaes-vma-backend-img-1 | cut -d' ' -f1)"'/g' /etc/nginx/nginx.conf
 sed -i 's/${VMA_BACKEND_2}/'"$(getent hosts jofisaes-vma-backend-img-2 | cut -d' ' -f1)"'/g' /etc/nginx/nginx.conf

docker-images/psql/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 cd /var/lib/postgresql || exit
 

pom.xml

@@ -10,7 +10,7 @@
     <name>VMA Parent</name>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
@@ -31,7 +31,7 @@
         <springdoc-openapi-starter.version>2.8.3</springdoc-openapi-starter.version>
 
         <omni-coveragereporter-maven-plugin.version>0.4.4</omni-coveragereporter-maven-plugin.version>
-        <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
+        <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
     </properties>
     <modules>
         <module>vma-play</module>

vma-play/Makefile

@@ -0,0 +1 @@
+include ../Makefile.mk

vma-service-backend/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:17-slim-buster
+FROM eclipse-temurin:21-alpine
 
 WORKDIR /root
 

vma-service-backend/entrypoint.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 java -jar -Dapplication.schema.host=${VMA_SCHEMA_REGISTRY} -Dapplication.postgres.host=jofisaes-vma-haproxy-lb -Dspring.profiles.active=${VMA_BACKEND_PROFILE} -Dserver.port="${VMA_PORT}" vma-service-backend.jar

vma-service-event-listener/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:17-slim-buster
+FROM eclipse-temurin:21-alpine
 
 WORKDIR /root
 

vma-service-event-listener/entrypoint.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 java -jar -Dapplication.schema.host=${VMA_SCHEMA_REGISTRY} -Dapplication.postgres.host=jofisaes-vma-haproxy-lb -Dspring.profiles.active=docker -Dserver.port="${VMA_PORT}" vma-service-event-listener.jar

vma-service-websockets/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:17-slim-buster
+FROM eclipse-temurin:21-alpine
 
 WORKDIR /root
 

vma-service-websockets/entrypoint.sh

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 java -jar -Dapplication.schema.host=${VMA_SCHEMA_REGISTRY} -Dapplication.postgres.host=jofisaes-vma-haproxy-lb -Dspring.profiles.active=${VMA_BACKEND_PROFILE} -Dserver.port="${VMA_PORT}" vma-service-websockets.jar