diff --git a/modules/nextflow/build.gradle b/modules/nextflow/build.gradle index 8338f5eab8..dcd9f6acc1 100644 --- a/modules/nextflow/build.gradle +++ b/modules/nextflow/build.gradle @@ -41,7 +41,7 @@ dependencies { api "ch.qos.logback:logback-classic:${logbackVersion}" api "ch.qos.logback:logback-core:${logbackVersion}" api "org.codehaus.gpars:gpars:1.2.1" - api("ch.artecat.grengine:grengine:3.0.2") { exclude group: 'org.codehaus.groovy' } + api "ch.grengine:grengine:3.1.2" api "org.apache.commons:commons-lang3:${commonsLang3Version}" api "commons-codec:commons-codec:1.15" api "commons-io:commons-io:2.15.1" diff --git a/modules/nextflow/src/main/groovy/nextflow/config/parser/v1/ConfigBase.groovy b/modules/nextflow/src/main/groovy/nextflow/config/parser/v1/ConfigBase.groovy index 4f4fab34ae..2c8872b105 100644 --- a/modules/nextflow/src/main/groovy/nextflow/config/parser/v1/ConfigBase.groovy +++ b/modules/nextflow/src/main/groovy/nextflow/config/parser/v1/ConfigBase.groovy @@ -19,7 +19,7 @@ package nextflow.config.parser.v1 import java.nio.file.NoSuchFileException import java.nio.file.Path -import ch.artecat.grengine.Grengine +import ch.grengine.Grengine import groovy.transform.Memoized import nextflow.SysEnv import nextflow.config.StripSecretsXform diff --git a/modules/nextflow/src/main/groovy/nextflow/config/parser/v1/ConfigParserV1.groovy b/modules/nextflow/src/main/groovy/nextflow/config/parser/v1/ConfigParserV1.groovy index 2706885668..646dd4eb60 100644 --- a/modules/nextflow/src/main/groovy/nextflow/config/parser/v1/ConfigParserV1.groovy +++ b/modules/nextflow/src/main/groovy/nextflow/config/parser/v1/ConfigParserV1.groovy @@ -18,7 +18,7 @@ package nextflow.config.parser.v1 import java.nio.file.Path -import ch.artecat.grengine.Grengine +import ch.grengine.Grengine import com.google.common.hash.Hashing import groovy.transform.PackageScope import nextflow.ast.NextflowXform diff --git a/modules/nextflow/src/main/groovy/nextflow/processor/TaskProcessor.groovy b/modules/nextflow/src/main/groovy/nextflow/processor/TaskProcessor.groovy index 306ee83d9e..f6048053d2 100644 --- a/modules/nextflow/src/main/groovy/nextflow/processor/TaskProcessor.groovy +++ b/modules/nextflow/src/main/groovy/nextflow/processor/TaskProcessor.groovy @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicIntegerArray import java.util.concurrent.atomic.LongAdder import java.util.regex.Pattern -import ch.artecat.grengine.Grengine +import ch.grengine.Grengine import com.google.common.hash.HashCode import groovy.transform.CompileStatic import groovy.transform.Memoized diff --git a/modules/nextflow/src/main/groovy/nextflow/processor/TaskTemplateEngine.groovy b/modules/nextflow/src/main/groovy/nextflow/processor/TaskTemplateEngine.groovy index cfcc79e6ac..3c926b7db5 100644 --- a/modules/nextflow/src/main/groovy/nextflow/processor/TaskTemplateEngine.groovy +++ b/modules/nextflow/src/main/groovy/nextflow/processor/TaskTemplateEngine.groovy @@ -20,7 +20,7 @@ package nextflow.processor -import ch.artecat.grengine.Grengine +import ch.grengine.Grengine import groovy.text.Template import groovy.text.TemplateEngine import groovy.transform.CompileStatic diff --git a/modules/nextflow/src/test/groovy/nextflow/processor/TaskDirectiveReadsTest.groovy b/modules/nextflow/src/test/groovy/nextflow/processor/TaskDirectiveReadsTest.groovy index f3118d81ab..fe41ba1bfc 100644 --- a/modules/nextflow/src/test/groovy/nextflow/processor/TaskDirectiveReadsTest.groovy +++ b/modules/nextflow/src/test/groovy/nextflow/processor/TaskDirectiveReadsTest.groovy @@ -18,7 +18,7 @@ package nextflow.processor import java.nio.file.Files -import ch.artecat.grengine.Grengine +import ch.grengine.Grengine import nextflow.Session import nextflow.config.parser.v1.ConfigParserV1 import nextflow.config.parser.v2.ConfigParserV2 diff --git a/modules/nextflow/src/test/groovy/nextflow/processor/TaskRunTest.groovy b/modules/nextflow/src/test/groovy/nextflow/processor/TaskRunTest.groovy index 159d74e04a..e687cd1bbd 100644 --- a/modules/nextflow/src/test/groovy/nextflow/processor/TaskRunTest.groovy +++ b/modules/nextflow/src/test/groovy/nextflow/processor/TaskRunTest.groovy @@ -19,7 +19,7 @@ package nextflow.processor import java.nio.file.Files import java.nio.file.Paths -import ch.artecat.grengine.Grengine +import ch.grengine.Grengine import nextflow.Session import nextflow.ast.TaskCmdXform import nextflow.container.DockerConfig diff --git a/modules/nf-cli-v1/src/main/groovy/nextflow/cli/CmdLog.groovy b/modules/nf-cli-v1/src/main/groovy/nextflow/cli/CmdLog.groovy index d9cbb7eabb..2c25fc49db 100644 --- a/modules/nf-cli-v1/src/main/groovy/nextflow/cli/CmdLog.groovy +++ b/modules/nf-cli-v1/src/main/groovy/nextflow/cli/CmdLog.groovy @@ -17,7 +17,7 @@ package nextflow.cli import java.nio.file.Path -import ch.artecat.grengine.Grengine +import ch.grengine.Grengine import com.beust.jcommander.Parameter import com.beust.jcommander.Parameters import com.google.common.hash.HashCode