From 9e08390b8207257284f1dce98c90ab2fd429b00d Mon Sep 17 00:00:00 2001 From: Paolo Di Tommaso Date: Wed, 10 Apr 2024 21:23:54 +0200 Subject: [PATCH] Bump groovy 4.0.21 Signed-off-by: Paolo Di Tommaso --- build.gradle | 47 +++++++++++++++--------------- modules/nextflow/build.gradle | 14 ++++----- modules/nf-commons/build.gradle | 4 +-- modules/nf-httpfs/build.gradle | 6 ++-- plugins/nf-amazon/build.gradle | 4 +-- plugins/nf-azure/build.gradle | 4 +-- plugins/nf-cloudcache/build.gradle | 4 +-- plugins/nf-codecommit/build.gradle | 4 +-- plugins/nf-console/build.gradle | 8 ++--- plugins/nf-ga4gh/build.gradle | 4 +-- plugins/nf-google/build.gradle | 4 +-- plugins/nf-tower/build.gradle | 4 +-- plugins/nf-wave/build.gradle | 4 +-- 13 files changed, 55 insertions(+), 56 deletions(-) diff --git a/build.gradle b/build.gradle index b16878b6cd..cb09f7831b 100644 --- a/build.gradle +++ b/build.gradle @@ -109,8 +109,8 @@ allprojects { // Documentation required libraries groovyDoc 'org.fusesource.jansi:jansi:2.4.0' - groovyDoc "org.apache.groovy:groovy-groovydoc:4.0.20" - groovyDoc "org.apache.groovy:groovy-ant:4.0.20" + groovyDoc "org.apache.groovy:groovy-groovydoc:4.0.21" + groovyDoc "org.apache.groovy:groovy-ant:4.0.21" } test { @@ -145,28 +145,27 @@ allprojects { } // Required to run tests on Java 9 and higher in compatibility mode - if (JavaVersion.current() >= JavaVersion.VERSION_1_9) { - tasks.withType(Test) { - jvmArgs ([ - '--enable-preview', - '--add-opens=java.base/java.lang=ALL-UNNAMED', - '--add-opens=java.base/java.io=ALL-UNNAMED', - '--add-opens=java.base/java.nio=ALL-UNNAMED', - '--add-opens=java.base/java.nio.file.spi=ALL-UNNAMED', - '--add-opens=java.base/java.net=ALL-UNNAMED', - '--add-opens=java.base/java.util=ALL-UNNAMED', - '--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED', - '--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED', - '--add-opens=java.base/sun.nio.ch=ALL-UNNAMED', - '--add-opens=java.base/sun.nio.fs=ALL-UNNAMED', - '--add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED', - '--add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED', - '--add-opens=java.base/sun.net.www.protocol.ftp=ALL-UNNAMED', - '--add-opens=java.base/sun.net.www.protocol.file=ALL-UNNAMED', - '--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED', - '--add-opens=java.base/jdk.internal.vm=ALL-UNNAMED', - ]) - } + tasks.withType(Test) { + jvmArgs ([ + '-Dorg.spockframework.mock.ignoreByteBuddy=true', + '--enable-preview', + '--add-opens=java.base/java.lang=ALL-UNNAMED', + '--add-opens=java.base/java.io=ALL-UNNAMED', + '--add-opens=java.base/java.nio=ALL-UNNAMED', + '--add-opens=java.base/java.nio.file.spi=ALL-UNNAMED', + '--add-opens=java.base/java.net=ALL-UNNAMED', + '--add-opens=java.base/java.util=ALL-UNNAMED', + '--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED', + '--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED', + '--add-opens=java.base/sun.nio.ch=ALL-UNNAMED', + '--add-opens=java.base/sun.nio.fs=ALL-UNNAMED', + '--add-opens=java.base/sun.net.www.protocol.http=ALL-UNNAMED', + '--add-opens=java.base/sun.net.www.protocol.https=ALL-UNNAMED', + '--add-opens=java.base/sun.net.www.protocol.ftp=ALL-UNNAMED', + '--add-opens=java.base/sun.net.www.protocol.file=ALL-UNNAMED', + '--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED', + '--add-opens=java.base/jdk.internal.vm=ALL-UNNAMED', + ]) } /** diff --git a/modules/nextflow/build.gradle b/modules/nextflow/build.gradle index 83e24f5fe9..465511ca4d 100644 --- a/modules/nextflow/build.gradle +++ b/modules/nextflow/build.gradle @@ -17,12 +17,12 @@ compileGroovy { dependencies { api(project(':nf-commons')) api(project(':nf-httpfs')) - api "org.apache.groovy:groovy:4.0.20" - api "org.apache.groovy:groovy-nio:4.0.20" - api "org.apache.groovy:groovy-xml:4.0.20" - api "org.apache.groovy:groovy-json:4.0.20" - api "org.apache.groovy:groovy-templates:4.0.20" - api "org.apache.groovy:groovy-yaml:4.0.20" + api "org.apache.groovy:groovy:4.0.21" + api "org.apache.groovy:groovy-nio:4.0.21" + api "org.apache.groovy:groovy-xml:4.0.21" + api "org.apache.groovy:groovy-json:4.0.21" + api "org.apache.groovy:groovy-templates:4.0.21" + api "org.apache.groovy:groovy-yaml:4.0.21" api "org.slf4j:jcl-over-slf4j:2.0.7" api "org.slf4j:jul-to-slf4j:2.0.7" api "org.slf4j:log4j-over-slf4j:2.0.7" @@ -48,7 +48,7 @@ dependencies { testImplementation 'org.subethamail:subethasmtp:3.1.7' // test configuration - testFixturesApi ("org.apache.groovy:groovy-test:4.0.20") { exclude group: 'org.apache.groovy' } + testFixturesApi ("org.apache.groovy:groovy-test:4.0.21") { exclude group: 'org.apache.groovy' } testFixturesApi ("cglib:cglib-nodep:3.3.0") testFixturesApi ("org.objenesis:objenesis:3.2") testFixturesApi ("org.spockframework:spock-core:2.3-groovy-4.0") { exclude group: 'org.apache.groovy'; exclude group: 'net.bytebuddy' } diff --git a/modules/nf-commons/build.gradle b/modules/nf-commons/build.gradle index 89f7d7cf8a..0c3e6a6322 100644 --- a/modules/nf-commons/build.gradle +++ b/modules/nf-commons/build.gradle @@ -26,8 +26,8 @@ sourceSets { dependencies { api "ch.qos.logback:logback-classic:1.4.12" - api "org.apache.groovy:groovy:4.0.20" - api "org.apache.groovy:groovy-nio:4.0.20" + api "org.apache.groovy:groovy:4.0.21" + api "org.apache.groovy:groovy-nio:4.0.21" api "commons-lang:commons-lang:2.6" api 'com.google.guava:guava:33.0.0-jre' api 'org.pf4j:pf4j:3.10.0' diff --git a/modules/nf-httpfs/build.gradle b/modules/nf-httpfs/build.gradle index 134ea40910..4cb1c5d3ec 100644 --- a/modules/nf-httpfs/build.gradle +++ b/modules/nf-httpfs/build.gradle @@ -30,12 +30,12 @@ sourceSets { dependencies { api project(':nf-commons') api "ch.qos.logback:logback-classic:1.4.12" - api "org.apache.groovy:groovy:4.0.20" - api "org.apache.groovy:groovy-nio:4.0.20" + api "org.apache.groovy:groovy:4.0.21" + api "org.apache.groovy:groovy-nio:4.0.21" api("com.esotericsoftware.kryo:kryo:2.24.0") { exclude group: 'com.esotericsoftware.minlog', module: 'minlog' } /* testImplementation inherited from top gradle build file */ - testImplementation "org.apache.groovy:groovy-json:4.0.20" // needed by wiremock + testImplementation "org.apache.groovy:groovy-json:4.0.21" // needed by wiremock testImplementation ('com.github.tomakehurst:wiremock:1.57') { exclude module: 'groovy-all' } testImplementation ('com.github.tomjankes:wiremock-groovy:0.2.0') { exclude module: 'groovy-all' } diff --git a/plugins/nf-amazon/build.gradle b/plugins/nf-amazon/build.gradle index 9fa5b12398..8087e8ee8c 100644 --- a/plugins/nf-amazon/build.gradle +++ b/plugins/nf-amazon/build.gradle @@ -56,6 +56,6 @@ dependencies { testImplementation(testFixtures(project(":nextflow"))) testImplementation project(':nextflow') - testImplementation "org.apache.groovy:groovy:4.0.20" - testImplementation "org.apache.groovy:groovy-nio:4.0.20" + testImplementation "org.apache.groovy:groovy:4.0.21" + testImplementation "org.apache.groovy:groovy-nio:4.0.21" } diff --git a/plugins/nf-azure/build.gradle b/plugins/nf-azure/build.gradle index 0cc71ca0f7..b3c5a33ec4 100644 --- a/plugins/nf-azure/build.gradle +++ b/plugins/nf-azure/build.gradle @@ -52,6 +52,6 @@ dependencies { testImplementation(testFixtures(project(":nextflow"))) testImplementation project(':nextflow') - testImplementation "org.apache.groovy:groovy:4.0.20" - testImplementation "org.apache.groovy:groovy-nio:4.0.20" + testImplementation "org.apache.groovy:groovy:4.0.21" + testImplementation "org.apache.groovy:groovy-nio:4.0.21" } diff --git a/plugins/nf-cloudcache/build.gradle b/plugins/nf-cloudcache/build.gradle index 9f26b6aeaa..7247b47416 100644 --- a/plugins/nf-cloudcache/build.gradle +++ b/plugins/nf-cloudcache/build.gradle @@ -35,7 +35,7 @@ dependencies { compileOnly 'org.pf4j:pf4j:3.10.0' testImplementation(testFixtures(project(":nextflow"))) - testImplementation "org.apache.groovy:groovy:4.0.20" - testImplementation "org.apache.groovy:groovy-nio:4.0.20" + testImplementation "org.apache.groovy:groovy:4.0.21" + testImplementation "org.apache.groovy:groovy-nio:4.0.21" } diff --git a/plugins/nf-codecommit/build.gradle b/plugins/nf-codecommit/build.gradle index 669aeaa58b..6e2ed213bc 100644 --- a/plugins/nf-codecommit/build.gradle +++ b/plugins/nf-codecommit/build.gradle @@ -42,6 +42,6 @@ dependencies { testImplementation(testFixtures(project(":nextflow"))) testImplementation project(':nextflow') - testImplementation "org.apache.groovy:groovy:4.0.20" - testImplementation "org.apache.groovy:groovy-nio:4.0.20" + testImplementation "org.apache.groovy:groovy:4.0.21" + testImplementation "org.apache.groovy:groovy-nio:4.0.21" } diff --git a/plugins/nf-console/build.gradle b/plugins/nf-console/build.gradle index d2afc53073..bb8244d2ee 100644 --- a/plugins/nf-console/build.gradle +++ b/plugins/nf-console/build.gradle @@ -37,13 +37,13 @@ dependencies { compileOnly 'org.slf4j:slf4j-api:2.0.7' compileOnly 'org.pf4j:pf4j:3.10.0' - api("org.apache.groovy:groovy-console:4.0.20") { transitive=false } - api("org.apache.groovy:groovy-swing:4.0.20") { transitive=false } + api("org.apache.groovy:groovy-console:4.0.21") { transitive=false } + api("org.apache.groovy:groovy-swing:4.0.21") { transitive=false } // this is required by 'groovy-console' api("com.github.javaparser:javaparser-core:3.25.8") testImplementation project(':nextflow') - testImplementation "org.apache.groovy:groovy:4.0.20" - testImplementation "org.apache.groovy:groovy-nio:4.0.20" + testImplementation "org.apache.groovy:groovy:4.0.21" + testImplementation "org.apache.groovy:groovy-nio:4.0.21" } diff --git a/plugins/nf-ga4gh/build.gradle b/plugins/nf-ga4gh/build.gradle index 73dc6f79ac..8002485429 100644 --- a/plugins/nf-ga4gh/build.gradle +++ b/plugins/nf-ga4gh/build.gradle @@ -45,6 +45,6 @@ dependencies { api 'joda-time:joda-time:2.9.9' testImplementation(testFixtures(project(":nextflow"))) - testImplementation "org.apache.groovy:groovy:4.0.20" - testImplementation "org.apache.groovy:groovy-nio:4.0.20" + testImplementation "org.apache.groovy:groovy:4.0.21" + testImplementation "org.apache.groovy:groovy-nio:4.0.21" } diff --git a/plugins/nf-google/build.gradle b/plugins/nf-google/build.gradle index 82cc889dd2..47bcc9d5c7 100644 --- a/plugins/nf-google/build.gradle +++ b/plugins/nf-google/build.gradle @@ -46,8 +46,8 @@ dependencies { api 'com.google.code.gson:gson:2.10.1' testImplementation(testFixtures(project(":nextflow"))) - testImplementation "org.apache.groovy:groovy:4.0.20" - testImplementation "org.apache.groovy:groovy-nio:4.0.20" + testImplementation "org.apache.groovy:groovy:4.0.21" + testImplementation "org.apache.groovy:groovy-nio:4.0.21" } test { diff --git a/plugins/nf-tower/build.gradle b/plugins/nf-tower/build.gradle index 9d05bc432f..3e36929b63 100644 --- a/plugins/nf-tower/build.gradle +++ b/plugins/nf-tower/build.gradle @@ -37,6 +37,6 @@ dependencies { api "com.fasterxml.jackson.core:jackson-databind:2.12.7.1" testImplementation(testFixtures(project(":nextflow"))) - testImplementation "org.apache.groovy:groovy:4.0.20" - testImplementation "org.apache.groovy:groovy-nio:4.0.20" + testImplementation "org.apache.groovy:groovy:4.0.21" + testImplementation "org.apache.groovy:groovy-nio:4.0.21" } diff --git a/plugins/nf-wave/build.gradle b/plugins/nf-wave/build.gradle index 54f1c8c263..cdcd02599f 100644 --- a/plugins/nf-wave/build.gradle +++ b/plugins/nf-wave/build.gradle @@ -39,6 +39,6 @@ dependencies { api 'io.seqera:wave-utils:0.8.1' testImplementation(testFixtures(project(":nextflow"))) - testImplementation "org.apache.groovy:groovy:4.0.20" - testImplementation "org.apache.groovy:groovy-nio:4.0.20" + testImplementation "org.apache.groovy:groovy:4.0.21" + testImplementation "org.apache.groovy:groovy-nio:4.0.21" }