Skip to content

Commit e89b6e0

Browse files
committed
Merge branch 'STABLE-25.04.x' into backport-fix-jgit-vuln [e2e prod]
2 parents b10c142 + c4d698e commit e89b6e0

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

plugins/nf-amazon/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ dependencies {
5555
}
5656

5757
// address security vulnerabilities
58-
runtimeOnly 'io.netty:netty-common:4.1.118.Final'
59-
runtimeOnly 'io.netty:netty-handler:4.1.118.Final'
60-
58+
runtimeOnly 'io.netty:netty-common:4.1.124.Final'
59+
runtimeOnly 'io.netty:netty-handler:4.1.124.Final'
60+
runtimeOnly 'io.netty:netty-codec-http2:4.1.124.Final'
61+
6162
testImplementation(testFixtures(project(":nextflow")))
6263
testImplementation project(':nextflow')
6364
testImplementation "org.apache.groovy:groovy:4.0.26"

plugins/nf-azure/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ dependencies {
4848
}
4949

5050
// address security vulnerabilities
51-
runtimeOnly 'io.netty:netty-handler:4.1.118.Final'
51+
runtimeOnly 'io.netty:netty-handler:4.1.124.Final'
52+
runtimeOnly 'io.netty:netty-codec-http2:4.1.124.Final'
5253
runtimeOnly 'net.minidev:json-smart:2.5.2'
5354

5455
testImplementation(testFixtures(project(":nextflow")))

plugins/nf-tower/src/main/io/seqera/tower/plugin/TowerFusionToken.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class TowerFusionToken implements FusionToken {
107107
if( !endpoint )
108108
throw new IllegalArgumentException("Missing Seqera Platform endpoint")
109109
if( !accessToken )
110-
throw new IllegalArgumentException("Missing Seqera Platform access token")
110+
throw new IllegalArgumentException("Seqera Platform access token is required to use Fusion -- see https://docs.seqera.io/fusion/licensing for more information")
111111
}
112112

113113
/**

validation/google.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,4 @@ $NXF_CMD -C ./google.config \
7777
run nextflow-io/hello \
7878
-process.array 10
7979

80-
## Legacy GLS tests
81-
82-
## run test-subdirs inputs/outputs
83-
$NXF_CMD -C ./gls.config -q run ./test-subdirs.nf
84-
85-
## run publishDir overwrite
86-
$NXF_CMD -C ./gls.config run ./test-overwrite.nf
87-
88-
## re-executing should overwrite the published file
89-
[ `$NXF_CMD -C ./gls.config run ./test-overwrite.nf -resume | { grep 'Failed to publish file' -c || true; }` == 0 ] && echo OK || { echo 'Failed to publish file' && false; }
9080

0 commit comments

Comments
 (0)