Skip to content

Commit

Permalink
Merge pull request #23 from alessandro-candon/feature/javaversion
Browse files Browse the repository at this point in the history
feat(jversion): update java version to 21
  • Loading branch information
alessandro-candon authored May 28, 2024
2 parents 2956d05 + 35b3f35 commit 157edd4
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- "v*.*.*"

env:
JAVA_VERSION: '17'
JAVA_VERSION: '21'
IMAGE: 'fake-oauth2'
REGISTRY_IMAGE: 'acando14/fake-oauth2'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
types: [opened, synchronize, reopened]

env:
JAVA_VERSION: '17'
JAVA_VERSION: '21'
IMAGE: 'fake-oauth2'

permissions:
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM amazoncorretto:17-alpine as builder
FROM amazoncorretto:21-alpine as builder

COPY gradle gradle
COPY build.gradle .
Expand All @@ -8,7 +8,7 @@ COPY src src

RUN ./gradlew build -x test

FROM amazoncorretto:17-alpine as corretto-deps
FROM amazoncorretto:21-alpine as corretto-deps

COPY --from=builder ./build/libs/*-SNAPSHOT.jar /app/app.jar

Expand All @@ -17,12 +17,12 @@ RUN unzip /app/app.jar -d temp && \
--print-module-deps \
--ignore-missing-deps \
--recursive \
--multi-release 17 \
--multi-release 21 \
--class-path="./temp/BOOT-INF/lib/*" \
--module-path="./temp/BOOT-INF/lib/*" \
/app/app.jar > /modules.txt

FROM amazoncorretto:17-alpine as corretto-jdk
FROM amazoncorretto:21-alpine as corretto-jdk

COPY --from=corretto-deps /modules.txt /modules.txt
RUN apk add --no-cache binutils && \
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ group = 'com.alessandro-candon'
version = '0.0.1-SNAPSHOT'

java {
sourceCompatibility = '17'
sourceCompatibility = '21'
}

repositories {
Expand Down

0 comments on commit 157edd4

Please sign in to comment.