Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updoot to java 17 #49

Merged
merged 8 commits into from
Feb 7, 2024
Merged

Updoot to java 17 #49

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f5fcd02
Updoot to java 17
JornC Feb 7, 2024
63058e0
Add JDK_VERSION to perhaps 1 or 2 too many actions, but can't hurt
JornC Feb 7, 2024
c52e64b
Upgrade to 3-openjdk-17
JornC Feb 7, 2024
0b22893
Remove a wrong jdk_version addition
JornC Feb 7, 2024
3d808e9
Remove another
JornC Feb 7, 2024
d279611
Upgrade dockerfile with temurin
JornC Feb 7, 2024
6fb7545
Use temurin maven
JornC Feb 7, 2024
6d84596
Use 17-jre
JornC Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/on-pull_request-opened-synchronize-reopened.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/on-push.yml
View file
Open in desktop
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
View file
Open in desktop
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/docker-publish-action@v1.0.2
with:
Expand Down
4 changes: 2 additions & 2 deletions docker/service/Dockerfile
View file
Open in desktop
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
JornC marked this conversation as resolved.
Show resolved Hide resolved

WORKDIR /app

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
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>
JornC marked this conversation as resolved.
Show resolved Hide resolved

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