Skip to content

Commit ece452f

Browse files
committed
All: Java 21
1 parent caf2286 commit ece452f

File tree

14 files changed

+31
-29
lines changed

14 files changed

+31
-29
lines changed

.github/workflows/cicd-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
- name: Checkout
2121
uses: actions/checkout@v2
2222

23-
- name: Set up JDK 17
23+
- name: Set up JDK 21
2424
uses: actions/setup-java@v2
2525
with:
26-
java-version: '17'
26+
java-version: '21'
2727
distribution: 'adopt'
2828

2929
- name: Build with Gradle

common-api/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
plugins {
2-
id "io.freefair.lombok" version "6.5.0.3"
2+
id "io.freefair.lombok" version "8.12"
33
id 'java-library'
44
}
55

66
group = 'bitxon.common'
77
version = '1.0-SNAPSHOT'
88

99
java {
10-
sourceCompatibility = JavaVersion.VERSION_17
11-
targetCompatibility = JavaVersion.VERSION_17
10+
toolchain {
11+
languageVersion = JavaLanguageVersion.of(21)
12+
}
1213
}
1314

1415
repositories {

dropwizard-app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ version = '1.0-SNAPSHOT'
99

1010
java {
1111
toolchain {
12-
languageVersion = JavaLanguageVersion.of(17)
12+
languageVersion = JavaLanguageVersion.of(21)
1313
}
1414
}
1515

@@ -26,10 +26,10 @@ dependencies {
2626
implementation 'io.dropwizard:dropwizard-hibernate'
2727
implementation 'org.mapstruct:mapstruct:1.5.3.Final'
2828

29-
annotationProcessor 'org.projectlombok:lombok:1.18.24'
29+
annotationProcessor 'org.projectlombok:lombok:1.18.36'
3030
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.3.Final'
3131

32-
compileOnly 'org.projectlombok:lombok:1.18.24'
32+
compileOnly 'org.projectlombok:lombok:1.18.36'
3333

3434
runtimeOnly 'org.postgresql:postgresql:42.7.5'
3535

dropwizard-app/src/main/java/bitxon/dropwizard/resource/AccountResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
@Path("/accounts")
3232
@Produces(MediaType.APPLICATION_JSON)
33-
@RequiredArgsConstructor(onConstructor = @__(@Inject))
33+
@RequiredArgsConstructor(onConstructor_ = @Inject)
3434
public class AccountResource {
3535

3636
private final AccountDao dao;

gradle/wrapper/gradle-wrapper.jar

-19.4 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
8788

8889
# Use the maximum available, or set MAX_FD != -1 to use that value.
8990
MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144145
case $MAX_FD in #(
145146
max*)
146147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
147-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
148149
MAX_FD=$( ulimit -H -n ) ||
149150
warn "Could not query maximum file descriptor limit"
150151
esac
151152
case $MAX_FD in #(
152153
'' | soft) :;; #(
153154
*)
154155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
155-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
156157
ulimit -n "$MAX_FD" ||
157158
warn "Could not set maximum file descriptor limit to $MAX_FD"
158159
esac
@@ -201,11 +202,11 @@ fi
201202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
202203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
203204

204-
# Collect all arguments for the java command;
205-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
206-
# shell script including quotes and variable substitutions, so put them in
207-
# double quotes to make sure that they get re-expanded; and
208-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
209210

210211
set -- \
211212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

micronaut-app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ version = '1.0-SNAPSHOT'
1010

1111
java {
1212
toolchain {
13-
languageVersion = JavaLanguageVersion.of(17)
13+
languageVersion = JavaLanguageVersion.of(21)
1414
}
1515
}
1616

quarkus-app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ version = '1.0-SNAPSHOT'
1010

1111
java {
1212
toolchain {
13-
languageVersion = JavaLanguageVersion.of(17)
13+
languageVersion = JavaLanguageVersion.of(21)
1414
}
1515
}
1616

@@ -20,7 +20,7 @@ repositories {
2020
}
2121

2222
dependencies {
23-
annotationProcessor 'org.projectlombok:lombok:1.18.24'
23+
annotationProcessor 'org.projectlombok:lombok:1.18.36'
2424
annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.3.Final'
2525
implementation project(":common-api")
2626
implementation enforcedPlatform("io.quarkus.platform:quarkus-bom:3.17.8")
@@ -32,7 +32,7 @@ dependencies {
3232
implementation 'io.quarkus:quarkus-hibernate-orm-panache'
3333
implementation 'io.quarkus:quarkus-jdbc-postgresql'
3434
implementation 'org.mapstruct:mapstruct:1.5.3.Final'
35-
compileOnly 'org.projectlombok:lombok:1.18.24'
35+
compileOnly 'org.projectlombok:lombok:1.18.36'
3636
testImplementation 'io.quarkus:quarkus-junit5'
3737
testImplementation 'io.rest-assured:rest-assured'
3838
testImplementation 'org.testcontainers:junit-jupiter'

quarkus-app/src/main/docker/Dockerfile.jvm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
# accessed directly. (example: "foo.example.com,bar.example.com")
7878
#
7979
###
80-
FROM registry.access.redhat.com/ubi8/openjdk-17:1.18
80+
FROM registry.access.redhat.com/ubi8/openjdk-21:1.20
8181

8282
ENV LANGUAGE='en_US:en'
8383

0 commit comments

Comments
 (0)