Skip to content

Commit 6515c26

Browse files
author
Maksim Litvinov
committed
update to java 21
1 parent e871faf commit 6515c26

File tree

7 files changed

+17
-19
lines changed

7 files changed

+17
-19
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010

1111
steps:
1212
- uses: actions/checkout@v4
13-
- uses: actions/setup-java@v3
13+
- uses: actions/setup-java@v4
1414
with:
1515
distribution: 'temurin'
16-
java-version: '20'
16+
java-version: '21'
1717
- run: make build
1818
- run: make test
1919

Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ COPY frontend /frontend
1010

1111
RUN npm run build
1212

13-
FROM eclipse-temurin:20-jdk
14-
15-
ARG GRADLE_VERSION=8.3
13+
FROM eclipse-temurin:21-jdk
1614

1715
RUN apt-get update && apt-get install -yq make unzip
1816

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
setup:
22
npm install
3-
./gradlew wrapper --gradle-version 8.5
3+
./gradlew wrapper --gradle-version 8.7
44
./gradlew build
55

66
frontend:

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
44
plugins {
55
application
66
// "checkstyle"
7-
id("io.freefair.lombok") version "8.4"
8-
id("org.springframework.boot") version "3.2.0"
7+
id("io.freefair.lombok") version "8.6"
8+
id("org.springframework.boot") version "3.2.4"
99
id("io.spring.dependency-management") version "1.1.4"
1010
id("com.github.ben-manes.versions") version "0.50.0"
1111
}

gradle/wrapper/gradle-wrapper.jar

-19.8 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.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew.bat

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
4343
%JAVA_EXE% -version >NUL 2>&1
4444
if %ERRORLEVEL% equ 0 goto execute
4545

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
46+
echo. 1>&2
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
48+
echo. 1>&2
49+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
50+
echo location of your Java installation. 1>&2
5151

5252
goto fail
5353

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5757

5858
if exist "%JAVA_EXE%" goto execute
5959

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
60+
echo. 1>&2
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
62+
echo. 1>&2
63+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
64+
echo location of your Java installation. 1>&2
6565

6666
goto fail
6767

0 commit comments

Comments
 (0)