From f06a66957414e8f138f6a0d30a53c3dbdd18f23a Mon Sep 17 00:00:00 2001 From: ThimoTollmien1002 Date: Tue, 28 Jan 2025 14:34:29 +0100 Subject: [PATCH 1/3] use gradle 8.12.1 and spring boot 3.4.2 and update other dependencies accordingly Co-authored-by: Nico Barton Co-authored-by: Thimo Tollmien --- build.gradle.kts | 39 ++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/resources/templates/discover.html | 2 +- src/main/resources/templates/index.html | 2 +- src/main/resources/templates/triggers.html | 2 +- 5 files changed, 21 insertions(+), 26 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 505f50d..b54e2ff 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,10 +7,10 @@ plugins { id("java") id("project-report") - id("org.springframework.boot") version "3.1.4" - id("io.spring.dependency-management") version "1.1.3" - id("com.github.ben-manes.versions") version "0.48.0" - id("com.gorylenko.gradle-git-properties") version "2.4.1" + id("org.springframework.boot") version "3.4.2" + id("io.spring.dependency-management") version "1.1.7" + id("com.github.ben-manes.versions") version "0.52.0" + id("com.gorylenko.gradle-git-properties") version "2.4.2" } repositories { @@ -30,14 +30,9 @@ configurations.all { exclude(module = "spring-boot-starter-tomcat") } -buildscript { - // jetty 11 does not yet support jakarta 6 - extra["jakarta-servlet.version"] = "5.0.0" -} - dependencies { - val edisonrelease = "3.1.5" - val logbackVersion = "1.4.11" + val edisonrelease = "3.4.1" + val logbackVersion = "1.5.16" // edison implementation("de.otto.edison:edison-core:${edisonrelease}") @@ -45,40 +40,40 @@ dependencies { // bootstrap //Don't forget to also update the links in the html templates if you change this! implementation("org.webjars:jquery:3.7.1") - implementation("org.webjars:bootstrap:5.3.2") + implementation("org.webjars:bootstrap:5.3.3") //Don't forget to also update the links in the html templates if you change this! // guava - implementation("com.google.guava:guava:32.1.2-jre") + implementation("com.google.guava:guava:33.4.0-jre") // logging implementation("ch.qos.logback:logback-core:${logbackVersion}") implementation("ch.qos.logback:logback-classic:${logbackVersion}") // spring - implementation("org.springframework.vault:spring-vault-core:3.0.4") - implementation("org.hibernate.validator:hibernate-validator:8.0.1.Final") + implementation("org.springframework.vault:spring-vault-core:3.1.2") + implementation("org.hibernate.validator:hibernate-validator:8.0.2.Final") implementation("org.springframework.boot:spring-boot-starter-thymeleaf") + implementation("org.springframework.boot:spring-boot-starter-web") // jetty implementation("org.springframework.boot:spring-boot-starter-jetty") // gson - implementation("com.google.code.gson:gson:2.10.1") + implementation("com.google.code.gson:gson:2.11.0") // asyncHttp - implementation("org.asynchttpclient:async-http-client:2.12.3") + implementation("org.asynchttpclient:async-http-client:3.0.1") // test - testImplementation("org.junit.jupiter:junit-jupiter:5.10.0") - testImplementation("org.mockito:mockito-core:5.5.0") + testImplementation("org.junit.jupiter:junit-jupiter:5.11.4") + testImplementation("org.mockito:mockito-core:5.15.2") testImplementation("org.hamcrest:java-hamcrest:2.0.0.0") testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("de.otto.edison:edison-testsupport:${edisonrelease}") - // workaround to make spring boot test work, which depends on jakarta 6 - testImplementation("org.eclipse.jetty:jetty-server:11.0.15") - testImplementation("jakarta.servlet:jakarta.servlet-api:6.0.0") + testImplementation("org.eclipse.jetty:jetty-server:12.0.16") + testImplementation("jakarta.servlet:jakarta.servlet-api:6.1.0") } tasks { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9f4197d..e18bc25 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.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/resources/templates/discover.html b/src/main/resources/templates/discover.html index ab02ced..7b3c5b0 100644 --- a/src/main/resources/templates/discover.html +++ b/src/main/resources/templates/discover.html @@ -57,6 +57,6 @@ - + diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index b116e1b..48b0f06 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -46,6 +46,6 @@ - + diff --git a/src/main/resources/templates/triggers.html b/src/main/resources/templates/triggers.html index b789c50..49b6d52 100644 --- a/src/main/resources/templates/triggers.html +++ b/src/main/resources/templates/triggers.html @@ -137,7 +137,7 @@

Messages

- +