Skip to content

Commit

Permalink
Updoot to java 17 (#49)
Browse files Browse the repository at this point in the history
* Updoot to java 17

* Add JDK_VERSION to perhaps 1 or 2 too many actions, but can't hurt

* Upgrade to 3-openjdk-17

* Remove a wrong jdk_version addition

* Remove another

* Upgrade dockerfile with temurin

* Use temurin maven

* Use 17-jre
  • Loading branch information
JornC authored Feb 7, 2024
1 parent 82a018a commit b6e081c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
- uses: aerius/github-actions/events/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
JDK_VERSION: 17

- uses: aerius/github-actions/extras/[email protected]
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/on-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
1 change: 1 addition & 0 deletions .github/workflows/on-release-published.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected]
with:
Expand Down
4 changes: 2 additions & 2 deletions docker/service/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

<imaer.version>5.1.0-2</imaer.version>
<maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
Expand Down

0 comments on commit b6e081c

Please sign in to comment.