diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1be34270..70296970 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -19,4 +19,4 @@ updates: # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups groovy: patterns: - - "org.codehaus.groovy:*" + - "org.apache.groovy:*" diff --git a/build.gradle.kts b/build.gradle.kts index 560a1185..5ee2e621 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ val dependencyVersions = listOf( "net.bytebuddy:byte-buddy:1.14.9", "net.bytebuddy:byte-buddy-agent:1.14.9", "org.apache.commons:commons-compress:1.24.0", - "org.codehaus.groovy:groovy:3.0.19", + "org.apache.groovy:groovy:4.0.15", "org.jetbrains:annotations:24.0.1", "org.junit:junit-bom:5.10.0", ) diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 16e1c668..74f874e6 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -73,13 +73,13 @@ dependencies { } } listOf( - "org.codehaus.groovy:groovy", - "org.codehaus.groovy:groovy-json" + "org.apache.groovy:groovy", + "org.apache.groovy:groovy-json" ).onEach { implementation(it) { version { - strictly("[3,)") - prefer("3.0.19") + strictly("[4,)") + prefer("4.0.15") } } } @@ -103,8 +103,8 @@ dependencies { api("de.gesellix:docker-engine:2023-10-03T21-35-00") api("de.gesellix:docker-compose:2023-09-23T20-42-00") - implementation("org.codehaus.groovy:groovy:3.0.19") - implementation("org.codehaus.groovy:groovy-json:3.0.19") + implementation("org.apache.groovy:groovy:4.0.15") + implementation("org.apache.groovy:groovy-json:4.0.15") api("com.squareup.moshi:moshi:1.15.0") implementation("com.google.re2j:re2j:1.7") @@ -123,7 +123,7 @@ dependencies { testImplementation("de.gesellix:testutil:[2023-09-01T01-01-01,)") testImplementation("org.junit.platform:junit-platform-launcher:1.10.0") - testImplementation("org.spockframework:spock-core:2.3-groovy-3.0") + testImplementation("org.spockframework:spock-core:2.3-groovy-4.0") testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.9") testRuntimeOnly("org.objenesis:objenesis:3.3") testImplementation("io.github.joke:spock-mockable:2.3.0") diff --git a/explore/build.gradle.kts b/explore/build.gradle.kts index 47a2ea46..8de12862 100644 --- a/explore/build.gradle.kts +++ b/explore/build.gradle.kts @@ -38,25 +38,25 @@ dependencies { } } listOf( - "org.codehaus.groovy:groovy", - "org.codehaus.groovy:groovy-json" + "org.apache.groovy:groovy", + "org.apache.groovy:groovy-json" ).onEach { implementation(it) { version { - strictly("[3,)") - prefer("3.0.19") + strictly("[4,)") + prefer("4.0.15") } } } } implementation(project(":client")) - implementation("org.codehaus.groovy:groovy:3.0.19") + implementation("org.apache.groovy:groovy:4.0.15") testImplementation("org.apache.commons:commons-compress:1.24.0") implementation("org.slf4j:slf4j-api:2.0.9") runtimeOnly("ch.qos.logback:logback-classic:[1.2,2)!!1.3.11") - testImplementation("org.spockframework:spock-core:2.3-groovy-3.0") + testImplementation("org.spockframework:spock-core:2.3-groovy-4.0") testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.9") testRuntimeOnly("ch.qos.logback:logback-classic:[1.2,2)!!1.3.11") } diff --git a/integration-test/build.gradle.kts b/integration-test/build.gradle.kts index 9d77f968..cb1492f8 100644 --- a/integration-test/build.gradle.kts +++ b/integration-test/build.gradle.kts @@ -75,7 +75,7 @@ dependencies { } } implementation(project(":client")) - testImplementation("org.codehaus.groovy:groovy-json:[3,)") + testImplementation("org.apache.groovy:groovy-json:[4,)") testImplementation("com.kohlschutter.junixsocket:junixsocket-core:[2.4,)") testImplementation("com.kohlschutter.junixsocket:junixsocket-common:[2.4,)") @@ -87,7 +87,7 @@ dependencies { testImplementation("de.gesellix:docker-registry:2023-10-03T20-58-00") testImplementation("de.gesellix:testutil:[2023-09-01T01-01-01,)") - testImplementation("org.spockframework:spock-core:2.3-groovy-3.0") + testImplementation("org.spockframework:spock-core:2.3-groovy-4.0") testRuntimeOnly("net.bytebuddy:byte-buddy:1.14.9") testImplementation("org.apache.commons:commons-lang3:3.13.0") testRuntimeOnly("ch.qos.logback:logback-classic:[1.2,2)!!1.3.8")