From 32a47029d67401943b444b21f308662e555301aa Mon Sep 17 00:00:00 2001 From: Maksim Litvinov Date: Mon, 21 Apr 2025 14:24:55 +0300 Subject: [PATCH 1/2] update deps --- .github/workflows/build.yml | 2 +- Dockerfile | 4 ++-- Makefile | 2 +- build.gradle.kts | 29 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 09808a8..f91cddc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: - name: Build with Gradle uses: gradle/actions/setup-gradle@v4 with: - gradle-version: "8.12" + gradle-version: "8.13" - run: ./gradlew checkstyleMain - run: ./gradlew test diff --git a/Dockerfile b/Dockerfile index 1c26244..09f8150 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 38610e6..395e2bf 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ dev: ./gradlew run setup: - gradle wrapper --gradle-version 8.12 + gradle wrapper --gradle-version 8.13 clean: ./gradlew clean diff --git a/build.gradle.kts b/build.gradle.kts index dc9cde9..9c932af 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,8 +4,8 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { application checkstyle - id("io.freefair.lombok") version "8.6" - id("com.github.ben-manes.versions") version "0.51.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" } @@ -21,19 +21,20 @@ repositories { } dependencies { - implementation("com.h2database:h2:2.2.224") - implementation("com.zaxxer:HikariCP:5.1.0") - implementation("com.fasterxml.jackson.core:jackson-databind:2.16.1") - implementation("org.apache.commons:commons-text:1.11.0") - implementation("gg.jte:jte:3.1.9") - implementation("org.slf4j:slf4j-simple:2.0.9") - implementation("io.javalin:javalin:6.1.3") - implementation("io.javalin:javalin-bundle:6.1.3") - implementation("io.javalin:javalin-rendering:6.1.3") + implementation("com.h2database:h2:2.3.232") + implementation("com.zaxxer:HikariCP:6.3.0") + implementation("com.fasterxml.jackson.core:jackson-databind:2.18.3") + implementation("org.apache.commons:commons-text:1.13.1") + implementation("gg.jte:jte:3.2.0") + implementation("org.slf4j:slf4j-simple:2.0.17") + implementation("io.javalin:javalin:6.6.0") + implementation("io.javalin:javalin-bundle:6.6.0") + implementation("io.javalin:javalin-rendering:6.6.0") - testImplementation("org.assertj:assertj-core:3.25.3") - testImplementation(platform("org.junit:junit-bom:5.10.1")) - testImplementation("org.junit.jupiter:junit-jupiter") + 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") } tasks.test { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cea7a79..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.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 572f421d865bc54bdb6098dcb308a3594efa6a6a Mon Sep 17 00:00:00 2001 From: Maksim Litvinov Date: Mon, 21 Apr 2025 14:26:34 +0300 Subject: [PATCH 2/2] fix indent --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9c932af..be43338 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,9 +32,9 @@ dependencies { implementation("io.javalin:javalin-rendering:6.6.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") + testImplementation(platform("org.junit:junit-bom:5.12.2")) + testImplementation("org.junit.jupiter:junit-jupiter") + testRuntimeOnly("org.junit.platform:junit-platform-launcher") } tasks.test {