diff --git a/.github/workflows/on-pull_request-opened-synchronize-reopened.yml b/.github/workflows/on-pull_request-opened-synchronize-reopened.yml index f2b8ed4..6f08dd3 100644 --- a/.github/workflows/on-pull_request-opened-synchronize-reopened.yml +++ b/.github/workflows/on-pull_request-opened-synchronize-reopened.yml @@ -19,6 +19,7 @@ jobs: - uses: aerius/github-actions/events/pull_request-event-action@v1.0.2 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + JDK_VERSION: 17 - uses: aerius/github-actions/extras/docker-build-action@v1.0.2 with: diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml index 9ecc30a..51a66b5 100644 --- a/.github/workflows/on-push.yml +++ b/.github/workflows/on-push.yml @@ -21,6 +21,7 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + JDK_VERSION: 17 - uses: aerius/github-actions/extras/docker-build-or-publish-based-on-maven-project-version-action@v1.0.2 with: @@ -29,3 +30,4 @@ jobs: DOCKER_REGISTRY_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} DOCKER_IMAGE_NAME: ${{ github.event.repository.name }} DOCKERFILE_LOCATION: docker/service/Dockerfile + JDK_VERSION: 17 diff --git a/.github/workflows/on-release-published.yml b/.github/workflows/on-release-published.yml index dd90719..f0e178a 100644 --- a/.github/workflows/on-release-published.yml +++ b/.github/workflows/on-release-published.yml @@ -22,6 +22,7 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + JDK_VERSION: 17 - uses: aerius/github-actions/extras/docker-publish-action@v1.0.2 with: diff --git a/docker/service/Dockerfile b/docker/service/Dockerfile index 621f326..cf65521 100644 --- a/docker/service/Dockerfile +++ b/docker/service/Dockerfile @@ -1,5 +1,5 @@ # Builder part for maven packaging. -FROM maven:3-openjdk-11 as builder +FROM maven:3-eclipse-temurin-17 as builder WORKDIR /app @@ -12,7 +12,7 @@ RUN mv -v search-service/target/search-service-*.jar app.jar \ # Clean up image so we can rerun without the cache being invalidated because target files are changed && mvn clean -FROM openjdk:11-jre +FROM eclipse-temurin:17-jre WORKDIR /app diff --git a/pom.xml b/pom.xml index 169d353..c7b451b 100644 --- a/pom.xml +++ b/pom.xml @@ -60,8 +60,8 @@ UTF-8 - 11 - 11 + 17 + 17 5.1.0-2 3.10.1