diff --git a/.github/workflows/deploy-prod&demo.yaml b/.github/workflows/deploy-prod&demo.yaml index 1042f0f..ccfd152 100644 --- a/.github/workflows/deploy-prod&demo.yaml +++ b/.github/workflows/deploy-prod&demo.yaml @@ -13,7 +13,7 @@ jobs: with: app_name: catalog-admin-service environment: prod - java_version: '19' + java_version: '21' coverage_file_path: ./target/site/jacoco/jacoco.xml secrets: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml index 0d334cb..619ea75 100644 --- a/.github/workflows/deploy-staging.yaml +++ b/.github/workflows/deploy-staging.yaml @@ -14,7 +14,7 @@ jobs: with: app_name: catalog-admin-service environment: staging - java_version: '19' + java_version: '21' coverage_file_path: ./target/site/jacoco/jacoco.xml secrets: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Dockerfile b/Dockerfile index a846c18..b5b9c3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:19-slim +FROM openjdk:21-slim ENV TZ=Europe/Oslo RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/pom.xml b/pom.xml index aa47d12..3bb4aae 100644 --- a/pom.xml +++ b/pom.xml @@ -13,12 +13,12 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.2.2 - 19 + 21 UTF-8 UTF-8 UTF-8 @@ -26,9 +26,9 @@ ${java.release} false - 1.9.10 - 1.19.0 - 4.9.0 + 1.9.22 + 1.19.4 + 4.10.0 @@ -81,12 +81,12 @@ jakarta.json jakarta.json-api - 2.1.2 + 2.1.3 org.eclipse.parsson jakarta.json - 1.1.4 + 1.1.5 @@ -111,7 +111,7 @@ org.mockito.kotlin mockito-kotlin - 5.1.0 + 5.2.1 test @@ -135,11 +135,16 @@ org.wiremock - wiremock - 3.0.2 + wiremock-standalone + 3.3.1 + test + + + org.apache.httpcomponents.client5 + httpclient5 + 5.2.2 test - @@ -204,7 +209,7 @@ org.jacoco jacoco-maven-plugin - 0.8.10 + 0.8.11 before-unit-test-execution @@ -262,8 +267,9 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.5 + ${surefire.jacoco.args} unit integration @@ -275,8 +281,9 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.1.2 + 3.2.5 + ${failsafe.jacoco.args} integration unit