From e4ac1702c8ccbdc9f3eee81b93f04ab9855ff978 Mon Sep 17 00:00:00 2001
From: Maksim Litvinov <litvinovmksm@gamil.com>
Date: Fri, 18 Apr 2025 12:04:53 +0300
Subject: [PATCH] update deps

---
 .github/workflows/java.yml               | 13 ++++++------
 Dockerfile                               |  6 +++---
 Makefile                                 |  2 +-
 build.gradle.kts                         | 25 ++++++++++++------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index e0675a5..737fd01 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -9,14 +9,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           java-version: '20'
           distribution: 'temurin'
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/actions/setup-gradle@v4
         with:
-          gradle-version: 8.3
-      - run: ./gradlew checkstyleMain
-      - run: ./gradlew test
-
+          fetch-depth: 0
+      - name: Execute Gradle build
+        run: ./gradlew build
diff --git a/Dockerfile b/Dockerfile
index 9d90aac..09f8150 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:20-jdk
+FROM eclipse-temurin:21-jdk
 
 WORKDIR /app
 
@@ -14,7 +14,7 @@ COPY config config
 
 RUN ./gradlew --no-daemon build
 
-ENV JAVA_OPTS "-Xmx512M -Xms512M"
+ENV JAVA_OPTS="-Xmx512M -Xms512M"
 EXPOSE 7070
 
-CMD java -jar build/libs/HexletJavalin-1.0-SNAPSHOT-all.jar
+CMD ["java", "-jar", "build/libs/HexletJavalin-1.0-SNAPSHOT-all.jar"]
diff --git a/Makefile b/Makefile
index 021a501..7153f51 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 setup:
-	gradle wrapper --gradle-version 8.3
+	gradle wrapper --gradle-version 8.13
 
 install:
 	./gradlew install
diff --git a/build.gradle.kts b/build.gradle.kts
index 1e85389..a417dbd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,10 +4,10 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 plugins {
     id("java")
     id("war")
-    id("org.gretty") version "4.1.0"
+    id("org.gretty") version "4.1.6"
     id("checkstyle")
-    id("io.freefair.lombok") version "8.4"
-    id("com.github.ben-manes.versions") version "0.47.0"
+    id("io.freefair.lombok") version "8.13.1"
+    id("com.github.ben-manes.versions") version "0.52.0"
     id("com.github.johnrengelman.shadow") version "8.1.1"
 }
 
@@ -19,21 +19,22 @@ repositories {
 }
 
 dependencies {
-    implementation("jakarta.servlet:jakarta.servlet-api:6.0.0")
-    implementation("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0")
+    implementation("jakarta.servlet:jakarta.servlet-api:6.1.0")
+    implementation("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.2")
     implementation("org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.1")
 
-    implementation("org.slf4j:slf4j-simple:2.0.7")
+    implementation("org.slf4j:slf4j-simple:2.0.17")
 
-    implementation("org.zalando:logbook-core:3.3.0")
-    implementation("org.zalando:logbook-servlet:3.3.0")
+    implementation("org.zalando:logbook-core:3.11.0")
+    implementation("org.zalando:logbook-servlet:3.11.0")
 
-    testImplementation("com.konghq:unirest-java-core:4.0.4")
-    testImplementation("com.konghq:unirest-java-bom:4.0.4")
+    testImplementation("com.konghq:unirest-java-core:4.4.5")
+    testImplementation("com.konghq:unirest-java-bom:4.4.5")
 
-    testImplementation("org.assertj:assertj-core:3.23.1")
-    testImplementation(platform("org.junit:junit-bom:5.10.0"))
+    testImplementation("org.assertj:assertj-core:3.27.3")
+    testImplementation(platform("org.junit:junit-bom:5.12.2"))
     testImplementation("org.junit.jupiter:junit-jupiter")
+    testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 
 gretty {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ac72c34..37f853b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME