Merge branch 'main' into 223-overlay-plugin

quiltdata · Aug 21, 2024 · 0434ece · 0434ece
2 parents ee3e469 + ff8ec9e
commit 0434ece
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,11 @@
 
 - Piggy-back on existing plugins in the absence of Quilt+ URIs
 
-## [0.7.16] 2024-06-178
+## [0.7.17] 2024-08-20
+
+- use prior package, if any, for relative paths
+
+## [0.7.16] 2024-06-17
 
 - use prior package, if any, for relative paths
 

diff --git a/Makefile b/Makefile
@@ -87,9 +87,10 @@ $(PIPELINE): $(NF_BIN) install
 deps:
 	./gradlew -q ${mm}dependencies
 
-#
-# Refresh SNAPSHOTs dependencies
-#
+update:
+	./gradlew useLatestVersions
+	make check
+
 refresh:
 	./gradlew --refresh-dependencies dependencies
 

diff --git a/build.gradle b/build.gradle
@@ -19,6 +19,8 @@ plugins {
     id 'io.codearte.nexus-staging' version '0.30.0'
     id 'java'
     id 'idea'
+    id 'se.patrikerdes.use-latest-versions' version '0.2.18'
+    id 'com.github.ben-manes.versions' version '0.51.0'
 }
 
 // Add ability to test with upcoming versions of Groovy
@@ -98,16 +100,16 @@ allprojects {
         // see https://docs.gradle.org/4.1/userguide/dependency_management.html#sec:module_replacement
         implementation 'com.github.groovy-wslite:groovy-wslite:1.1.3'
         implementation 'org.codehaus.groovy:groovy-all:3.0.21'
-        implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.1'
+        implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2'
         implementation 'com.upplication:s3fs:2.2.2'
 
         modules {
             module('commons-logging:commons-logging') { replacedBy('org.slf4j:jcl-over-slf4j') }
         }
         // Documentation required libraries
         groovyDoc 'org.fusesource.jansi:jansi:2.4.1'
-        groovyDoc 'org.codehaus.groovy:groovy-groovydoc:3.0.21'
-        groovyDoc 'org.codehaus.groovy:groovy-ant:3.0.21'
+        groovyDoc 'org.codehaus.groovy:groovy-groovydoc:3.0.22'
+        groovyDoc 'org.codehaus.groovy:groovy-ant:3.0.22'
     }
 
     test {

diff --git a/plugins/nf-quilt/build.gradle b/plugins/nf-quilt/build.gradle
@@ -18,6 +18,20 @@ plugins {
     // Apply the groovy plugin to add support for Groovy
     id 'groovy'
     id 'idea'
+    id 'se.patrikerdes.use-latest-versions' version '0.2.18'
+    id 'com.github.ben-manes.versions' version '0.51.0'
+}
+
+useLatestVersions {
+   // A blacklist of dependencies to update, in the format of group:name
+   updateBlacklist = [
+        'com.quiltdata:quiltcore',
+        'org.codehaus.groovy:groovy',
+        'org.codehaus.groovy:groovy-nio',
+        'org.codehaus.groovy:groovy-test',
+        'org.spockframework:spock-core',
+        'org.spockframework:spock-junit4',
+    ]
 }
 
 group = 'io.nextflow'
@@ -64,13 +78,13 @@ dependencies {
 
     // This dependency is exported to consumers, that is to say found on their compile classpath.
     compileOnly "io.nextflow:nextflow:$nextflowVersion"
-    compileOnly 'org.slf4j:slf4j-api:2.0.13'
-    compileOnly 'org.pf4j:pf4j:3.11.1'
+    compileOnly 'org.slf4j:slf4j-api:2.1.0-alpha1'
+    compileOnly 'org.pf4j:pf4j:3.12.0'
     // add here plugins depepencies
-    compileOnly 'org.slf4j:slf4j-simple:2.0.13'
+    compileOnly 'org.slf4j:slf4j-simple:2.1.0-alpha1'
     compileOnly 'black.ninia:jep:4.2.0'
     runtime 'black.ninia:jep:4.2.0'
-    runtimeOnly 'org.junit.platform:junit-platform-launcher:1.10.2'
+    runtimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
     implementation 'black.ninia:jep:4.2.0'
     testImplementation 'black.ninia:jep:4.2.0'
     //testImplementation(testFixtures('black.ninia:jep:4.0.3'))