diff --git a/build.gradle.kts b/build.gradle.kts index a62f4ccb1..d2db7dbe0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,7 @@ plugins { id("com.github.ben-manes.versions") version "0.46.0" apply false id("io.spring.dependency-management") version "1.1.0" apply false - kotlin("plugin.spring") version "2.0.0" apply false + kotlin("plugin.spring") version "2.0.21" apply false } subprojects { diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 4ff3557ff..6c64722a8 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,5 +18,5 @@ tasks.compileKotlin { } dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21") } diff --git a/buildSrc/src/main/kotlin/jactor-modules-kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/jactor-modules-kotlin-conventions.gradle.kts index 4e601e1c9..826db6abc 100644 --- a/buildSrc/src/main/kotlin/jactor-modules-kotlin-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/jactor-modules-kotlin-conventions.gradle.kts @@ -21,16 +21,16 @@ dependencies { // test testImplementation("com.ninja-squad:springmockk:4.0.2") testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.28.1") - testImplementation("io.mockk:mockk:1.13.11") + testImplementation("io.mockk:mockk:1.13.13") testImplementation("org.junit.platform:junit-platform-suite") testImplementation("org.springframework.boot:spring-boot-starter-test") testImplementation("org.jetbrains.kotlin:kotlin-test-junit") // cucumber - testImplementation("io.cucumber:cucumber-java:7.18.0") - testImplementation("io.cucumber:cucumber-java8:7.18.0") - testImplementation("io.cucumber:cucumber-junit-platform-engine:7.18.0") - testImplementation("io.cucumber:cucumber-spring:7.18.0") + testImplementation("io.cucumber:cucumber-java:7.20.1") + testImplementation("io.cucumber:cucumber-java8:7.20.1") + testImplementation("io.cucumber:cucumber-junit-platform-engine:7.20.1") + testImplementation("io.cucumber:cucumber-spring:7.20.1") } tasks.compileKotlin { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f..a4b76b953 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138c..df97d72b8 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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a426..f5feea6d6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e46..9b42019c7 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/persistence/build.gradle.kts b/persistence/build.gradle.kts index 6e8cfde44..7fbda80e0 100644 --- a/persistence/build.gradle.kts +++ b/persistence/build.gradle.kts @@ -3,7 +3,7 @@ version = "2.0.x-SNAPSHOT" description = "jactor::persistence" plugins { - id("org.springframework.boot") version "3.3.0" + id("org.springframework.boot") version "3.3.5" } dependencies { @@ -17,8 +17,8 @@ dependencies { implementation(project(":shared")) // database - runtimeOnly("org.flywaydb:flyway-core:10.15.0") - runtimeOnly("com.h2database:h2:2.2.224") + runtimeOnly("org.flywaydb:flyway-core:10.20.1") + runtimeOnly("com.h2database:h2:2.3.232") } tasks.test { diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 012088106..6afeb7baa 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -4,6 +4,6 @@ description = "jactor::shared" dependencies { // logging og swagger - implementation("io.github.oshai:kotlin-logging-jvm:6.0.9") + implementation("io.github.oshai:kotlin-logging-jvm:7.0.0") implementation("org.springdoc:springdoc-openapi-ui:1.8.0") } diff --git a/web/build.gradle.kts b/web/build.gradle.kts index abe5ca00a..cd7acbf6e 100644 --- a/web/build.gradle.kts +++ b/web/build.gradle.kts @@ -3,7 +3,7 @@ version = "1.0.x-SNAPSHOT" description = "jactor-web" plugins { - id("org.springframework.boot") version "3.3.0" + id("org.springframework.boot") version "3.3.5" } dependencies {