From cd0e807ef7f4ceaeea534c28f9ff1d152f0534f6 Mon Sep 17 00:00:00 2001 From: Stephan Saalfeld Date: Thu, 27 Jun 2019 16:21:42 -0400 Subject: [PATCH 001/996] add n5 related dependencies --- pom.xml | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/pom.xml b/pom.xml index ef7bb38f..65ab5a29 100644 --- a/pom.xml +++ b/pom.xml @@ -833,6 +833,24 @@ 2.19.0 ${mockito.version} + + 1.11.319 + 1.27.0 + 0.45.0-alpha + v2-rev134-1.23.0 + 1.23.0 + 1.23.0 + 0.8.1 + 2.9.8 + 1.5.0 + 1.8 + 2.1.0 + 3.3.0 + 1.0.3 + 2.1.0 + 2.3.1 + 2.1.0 + 45.1.1 @@ -3185,6 +3203,88 @@ ${mines-jtk.version} + + + com.amazonaws + aws-java-sdk-s3 + ${aws-java-sdk-s3.version} + + + com.google.cloud + google-cloud-storage + ${google-cloud-storage.version} + + + com.google.cloud + google-cloud-resourcemanager + ${google-cloud-resourcemanager.version} + + + com.google.apis + google-api-services-oauth2 + ${google-api-services-oauth2.version} + + + com.google.http-client + google-http-client-jackson2 + ${google-http-client-jackson2.version} + + + com.google.oauth-client + google-oauth-client-jetty + ${google-oauth-client-jetty.version} + + + net.imglib2 + imglib2-label-multisets + ${imglib2-label-multisets.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + + org.lz4 + lz4-java + ${lz4-java.version} + + + org.tukaani + xz + ${xz.version} + + + org.janelia.saalfeldlab + n5 + ${n5.version} + + + org.janelia.saalfeldlab + n5-imglib2 + ${n5-imglib2.version} + + + org.janelia.saalfeldlab + n5-hdf5 + ${n5-hdf5.version} + + + org.janelia.saalfeldlab + n5-aws-s3 + ${n5-aws-s3.version} + + + org.janelia.saalfeldlab + n5-google-cloud + ${n5-google-cloud.version} + + + org.janelia.saalfeldlab + n5-viewer + ${n5-viewer.version} + + org.ojalgo From cdd74b5279b7c3cbecd7c8f3c52ebe5a147b5117 Mon Sep 17 00:00:00 2001 From: Stephan Saalfeld Date: Thu, 27 Jun 2019 19:09:56 -0400 Subject: [PATCH 002/996] bump to n5-hdf-1.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65ab5a29..dd9d7bb1 100644 --- a/pom.xml +++ b/pom.xml @@ -846,7 +846,7 @@ 1.8 2.1.0 3.3.0 - 1.0.3 + 1.0.4 2.1.0 2.3.1 2.1.0 From 6524be67a4ab4264d645e13bb4cd343fba5a27cc Mon Sep 17 00:00:00 2001 From: frauzufall Date: Thu, 8 Aug 2019 14:42:13 +0200 Subject: [PATCH 003/996] Updater V1 changes * imagej-scijava-plugins-uploader-webdav: 0.2.2 -> 0.3.1 * imagej-ui-swing: 0.22.0 -> 0.23.1 * imagej-updater: 0.9.3 -> 0.10.1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2d31dc64..5190f6b1 100644 --- a/pom.xml +++ b/pom.xml @@ -309,7 +309,7 @@ 0.3.2 - 0.2.2 + 0.3.1 0.8.2 @@ -324,10 +324,10 @@ 0.3.1 - 0.22.0 + 0.23.1 - 0.9.3 + 0.10.1 0.4.1 From 07b458c68fdb1d32d69b2e85ed32abf093a65e2a Mon Sep 17 00:00:00 2001 From: karlduderstadt Date: Tue, 27 Aug 2019 15:30:13 +0200 Subject: [PATCH 004/996] update miglayout version update from miglayout version 3.7.4 to version 5.2. Required miglayout-core and miglayout-swing --- pom.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2d31dc64..c50ee8ba 100644 --- a/pom.xml +++ b/pom.xml @@ -825,7 +825,7 @@ 3.0.7 - 3.7.4 + 5.2 20151125 @@ -3174,7 +3174,12 @@ com.miglayout - miglayout + miglayout-core + ${miglayout.version} + + + com.miglayout + miglayout-swing ${miglayout.version} swing From 264647115c599bd1fc07b1929f30a2fefc0070a8 Mon Sep 17 00:00:00 2001 From: Philipp Hanslovsky Date: Sat, 7 Sep 2019 10:35:32 -0400 Subject: [PATCH 005/996] Update picocli version to 4.0.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6adc5678..5e8a1cb9 100644 --- a/pom.xml +++ b/pom.xml @@ -858,7 +858,7 @@ 3.9 - 3.8.1 + 4.0.3 9.1-901-1.jdbc4 From da34504483011b85b159cf5a692469385717f037 Mon Sep 17 00:00:00 2001 From: Philipp Hanslovsky Date: Wed, 11 Sep 2019 15:51:13 -0400 Subject: [PATCH 006/996] Update picocli version to 4.0.4 The latest release is no 4.0.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e8a1cb9..cb601235 100644 --- a/pom.xml +++ b/pom.xml @@ -858,7 +858,7 @@ 3.9 - 4.0.3 + 4.0.4 9.1-901-1.jdbc4 From 7aeac8fd423e7d96f7f4221df80fc465620e59bd Mon Sep 17 00:00:00 2001 From: Stephan Saalfeld Date: Fri, 11 Oct 2019 15:34:20 -0400 Subject: [PATCH 007/996] bump n5 release versions (this PR is getting old) --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index dd9d7bb1..40bf6100 100644 --- a/pom.xml +++ b/pom.xml @@ -840,16 +840,16 @@ v2-rev134-1.23.0 1.23.0 1.23.0 - 0.8.1 + 0.9.0 2.9.8 1.5.0 1.8 - 2.1.0 - 3.3.0 + 2.1.2 + 3.4.1 1.0.4 2.1.0 2.3.1 - 2.1.0 + 2.2.0 45.1.1 From c28f3ac5dea91464e17116768de75e3e3e566af3 Mon Sep 17 00:00:00 2001 From: frauzufall Date: Fri, 6 Dec 2019 13:41:22 +0100 Subject: [PATCH 008/996] Update imagej-updater to 0.10.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5190f6b1..284e6520 100644 --- a/pom.xml +++ b/pom.xml @@ -327,7 +327,7 @@ 0.23.1 - 0.10.1 + 0.10.3 0.4.1 From 97bfe839636ffd75cbbbe71b4392eb5823efffca Mon Sep 17 00:00:00 2001 From: frauzufall Date: Fri, 6 Dec 2019 13:41:57 +0100 Subject: [PATCH 009/996] Add apache-httpclient, apache-httpcore and jackrabbit-webdav to dependency management --- pom.xml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/pom.xml b/pom.xml index 284e6520..2a4e6828 100644 --- a/pom.xml +++ b/pom.xml @@ -637,6 +637,10 @@ 2.3.1 + + 4.5.6 + 4.4.11 + 1.11 ${batik.version} @@ -708,6 +712,9 @@ 5.5.13.1 + + 2.19.3 + 1.1.3 ${jai.version} @@ -2457,6 +2464,23 @@ + + + org.apache.httpcomponents + httpclient + ${apache-httpclient.version} + + + commons-logging + commons-logging + + + + + org.apache.httpcomponents + httpcore + ${apache-httpcore.version} + org.apache.xmlgraphics @@ -2805,6 +2829,13 @@ ${itextpdf.version} + + + org.apache.jackrabbit + jackrabbit-webdav + ${jackrabbit-webdav.version} + + com.sun.media From 83970de457eee94e76a69fa464ae2fcc1a9e755a Mon Sep 17 00:00:00 2001 From: frauzufall Date: Fri, 6 Dec 2019 14:09:30 +0100 Subject: [PATCH 010/996] Adds commons-compress to managed dependencies * imagej-tensorflow is depending on commons-compress --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 2d31dc64..bb2d866d 100644 --- a/pom.xml +++ b/pom.xml @@ -677,6 +677,9 @@ 3.2.2 + + 1.18 + 2.6 @@ -2730,6 +2733,13 @@ ${commons-collections.version} + + + org.apache.commons + commons-compress + ${commons-compress.version} + + commons-io From 1df2ebfc941b278b167ca9441142ba180f30894b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 24 Jan 2020 05:31:35 -0600 Subject: [PATCH 011/996] Manage imagej-opencv --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index fba8b79e..04920b88 100644 --- a/pom.xml +++ b/pom.xml @@ -293,6 +293,9 @@ 0.1.2 + + 0.1.0 + 0.45.0 @@ -1262,6 +1265,13 @@ ${imagej-omero-legacy.version} + + + net.imagej + imagej-opencv + ${imagej-opencv.version} + + net.imagej @@ -3506,6 +3516,7 @@ LATEST LATEST LATEST + LATEST LATEST LATEST LATEST From 4c0aae47afb5b7b502bc6631db485b7e7d4e4aa7 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Wed, 12 Feb 2020 16:00:53 -0500 Subject: [PATCH 012/996] update imglib2-realtransform to version 3.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 04920b88..37f1caa2 100644 --- a/pom.xml +++ b/pom.xml @@ -359,7 +359,7 @@ 2.0.0-beta-44 - 2.2.1 + 3.0.0 0.8.1 From a806c4cb88b16ebdba8e1cde1c2dc04fee841297 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 14 Feb 2020 10:01:06 -0600 Subject: [PATCH 013/996] Update pom-scijava-base parent to 9.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 04920b88..0dc7fbd9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 9.0.0 + 9.1.0 From 16c751acbdfecc197c369888324622ccd17fba7c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 14 Feb 2020 10:01:18 -0600 Subject: [PATCH 014/996] Update ImageJ component versions * batch-processor: 0.3.0 -> 0.4.1 * scijava-common: 2.77.0 -> 2.82.0 * imagej-common: 0.28.2 -> 0.31.0 * imagej-ops: 0.45.0 -> 0.45.2 With this bill of materials, sc.fiji:fiji passes melting pot validation. See also: imagej/imagej-common#90, imagej/imagej-ops#617 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0dc7fbd9..b06245c2 100644 --- a/pom.xml +++ b/pom.xml @@ -141,7 +141,7 @@ - 0.3.0 + 0.4.1 0.7.4-scijava @@ -162,7 +162,7 @@ 0.1.2 - 2.77.0 + 2.82.0 2.0.2 @@ -264,7 +264,7 @@ 1.0.0 - 0.28.2 + 0.31.0 0.1.2 @@ -297,7 +297,7 @@ 0.1.0 - 0.45.0 + 0.45.2 0.1.1 From a4e7cb54073fcfbf72910d900a0745429ee47f25 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 14 Feb 2020 13:34:34 -0600 Subject: [PATCH 015/996] Preemptively bump imagej and fiji versions * imagej: 2.0.0-rc-71 -> 2.0.0-rc-72 * fiji: 2.0.0-pre-10 -> 2.0.0-pre-11 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b06245c2..30fb2749 100644 --- a/pom.xml +++ b/pom.xml @@ -254,7 +254,7 @@ - 2.0.0-rc-71 + 2.0.0-rc-72 1.52r @@ -399,7 +399,7 @@ - 2.0.0-pre-10 + 2.0.0-pre-11 From 3b8d65b6f6c85beabb5f69d17bca256f8a4490e2 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 14 Feb 2020 13:35:35 -0600 Subject: [PATCH 016/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30fb2749..50262a78 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 28.0.0-SNAPSHOT + 28.0.1-SNAPSHOT pom SciJava Parent POM From 4270a3aaaf049462397af74ded334f040ee36b3d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 14 Feb 2020 15:08:11 -0600 Subject: [PATCH 017/996] Tweak N5 comments --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1217ae95..c1858cdb 100644 --- a/pom.xml +++ b/pom.xml @@ -857,7 +857,7 @@ 2.19.0 ${mockito.version} - + 1.11.319 1.27.0 0.45.0-alpha @@ -3206,7 +3206,7 @@ ${mines-jtk.version} - + com.amazonaws aws-java-sdk-s3 From b20f8d33b59ffc2eb48770b06eb3c55a37cb4991 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 14 Feb 2020 15:08:49 -0600 Subject: [PATCH 018/996] Update minor version The N5-related components are newly managed. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1858cdb..390d6b3b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 28.0.1-SNAPSHOT + 28.1.0-SNAPSHOT pom SciJava Parent POM From d2ee14cf2e0ad2b13ba13750b4a395f365e62d06 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 14 Feb 2020 15:12:59 -0600 Subject: [PATCH 019/996] Fix miglayout dependency management Each artifact's version should have a corresponding version property with the same name. And the swing classifier does not exist anymore. --- pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c50ee8ba..ea555f91 100644 --- a/pom.xml +++ b/pom.xml @@ -826,6 +826,8 @@ 5.2 + ${miglayout.version} + ${miglayout.version} 20151125 @@ -3175,13 +3177,12 @@ com.miglayout miglayout-core - ${miglayout.version} + ${miglayout-core.version} com.miglayout miglayout-swing - ${miglayout.version} - swing + ${miglayout-swing.version} From 5a7d0b0bb6a3b6f577ac7da6c8c9f4df940ccb46 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 14 Feb 2020 15:14:50 -0600 Subject: [PATCH 020/996] Bump major version digit The miglayout components updated to a new major version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 60763413..5d3673ca 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 28.1.0-SNAPSHOT + 29.0.0-SNAPSHOT pom SciJava Parent POM From cd0edcbe4dbc5cf90c201526370c3d8fe25eb5d3 Mon Sep 17 00:00:00 2001 From: David Gault Date: Mon, 16 Dec 2019 15:46:10 +0000 Subject: [PATCH 021/996] Bump Bio-Formats version to 6.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e96ee949..1dcfc595 100644 --- a/pom.xml +++ b/pom.xml @@ -590,7 +590,7 @@ 6.0.1 - 6.3.0 + 6.3.1 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From ae1ea5debee4f19c181fb551416c9536152f1de4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 14 Feb 2020 15:55:52 -0600 Subject: [PATCH 022/996] Update imagej-updater to 0.10.4 The 0.10.2 and 0.10.3 releases were incomplete. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 078190f1..35ec35a9 100644 --- a/pom.xml +++ b/pom.xml @@ -330,7 +330,7 @@ 0.23.1 - 0.10.3 + 0.10.4 0.4.1 From 8d3f9dee7e2c29282d9965a9df222c74533639a5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 15 Feb 2020 07:45:09 -0600 Subject: [PATCH 023/996] Fix httpclient and httpcore property names The property names must match the artifact names for downstream tooling (particularly the melting pot) to function optimally well. --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 35ec35a9..94e481d2 100644 --- a/pom.xml +++ b/pom.xml @@ -655,8 +655,8 @@ 2.3.1 - 4.5.6 - 4.4.11 + 4.5.11 + 4.4.13 1.11 @@ -2476,7 +2476,7 @@ org.apache.httpcomponents httpclient - ${apache-httpclient.version} + ${httpclient.version} commons-logging @@ -2487,7 +2487,7 @@ org.apache.httpcomponents httpcore - ${apache-httpcore.version} + ${httpcore.version} From 8844963e8171efb46adcc0197c1c452450c13cf9 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 15 Feb 2020 07:46:04 -0600 Subject: [PATCH 024/996] Update component versions * parsington: 1.0.4 -> 1.0.5 * imagej1: 1.52r -> 1.52t * ij1-patcher: 1.0.0 -> 1.0.1 * cleargl: 2.2.6 -> 2.2.10 * scenery: 0.6.2 -> 0.7.0-beta-7 * batik: 1.11 -> 1.12 * xmlgraphics-commons: 2.3 -> 2.4 * commons-beanutils: 1.9.3 -> 1.9.4 * commons-codec: 1.12 -> 1.14 * commons-compress: 1.18 -> 1.20 * commons-text: 1.6 -> 1.8 * cglib: 3.2.12 -> 3.3.0 * gson: 2.8.5 -> 2.8.6 * jackrabbit-webdav: 2.19.3 -> 2.21.0 * javassist: 3.25.0-GA -> 3.26.0-GA * jetty: 9.4.19.v20190610 -> 9.4.26.v20200117 * jmh: 1.19 -> 1.23 * jmockit: 1.33 -> 1.49 * joda-time: 2.10.2 -> 2.10.5 * joml: 1.9.16 -> 1.9.20 * junit: 4.12 -> 4.13 * mapdb: 3.0.7 -> 3.0.8 * aws-java-sdk-s3: 1.11.319 -> 1.11.723 * google-cloud-storage: 1.27.0 -> 1.103.1 * google-cloud-resourcemanager: 0.45.0-alpha -> 0.117.1-alpha * google-api-services-oauth2: v2-rev134-1.23.0 -> v2-rev20190313-1.30.8 * google-http-client-jackson2: 1.23.0 -> 1.34.2 * google-oauth-client-jetty: 1.23.0 -> 1.30.5 * jackson-databind: 2.9.8 -> 2.10.2 * lz4-java: 1.5.0 -> 1.7.1 * picocli: 4.0.4 -> 4.2.0 * rsyntaxtextarea: 3.0.3 -> 3.0.8 * autocomplete: 3.0.0 -> 3.0.5 * languagesupport: 3.0.0 -> 3.0.2 * slf4j: 1.7.26 -> 1.7.30 * snakeyaml: 1.24 -> 1.25 * snakeyaml-engine: 1.0 -> 2.1 * weka: 3.9.3 -> 3.9.4 --- pom.xml | 76 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index 94e481d2..2d85fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ 2.3.4 - 1.0.4 + 1.0.5 0.1.2 @@ -257,11 +257,11 @@ 2.0.0-rc-72 - 1.52r + 1.52t ${imagej1.version} - 1.0.0 + 1.0.1 0.31.0 @@ -638,10 +638,10 @@ 0.4.7 - 2.2.6 + 2.2.10 - 0.6.2 + 0.7.0-beta-7 0.1.6 @@ -659,7 +659,7 @@ 4.4.13 - 1.11 + 1.12 ${batik.version} ${batik.version} ${batik.version} @@ -687,19 +687,19 @@ ${batik.version} ${batik.version} ${batik.version} - 2.3 + 2.4 - 1.9.3 + 1.9.4 - 1.12 + 1.14 3.2.2 - 1.18 + 1.20 2.6 @@ -715,13 +715,13 @@ 3.6.1 - 1.6 + 1.8 - 3.2.12 + 3.3.0 - 2.8.5 + 2.8.6 21.0 @@ -733,7 +733,7 @@ 5.5.13.1 - 2.19.3 + 2.21.0 1.1.3 @@ -750,13 +750,13 @@ ${java3d.version} - 3.25.0-GA + 3.26.0-GA 2.0.6 - 9.4.19.v20190610 + 9.4.26.v20200117 ${jetty.version} ${jetty.version} ${jetty.version} @@ -805,18 +805,18 @@ 14.12.6 - 1.19 + 1.23 ${jmh.version} ${jmh.version} - 1.33 + 1.49 4.5.2 - 2.10.2 + 2.10.5 2.3.2 @@ -826,7 +826,7 @@ ${jogl.version} - 1.9.16 + 1.9.20 2.80b11 @@ -836,7 +836,7 @@ 0.1.55 - 4.12 + 4.13 1.1.3 @@ -852,7 +852,7 @@ ${logback.version} - 3.0.7 + 3.0.8 5.2 @@ -867,15 +867,15 @@ ${mockito.version} - 1.11.319 - 1.27.0 - 0.45.0-alpha - v2-rev134-1.23.0 - 1.23.0 - 1.23.0 + 1.11.723 + 1.103.1 + 0.117.1-alpha + v2-rev20190313-1.30.8 + 1.34.2 + 1.30.5 0.9.0 - 2.9.8 - 1.5.0 + 2.10.2 + 1.7.1 1.8 2.1.2 3.4.1 @@ -891,18 +891,18 @@ 3.9 - 4.0.4 + 4.2.0 9.1-901-1.jdbc4 - 3.0.3 - 3.0.0 - 3.0.0 + 3.0.8 + 3.0.5 + 3.0.2 - 1.7.26 + 1.7.30 ${slf4j.version} ${slf4j.version} ${slf4j.version} @@ -911,10 +911,10 @@ ${slf4j.version} - 1.24 + 1.25 - 1.0 + 2.1 1.12.0 @@ -927,7 +927,7 @@ 3.0.3 - 3.9.3 + 3.9.4 ${weka.version} From eec5f0d3d8e3136dbe370640eb7ad317e334017f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 15 Feb 2020 08:39:53 -0600 Subject: [PATCH 025/996] Update pom-scijava-base parent to 10.0.0 This removes the nar-maven-plugin configuration, and updates to the latest kotlin and extra-enforcer-rules. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2d85fce6..95ec6821 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 9.1.0 + 10.0.0 From dda54ffc8a0935c9109e732325842f4cc9a6cd3a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 15 Feb 2020 10:05:36 -0600 Subject: [PATCH 026/996] Manage version of miglayout-swt --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 95ec6821..5ab097fb 100644 --- a/pom.xml +++ b/pom.xml @@ -858,6 +858,7 @@ 5.2 ${miglayout.version} ${miglayout.version} + ${miglayout.version} 20151125 @@ -3235,6 +3236,11 @@ miglayout-swing ${miglayout-swing.version} + + com.miglayout + miglayout-swt + ${miglayout-swt.version} + From 8fe55c50cebb6a5471b5b3cd7852a50ff51b120a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 15 Feb 2020 18:18:52 -0600 Subject: [PATCH 027/996] Tweak Jackrabbit description comments --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5ab097fb..0f06085d 100644 --- a/pom.xml +++ b/pom.xml @@ -732,7 +732,7 @@ 5.5.13.1 - + 2.21.0 @@ -2845,7 +2845,7 @@ ${itextpdf.version} - + org.apache.jackrabbit jackrabbit-webdav From b3424c108c643155b2b06f3d2003ecfa1e7abb98 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 15 Feb 2020 18:19:45 -0600 Subject: [PATCH 028/996] Move N5 into the SciJava component collection The N5 project is now part of the SciJava component collection, meaning it will be tested in the melting pot to help validate that the SciJava Bill of Materials works with N5 as intended. N5's dependencies remain in the third party components section, and are now sorted into the list by project name. --- pom.xml | 222 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 122 insertions(+), 100 deletions(-) diff --git a/pom.xml b/pom.xml index 0f06085d..c3949c81 100644 --- a/pom.xml +++ b/pom.xml @@ -567,6 +567,16 @@ 2.0.2 1.0.1 + + + 0.9.0 + 2.1.2 + 3.4.1 + 1.0.4 + 2.1.0 + 2.3.1 + 2.2.0 + + + 1.11.723 + 3.17 @@ -720,6 +733,13 @@ 3.3.0 + + v2-rev20190313-1.30.8 + 0.117.1-alpha + 1.103.1 + 1.34.2 + 1.30.5 + 2.8.6 @@ -735,6 +755,9 @@ 2.21.0 + + 2.10.2 + 1.1.3 ${jai.version} @@ -851,6 +874,9 @@ ${logback.version} ${logback.version} + + 1.7.1 + 3.0.8 @@ -867,24 +893,6 @@ 2.19.0 ${mockito.version} - - 1.11.723 - 1.103.1 - 0.117.1-alpha - v2-rev20190313-1.30.8 - 1.34.2 - 1.30.5 - 0.9.0 - 2.10.2 - 1.7.1 - 1.8 - 2.1.2 - 3.4.1 - 1.0.4 - 2.1.0 - 2.3.1 - 2.2.0 - 45.1.1 @@ -930,6 +938,9 @@ 3.9.4 ${weka.version} + + + 1.8 @@ -2138,6 +2149,44 @@ ${trakem2-transform.version} + + + + net.imglib2 + imglib2-label-multisets + ${imglib2-label-multisets.version} + + + org.janelia.saalfeldlab + n5 + ${n5.version} + + + org.janelia.saalfeldlab + n5-imglib2 + ${n5-imglib2.version} + + + org.janelia.saalfeldlab + n5-hdf5 + ${n5-hdf5.version} + + + org.janelia.saalfeldlab + n5-aws-s3 + ${n5-aws-s3.version} + + + org.janelia.saalfeldlab + n5-google-cloud + ${n5-google-cloud.version} + + + org.janelia.saalfeldlab + n5-viewer + ${n5-viewer.version} + + @@ -2437,6 +2486,13 @@ + + + com.amazonaws + aws-java-sdk-s3 + ${aws-java-sdk-s3.version} + + org.apache.poi @@ -2817,6 +2873,33 @@ ${cglib.version} + + + com.google.apis + google-api-services-oauth2 + ${google-api-services-oauth2.version} + + + com.google.cloud + google-cloud-resourcemanager + ${google-cloud-resourcemanager.version} + + + com.google.cloud + google-cloud-storage + ${google-cloud-storage.version} + + + com.google.http-client + google-http-client-jackson2 + ${google-http-client-jackson2.version} + + + com.google.oauth-client + google-oauth-client-jetty + ${google-oauth-client-jetty.version} + + com.google.code.gson @@ -2852,6 +2935,13 @@ ${jackrabbit-webdav.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind.version} + + com.sun.media @@ -3218,6 +3308,13 @@ ${logback-core.version} + + + org.lz4 + lz4-java + ${lz4-java.version} + + org.mapdb @@ -3249,88 +3346,6 @@ ${mines-jtk.version} - - - com.amazonaws - aws-java-sdk-s3 - ${aws-java-sdk-s3.version} - - - com.google.cloud - google-cloud-storage - ${google-cloud-storage.version} - - - com.google.cloud - google-cloud-resourcemanager - ${google-cloud-resourcemanager.version} - - - com.google.apis - google-api-services-oauth2 - ${google-api-services-oauth2.version} - - - com.google.http-client - google-http-client-jackson2 - ${google-http-client-jackson2.version} - - - com.google.oauth-client - google-oauth-client-jetty - ${google-oauth-client-jetty.version} - - - net.imglib2 - imglib2-label-multisets - ${imglib2-label-multisets.version} - - - com.fasterxml.jackson.core - jackson-databind - ${jackson-databind.version} - - - org.lz4 - lz4-java - ${lz4-java.version} - - - org.tukaani - xz - ${xz.version} - - - org.janelia.saalfeldlab - n5 - ${n5.version} - - - org.janelia.saalfeldlab - n5-imglib2 - ${n5-imglib2.version} - - - org.janelia.saalfeldlab - n5-hdf5 - ${n5-hdf5.version} - - - org.janelia.saalfeldlab - n5-aws-s3 - ${n5-aws-s3.version} - - - org.janelia.saalfeldlab - n5-google-cloud - ${n5-google-cloud.version} - - - org.janelia.saalfeldlab - n5-viewer - ${n5-viewer.version} - - org.ojalgo @@ -3485,6 +3500,13 @@ + + + org.tukaani + xz + ${xz.version} + + From ba2491927020608580d7639f599f46bb02b1b2d2 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 15 Feb 2020 18:54:42 -0600 Subject: [PATCH 029/996] Update contributors list --- .mailmap | 6 ++++ pom.xml | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 103 insertions(+), 6 deletions(-) diff --git a/.mailmap b/.mailmap index 06674113..4b1c4c17 100644 --- a/.mailmap +++ b/.mailmap @@ -1,5 +1,11 @@ +Deborah Schmidt ImageJ Jenkins Jan Eglinger Johannes Schindelin +Karl Duderstadt +Lorenzo Scianatico Mark Hiner +Nicolas Chiaruttini Philipp Hanslovsky +Stefan Helfrich +Tiago Ferreira diff --git a/pom.xml b/pom.xml index c3949c81..4c104596 100644 --- a/pom.xml +++ b/pom.xml @@ -56,26 +56,117 @@ https://imagej.net/User:Schindelin dscho + + Sébastien Besson + https://imagej.net/User:Sbesson + sbesson + + + John Bogovic + https://imagej.net/User:Bogovic + bogovicj + + + Nicolas Chiaruttini + https://imagej.net/User:NicoKiaru + NicoKiaru + Barry DeZonia https://imagej.net/User:Bdezonia bdezonia - Jean-Yves Tinevez - https://imagej.net/User:JeanYvesTinevez - tinevez + Richard Domander + https://imagej.net/User:Rdom + rimadoma - Lorenzo Scianatico - https://imagej.net/User:LoreScianatico - LoreScianatico + Karl Duderstadt + karlduderstadt Jan Eglinger https://imagej.net/User:Eglinger imagejan + + Gabriel Einsdorf + https://imagej.net/User:Gab1one + gab1one + + + Tiago Ferreira + https://imagej.net/User:Tiago + tferr + + + David Gault + dgault + + + Ulrik Günther + https://imagej.net/User:Skalarproduktraum + skalarproduktraum + + + Philipp Hanslovsky + https://imagej.net/User:Hanslovsky + hanslovsky + + + Stefan Helfrich + https://imagej.net/User:stelfrich + stelfrich + + + Cameron Lloyd + camlloyd + + + Hadrien Mary + https://imagej.net/User:Hadim + hadim + + + Tobias Pietzsch + https://imagej.net/User:Pietzsch + tpietzsch + + + Stephan Preibisch + https://imagej.net/User:StephanP + StephanPreibisch + + + Stephan Saalfeld + https://imagej.net/User:Saalfeld + axtimwalde + + + Deborah Schmidt + https://imagej.net/User:Frauzufall + frauzufall + + + Lorenzo Scianatico + https://imagej.net/User:LoreScianatico + LoreScianatico + + + Jean-Yves Tinevez + https://imagej.net/User:JeanYvesTinevez + tinevez + + + Christian Tischer + tischi + + + Gabriella Turek + https://imagej.net/User:Turek + turekg + From 22bb44ca55a5d1751b7e1fbb9a797bf5dc82d469 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 16 Feb 2020 13:23:46 -0600 Subject: [PATCH 030/996] Update component versions * scijava-search: 0.6.0 -> 0.7.0 * scijava-ui-awt: 0.1.6 -> 0.1.7 * scijava-ui-swing: 0.13.0 -> 0.13.1 * scripting-beanshell: 0.3.3 -> 0.3.4 * scripting-groovy: 0.2.7 -> 0.3.0 * scripting-javascript: 0.4.4 -> 0.5.0 * scripting-jruby: 0.3.0 -> 0.3.1 * scripting-jython: 0.4.2 -> 0.5.0 * scripting-renjin: 0.2.2 -> 0.2.3 * scripting-scala: 0.2.1 -> 0.2.2 * imagej-deprecated: 0.1.2 -> 0.1.4 * imagej-matlab: 0.7.2 -> 0.7.4 * imagej-mesh: 0.7.1 -> 0.8.0 * imagej-plugins-uploader-webdav: 0.3.1 -> 0.3.2 * imglib2-algorithm: 0.11.1 -> 0.11.2 * imglib2-algorithm-gpl: 0.2.3 -> 0.2.4 * imglib2-cache: 1.0.0-beta-11 -> 1.0.0-beta-13 * imglib2-ij: 2.0.0-beta-44 -> 2.0.0-beta-45 * imglib2-ui: 2.0.0 -> 2.0.1 * imglib2-unsafe: 0.2.0 -> 0.3.1 * Auto_Local_Threshold: 1.10.0 -> 1.10.1 * Auto_Threshold: 1.17.1 -> 1.17.2 * Cell_Counter: 2.2.2 -> 3.0.0 * Color_Inspector_3D: 2.3.2 -> 2.5.0 * Colour_Deconvolution: 3.0.2 -> 3.0.3 * CorrectBleach: 2.0.2 -> 2.0.3 * Dichromacy: 2.1.1 -> 2.1.2 * HDF5_Vibez: 1.0.2 -> 1.1.0 * IO: 3.0.4 -> 4.1.0 * ImageJ_3D_Viewer: 4.0.2 -> 4.0.3 * Stack_Manipulation: 2.1.1 -> 2.1.2 * Time_Lapse: 2.1.0 -> 2.1.1 * VIB: 3.0.2 -> 3.0.3 * Vaa3d_Reader: 2.0.2 -> 2.0.3 * mpicbg: 1.2.0 -> 1.3.0 * bigdataviewer_fiji: 6.0.0 -> 6.1.0 * spim_data: 2.2.2 -> 2.2.3 * n5: 2.1.2 -> 2.1.4 * n5-aws-s3: 2.1.0 -> 3.0.0 * omero-blitz: 5.5.3 -> 5.5.5 * omero-common: 5.5.2 -> 5.5.3 * omero-gateway: 5.5.3 -> 5.6.2 * omero-model: 5.5.2 -> 5.5.3 * omero-renderer: 5.5.2 -> 5.5.3 * omero-romio: 5.5.2 -> 5.5.3 * omero-server: 5.5.4 -> 5.5.5 * MorphoLibJ: 1.4.0 -> 1.4.1 * BigStitcher: 0.3.4 -> 0.3.6 * multiview-reconstruction: 0.3.5 -> 0.4.1 * coremem: 0.4.7 -> 0.4.8 * sciview: 0.1.6 -> 0.2.0-beta-4 * ojalgo: 45.1.1 -> 48.1.0 --- pom.xml | 104 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/pom.xml b/pom.xml index 4c104596..0d1ed8ba 100644 --- a/pom.xml +++ b/pom.xml @@ -289,40 +289,40 @@ 0.1.3 - 0.6.0 + 0.7.0 0.4.0 - 0.1.6 + 0.1.7 - 0.13.0 + 0.13.1 0.5.0 - 0.3.3 + 0.3.4 0.1.6 - 0.2.7 + 0.3.0 0.4.1 - 0.4.4 + 0.5.0 - 0.3.0 + 0.3.1 - 0.4.2 + 0.5.0 0.1.0 @@ -331,10 +331,10 @@ 0.5.2 - 0.2.2 + 0.2.3 - 0.2.1 + 0.2.2 1.0.2 @@ -358,7 +358,7 @@ 0.31.0 - 0.1.2 + 0.1.4 5.0.3 @@ -367,10 +367,10 @@ 0.35.0 - 0.7.2 + 0.7.4 - 0.7.1 + 0.8.0 0.1.2 @@ -403,7 +403,7 @@ 0.3.2 - 0.3.1 + 0.3.2 0.8.2 @@ -435,19 +435,19 @@ 5.8.0 - 0.11.1 + 0.11.2 0.2.0 - 0.2.3 + 0.2.4 - 1.0.0-beta-11 + 1.0.0-beta-13 - 2.0.0-beta-44 + 2.0.0-beta-45 3.0.0 @@ -459,10 +459,10 @@ 0.2.4 - 2.0.0 + 2.0.1 - 0.2.0 + 0.3.1 @@ -500,23 +500,23 @@ 0.5.4 2.0.2 ${Arrow.version} - 1.10.0 - 1.17.1 + 1.10.1 + 1.17.2 3.0.1 ${BalloonSegmentation.version} 2.1.1 2.0.1 2.0.1 - 2.2.2 + 3.0.0 3.0.5 2.0.7 - 2.3.2 - 3.0.2 - 2.0.2 + 2.5.0 + 3.0.3 + 2.0.3 ${CorrectBleach.version} 1.0.3 2.1.4 - 2.1.1 + 2.1.2 ${Dichromacy.version} 2.3.0 ${Directionality.version} @@ -532,13 +532,13 @@ 1.0.2 2.3.4 1.1.0 - 1.0.2 + 1.1.0 2.0.2 2.0.1 - 3.0.4 + 4.1.0 ${IO.version} 2.0.1 - 4.0.2 + 4.0.3 2.0.2 3.0.1 3.0.0 @@ -574,13 +574,13 @@ ${Skeletonize3D.version} 2.0.2 ${SplineDeformationGenerator.version} - 2.1.1 + 2.1.2 2.0.1 3.1.6 ${Stitching.version} 1.7-fiji4 2.0.1 - 2.1.0 + 2.1.1 2.1.0 25.0.2 ${ToAST.version} @@ -591,9 +591,9 @@ 3.2.29 2.0.3 2.2.0 - 3.0.2 + 3.0.3 ${VIB.version} - 2.0.2 + 2.0.3 1.0.3 2.0.1 1.3.2 @@ -632,7 +632,7 @@ ${bigwarp.version} - 1.2.0 + 1.3.0 ${mpicbg.version} @@ -646,8 +646,8 @@ 7.0.0 2.1.0 1.0.0-beta-15 - 6.0.0 - 2.2.2 + 6.1.0 + 2.2.3 @@ -661,10 +661,10 @@ 0.9.0 - 2.1.2 + 2.1.4 3.4.1 1.0.4 - 2.1.0 + 3.0.0 2.3.1 2.2.0 @@ -698,45 +698,45 @@ ${bio-formats.version} - 5.5.3 + 5.5.5 - 5.5.2 + 5.5.3 5.5.0 - 5.5.3 + 5.6.2 - 5.5.2 + 5.5.3 - 5.5.2 + 5.5.3 - 5.5.2 + 5.5.3 - 5.5.4 + 5.5.5 - 1.4.0 + 1.4.1 - 0.3.4 + 0.3.6 - 0.3.5 + 0.4.1 0.2.0 - 0.4.7 + 0.4.8 2.2.10 @@ -745,7 +745,7 @@ 0.7.0-beta-7 - 0.1.6 + 0.2.0-beta-4 @@ -985,7 +985,7 @@ ${mockito.version} - 45.1.1 + 48.1.0 3.9 From 432902adf5675613caed383da5e5e16b01a3fc86 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 16 Feb 2020 14:20:43 -0600 Subject: [PATCH 031/996] Update component versions * script-editor: 0.5.0 -> 0.5.3 * scripting-kotlin: 0.1.0 -> 0.1.1 * ui-behaviour: 1.7.4 -> 2.0.1 * imagej-legacy: 0.35.0 -> 0.37.1 * imagej-omero: 0.8.0 -> 0.8.1 * imagej-server: 0.1.1 -> 0.1.2 * imglib2-roi: 0.8.1 -> 0.9.0 * scifio: 0.37.3 -> 0.38.2 * scifio-bf-compat: 3.0.0 -> 4.0.0 * scifio-cli: 0.5.0 -> 0.6.0 * scifio-hdf5: 0.1.3 -> 0.2.0 * scifio-lifesci: 0.8.0 -> 0.9.0 * scifio-ome-xml: 0.15.0 -> 0.16.0 * TrackMate: 4.0.0 -> 5.2.0 * bUnwarpJ: 2.6.11 -> 2.6.12 * bigwarp: 5.0.0 -> 5.1.0 * bigdataviewer-core: 7.0.0 -> 8.0.0 * bigdataviewer-vistools: 1.0.0-beta-15 -> 1.0.0-beta-18 --- pom.xml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 0d1ed8ba..27546139 100644 --- a/pom.xml +++ b/pom.xml @@ -301,7 +301,7 @@ 0.13.1 - 0.5.0 + 0.5.3 0.3.4 @@ -325,7 +325,7 @@ 0.5.0 - 0.1.0 + 0.1.1 0.5.2 @@ -340,7 +340,7 @@ 1.0.2 - 1.7.4 + 2.0.1 @@ -364,7 +364,7 @@ 5.0.3 - 0.35.0 + 0.37.1 0.7.4 @@ -379,7 +379,7 @@ 0.7.1 - 0.8.0 + 0.8.1 0.1.2 @@ -409,7 +409,7 @@ 0.8.2 - 0.1.1 + 0.1.2 1.0.4 @@ -453,7 +453,7 @@ 3.0.0 - 0.8.1 + 0.9.0 0.2.4 @@ -467,25 +467,25 @@ - 0.37.3 + 0.38.2 - 3.0.0 + 4.0.0 - 0.5.0 + 0.6.0 - 0.1.3 + 0.2.0 1.1.1 - 0.8.0 + 0.9.0 - 0.15.0 + 0.16.0 @@ -586,7 +586,7 @@ ${ToAST.version} 2.0.1 ${TopoJ.version} - 4.0.0 + 5.2.0 ${TrackMate.version} 3.2.29 2.0.3 @@ -600,7 +600,7 @@ ${View5D.version} 2.0.2 2.01.2 - 2.6.11 + 2.6.12 ${bUnwarpJ.version} 0.1.1 2.1.3 @@ -628,7 +628,7 @@ 3.0.1 - 5.0.0 + 5.1.0 ${bigwarp.version} @@ -643,9 +643,9 @@ - 7.0.0 + 8.0.0 2.1.0 - 1.0.0-beta-15 + 1.0.0-beta-18 6.1.0 2.2.3 From 15ebd23e3f15e7f1851772cd694da490e3e5b160 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 16 Feb 2020 14:55:48 -0600 Subject: [PATCH 032/996] Fix libtensorflow_jni_gpu artifact ID Not sure where tensorflow_jni_gpu came from... but it doesn't exist. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 27546139..c2e08ad0 100644 --- a/pom.xml +++ b/pom.xml @@ -1020,7 +1020,7 @@ 1.12.0 ${tensorflow.version} ${tensorflow.version} - ${tensorflow.version} + ${tensorflow.version} ${tensorflow.version} @@ -3546,8 +3546,8 @@ org.tensorflow - tensorflow_jni_gpu - ${tensorflow_jni_gpu.version} + libtensorflow_jni_gpu + ${libtensorflow_jni_gpu.version} org.tensorflow From 5b9ef3bb6c84a4998e78f5550581c2ef4f6a8688 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 16 Feb 2020 15:01:53 -0600 Subject: [PATCH 033/996] Update component versions * script-editor: 0.5.3 -> 0.5.4 * imagej-ui-swing: 0.23.1 -> 0.23.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c2e08ad0..7fea7361 100644 --- a/pom.xml +++ b/pom.xml @@ -301,7 +301,7 @@ 0.13.1 - 0.5.3 + 0.5.4 0.3.4 @@ -418,7 +418,7 @@ 0.3.1 - 0.23.1 + 0.23.2 0.10.4 From 0366c91b0e61b06d3e36846b2f7a0791a0924779 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 16 Feb 2020 16:57:37 -0600 Subject: [PATCH 034/996] Update component versions * op-finder: 0.1.3 -> 0.1.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7fea7361..17ccd5d7 100644 --- a/pom.xml +++ b/pom.xml @@ -427,7 +427,7 @@ 0.4.1 - 0.1.3 + 0.1.4 From 9fcde97fac4fdd998b44ed2f95c289bfa23b8d17 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 16 Feb 2020 17:39:07 -0600 Subject: [PATCH 035/996] Fix n5-viewer_fiji artifact ID --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 17ccd5d7..1054a170 100644 --- a/pom.xml +++ b/pom.xml @@ -666,7 +666,7 @@ 1.0.4 3.0.0 2.3.1 - 2.2.0 + 2.2.0 From 0c61b425397de58c55d6adcb4c150d1556fc1854 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 16 Feb 2020 17:39:22 -0600 Subject: [PATCH 036/996] Remove obsolete jetty artifacts At least, I assume they are obsolete, since they haven't been monoversioned in step with the rest of jetty lately. --- pom.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pom.xml b/pom.xml index 1054a170..9d816356 100644 --- a/pom.xml +++ b/pom.xml @@ -883,10 +883,8 @@ ${jetty.version} ${jetty.version} ${jetty.version} - ${jetty.version} ${jetty.version} ${jetty.version} - ${jetty.version} ${jetty.version} ${jetty.version} ${jetty.version} @@ -3144,11 +3142,6 @@ jetty-jndi ${jetty-jndi.version} - - org.eclipse.jetty - jetty-jsp - ${jetty-jsp.version} - org.eclipse.jetty jetty-jspc-maven-plugin @@ -3159,11 +3152,6 @@ jetty-maven-plugin ${jetty-maven-plugin.version} - - org.eclipse.jetty - jetty-monitor - ${jetty-monitor.version} - org.eclipse.jetty jetty-nosql From 4300a2978b9265cc8412a95c9338e0052d5dca4c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 16 Feb 2020 17:43:52 -0600 Subject: [PATCH 037/996] Fix jgrapht component version properties The org.jgrapht:jgrapht dependency is pom only. The others need properties matching the artifactIds. --- pom.xml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 9d816356..e7863cc1 100644 --- a/pom.xml +++ b/pom.xml @@ -909,6 +909,12 @@ 1.3.1 + ${jgrapht.version} + ${jgrapht.version} + ${jgrapht.version} + ${jgrapht.version} + ${jgrapht.version} + ${jgrapht.version} 3.4.1.3 @@ -3249,40 +3255,35 @@ - - org.jgrapht - jgrapht - ${jgrapht.version} - org.jgrapht jgrapht-core - ${jgrapht.version} + ${jgrapht-core.version} org.jgrapht jgrapht-demo - ${jgrapht.version} + ${jgrapht-demo.version} org.jgrapht jgrapht-ext - ${jgrapht.version} + ${jgrapht-ext.version} org.jgrapht jgrapht-guava - ${jgrapht.version} + ${jgrapht-guava.version} org.jgrapht jgrapht-io - ${jgrapht.version} + ${jgrapht-io.version} org.jgrapht jgrapht-opt - ${jgrapht.version} + ${jgrapht-opt.version} From 4d0c352ffd8207af8eaf403d5b8b50a5eca862a2 Mon Sep 17 00:00:00 2001 From: Jan Eglinger Date: Mon, 24 Feb 2020 13:07:42 +0100 Subject: [PATCH 038/996] Update scijava-table to 0.5.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e7863cc1..c59e4696 100644 --- a/pom.xml +++ b/pom.xml @@ -292,7 +292,7 @@ 0.7.0 - 0.4.0 + 0.5.0 0.1.7 From 0d9c330d155f91079f0fe8616d62584c82a544ca Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 19 Feb 2020 13:37:49 -0600 Subject: [PATCH 039/996] Update component versions * imagej-legacy: 0.37.1 -> 0.37.2 * imglib2-roi: 0.9.0 -> 0.10.0 * omero-common: 5.5.3 -> 5.5.4 * omero-model: 5.5.3 -> 5.5.4 * omero-renderer: 5.5.3 -> 5.5.4 * omero-romio: 5.5.3 -> 5.5.4 * aws-java-sdk-s3: 1.11.723 -> 1.11.729 * google-cloud-storage: 1.103.1 -> 1.104.0 * jgrapht: 1.3.1 -> 1.4.0 * joml: 1.9.20 -> 1.9.22 --- pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index c59e4696..506f8bf2 100644 --- a/pom.xml +++ b/pom.xml @@ -364,7 +364,7 @@ 5.0.3 - 0.37.1 + 0.37.2 0.7.4 @@ -453,7 +453,7 @@ 3.0.0 - 0.9.0 + 0.10.0 0.2.4 @@ -701,7 +701,7 @@ 5.5.5 - 5.5.3 + 5.5.4 5.5.0 @@ -710,13 +710,13 @@ 5.6.2 - 5.5.3 + 5.5.4 - 5.5.3 + 5.5.4 - 5.5.3 + 5.5.4 5.5.5 @@ -750,7 +750,7 @@ - 1.11.723 + 1.11.729 3.17 @@ -827,7 +827,7 @@ v2-rev20190313-1.30.8 0.117.1-alpha - 1.103.1 + 1.104.0 1.34.2 1.30.5 @@ -908,7 +908,7 @@ 3.4 - 1.3.1 + 1.4.0 ${jgrapht.version} ${jgrapht.version} ${jgrapht.version} @@ -944,7 +944,7 @@ ${jogl.version} - 1.9.20 + 1.9.22 2.80b11 From 0a668bbb5431600f4798f910245389c108486c90 Mon Sep 17 00:00:00 2001 From: David Gault Date: Thu, 12 Mar 2020 16:53:10 +0000 Subject: [PATCH 040/996] Bump Bio-Formats version to 6.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 506f8bf2..f820423d 100644 --- a/pom.xml +++ b/pom.xml @@ -691,7 +691,7 @@ 6.0.1 - 6.3.1 + 6.4.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From ad75dc94631ee6edfc6c8dcb31218747989d83fc Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Thu, 26 Mar 2020 14:33:49 +0100 Subject: [PATCH 041/996] Update imglib2 to 5.9.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f820423d..d2d9ab0e 100644 --- a/pom.xml +++ b/pom.xml @@ -432,7 +432,7 @@ - 5.8.0 + 5.9.0 0.11.2 From 3b4369c187ea7fef9bb53ad65386487547f40cb5 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Thu, 26 Mar 2020 14:39:20 +0100 Subject: [PATCH 042/996] Update imglib2-ij to 2.0.0-beta-46 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f820423d..afd8a75e 100644 --- a/pom.xml +++ b/pom.xml @@ -447,7 +447,7 @@ 1.0.0-beta-13 - 2.0.0-beta-45 + 2.0.0-beta-46 3.0.0 From 3098cdaa53f0583c22568f08ef2d0f8a829e4bec Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Thu, 26 Mar 2020 15:42:32 +0100 Subject: [PATCH 043/996] Update bigdataviewer-core to 9.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f820423d..3db4bf82 100644 --- a/pom.xml +++ b/pom.xml @@ -643,7 +643,7 @@ - 8.0.0 + 9.0.0 2.1.0 1.0.0-beta-18 6.1.0 From 2c4d659f7c6b84a0a103d5605afc33561378a681 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Thu, 26 Mar 2020 20:55:11 +0100 Subject: [PATCH 044/996] Update bigdataviewer-vistools to 1.0.0-beta-19 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f820423d..f1152793 100644 --- a/pom.xml +++ b/pom.xml @@ -645,7 +645,7 @@ 8.0.0 2.1.0 - 1.0.0-beta-18 + 1.0.0-beta-19 6.1.0 2.2.3 From 9181ee3fee07b056d74a41039656f17afdebf0db Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 5 Mar 2020 14:49:36 -0600 Subject: [PATCH 045/996] Update component versions * LocalThickness: 4.0.2 -> 4.0.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4feca6b7..ab5ffebe 100644 --- a/pom.xml +++ b/pom.xml @@ -549,7 +549,7 @@ 4.1.2 2.0.2 2.0.1 - 4.0.2 + 4.0.3 ${LocalThickness.version} 2.0.1 ${MTrack2.version} From 793e474d5623ad40465cead803aeeb6de99d728d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 13 Apr 2020 21:16:58 -0500 Subject: [PATCH 046/996] Update Groovy to 3.0.3 And manage all Groovy components. See also scijava/scripting-groovy#5. --- pom.xml | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/pom.xml b/pom.xml index ab5ffebe..7e8bf5c7 100644 --- a/pom.xml +++ b/pom.xml @@ -752,6 +752,34 @@ 1.11.729 + + 3.0.3 + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + ${groovy.version} + 3.17 @@ -2588,6 +2616,138 @@ ${aws-java-sdk-s3.version} + + + org.codehaus.groovy + groovy + ${groovy.version} + + + org.codehaus.groovy + groovy-ant + ${groovy-ant.version} + + + org.codehaus.groovy + groovy-astbuilder + ${groovy-astbuilder.version} + + + org.codehaus.groovy + groovy-bsf + ${groovy-bsf.version} + + + org.codehaus.groovy + groovy-cli-commons + ${groovy-cli-commons.version} + + + org.codehaus.groovy + groovy-cli-picocli + ${groovy-cli-picocli.version} + + + org.codehaus.groovy + groovy-console + ${groovy-console.version} + + + org.codehaus.groovy + groovy-datetime + ${groovy-datetime.version} + + + org.codehaus.groovy + groovy-dateutil + ${groovy-dateutil.version} + + + org.codehaus.groovy + groovy-docgenerator + ${groovy-docgenerator.version} + + + org.codehaus.groovy + groovy-groovydoc + ${groovy-groovydoc.version} + + + org.codehaus.groovy + groovy-groovysh + ${groovy-groovysh.version} + + + org.codehaus.groovy + groovy-jaxb + ${groovy-jaxb.version} + + + org.codehaus.groovy + groovy-jmx + ${groovy-jmx.version} + + + org.codehaus.groovy + groovy-json + ${groovy-json.version} + + + org.codehaus.groovy + groovy-macro + ${groovy-macro.version} + + + org.codehaus.groovy + groovy-nio + ${groovy-nio.version} + + + org.codehaus.groovy + groovy-servlet + ${groovy-servlet.version} + + + org.codehaus.groovy + groovy-sql + ${groovy-sql.version} + + + org.codehaus.groovy + groovy-swing + ${groovy-swing.version} + + + org.codehaus.groovy + groovy-templates + ${groovy-templates.version} + + + org.codehaus.groovy + groovy-test + ${groovy-test.version} + + + org.codehaus.groovy + groovy-test-junit5 + ${groovy-test-junit5.version} + + + org.codehaus.groovy + groovy-testng + ${groovy-testng.version} + + + org.codehaus.groovy + groovy-xml + ${groovy-xml.version} + + + org.codehaus.groovy + groovy-yaml + ${groovy-yaml.version} + + org.apache.poi From 91b83b6c1a24cbedfef847d87d6eb85ce2387d1b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 19 Apr 2020 09:38:47 -0500 Subject: [PATCH 047/996] Update script-editor: 0.5.4 -> 0.5.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e8bf5c7..a9b9128c 100644 --- a/pom.xml +++ b/pom.xml @@ -301,7 +301,7 @@ 0.13.1 - 0.5.4 + 0.5.5 0.3.4 From b791b4380b772b14f5749b9bc77f1ea8e6227d34 Mon Sep 17 00:00:00 2001 From: Igor Pisarev Date: Fri, 1 May 2020 12:01:48 -0400 Subject: [PATCH 048/996] bump n5 related artifacts --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index a9b9128c..ab155403 100644 --- a/pom.xml +++ b/pom.xml @@ -661,11 +661,11 @@ 0.9.0 - 2.1.4 - 3.4.1 + 2.2.0 + 3.5.0 1.0.4 - 3.0.0 - 2.3.1 + 3.1.1 + 3.2.1 2.2.0 - v2-rev20190313-1.30.8 - 0.117.1-alpha - 1.104.0 - 1.34.2 - 1.30.5 + 0.117.2-alpha + 1.106.0 2.8.6 @@ -3129,11 +3126,6 @@ - - com.google.apis - google-api-services-oauth2 - ${google-api-services-oauth2.version} - com.google.cloud google-cloud-resourcemanager @@ -3144,16 +3136,6 @@ google-cloud-storage ${google-cloud-storage.version} - - com.google.http-client - google-http-client-jackson2 - ${google-http-client-jackson2.version} - - - com.google.oauth-client - google-oauth-client-jetty - ${google-oauth-client-jetty.version} - From f90c3fa0478ebedc79589f3372c625e1b1684e0a Mon Sep 17 00:00:00 2001 From: Igor Pisarev Date: Fri, 1 May 2020 13:06:02 -0400 Subject: [PATCH 050/996] downgrade jackson-databind to match version used in spark and aws-sdk spark uses 2.6.7.1, and aws-java-sdk-s3 uses 2.6.7.3. There are no conflicts between the two, so we can explicitly use the latter. When running spark with the newer version of jackson-databind (2.10.2), it produces the following runtime error: Exception in thread "main" java.lang.ExceptionInInitializerError at org.apache.spark.SparkContext.withScope(SparkContext.scala:693) at org.apache.spark.SparkContext.parallelize(SparkContext.scala:710) at org.apache.spark.api.java.JavaSparkContext.parallelize(JavaSparkContext.scala:134) at org.janelia.stitching.PipelineFusionStepExecutor.fuse(PipelineFusionStepExecutor.java:276) at org.janelia.stitching.PipelineFusionStepExecutor.runImpl(PipelineFusionStepExecutor.java:179) at org.janelia.stitching.PipelineFusionStepExecutor.run(PipelineFusionStepExecutor.java:69) at org.janelia.stitching.StitchingSpark.run(StitchingSpark.java:87) at org.janelia.stitching.StitchingSpark.main(StitchingSpark.java:34) Caused by: com.fasterxml.jackson.databind.JsonMappingException: Incompatible Jackson version: 2.10.2 at com.fasterxml.jackson.module.scala.JacksonModule$class.setupModule(JacksonModule.scala:64) at com.fasterxml.jackson.module.scala.DefaultScalaModule.setupModule(DefaultScalaModule.scala:19) at com.fasterxml.jackson.databind.ObjectMapper.registerModule(ObjectMapper.java:808) at org.apache.spark.rdd.RDDOperationScope$.(RDDOperationScope.scala:82) at org.apache.spark.rdd.RDDOperationScope$.(RDDOperationScope.scala) ... 8 more --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 14663e1d..f196ff44 100644 --- a/pom.xml +++ b/pom.xml @@ -872,7 +872,7 @@ 2.21.0 - 2.10.2 + 2.6.7.3 1.1.3 From a360301ba7435707b1acc1a2dffc2fc83726ff05 Mon Sep 17 00:00:00 2001 From: David Gault Date: Mon, 4 May 2020 15:34:39 +0100 Subject: [PATCH 051/996] Bump Bio-Formats version to 6.5.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f820423d..5ca67c8d 100644 --- a/pom.xml +++ b/pom.xml @@ -691,7 +691,7 @@ 6.0.1 - 6.4.0 + 6.5.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From 27461240b54a6a530f579aaedad2f36965c0e444 Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Sat, 16 May 2020 00:26:25 -0400 Subject: [PATCH 052/996] Update Sholl_Analysis to v4.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30cf4d2f..9007b2d3 100644 --- a/pom.xml +++ b/pom.xml @@ -622,7 +622,7 @@ 1.1.2 - 4.0.0 + 4.0.1 3.0.1 From 52a34fd70b4c820fca4030061d30919755316558 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 4 May 2020 14:35:11 -0500 Subject: [PATCH 053/996] Manage the version of Eclipse SWT artifacts We need to do this because com.miglayout:miglayout-swt:5.2 depends on Eclipse SWT at version 4.2.1 from a GitHub-Pages-hosted repository (https://github.com/maven-eclipse/maven-eclipse.github.io), hardcoding the additional repository in its POM. I filed mikaelgrev/miglayout#75 which was immediately merged (awesome! :-D), but I doubt there will be a new miglayout release soon (the last one was 2018-August-21), so in the meantime, we override the Eclipse SWT version here to avoid problems. --- pom.xml | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/pom.xml b/pom.xml index 9007b2d3..9aefce8e 100644 --- a/pom.xml +++ b/pom.xml @@ -852,6 +852,24 @@ 3.3.0 + + 4.3 + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + ${eclipse-swt.version} + 0.117.2-alpha 1.106.0 @@ -3125,6 +3143,83 @@ ${cglib.version} + + + org.eclipse.swt + org.eclipse.swt.cocoa.macosx + ${org.eclipse.swt.cocoa.macosx.version} + + + org.eclipse.swt + org.eclipse.swt.cocoa.macosx.x86_64 + ${org.eclipse.swt.cocoa.macosx.x86_64.version} + + + org.eclipse.swt + org.eclipse.swt.gtk.aix.ppc + ${org.eclipse.swt.gtk.aix.ppc.version} + + + org.eclipse.swt + org.eclipse.swt.gtk.aix.ppc64 + ${org.eclipse.swt.gtk.aix.ppc64.version} + + + org.eclipse.swt + org.eclipse.swt.gtk.hpux.ia64 + ${org.eclipse.swt.gtk.hpux.ia64.version} + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.ppc + ${org.eclipse.swt.gtk.linux.ppc.version} + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.ppc64 + ${org.eclipse.swt.gtk.linux.ppc64.version} + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.s390 + ${org.eclipse.swt.gtk.linux.s390.version} + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.s390x + ${org.eclipse.swt.gtk.linux.s390x.version} + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86 + ${org.eclipse.swt.gtk.linux.x86.version} + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86_64 + ${org.eclipse.swt.gtk.linux.x86_64.version} + + + org.eclipse.swt + org.eclipse.swt.gtk.solaris.sparc + ${org.eclipse.swt.gtk.solaris.sparc.version} + + + org.eclipse.swt + org.eclipse.swt.gtk.solaris.x86 + ${org.eclipse.swt.gtk.solaris.x86.version} + + + org.eclipse.swt + org.eclipse.swt.win32.win32.x86 + ${org.eclipse.swt.win32.win32.x86.version} + + + org.eclipse.swt + org.eclipse.swt.win32.win32.x86_64 + ${org.eclipse.swt.win32.win32.x86_64.version} + + com.google.cloud From bee1c91de47b21cb1e934fcfba0f9cb52f244b93 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 4 May 2020 15:17:02 -0500 Subject: [PATCH 054/996] Do not manage org.eclipse.jetty:jetty-runner It is an unshaded uber-JAR, which conflicts with many other things. --- pom.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 9aefce8e..1c13d67a 100644 --- a/pom.xml +++ b/pom.xml @@ -932,7 +932,7 @@ ${jetty.version} ${jetty.version} ${jetty.version} - ${jetty.version} + ${jetty.version} ${jetty.version} ${jetty.version} @@ -3415,11 +3415,6 @@ jetty-rewrite ${jetty-rewrite.version} - - org.eclipse.jetty - jetty-runner - ${jetty-runner.version} - org.eclipse.jetty jetty-security From efcff8724b18eb0a18413e3c474063c2ce03839f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 4 May 2020 18:39:49 -0500 Subject: [PATCH 055/996] Do not manage org.eclipse.jetty:jetty-ant It depends on ant with the old groupId, which creates problems. We could exclude the old ant artifacts from its dependency tree, but then it wouldn't work out of the box when people depend on it. --- pom.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 1c13d67a..8b02c59f 100644 --- a/pom.xml +++ b/pom.xml @@ -915,7 +915,10 @@ 9.4.26.v20200117 ${jetty.version} - ${jetty.version} + ${jetty.version} ${jetty.version} ${jetty.version} @@ -3330,11 +3333,6 @@ jetty-annotations ${jetty-annotations.version} - - org.eclipse.jetty - jetty-ant - ${jetty-ant.version} - org.eclipse.jetty jetty-client From 87b83d42e56077de1af12c0608d7c622712a5864 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 4 May 2020 15:55:37 -0500 Subject: [PATCH 056/996] Exclude netty-all from spark-core_2.11 The io.netty:netty-all component is an unshaded uber-JAR. --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 8b02c59f..ddebd402 100644 --- a/pom.xml +++ b/pom.xml @@ -2796,6 +2796,11 @@ commons-beanutils commons-beanutils-core + + + io.netty + netty-all + xml-apis xml-apis From 30ba0ca1013ea1c8cb210492dff2952aaa418730 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 4 May 2020 16:01:29 -0500 Subject: [PATCH 057/996] Switch from jython-shaded to jython-slim There is now org.python:jython-slim:2.7.2, with proper dependencies. And update components to use jython-slim instead of jython-shaded: * scripting-jython: 0.5.0 -> 1.0.0 * TrakEM2_: 1.3.2 -> 1.3.3 Closes scijava/jython-shaded#7. --- pom.xml | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index ddebd402..eaaf4dbd 100644 --- a/pom.xml +++ b/pom.xml @@ -237,9 +237,6 @@ 0.7.4-scijava - - 2.7.1.1 - 2.2.2 @@ -322,7 +319,7 @@ 0.3.1 - 0.5.0 + 1.0.0 0.1.1 @@ -653,7 +650,7 @@ 1.1.3 1.1.3 - 1.3.2 + 1.3.3 ${TrakEM2.version} 2.0.2 1.0.1 @@ -1002,6 +999,10 @@ 4.13 + + 2.7.2 + ${jython.version} + 1.1.3 @@ -1095,13 +1096,6 @@ ${batch-processor.version} - - - org.scijava - jython-shaded - ${jython-shaded.version} - - org.scijava @@ -2192,6 +2186,13 @@ ca.mcgill Sholl_Analysis ${Sholl_Analysis.version} + + + + net.imagej + imagej + + @@ -3592,6 +3593,13 @@ ${jsch.version} + + + org.python + jython-slim + ${jython-slim.version} + + com.jcraft @@ -3926,7 +3934,6 @@ LATEST - LATEST LATEST LATEST LATEST From adb88f991038d0a8d80c0506148ff45b45aee65a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 4 May 2020 17:29:03 -0500 Subject: [PATCH 058/996] Ignore ome:jxrlib-all package clashes See: https://forum.image.sc/t/37290 --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eaaf4dbd..62b9de40 100644 --- a/pom.xml +++ b/pom.xml @@ -202,8 +202,12 @@ * org.apache.hadoop:hadoop-yarn-* * org.apache.spark:spark-*_2.11 * org.jmockit:jmockit + junit:junit + * ome:jxrlib-all + com.sun.istack:istack-commons-runtime + * ome:jxrlib-all + javax.xml.bind:jaxb-api or jakarta.xml.bind:jakarta.xml.bind-api + * ome:jxrlib-all + org.glassfish.jaxb:jaxb-runtime + * ome:jxrlib-all + org.glassfish.jaxb:txw2 --> - org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner + META-INF/versions/9/javax.xml.bind.ModuleUtil,com.sun.istack.*,com.sun.xml.bind.*,com.sun.xml.txw2.*,javax.xml.bind.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner - META-INF/versions/9/javax.xml.bind.ModuleUtil,com.sun.istack.*,com.sun.xml.bind.*,com.sun.xml.txw2.*,javax.xml.bind.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner + META-INF/versions/9/javax.xml.bind.ModuleUtil,com.codahale.metrics.graphite.*,com.codahale.metrics.logback.InstrumentedAppender,com.sun.istack.*,com.sun.xml.bind.*,com.sun.xml.txw2.*,javax.xml.bind.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner - 9.0.0 + 9.0.4 2.1.0 1.0.0-beta-19 6.1.0 From 1388d3203e78fab2972314e7ab2fd1299e6cb5a2 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 5 May 2020 15:22:05 -0500 Subject: [PATCH 061/996] Exclude old artifactIds in favor of new ones * javax.annotation:jsr250-api -> javax.annotation:javax.annotation-api * javax.transaction:jta -> javax.transaction:javax.transaction-api Unfortunately, this may result in runtime issues if the artifacts in question (jetty-jspc-maven-plugin and omero-model, respectively) are depended upon without the newer artifacts on the classpath as well. But Maven does not have a built-in way to add dependencies to a managed artifact, so what can you do? Maybe we add a smart dependency checking step to scijava-maven-plugin the future to catch these sorts of things? --- pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index b576bd1c..1dd5b0ce 100644 --- a/pom.xml +++ b/pom.xml @@ -2515,6 +2515,13 @@ org.openmicroscopy omero-model ${omero-model.version} + + + + javax.transaction + jta + + @@ -3399,6 +3406,13 @@ org.eclipse.jetty jetty-jspc-maven-plugin ${jetty-jspc-maven-plugin.version} + + + + javax.annotation + jsr250-api + + org.eclipse.jetty From 47b92413df17b67d3dca13cd101512cb0f44fab3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 5 May 2020 15:43:51 -0500 Subject: [PATCH 062/996] Exclude java-cup-runtime from weka-dev The weka-dev artifact depends on both java-cup and java-cup-runtime, but java-cup is a superset of java-cup-runtime. --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 1dd5b0ce..3317a997 100644 --- a/pom.xml +++ b/pom.xml @@ -3824,6 +3824,11 @@ com.github.fommil.netlib all + + + com.github.vbmacher + java-cup-runtime + com.googlecode.netlib-java netlib-java From 0ff6148cbd27c8ccb82ec4b6fa071b0385598f38 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 5 May 2020 15:44:51 -0500 Subject: [PATCH 063/996] Ignore jruby-core + jnr-ffi conflicts I don't like doing this, but jruby-core ships jnr-ffi unshaded, and jruby-core seems to be the most granular artifact available. :-( Since jython-slim depends properly on jnr-ffi, in order to support both jruby-core and jython-slim on the same classpath, we need to ignore this class overlap and just hope for the best version-wise. --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3317a997..bc192fd2 100644 --- a/pom.xml +++ b/pom.xml @@ -208,8 +208,9 @@ * ome:jxrlib-all + org.glassfish.jaxb:txw2 * com.codahale.metrics:metrics-logback + io.dropwizard.metrics:metrics-logback * com.codahale.metrics:metrics-graphite + io.dropwizard.metrics:metrics-graphite + * com.github.jnr:jnr-ffi + org.jruby:jruby-core --> - META-INF/versions/9/javax.xml.bind.ModuleUtil,com.codahale.metrics.graphite.*,com.codahale.metrics.logback.InstrumentedAppender,com.sun.istack.*,com.sun.xml.bind.*,com.sun.xml.txw2.*,javax.xml.bind.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner + META-INF/versions/9/javax.xml.bind.ModuleUtil,com.codahale.metrics.graphite.*,com.codahale.metrics.logback.InstrumentedAppender,com.sun.istack.*,com.sun.xml.bind.*,com.sun.xml.txw2.*,javax.xml.bind.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner + 0.12.0 + 3.1.0 + 3.6.3 + 3.6.0 + 3.17 @@ -2781,6 +2787,28 @@ ${groovy-yaml.version} + + + org.apache.maven.shared + maven-artifact-transfer + ${maven-artifact-transfer.version} + + + org.apache.maven.shared + maven-common-artifact-filters + ${maven-common-artifact-filters.version} + + + org.apache.maven + maven-core + ${maven-core.version} + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + ${maven-plugin-tools-api.version} + + org.apache.poi @@ -3413,6 +3441,11 @@ javax.annotation jsr250-api + + + classworlds + classworlds + From ce86d018563e43540a1156688204ff268856e6d7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 6 May 2020 18:25:11 -0500 Subject: [PATCH 066/996] Add missing blank lines --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index c01cf7e1..16bbd1b7 100644 --- a/pom.xml +++ b/pom.xml @@ -2850,6 +2850,7 @@ + org.apache.httpcomponents @@ -2867,6 +2868,7 @@ httpcore ${httpcore.version} + org.apache.xmlgraphics From fe8f58c6c1e28a48294ce008dd94f1487fc39d7e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 6 May 2020 18:40:11 -0500 Subject: [PATCH 067/996] Punt on Spark and Dropwizard Their dependency trees are large and messy. They include artifacts with classes that overlap different artifacts elsewhere in the ecosystem. It is not feasible to address all the problems without fixing upstream dependency issues. --- pom.xml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 16bbd1b7..072ecb5a 100644 --- a/pom.xml +++ b/pom.xml @@ -206,11 +206,9 @@ * ome:jxrlib-all + javax.xml.bind:jaxb-api or jakarta.xml.bind:jakarta.xml.bind-api * ome:jxrlib-all + org.glassfish.jaxb:jaxb-runtime * ome:jxrlib-all + org.glassfish.jaxb:txw2 - * com.codahale.metrics:metrics-logback + io.dropwizard.metrics:metrics-logback - * com.codahale.metrics:metrics-graphite + io.dropwizard.metrics:metrics-graphite * com.github.jnr:jnr-ffi + org.jruby:jruby-core --> - META-INF/versions/9/javax.xml.bind.ModuleUtil,com.codahale.metrics.graphite.*,com.codahale.metrics.logback.InstrumentedAppender,com.sun.istack.*,com.sun.xml.bind.*,com.sun.xml.txw2.*,javax.xml.bind.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner + META-INF/versions/9/javax.xml.bind.ModuleUtil,com.com.sun.istack.*,com.sun.xml.bind.*,com.sun.xml.txw2.*,javax.xml.bind.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner From 0d80b9f67b3425840db1e27273e8d94b3aa1c7c5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 6 May 2020 19:40:33 -0500 Subject: [PATCH 068/996] Update jgraphx to version 4.1.0 And switch to the officially recommended groupId. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 072ecb5a..dea5296d 100644 --- a/pom.xml +++ b/pom.xml @@ -984,7 +984,7 @@ ${jgrapht.version} - 3.4.1.3 + 4.1.0 14.12.6 @@ -3591,7 +3591,7 @@ - org.tinyjee.jgraphx + com.github.vlsi.mxgraph jgraphx ${jgraphx.version} From 21c2bd462bbb527c1c0a713fcd6e121cec3dac9c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 7 May 2020 17:49:37 -0500 Subject: [PATCH 069/996] Update component versions * FlowJ: 1.29.4 -> 2.0.0 * bij: 0.1.1 -> 1.0.0 This reconciles the two to avoid duplicate classes, with permission secured to redistribute the code under GPLv3; see also fiji/FlowJ#1. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dea5296d..1444fa7c 100644 --- a/pom.xml +++ b/pom.xml @@ -542,7 +542,7 @@ 2.0.7 2.1.1 3.1.1 - 1.29.4 + 2.0.0 ${FlowJ.version} 1.0.2 2.3.4 @@ -617,7 +617,7 @@ 2.01.2 2.6.12 ${bUnwarpJ.version} - 0.1.1 + 1.0.0 2.1.3 ${blockmatching.version} 2.1.2 From c7925527286ae9866de5c88f95f48ef59645dabb Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 8 May 2020 10:47:03 -0500 Subject: [PATCH 070/996] Manage ome:jxrlib-all at version 0.2.3 This eliminates the previous class conflicts, but introduces a new conflict with args4j; see: https://forum.image.sc/t/37290/6 --- pom.xml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 1444fa7c..c9a1dc46 100644 --- a/pom.xml +++ b/pom.xml @@ -202,13 +202,10 @@ * org.apache.hadoop:hadoop-yarn-* * org.apache.spark:spark-*_2.11 * org.jmockit:jmockit + junit:junit - * ome:jxrlib-all + com.sun.istack:istack-commons-runtime - * ome:jxrlib-all + javax.xml.bind:jaxb-api or jakarta.xml.bind:jakarta.xml.bind-api - * ome:jxrlib-all + org.glassfish.jaxb:jaxb-runtime - * ome:jxrlib-all + org.glassfish.jaxb:txw2 + * ome:jxrlib-all + args4j:args4j * com.github.jnr:jnr-ffi + org.jruby:jruby-core --> - META-INF/versions/9/javax.xml.bind.ModuleUtil,com.com.sun.istack.*,com.sun.xml.bind.*,com.sun.xml.txw2.*,javax.xml.bind.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner + META-INF/versions/9/javax.xml.bind.ModuleUtil,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.kohsuke.args4j.*,org.junit.runner.Runner 6.0.1 + + 0.2.3 + ${jxrlib.version} + 6.5.0 ${bio-formats.version} @@ -2425,6 +2426,13 @@ ${ome-xml.version} + + + ome + jxrlib-all + ${jxrlib-all.version} + + ome @@ -3971,6 +3979,7 @@ LATEST LATEST LATEST + LATEST LATEST LATEST LATEST From 3383fc00de065c7fd6a94fc8a1292a3f8a3cfa88 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 8 May 2020 14:26:54 -0500 Subject: [PATCH 071/996] Update TrackMate to 6.0.0 This reconciles the jgraphx dependency, avoiding class conflicts. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c9a1dc46..9306aa2f 100644 --- a/pom.xml +++ b/pom.xml @@ -598,7 +598,7 @@ ${ToAST.version} 2.0.1 ${TopoJ.version} - 5.2.0 + 6.0.0 ${TrackMate.version} 3.2.29 2.0.3 From c3edc1fc98fe23016381b2cbd0540ca1c03dc130 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 8 May 2020 15:56:41 -0500 Subject: [PATCH 072/996] Stop managing the scijava-jupyter-kernel version We are retiring this kernel in favor of standard BeakerX kernels. See: https://forum.image.sc/t/21845 --- pom.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pom.xml b/pom.xml index 9306aa2f..cf853eb3 100644 --- a/pom.xml +++ b/pom.xml @@ -279,9 +279,6 @@ 0.1.0 - - 0.6.1 - 1.0.5 @@ -1190,13 +1187,6 @@ ${scijava-java3d.version} - - - org.scijava - scijava-jupyter-kernel - ${scijava-jupyter-kernel.version} - - org.scijava From ca6038926376673c00b9fb8fa9f1431593335347 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 8 May 2020 17:18:27 -0500 Subject: [PATCH 073/996] Document allowedDuplicateClasses more thoroughly It is important to keep track of each individual allowance. But syntactically, we need to list them all squished on one line. Therefore, we include a verbose comment explaining the details. --- pom.xml | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index cf853eb3..fa0ef644 100644 --- a/pom.xml +++ b/pom.xml @@ -198,14 +198,40 @@ - META-INF/versions/9/javax.xml.bind.ModuleUtil,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.kohsuke.args4j.*,org.junit.runner.Runner + jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.kohsuke.args4j.* - jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.kohsuke.args4j.* + com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.kohsuke.args4j.* 3.17 @@ -2843,6 +2852,16 @@ maven-plugin-tools-api ${maven-plugin-tools-api.version} + + org.sonatype.sisu + sisu-inject-bean + ${sisu-inject-bean.version} + + + org.sonatype.sisu + sisu-inject-plexus + ${sisu-inject-plexus.version} + From b9580dec3bd9f7a751aec06c2c5834b9a545abbf Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 8 May 2020 17:57:17 -0500 Subject: [PATCH 075/996] Add temporary workaround for kryo groupId skew See ome/ome-common-java#50 and ome/bioformats#3557. --- pom.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9e4069f..6afd58b8 100644 --- a/pom.xml +++ b/pom.xml @@ -199,6 +199,20 @@ HACK: The following list of allowed-to-be-duplicated classes facilitates intended combinations of artifacts: == + TEMP: Until ome/ome-common-java#50 and ome/bioformats#3557 merge. + Classes: + com.esotericsoftware.kryo.*, + com.esotericsoftware.minlog.*, + com.esotericsoftware.reflectasm.* + Part of: + com.esotericsoftware.kryo:kryo, + com.esotericsoftware:kryo, + com.esotericsoftware:minlog, + com.esotericsoftware:reflectasm + Enables: + org.openmicroscopy:ome-common (com.esotericsoftware.kryo:kryo) + + graphics.scenery:scenery (com.esotericsoftware:kryo) + == Classes: com.google.inject.* Part of: com.google.inject:guice:no_aop Also in: org.sonatype.sisu:sisu-guice @@ -238,7 +252,7 @@ Also in: ome:jxrlib-all Enables: args4j:args4j + ome:jxrlib-all --> - com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.kohsuke.args4j.* + com.esotericsoftware.kryo.*,com.esotericsoftware.minlog.*,com.esotericsoftware.reflectasm.*,com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.kohsuke.args4j.* - com.esotericsoftware.kryo.*,com.esotericsoftware.minlog.*,com.esotericsoftware.reflectasm.*,com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.kohsuke.args4j.* + com.esotericsoftware.kryo.*,com.esotericsoftware.minlog.*,com.esotericsoftware.reflectasm.*,com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner - 0.2.3 + 0.2.4 ${jxrlib.version} From e7b14ea08b59a35f46778ffa164be12edb27e222 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 11 May 2020 15:36:37 -0500 Subject: [PATCH 077/996] Manage cdi-api at version 1.2 This avoids a conflict where: 1. org.sonatype.sisu:sisu-inject-bean:2.6.0 depends on javax.enterprise:cdi-api:1.0 depends on javax.annotation:jsr250-api:1.0 2. org.eclipse.jetty:jetty-annotations:9.4.26.v20200117 depends on javax.annotation:javax.annotation-api:1.3 with jsr250-api and javax.annotation-api having the same classes. --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index f05e29a0..c428b674 100644 --- a/pom.xml +++ b/pom.xml @@ -884,6 +884,9 @@ ${batik.version} 2.4 + + 1.2 + 1.9.4 @@ -3184,6 +3187,13 @@ ${xmlgraphics-commons.version} + + + javax.enterprise + cdi-api + ${cdi-api.version} + + commons-beanutils From d1a422df0181fad151c42b56e401c14a09bb566f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 11 May 2020 15:48:24 -0500 Subject: [PATCH 078/996] Exclude javax.activation:activation It was replaced by jakarta.activation:jakarta.activation-api; see: https://wiki.eclipse.org/Jakarta_EE_Maven_Coordinates --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index c428b674..ea3d97aa 100644 --- a/pom.xml +++ b/pom.xml @@ -2629,6 +2629,14 @@ com.sun.mail javax.mail + + + javax.activation + activation + org.apache.xmlgraphics From f6d353196a9f91b7b9b7efd5a5ce3f264a80b613 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 11 May 2020 16:00:02 -0500 Subject: [PATCH 079/996] Downgrade spring-aop to 3.2.9.RELEASE It is the last version not to act as an unshaded uberjar. Starting with 3.3.0.RELEASE, it includes org.aopalliance classes (from aopalliance:aopalliance) unshaded, clashing with other libraries that depend on aopalliance:aopalliance, notably com.google.inject:guice. --- pom.xml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index ea3d97aa..e95b5bf3 100644 --- a/pom.xml +++ b/pom.xml @@ -1136,6 +1136,14 @@ 2.1 + + + 3.2.9.RELEASE + 1.12.0 ${tensorflow.version} @@ -2614,11 +2622,6 @@ omero-server ${omero-server.version} - - - aopalliance - aopalliance - c3p0 @@ -3897,6 +3900,13 @@ ${snakeyaml-engine.version} + + + org.springframework + spring-aop + ${spring-aop.version} + + org.tensorflow From bd91084c3f66e9443178bc0c44e8ec23b08b20be Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 11 May 2020 19:21:55 -0500 Subject: [PATCH 080/996] Address javax.websocket conflict The org.eclipse.jetty:jetty-maven-plugin dependencies duplicate classes: +- org.eclipse.jetty:jetty-maven-plugin:jar:9.4.26.v20200117:compile | +- org.eclipse.jetty.websocket:javax-websocket-server-impl:jar:9.4.26.v20200117:compile | | +- org.eclipse.jetty.websocket:javax-websocket-client-impl:jar:9.4.26.v20200117:compile | | | \- javax.websocket:javax.websocket-client-api:jar:1.0:compile | | \- javax.websocket:javax.websocket-api:jar:1.0:compile | +- org.eclipse.jetty.websocket:websocket-server:jar:9.4.26.v20200117:compile | | +- org.eclipse.jetty.websocket:websocket-common:jar:9.4.26.v20200117:compile | | | \- org.eclipse.jetty.websocket:websocket-api:jar:9.4.26.v20200117:compile | | +- org.eclipse.jetty.websocket:websocket-client:jar:9.4.26.v20200117:compile | | \- org.eclipse.jetty.websocket:websocket-servlet:jar:9.4.26.v20200117:compile Specifically, javax.websocket-api contains javax.websocket-client-api plus server classes. Depending on both at once can create version skew. --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index e95b5bf3..32c89e32 100644 --- a/pom.xml +++ b/pom.xml @@ -3538,6 +3538,13 @@ org.eclipse.jetty jetty-maven-plugin ${jetty-maven-plugin.version} + + + + javax.websocket + javax.websocket-client-api + + org.eclipse.jetty From 4ee1c23626833b4e17cadfc075acd7c0f9996d3f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 11 May 2020 21:57:33 -0500 Subject: [PATCH 081/996] Add link to related jruby issue --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 32c89e32..1fed923e 100644 --- a/pom.xml +++ b/pom.xml @@ -220,6 +220,7 @@ org.apache.maven:maven-core (guice) + org.apache.maven.shared:maven-common-artifact-filters (sisu-guice) == + TEMP: Until jruby/jruby#6205 is addressed. Classes: jnr.ffi.* Part of: com.github.jnr:jnr-ffi Also in: org.jruby:jruby-core From a37ac8bfeaffe573900798695a83327630ccdbf0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 11 May 2020 21:57:47 -0500 Subject: [PATCH 082/996] Add indirection level for known duplicate classes --- pom.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1fed923e..3dbfb93d 100644 --- a/pom.xml +++ b/pom.xml @@ -248,7 +248,14 @@ Also in: org.jmockit:jmockit Enables: junit:junit + org.jmockit:jmockit --> - com.esotericsoftware.kryo.*,com.esotericsoftware.minlog.*,com.esotericsoftware.reflectasm.*,com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner + com.esotericsoftware.kryo.*,com.esotericsoftware.minlog.*,com.esotericsoftware.reflectasm.*,com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner + + ${scijava.allowedDuplicateClasses} 1.25 @@ -2941,12 +2942,6 @@ org.apache.httpcomponents httpclient ${httpclient.version} - - - commons-logging - commons-logging - - org.apache.httpcomponents @@ -3410,6 +3405,18 @@ org.apache.jackrabbit jackrabbit-webdav ${jackrabbit-webdav.version} + + + + org.slf4j + jcl-over-slf4j + + @@ -3900,6 +3907,11 @@ slf4j-simple ${slf4j-simple.version} + + org.slf4j + jcl-over-slf4j + ${jcl-over-slf4j.version} + From 902b1b2326fa072843aa1289aaaddc52c932a5a0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 11 May 2020 22:41:00 -0500 Subject: [PATCH 084/996] Update to the latest postgresql The groupId changed, with omero-server now depending on the newer org.postgresql:postgresql rather than the now-obsolete postgresql:postgresql. We need to keep up here. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f05c01bc..d2044e37 100644 --- a/pom.xml +++ b/pom.xml @@ -712,7 +712,7 @@ 1.1.3 1.1.3 - 1.3.3 + 1.3.4 ${TrakEM2.version} 2.0.2 1.0.1 @@ -1122,7 +1122,7 @@ 4.2.0 - 9.1-901-1.jdbc4 + 42.2.12 3.0.8 @@ -3854,7 +3854,7 @@ - postgresql + org.postgresql postgresql ${postgresql.version} From afed1175e6ea221ac55560a8d3b67fd0a669ac87 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 11 May 2020 23:29:29 -0500 Subject: [PATCH 085/996] Manage kotlin artifacts more thoroughly And ignore duplicate class conflicts between kotlin-daemon-client and kotlin-daemon-embeddable. I'm guessing that kotlin-daemon-embeddable is preferred as a dependency -- it's what kotlin-compiler-embeddable uses -- but the community wants to use kotlin-script-util, which depends on kotlin-daemon-client. I'm not sure how best to reconcile this, so for now we just ignore the problem. --- pom.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d2044e37..63ca3471 100644 --- a/pom.xml +++ b/pom.xml @@ -247,8 +247,14 @@ Part of: junit:junit Also in: org.jmockit:jmockit Enables: junit:junit + org.jmockit:jmockit + == + Classes: org.jetbrains.kotlin.daemon.common.* + Part of: kotlin-daemon-client, kotlin-daemon-embeddable + Enables: + org.jetbrains.kotlin:kotlin-compiler-embeddable (kotlin-daemon-embeddable) + + org.jetbrains.kotlin:kotlin-script-util (kotlin-compiler-client) --> - com.esotericsoftware.kryo.*,com.esotericsoftware.minlog.*,com.esotericsoftware.reflectasm.*,com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner + com.esotericsoftware.kryo.*,com.esotericsoftware.minlog.*,com.esotericsoftware.reflectasm.*,com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.jetbrains.kotlin.daemon.common.*,org.junit.runner.Runner + ${kotlin.version} + ${kotlin.version} ${kotlin.version} + ${kotlin.version} + ${kotlin.version} + ${kotlin.version} + ${kotlin.version} + ${kotlin.version} ${kotlin.version} + 1.2.3 ${logback.version} @@ -3772,14 +3786,49 @@ org.jetbrains.kotlin - kotlin-stdlib-jdk8 - ${kotlin-stdlib.version} + kotlin-compiler-embeddable + ${kotlin-compiler-embeddable.version} + + + org.jetbrains.kotlin + kotlin-daemon-embeddable + ${kotlin-daemon-embeddable.version} org.jetbrains.kotlin kotlin-reflect ${kotlin-reflect.version} + + org.jetbrains.kotlin + kotlin-script-runtime + ${kotlin-script-runtime.version} + + + org.jetbrains.kotlin + kotlin-script-util + ${kotlin-script-util.version} + + + org.jetbrains.kotlin + kotlin-scripting-common + ${kotlin-scripting-common.version} + + + org.jetbrains.kotlin + kotlin-scripting-compiler-embeddable + ${kotlin-scripting-compiler-embeddable.version} + + + org.jetbrains.kotlin + kotlin-scripting-jvm + ${kotlin-scripting-jvm.version} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin-stdlib.version} + From 7446a16c832e3d5da30c5cd750a1a6b7acd37824 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 11 May 2020 23:50:15 -0500 Subject: [PATCH 086/996] Stop managing jetty maven plugins Their dependencies are too ugly, and we don't need them. --- pom.xml | 49 ++++++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 63ca3471..4cc5e231 100644 --- a/pom.xml +++ b/pom.xml @@ -1009,8 +1009,14 @@ ${jetty.version} ${jetty.version} ${jetty.version} - ${jetty.version} - ${jetty.version} + ${jetty.version} ${jetty.version} ${jetty.version} @@ -3546,35 +3552,6 @@ jetty-jndi ${jetty-jndi.version} - - org.eclipse.jetty - jetty-jspc-maven-plugin - ${jetty-jspc-maven-plugin.version} - - - - javax.annotation - jsr250-api - - - - classworlds - classworlds - - - - - org.eclipse.jetty - jetty-maven-plugin - ${jetty-maven-plugin.version} - - - - javax.websocket - javax.websocket-client-api - - - org.eclipse.jetty jetty-nosql @@ -3854,6 +3831,16 @@ org.mapdb mapdb ${mapdb.version} + + + + net.jpountz.lz4 + lz4 + + From f344aac878d266ac47ad28f4d9eb7af7852dab44 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 19 May 2020 19:38:46 -0500 Subject: [PATCH 087/996] Manage versions of bonej components --- pom.xml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/pom.xml b/pom.xml index 4cc5e231..5768e6ba 100644 --- a/pom.xml +++ b/pom.xml @@ -741,6 +741,14 @@ above. --> + + 7.0.5 + ${bonej.version} + ${bonej.version} + ${bonej.version} + ${bonej.version} + ${bonej.version} + @@ -2428,6 +2436,34 @@ ${n5-viewer_fiji.version} + + + + org.bonej + bonej-plugins + ${bonej-plugins.version} + + + org.bonej + bonej-ops + ${bonej-ops.version} + + + org.bonej + bonej-legacy-plugins_ + ${bonej-legacy-plugins_.version} + + + org.bonej + bonej-legacy-util_ + ${bonej-legacy-util_.version} + + + org.bonej + bonej-utilities + ${bonej-utilities.version} + + From 29bd9a61a533d9a1f24b09954a9bb13c25f3db47 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 20 May 2020 11:14:24 -0500 Subject: [PATCH 088/996] Remove imagej-usage from managed dependencies That component is not currently maintained, nor should anything downstream ever depend on it. --- pom.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pom.xml b/pom.xml index 5768e6ba..9c92ddb3 100644 --- a/pom.xml +++ b/pom.xml @@ -488,9 +488,6 @@ 0.10.4 - - 0.4.1 - 0.1.4 @@ -1643,13 +1640,6 @@ tests - - - net.imagej - imagej-usage - ${imagej-usage.version} - - net.imagej @@ -4268,7 +4258,6 @@ LATEST LATEST LATEST - LATEST LATEST From 715e1e56ca5163b8d526e1a3fa565323837f1c6d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 20 May 2020 11:30:20 -0500 Subject: [PATCH 089/996] Update SPIM_Registration to 5.0.21 This accounts for backwards incompatibilities in bigdataviewer-core. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9c92ddb3..525fda22 100644 --- a/pom.xml +++ b/pom.xml @@ -626,7 +626,7 @@ ${RATS.version} 2.0.4 2.0.2 - 5.0.20 + 5.0.21 2.0.2 ${Samples.version} 2.0.1 From 194a6586508a6de22d837b33439fac27429ad795 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 22 May 2020 19:37:29 -0500 Subject: [PATCH 090/996] Update component versions * parsington: 1.0.5 -> 2.0.0 * scijava-common: 2.82.0 -> 2.83.1 * imagej1: 1.52t -> 1.53a * imagej-common: 0.31.0 -> 0.33.0 * imagej-legacy: 0.37.2 -> 0.37.3 * imagej-ops: 0.45.2 -> 0.45.4 * imglib2-roi: 0.10.0 -> 0.10.2 * Trainable_Segmentation: 3.2.29 -> 3.2.34 * bigwarp: 5.1.0 -> 6.0.0 * bigdataviewer-core: 9.0.4 -> 9.0.5 * bigdataviewer-server: 2.1.0 -> 3.0.0 * bigdataviewer-vistools: 1.0.0-beta-19 -> 1.0.0-beta-20 * bigdataviewer_fiji: 6.1.0 -> 6.2.0 * spim_data: 2.2.3 -> 2.2.4 * ome-xml: 6.0.1 -> 6.1.0 * omero-blitz: 5.5.5 -> 5.5.6 * omero-common: 5.5.4 -> 5.5.5 * omero-gateway: 5.6.2 -> 5.6.3 * omero-model: 5.5.4 -> 5.6.0 * omero-renderer: 5.5.4 -> 5.5.5 * omero-romio: 5.5.4 -> 5.6.0 * omero-server: 5.5.5 -> 5.5.6 * BigStitcher: 0.3.6 -> 0.5.5 * multiview-reconstruction: 0.4.1 -> 0.6.5 * groovy: 3.0.3 -> 3.0.4 * httpclient: 4.5.11 -> 4.5.12 * batik: 1.12 -> 1.13 * commons-lang3: 3.9 -> 3.10 * jackrabbit-webdav: 2.21.0 -> 2.21.1 * jackson-databind: 2.6.7.3 -> 2.11.0 * javassist: 3.26.0-GA -> 3.27.0-GA * joml: 1.9.22 -> 1.9.24 * rsyntaxtextarea: 3.0.8 -> 3.1.1 * autocomplete: 3.0.5 -> 3.1.0 * languagesupport: 3.0.2 -> 3.1.0 * snakeyaml: 1.25 -> 1.26 --- pom.xml | 72 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index 525fda22..b011c204 100644 --- a/pom.xml +++ b/pom.xml @@ -315,13 +315,13 @@ 2.3.4 - 1.0.5 + 2.0.0 0.1.2 - 2.82.0 + 2.83.1 2.0.2 @@ -413,14 +413,14 @@ 2.0.0-rc-72 - 1.52t + 1.53a ${imagej1.version} 1.0.1 - 0.31.0 + 0.33.0 0.1.4 @@ -429,7 +429,7 @@ 5.0.3 - 0.37.2 + 0.37.3 0.7.4 @@ -453,7 +453,7 @@ 0.1.0 - 0.45.2 + 0.45.4 0.1.1 @@ -515,7 +515,7 @@ 3.0.0 - 0.10.0 + 0.10.2 0.2.4 @@ -650,7 +650,7 @@ ${TopoJ.version} 6.0.0 ${TrackMate.version} - 3.2.29 + 3.2.34 2.0.3 2.2.0 3.0.3 @@ -690,7 +690,7 @@ 3.0.1 - 5.1.0 + 6.0.0 ${bigwarp.version} @@ -705,11 +705,11 @@ - 9.0.4 - 2.1.0 - 1.0.0-beta-19 - 6.1.0 - 2.2.3 + 9.0.5 + 3.0.0 + 1.0.0-beta-20 + 6.2.0 + 2.2.4 @@ -758,7 +758,7 @@ 5.3.3 - 6.0.1 + 6.1.0 0.2.4 @@ -772,28 +772,28 @@ ${bio-formats.version} - 5.5.5 + 5.5.6 - 5.5.4 + 5.5.5 5.5.0 - 5.6.2 + 5.6.3 - 5.5.4 + 5.6.0 - 5.5.4 + 5.5.5 - 5.5.4 + 5.6.0 - 5.5.5 + 5.5.6 @@ -801,10 +801,10 @@ 1.4.1 - 0.3.6 + 0.5.5 - 0.4.1 + 0.6.5 0.2.0 @@ -827,7 +827,7 @@ 1.11.729 - 3.0.3 + 3.0.4 ${groovy.version} ${groovy.version} ${groovy.version} @@ -869,11 +869,11 @@ 2.3.1 - 4.5.11 + 4.5.12 4.4.13 - 1.12 + 1.13 ${batik.version} ${batik.version} ${batik.version} @@ -923,7 +923,7 @@ 2.6 - 3.9 + 3.10 1.2 @@ -972,10 +972,10 @@ 5.5.13.1 - 2.21.0 + 2.21.1 - 2.6.7.3 + 2.11.0 1.1.3 @@ -992,7 +992,7 @@ ${java3d.version} - 3.26.0-GA + 3.27.0-GA 2.0.6 @@ -1081,7 +1081,7 @@ ${jogl.version} - 1.9.22 + 1.9.24 2.80b11 @@ -1150,9 +1150,9 @@ 42.2.12 - 3.0.8 - 3.0.5 - 3.0.2 + 3.1.1 + 3.1.0 + 3.1.0 1.7.30 @@ -1165,7 +1165,7 @@ ${slf4j.version} - 1.25 + 1.26 2.1 From 803e8e3ea2e82ff12c820cac1b1f8d9349045273 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 23 May 2020 16:25:35 -0500 Subject: [PATCH 091/996] Manage more N5 artifacts Including n5-blosc and n5-zarr. And alphabetize. --- pom.xml | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index b011c204..c8c95698 100644 --- a/pom.xml +++ b/pom.xml @@ -724,11 +724,13 @@ 0.9.0 2.2.0 - 3.5.0 - 1.0.4 3.1.1 + 1.0.1 3.2.1 + 1.0.4 + 3.5.0 2.2.0 + 0.0.3-beta From 6d5a62e2a8983cf7159cfe5b7ec3fa72a2595a75 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 23 May 2020 19:06:42 -0500 Subject: [PATCH 092/996] Update component versions * imagej-opencv: 0.1.0 -> 0.1.1 * imagej-tensorflow: 1.0.4 -> 1.1.5 * imglib2: 5.9.0 -> 5.9.2 * scifio: 0.38.2 -> 0.39.1 * scifio-bf-compat: 4.0.0 -> 4.0.2 * scifio-cli: 0.6.0 -> 0.6.1 * scifio-hdf5: 0.2.0 -> 0.2.1 * scifio-ome-xml: 0.16.0 -> 0.16.1 * Correct_3D_Drift: 1.0.3 -> 1.0.5 * MorphoLibJ: 1.4.1 -> 1.4.2.1 * joda-time: 2.10.5 -> 2.10.6 * picocli: 4.2.0 -> 4.3.2 --- pom.xml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index c8c95698..37333a1d 100644 --- a/pom.xml +++ b/pom.xml @@ -450,7 +450,7 @@ 0.1.2 - 0.1.0 + 0.1.1 0.45.4 @@ -477,7 +477,7 @@ 0.1.2 - 1.0.4 + 1.1.5 0.3.1 @@ -494,7 +494,7 @@ - 5.9.0 + 5.9.2 0.11.2 @@ -529,16 +529,16 @@ - 0.38.2 + 0.39.1 - 4.0.0 + 4.0.2 - 0.6.0 + 0.6.1 - 0.2.0 + 0.2.1 1.1.1 @@ -547,7 +547,7 @@ 0.9.0 - 0.16.0 + 0.16.1 @@ -576,7 +576,7 @@ 3.0.3 2.0.3 ${CorrectBleach.version} - 1.0.3 + 1.0.5 2.1.4 2.1.2 ${Dichromacy.version} @@ -617,7 +617,6 @@ ${MTrack2.version} 2.0.1 2.1.1 - ${MorphoLibJ.version} 3.0.1 1.1.2 1.1.2 @@ -800,7 +799,8 @@ - 1.4.1 + 1.4.2.1 + ${MorphoLibJ.version} 0.5.5 @@ -1073,7 +1073,7 @@ 4.5.2 - 2.10.5 + 2.10.6 2.3.2 @@ -1146,7 +1146,7 @@ 3.9 - 4.2.0 + 4.3.2 42.2.12 From eb498d22c042c85cdd931b05c66f0bc614307eca Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 23 May 2020 23:30:27 -0500 Subject: [PATCH 093/996] Downgrade ojalgo back to 45.1.1 That's the version currently in use in imglib2-algorithm. Newer major versions really do break backwards compatibility. We can take the time to upgrade later, as needed by users. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37333a1d..492bcc4e 100644 --- a/pom.xml +++ b/pom.xml @@ -1140,7 +1140,7 @@ ${mockito.version} - 48.1.0 + 45.1.1 3.9 From 364fe28a311adbcd03514f83b5c01319665ff28a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 23 May 2020 23:33:17 -0500 Subject: [PATCH 094/996] Update imagej-ops version to 0.45.5 This updates imagej-ops to use parsington 2.0.0. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 492bcc4e..beeb2cb6 100644 --- a/pom.xml +++ b/pom.xml @@ -453,7 +453,7 @@ 0.1.1 - 0.45.4 + 0.45.5 0.1.1 From ef558a2aec3a48fa4b57e7906730b7bd688ff005 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 23 May 2020 23:48:41 -0500 Subject: [PATCH 095/996] Downgrade mpicbg back to 1.2.0 The 1.3.0 version breaks downstream builds, including SPIM_Registration 5.0.21, bigwarp_fiji 6.0.0 and TrakEM2_ 1.3.4. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index beeb2cb6..1a7ec376 100644 --- a/pom.xml +++ b/pom.xml @@ -693,7 +693,7 @@ ${bigwarp.version} - 1.3.0 + 1.2.0 ${mpicbg.version} From 54a833ccbc49bb97140a75fe97a05a8db878a80c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 24 May 2020 17:52:47 -0500 Subject: [PATCH 096/996] Downgrade ImageJ1 to 1.52p This is the most recent version that works fully correctly with ij1-patcher and imagej-legacy. A (hopefully very near) future version of pom-scijava will update ij1-patcher and imagej-legacy together along with ij to its most recent version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a7ec376..235de410 100644 --- a/pom.xml +++ b/pom.xml @@ -413,7 +413,7 @@ 2.0.0-rc-72 - 1.53a + 1.52p ${imagej1.version} From 29306a696bf471e5b7c1648c483101aaa2e59d75 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 24 May 2020 23:29:57 -0500 Subject: [PATCH 097/996] Update component versions * scijava-ui-swing: 0.13.1 -> 0.13.2 * scifio: 0.39.1 -> 0.39.2 * Correct_3D_Drift: 1.0.5 -> 1.0.6 * Gray_Morphology: 2.3.4 -> 2.3.5 * bUnwarpJ: 2.6.12 -> 2.6.13 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 235de410..5ec51b33 100644 --- a/pom.xml +++ b/pom.xml @@ -363,7 +363,7 @@ 0.1.7 - 0.13.1 + 0.13.2 0.5.5 @@ -529,7 +529,7 @@ - 0.39.1 + 0.39.2 4.0.2 @@ -576,7 +576,7 @@ 3.0.3 2.0.3 ${CorrectBleach.version} - 1.0.5 + 1.0.6 2.1.4 2.1.2 ${Dichromacy.version} @@ -592,7 +592,7 @@ 2.0.0 ${FlowJ.version} 1.0.2 - 2.3.4 + 2.3.5 1.1.0 1.1.0 2.0.2 @@ -661,7 +661,7 @@ ${View5D.version} 2.0.2 2.01.2 - 2.6.12 + 2.6.13 ${bUnwarpJ.version} 1.0.0 2.1.3 From 086edf575f616e60e649ea19bf2c360034a0cfe3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 25 May 2020 13:34:49 -0500 Subject: [PATCH 098/996] Update component versions * scijava-common: 2.83.1 -> 2.83.2 * script-editor: 0.5.5 -> 0.5.6 * scifio: 0.39.2 -> 0.40.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 5ec51b33..8504ec2e 100644 --- a/pom.xml +++ b/pom.xml @@ -321,7 +321,7 @@ 0.1.2 - 2.83.1 + 2.83.2 2.0.2 @@ -366,7 +366,7 @@ 0.13.2 - 0.5.5 + 0.5.6 0.3.4 @@ -529,7 +529,7 @@ - 0.39.2 + 0.40.0 4.0.2 From d1bdfac482e3564fa7ba7dacda44c5aac95e63e6 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 26 May 2020 00:18:16 -0500 Subject: [PATCH 099/996] Update parent to pom-scijava-base 11.0.0 This improves several things: * Removes the jigsaw profile, fixing JPMS support in Java 9+. * Updates scijava-maven-plugin to 2.0.0, fixing some major bugs. * Updates kotlin to 1.3.72. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8504ec2e..1bfb17e7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 10.0.0 + 11.0.0 From 3f989867a6e2ef39eccb6d596cf6c01350658bd1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 26 May 2020 00:26:33 -0500 Subject: [PATCH 100/996] Add initial "mega melt" infrastructure The mega melt is a script intended to test all components managed by pom-scijava together in a consistent runtime environment, using the melting-pot script from the scijava-scripts repository. This initial version is working quite well after some manual tweaks. Once it reaches a state where it can execute successfully in a fully automated way, we can hook it up to CI infrastructure to continually check for regressions as component versions continue rolling forward. --- tests/filter-build-log.py | 48 +++++++++++++++++ tests/generate-mega-melt.py | 100 +++++++++++++++++++++++++++++++++++ tests/mega-melt-template.xml | 66 +++++++++++++++++++++++ tests/run.sh | 75 ++++++++++++++++++++++++++ 4 files changed, 289 insertions(+) create mode 100644 tests/filter-build-log.py create mode 100644 tests/generate-mega-melt.py create mode 100644 tests/mega-melt-template.xml create mode 100644 tests/run.sh diff --git a/tests/filter-build-log.py b/tests/filter-build-log.py new file mode 100644 index 00000000..4e3a9483 --- /dev/null +++ b/tests/filter-build-log.py @@ -0,0 +1,48 @@ +# +# filter-build-log.py - Cuts out cruft to focus on build failure details. +# + +# This script filters build logs down to only [WARNING] and [ERROR] lines, +# and consolidates lengthy duplicate class listings down to packages only. + +import sys + +def print_filtered_log(log): + dups = [] + parsingdups = False + atbeginning = True + for line in log: + line = line.rstrip('\n') + if line.startswith('[INFO]'): + # Filter out non-error build messages. + continue + if line.startswith('Download') or line.startswith('Progress'): + # Filter out details of remote resource queries. + continue + if atbeginning and not line.strip(): + # Filter out leading blank lines. + continue + atbeginning = False + if parsingdups: + if line.startswith(' '): + if line.index('/') >= 0: + # Strip to containing package only. + line = line[:line.rindex('/')] + dups.append(line) + else: + parsingdups = False + for dup in sorted(set(dups)): + print(dup) + print('') + dups = [] + else: + if line == ' Duplicate classes:': + print(' Duplicate packages:') + parsingdups = True + else: + print(line) + +for arg in sys.argv[1:]: + with open(arg) as f: + print_filtered_log(f) + diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py new file mode 100644 index 00000000..88d716ed --- /dev/null +++ b/tests/generate-mega-melt.py @@ -0,0 +1,100 @@ +# +# generate-mega-melt.py - Make a POM depending on everything in pom-scijava. +# + +import os, re, sys +from xml.dom import minidom + +def child(node, tag): + nodes = node.getElementsByTagName(tag) + return None if len(nodes) == 0 else nodes[0] + +script_dir = os.path.dirname(os.path.realpath(__file__)) if __file__ else '.' +out = minidom.parse(os.path.join(script_dir, 'mega-melt-template.xml')) +out.getElementsByTagName('project')[0].appendChild(out.createElement('dependencies')) +outDeps = out.getElementsByTagName('dependencies')[0] + +psj = minidom.parse(os.path.join(script_dir, '..', 'pom.xml')) +depMgmt = psj.getElementsByTagName('dependencyManagement')[0] +deps = depMgmt.getElementsByTagName('dependencies')[0] +depList = deps.getElementsByTagName('dependency') + +# Artifacts to exclude from the mega melt. +ignoredArtifacts = [ + # TEMP: Until scenerygraphics/scenery#314 is addressed. + 'scenery', + # NB: The following artifacts have messy dependency trees. + # Too many problems to test as part of the mega-melt. + # See WARNING block in pom-scijava's pom.xml for details. + 'imagej-server', + 'spark-core_2.11', + # NB: Skip scijava forks of third-party projects. + # These are very stable, with few/no dependencies, and + # don't need to be retested as pom-scijava evolves. + 'j3dcore', + 'j3dutils', + 'jep', + 'junit-benchmarks', + 'vecmath', + # NB: The following artifacts require native libraries to + # build/test successfully, which might not be installed. + 'n5-blosc', + 'n5-zarr', + # NB: All the SWT platform JARs have the same classes. + # The current platform will be brought in transitively. + 'org.eclipse.swt.cocoa.macosx', + 'org.eclipse.swt.cocoa.macosx.x86_64', + 'org.eclipse.swt.gtk.aix.ppc', + 'org.eclipse.swt.gtk.aix.ppc64', + 'org.eclipse.swt.gtk.hpux.ia64', + 'org.eclipse.swt.gtk.linux.ppc', + 'org.eclipse.swt.gtk.linux.ppc64', + 'org.eclipse.swt.gtk.linux.s390', + 'org.eclipse.swt.gtk.linux.s390x', + 'org.eclipse.swt.gtk.linux.x86', + 'org.eclipse.swt.gtk.linux.x86_64', + 'org.eclipse.swt.gtk.solaris.sparc', + 'org.eclipse.swt.gtk.solaris.x86', + 'org.eclipse.swt.win32.win32.x86', + 'org.eclipse.swt.win32.win32.x86_64', + # NB: All SLF4J bindings have the same classes. + # We'll rely on logback-classic being present here. + 'slf4j-jcl', + 'slf4j-jdk14', + 'slf4j-nop', + 'slf4j-simple', + # NB: Cannot include both commons-logging and jcl-over-slf4j; + # see: http://www.slf4j.org/codes.html#jclDelegationLoop + 'jcl-over-slf4j' +] + +for dep in depList: + # Harvest relevant information (ignore exclusions and version). + groupId = child(dep, 'groupId') + artifactId = child(dep, 'artifactId') + classifier = child(dep, 'classifier') + scope = child(dep, 'scope') + + if artifactId.firstChild.data in ignoredArtifacts: + continue + + outDep = out.createElement('dependency') + outDep.appendChild(groupId) + outDep.appendChild(artifactId) + if classifier: + outDep.appendChild(classifier) + if scope: + outDep.appendChild(scope) + outDeps.appendChild(outDep) + +# Filter XML through a hacky substitution to avoid unwanted whitespace. +xml = re.sub('\n[\n\r\t]*\n', '\n', out.toprettyxml()) + +outDir = sys.argv[1] if len(sys.argv) > 1 else 'mega-melt' +try: + os.mkdir(outDir) +except: + pass + +with open(os.path.join(outDir, 'pom.xml'), 'w') as outPOM: + outPOM.write(xml) diff --git a/tests/mega-melt-template.xml b/tests/mega-melt-template.xml new file mode 100644 index 00000000..fe60a916 --- /dev/null +++ b/tests/mega-melt-template.xml @@ -0,0 +1,66 @@ + + + 4.0.0 + + org.scijava + pom-scijava + 999-mega-melt + + + mega-melt + 0-SNAPSHOT + pom + Mega Melt + The whole BOM in one project + https://scijava.org/ + now + + SciJava + https://scijava.org/ + + + + CC0 1.0 Universal License + https://creativecommons.org/publicdomain/zero/1.0/ + repo + + + + + ctrueden + Curtis Rueden + + + + + None + + + + + None + + + + scm:git:git://github.com/scijava/pom-scijava + scm:git:git@github.com:scijava/pom-scijava + HEAD + https://github.com/scijava/pom-scijava + + + None + + + None + + + N/A + N/A + + + + scijava.public + https://maven.scijava.org/content/groups/public + + + diff --git a/tests/run.sh b/tests/run.sh new file mode 100644 index 00000000..12e725a8 --- /dev/null +++ b/tests/run.sh @@ -0,0 +1,75 @@ +#!/bin/sh + +# +# run.sh - Tests correctness of the pom-scijava BOM. +# + +die () { echo "$*" >&2; exit 1; } + +echo && +printf 'Generating mega-melt project... ' && + +dir=$(dirname "$0") +pom="$dir/../pom.xml" +test -f "$pom" || die 'Where is pom.xml?!' + +generateMegaMeltScript="$dir/generate-mega-melt.py" +filterBuildLogScript="$dir/filter-build-log.py" + +megaMeltDir="$dir/../target/mega-melt" +versionSwapLog="$megaMeltDir/version-swap.log" +dependencyTreeLog="$megaMeltDir/dependency-tree.log" +validationLog="$megaMeltDir/validation.log" +validationErrorsLog="$megaMeltDir/validation-errors.log" +megaMeltPOM="$megaMeltDir/pom.xml" +meltingPotURL=https://raw.githubusercontent.com/scijava/scijava-scripts/master/melting-pot.sh +meltingPotScript="$megaMeltDir/melting-pot.sh" + +rm -rf "$megaMeltDir" && mkdir -p "$megaMeltDir" || die "Creation of $megaMeltDir failed!" +mvn -f "$pom" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" && +mvn -f "$pom" install >> "$versionSwapLog" || + die "pom-scijava version swap failed:\n$(cat "$versionSwapLog")" +mv -f "$pom.versionsBackup" "$pom" || die 'POM restoration failed!' +python "$generateMegaMeltScript" "$megaMeltDir" || die 'Generation failed!' +echo 'Done!' + +# Ensure the mega-melt dependency structure validates. +# In particular, this runs our enforcer rules: the build +# will fail if there are any snapshots dependencies, or +# any duplicate classes across artifacts on the classpath. +echo && +printf 'Validating mega-melt project... ' && +mvn -f "$megaMeltPOM" dependency:tree > "$dependencyTreeLog" || + die "Invalid dependency tree:\n$(cat "$dependencyTreeLog")" +mvn -f "$megaMeltPOM" -U clean package > "$validationLog" || { + python "$filterBuildLogScript" "$validationLog" > "$validationErrorsLog" + die "Validation build failed!\n\nDependency tree:\n$(cat "$dependencyTreeLog")\n\nBuild log:\n$(cat "$validationErrorsLog")" +} +echo 'Done!' + +# Run mega-melt through the melting pot, +# with all SciJava-affiliated groupIds. +echo && +echo 'Executing melting pot...' && +curl -fsL "$meltingPotURL" > "$meltingPotScript" && +chmod +x "$meltingPotScript" && +"$meltingPotScript" "$megaMeltDir" \ + -o "$megaMeltDir/melting-pot" \ + -i 'ca.mcgill:*' \ + -i 'graphics.scenery:*' \ + -i 'io.scif:*' \ + -i 'jitk:*' \ + -i 'mpicbg:*' \ + -i 'net.imagej:*' \ + -i 'net.imglib2:*' \ + -i 'net.preibisch:*' \ + -i 'org.bonej:*' \ + -i 'org.janelia.saalfeldlab:*' \ + -i 'org.janelia:*' \ + -i 'org.scijava:*' \ + -i 'sc.fiji:*' \ + -i 'sc.iview:*' \ + -f -v $@ || die 'Melting pot build failed!' + +echo +echo 'All checks succeeded! :-D' From 4af05eb1b4a5e8f93c83cf47498e24e96e812753 Mon Sep 17 00:00:00 2001 From: Igor Pisarev Date: Tue, 26 May 2020 17:22:38 -0400 Subject: [PATCH 101/996] bump mpicbg to 1.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1bfb17e7..15495cb7 100644 --- a/pom.xml +++ b/pom.xml @@ -693,7 +693,7 @@ ${bigwarp.version} - 1.2.0 + 1.4.0 ${mpicbg.version} From 430514ba3a8382fb457691c5284a62372abb126e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 26 May 2020 19:08:34 -0500 Subject: [PATCH 102/996] Update parent to pom-scijava 11.1.1 This adds configuration for the revapi-maven-plugin. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1bfb17e7..06f74817 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 11.0.0 + 11.1.1 From 0ea557d7ff2f22f94d44e95ea18e8ccd2027853f Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Tue, 26 May 2020 23:38:34 -0400 Subject: [PATCH 103/996] Bump scijava-io-http to version 0.2.1 This requires https://github.com/scijava/scijava-io-http/pull/5 to be accepted and merged! --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 06f74817..95752a95 100644 --- a/pom.xml +++ b/pom.xml @@ -330,7 +330,7 @@ 0.1.0 - 0.2.0 + 0.2.1 0.1.0 From 8d5d0af5a92e170ae43bb9876b53ce26c9f51802 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 27 May 2020 14:17:38 -0500 Subject: [PATCH 104/996] Update component versions * n5: 2.2.0 -> 2.2.1 * n5-blosc: 1.0.1 -> 1.1.0 * n5-hdf5: 1.0.4 -> 1.1.0 * n5-imglib2: 3.5.0 -> 3.5.1 * n5-zarr: 0.0.3-beta -> 0.0.4 * BigStitcher: 0.5.5 -> 0.5.6 * multiview-reconstruction: 0.6.5 -> 0.7.0 --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 8528bffc..51c76c4a 100644 --- a/pom.xml +++ b/pom.xml @@ -722,14 +722,14 @@ 0.9.0 - 2.2.0 + 2.2.1 3.1.1 - 1.0.1 + 1.1.0 3.2.1 - 1.0.4 - 3.5.0 + 1.1.0 + 3.5.1 2.2.0 - 0.0.3-beta + 0.0.4 - 0.5.5 + 0.5.6 - 0.6.5 + 0.7.0 0.2.0 From 976b2bc2950e1189ba7ea63786af9b077a2cfb83 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 3 Jun 2020 10:29:04 -0500 Subject: [PATCH 105/996] Update component versions * scijava-common: 2.83.2 -> 2.83.3 * imagej-legacy: 0.37.3 -> 0.37.4 * BigStitcher: 0.5.6 -> 0.5.8 * multiview-reconstruction: 0.7.0 -> 0.7.2 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5f67c189..2594f891 100644 --- a/pom.xml +++ b/pom.xml @@ -321,7 +321,7 @@ 0.1.2 - 2.83.2 + 2.83.3 2.0.2 @@ -429,7 +429,7 @@ 5.0.3 - 0.37.3 + 0.37.4 0.7.4 @@ -803,10 +803,10 @@ ${MorphoLibJ.version} - 0.5.6 + 0.5.8 - 0.7.0 + 0.7.2 0.2.0 From 430950dc1a8b6ef86378f39633f7211957bc1368 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Thu, 4 Jun 2020 11:33:33 -0500 Subject: [PATCH 106/996] Update component version * scifio-bf-compat: 4.0.2 -> 4.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2594f891..50b97d3c 100644 --- a/pom.xml +++ b/pom.xml @@ -532,7 +532,7 @@ 0.40.0 - 4.0.2 + 4.1.0 0.6.1 From 7423340e1a942ee9cef11cb1e009e4df844dc7c1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 5 Jun 2020 15:55:45 -0500 Subject: [PATCH 107/996] Update parent to pom-scijava-base 11.1.2 This adds JavaFX to the list of javadoc links, enabling the javadoc of projects using JavaFX to be built. It also excludes script_templates directories from license updates. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 50b97d3c..b9e3dc93 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 11.1.1 + 11.1.2 From e5162e9f8bda4cd424868f758b79eae25bc8b917 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 5 Jun 2020 17:03:12 -0500 Subject: [PATCH 108/996] Update component versions * n5-aws-s3: 3.1.1 -> 3.1.2 * n5-google-cloud: 3.2.1 -> 3.2.2 * aws-java-sdk-s3: 1.11.729 -> 1.11.796 * commons-io: 2.6 -> 2.7 * google-cloud-storage: 1.106.0 -> 1.108.0 * jetty: 9.4.26.v20200117 -> 9.4.26.v20200521 * joml: 1.9.24 -> 1.9.25 --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index b9e3dc93..e9acb312 100644 --- a/pom.xml +++ b/pom.xml @@ -723,9 +723,9 @@ 0.9.0 2.2.1 - 3.1.1 + 3.1.2 1.1.0 - 3.2.1 + 3.2.2 1.1.0 3.5.1 2.2.0 @@ -826,7 +826,7 @@ - 1.11.729 + 1.11.796 3.0.4 @@ -921,7 +921,7 @@ 1.20 - 2.6 + 2.7 2.6 @@ -959,7 +959,7 @@ 0.117.2-alpha - 1.106.0 + 1.108.0 2.8.6 @@ -1000,7 +1000,7 @@ 2.0.6 - 9.4.26.v20200117 + 9.4.26.v20200521 ${jetty.version} - 1.9.24 + 1.9.25 2.80b11 From f28adbc50a11b72e6ceb28bf9ef7e2e5db144b17 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 5 Jun 2020 17:04:55 -0500 Subject: [PATCH 109/996] Update component versions * Simple_Neurite_Tracer: 3.1.6 -> 3.1.7 * OMEVisual: 1.1.2 -> 2.0.0 Note that OMEVisual moved to the fiji org from hadim. --- pom.xml | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index e9acb312..93f231c2 100644 --- a/pom.xml +++ b/pom.xml @@ -618,6 +618,7 @@ 2.0.1 2.1.1 3.0.1 + 2.0.0 1.1.2 1.1.2 ${QuickPALM.version} @@ -629,7 +630,7 @@ 2.0.2 ${Samples.version} 2.0.1 - 3.1.6 + 3.1.7 1.0.5 2.1.1 ${Skeletonize3D.version} @@ -679,9 +680,6 @@ - - 1.1.2 - 4.0.1 @@ -2050,6 +2048,11 @@ Multi_Kymograph ${Multi_Kymograph.version} + + sc.fiji + OMEVisual + ${OMEVisual.version} + sc.fiji PIV_analyser @@ -2273,13 +2276,6 @@ - - - sc.fiji - OMEVisual - ${OMEVisual.version} - - ca.mcgill @@ -4419,6 +4415,7 @@ LATEST LATEST LATEST + LATEST LATEST LATEST LATEST @@ -4465,7 +4462,6 @@ LATEST - LATEST LATEST LATEST LATEST From 358ae0beff0272c01f341541d1c74c9a7f78efa5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 5 Jun 2020 20:49:46 -0500 Subject: [PATCH 110/996] Fix typo in new jetty version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 93f231c2..6beaf54f 100644 --- a/pom.xml +++ b/pom.xml @@ -998,7 +998,7 @@ 2.0.6 - 9.4.26.v20200521 + 9.4.29.v20200521 ${jetty.version} - 7.0.5 + 7.0.6 ${bonej.version} ${bonej.version} ${bonej.version} From 03542198d30826268f6a1d89bfc7c8352a2731ef Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 12 Jun 2020 12:05:44 -0500 Subject: [PATCH 112/996] Update JUnit 4 URL --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6beaf54f..9b6bb2d8 100644 --- a/pom.xml +++ b/pom.xml @@ -1090,7 +1090,7 @@ 0.1.55 - + 4.13 @@ -4081,7 +4081,7 @@ - + junit junit From d62263d4142645a88e54ed81503c36e0f8f7b1ef Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Fri, 12 Jun 2020 09:03:34 -0500 Subject: [PATCH 113/996] Add versions for JUnit 5 modules --- pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/pom.xml b/pom.xml index 9b6bb2d8..2bc53ec1 100644 --- a/pom.xml +++ b/pom.xml @@ -1093,6 +1093,14 @@ 4.13 + + 5.6.2 + ${junit-jupiter.version} + ${junit-jupiter.version} + ${junit-jupiter.version} + ${junit-jupiter.version} + ${junit-jupiter.version} + 2.7.2 ${jython.version} @@ -4089,6 +4097,38 @@ test + + + org.junit.jupiter + junit-jupiter-api + ${junit-jupiter-api.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit-jupiter-engine.version} + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + ${junit-jupiter-migrationsupport.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit-jupiter-params.version} + test + + + org.junit.vintage + junit-vintage-engine + ${junit-vintage-engine.version} + test + + org.scijava From d7795baee39a809617f49dd752e8ca8469f2aa69 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 12 Jun 2020 14:39:11 -0500 Subject: [PATCH 114/996] Update ij1-patcher: 1.0.1 -> 1.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9cf9c131..6af194de 100644 --- a/pom.xml +++ b/pom.xml @@ -417,7 +417,7 @@ ${imagej1.version} - 1.0.1 + 1.1.0 0.33.0 From 50be568b809f02dafaa8607e134bd47cc61f3234 Mon Sep 17 00:00:00 2001 From: Stephan Saalfeld Date: Tue, 9 Jun 2020 15:25:08 -0400 Subject: [PATCH 115/996] Add jblosc and google-cloud-nio These are used by n5-blosc and n5-google-cloud. Co-authored-by: Curtis Rueden --- pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pom.xml b/pom.xml index 6beaf54f..c1e2a71f 100644 --- a/pom.xml +++ b/pom.xml @@ -903,6 +903,10 @@ ${batik.version} 2.4 + + 1.0.1 + 1.18.1 + 1.2 @@ -956,6 +960,7 @@ ${eclipse-swt.version} + 0.120.0-alpha 0.117.2-alpha 1.108.0 @@ -3255,6 +3260,13 @@ ${xmlgraphics-commons.version} + + + org.lasersonlab + jblosc + ${jblosc.version} + + javax.enterprise @@ -3415,6 +3427,11 @@ + + com.google.cloud + google-cloud-nio + ${google-cloud-nio.version} + com.google.cloud google-cloud-resourcemanager From 6ccc7819ae090edea9fc684ae1af63eedc849a8a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 12 Jun 2020 17:11:37 -0500 Subject: [PATCH 116/996] mega-melt: explicitly skip ignored artifacts The SciJava component collection includes some artifacts we do not want to include in the mega melt, even though their groupIds as a whole are included. For example, we do not need to melt SciJava forks of third-party components (Java 3D, JUnit Benchmarks, JEP), and we do not want to melt known-to-fail components (Scenery, n5-blosc and n5-zarr). --- tests/run.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 12e725a8..cfde5ecd 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -47,8 +47,8 @@ mvn -f "$megaMeltPOM" -U clean package > "$validationLog" || { } echo 'Done!' -# Run mega-melt through the melting pot, -# with all SciJava-affiliated groupIds. +# Run mega-melt through the melting pot, with all SciJava-affiliated groupIds, +# minus excluded artifacts (see ignoredArtifacts in generate-mega-melt.py). echo && echo 'Executing melting pot...' && curl -fsL "$meltingPotURL" > "$meltingPotScript" && @@ -69,6 +69,14 @@ chmod +x "$meltingPotScript" && -i 'org.scijava:*' \ -i 'sc.fiji:*' \ -i 'sc.iview:*' \ + -e 'graphics.scenery:scenery' \ + -e 'org.janelia.saalfeldlab:n5-blosc' \ + -e 'org.janelia.saalfeldlab:n5-zarr' \ + -e 'org.scijava:j3dcore' \ + -e 'org.scijava:j3dutils' \ + -e 'org.scijava:jep' \ + -e 'org.scijava:junit-benchmarks' \ + -e 'org.scijava:vecmath' \ -f -v $@ || die 'Melting pot build failed!' echo From f3727ca430028945ed36749448000ce0faca64ac Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 12 Jun 2020 19:19:45 -0500 Subject: [PATCH 117/996] Update sciview: 0.2.0-beta-4 -> 0.2.0-beta-5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bb4d8ce7..bc431ef8 100644 --- a/pom.xml +++ b/pom.xml @@ -819,7 +819,7 @@ 0.7.0-beta-7 - 0.2.0-beta-4 + 0.2.0-beta-5 From 8491f984f8cc12ca318c6074978703260807d0d8 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 14 Jun 2020 17:55:17 -0500 Subject: [PATCH 118/996] Move jep into third-party section It's a fork of a third-party project. --- pom.xml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index bc431ef8..6e3b0622 100644 --- a/pom.xml +++ b/pom.xml @@ -668,7 +668,6 @@ 2.1.3 ${blockmatching.version} 2.1.2 - 2.4.2 1.1.9 1.0.2 2.0.1 @@ -1002,6 +1001,9 @@ 2.0.6 + + 2.4.2 + 9.4.29.v20200521 ${jetty.version} @@ -2246,11 +2248,6 @@ fiji-lib ${fiji-lib.version} - - org.scijava - jep - ${jep.version} - sc.fiji legacy-imglib1 @@ -3555,6 +3552,13 @@ ${jdom2.version} + + + org.scijava + jep + ${jep.version} + + org.eclipse.jetty @@ -4509,7 +4513,6 @@ LATEST LATEST LATEST - LATEST LATEST LATEST LATEST From 21578d21a34e1168325abb3f0fee3c424de71293 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 15 Jun 2020 16:04:37 -0500 Subject: [PATCH 119/996] Update scifio version: 0.40.0 -> 0.41.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e3b0622..e8c9f1a1 100644 --- a/pom.xml +++ b/pom.xml @@ -529,7 +529,7 @@ - 0.40.0 + 0.41.0 4.1.0 From 464065a7e6b1f066defde39a8d03631cf9bab588 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 15 Jun 2020 17:59:38 -0500 Subject: [PATCH 120/996] Update parent to pom-scijava-base 11.2.0 This updates plugin versions, removes obsolete maven-javadoc-plugin hacks, and adds configuration to customize the core Java library javadoc link URL. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e8c9f1a1..9bdd7258 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 11.1.2 + 11.2.0 From dcf34269d21345b98127b7da790fd5ee17642ede Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Tue, 16 Jun 2020 08:50:52 +0800 Subject: [PATCH 121/996] BoneJ version 7.0.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9bdd7258..0995ad69 100644 --- a/pom.xml +++ b/pom.xml @@ -737,7 +737,7 @@ --> - 7.0.6 + 7.0.7 ${bonej.version} ${bonej.version} ${bonej.version} From 9c0eb377e896a3a6a370ff4573aa9e0c352483c1 Mon Sep 17 00:00:00 2001 From: Jan Eglinger Date: Fri, 19 Jun 2020 15:41:42 +0200 Subject: [PATCH 122/996] Add scijava-optional --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 0995ad69..4e2ce7cf 100644 --- a/pom.xml +++ b/pom.xml @@ -338,6 +338,9 @@ 1.0.5 + + 1.0.0 + 0.2.3 @@ -1298,6 +1301,13 @@ ${scijava-log-slf4j.version} + + + org.scijava + scijava-optional + ${scijava-optional.version} + + org.scijava @@ -4255,6 +4265,7 @@ LATEST LATEST LATEST + LATEST LATEST LATEST LATEST From d1ca295c49c2ac4a35fe3db561102eedf45caadc Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Wed, 24 Jun 2020 11:00:21 +0800 Subject: [PATCH 123/996] Add Eclipse Collections MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Eclipse Collections is a Java collections framework containing useful and high performance replacements for JDK's default collections. For example, HashSet can be replaced by the primitive collection IntHashSet. It is in general faster than Trove by a factor of 1.5-3×, and is actively maintained at https://github.com/eclipse/eclipse-collections --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index 9bdd7258..1ab98d46 100644 --- a/pom.xml +++ b/pom.xml @@ -939,6 +939,9 @@ 3.3.0 + + + 10.2.0 4.3 @@ -3354,6 +3357,19 @@ ${cglib.version} + + + org.eclipse.collections + eclipse-collections-api + ${eclipse-collections.version} + + + + org.eclipse.collections + eclipse-collections + ${eclipse-collections.version} + + org.eclipse.swt From 3b7b8b43f3f163f7c377d76906fc527b6ecfe992 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 24 Jun 2020 12:18:11 -0500 Subject: [PATCH 124/996] Manage all org.eclipse.collections artifacts And give them each a unique property, for individual overriding. --- pom.xml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 1ab98d46..b60243ff 100644 --- a/pom.xml +++ b/pom.xml @@ -942,6 +942,9 @@ 10.2.0 + ${eclipse-collections.version} + ${eclipse-collections.version} + ${eclipse-collections.version} 4.3 @@ -3359,15 +3362,24 @@ - org.eclipse.collections - eclipse-collections-api - ${eclipse-collections.version} + org.eclipse.collections + eclipse-collections + ${eclipse-collections.version} + + + org.eclipse.collections + eclipse-collections-api + ${eclipse-collections-api.version} + + + org.eclipse.collections + eclipse-collections-forkjoin + ${eclipse-collections-forkjoin.version} - - org.eclipse.collections - eclipse-collections - ${eclipse-collections.version} + org.eclipse.collections + eclipse-collections-testutils + ${eclipse-collections-testutils.version} From 0ce7f59b0ca878c1b8d7a9c0bca2d07626da7700 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 10 Jul 2020 17:58:07 -0500 Subject: [PATCH 125/996] Update imagej-updater version: 0.10.4 -> 0.10.5 This avoids a critical bug which impacted Fiji bootstrapping in the fiji/fiji-builds packaging logic. See also imagej/imagej-updater#88. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9a3856f..0047e577 100644 --- a/pom.xml +++ b/pom.xml @@ -489,7 +489,7 @@ 0.23.2 - 0.10.4 + 0.10.5 0.1.4 From c8cd7f5b4069f9af4631a0e83e1fbed0508f9933 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Mon, 13 Jul 2020 17:41:32 +0200 Subject: [PATCH 126/996] Manage scijava-listeners --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 0047e577..b8a1bf76 100644 --- a/pom.xml +++ b/pom.xml @@ -335,6 +335,9 @@ 0.1.0 + + 1.0.0-beta-3 + 1.0.5 @@ -1300,6 +1303,13 @@ ${scijava-java3d.version} + + + org.scijava + scijava-listeners + ${scijava-listeners.version} + + org.scijava @@ -4292,6 +4302,7 @@ LATEST LATEST LATEST + LATEST LATEST LATEST LATEST From 6f9e028038c153fabd1c53537fc8885f39132ada Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Mon, 13 Jul 2020 21:30:01 +0200 Subject: [PATCH 127/996] filter-build-log.py: use find() instead of index() to avoid ValueError --- tests/filter-build-log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/filter-build-log.py b/tests/filter-build-log.py index 4e3a9483..4e8f1942 100644 --- a/tests/filter-build-log.py +++ b/tests/filter-build-log.py @@ -25,7 +25,7 @@ def print_filtered_log(log): atbeginning = False if parsingdups: if line.startswith(' '): - if line.index('/') >= 0: + if line.find('/') >= 0: # Strip to containing package only. line = line[:line.rindex('/')] dups.append(line) From a32fe028be5709512905889ce4f4f57d79e68bd3 Mon Sep 17 00:00:00 2001 From: Jan Eglinger Date: Thu, 23 Jul 2020 21:33:46 +0200 Subject: [PATCH 128/996] Update imglib2-roi: 0.10.2 -> 0.10.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8a1bf76..ec137787 100644 --- a/pom.xml +++ b/pom.xml @@ -521,7 +521,7 @@ 3.0.0 - 0.10.2 + 0.10.3 0.2.4 From 3893358dcae1920534d7c064308b8a723ae9bbb6 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 25 Jul 2020 12:58:28 -0500 Subject: [PATCH 129/996] Exclude imagej-omero from the mega-melt for now --- tests/generate-mega-melt.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index 88d716ed..36af4220 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -23,6 +23,9 @@ def child(node, tag): ignoredArtifacts = [ # TEMP: Until scenerygraphics/scenery#314 is addressed. 'scenery', + # TEMP: Until imagej-omero is updated for pom-scijava 29. + 'imagej-omero', + 'imagej-omero-legacy', # NB: The following artifacts have messy dependency trees. # Too many problems to test as part of the mega-melt. # See WARNING block in pom-scijava's pom.xml for details. From d73954f7ca85eabe917f2422f85d3fc73e6973c0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 25 Jul 2020 12:59:04 -0500 Subject: [PATCH 130/996] mega-melt: store melting pot dir in a variable --- tests/run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index cfde5ecd..e2d241ea 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -24,6 +24,7 @@ validationErrorsLog="$megaMeltDir/validation-errors.log" megaMeltPOM="$megaMeltDir/pom.xml" meltingPotURL=https://raw.githubusercontent.com/scijava/scijava-scripts/master/melting-pot.sh meltingPotScript="$megaMeltDir/melting-pot.sh" +meltingPotDir="$megaMeltDir/melting-pot" rm -rf "$megaMeltDir" && mkdir -p "$megaMeltDir" || die "Creation of $megaMeltDir failed!" mvn -f "$pom" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" && @@ -54,7 +55,7 @@ echo 'Executing melting pot...' && curl -fsL "$meltingPotURL" > "$meltingPotScript" && chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ - -o "$megaMeltDir/melting-pot" \ + -o "$meltingPotDir" \ -i 'ca.mcgill:*' \ -i 'graphics.scenery:*' \ -i 'io.scif:*' \ From 3a6e3c5adbb365e8aa4adf4521fbb0c72e47dd18 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 25 Jul 2020 12:59:34 -0500 Subject: [PATCH 131/996] mega-melt: fix typo --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index e2d241ea..dc1ffbe8 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -36,7 +36,7 @@ echo 'Done!' # Ensure the mega-melt dependency structure validates. # In particular, this runs our enforcer rules: the build -# will fail if there are any snapshots dependencies, or +# will fail if there are any snapshot dependencies, or # any duplicate classes across artifacts on the classpath. echo && printf 'Validating mega-melt project... ' && From 1aec6d541711cc9fc8d4d2950aa6d339934199a4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 25 Jul 2020 12:59:51 -0500 Subject: [PATCH 132/996] mega-melt: avoid duplicate version properties When two components have the same artifactId, the melting pot sets two version properties with the same name, one for each component, likely at different versions. This breaks the melting pot. To avoid the issue for now, we prune the known-duplicate properties from the build script. Some day, it would be nice for the melting pot to use "fully qualified" version properties that include the groupId somehow, to avoid ambiguity. --- tests/run.sh | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index dc1ffbe8..66633aff 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -51,7 +51,7 @@ echo 'Done!' # Run mega-melt through the melting pot, with all SciJava-affiliated groupIds, # minus excluded artifacts (see ignoredArtifacts in generate-mega-melt.py). echo && -echo 'Executing melting pot...' && +echo 'Generating melting pot...' && curl -fsL "$meltingPotURL" > "$meltingPotScript" && chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ @@ -78,7 +78,40 @@ chmod +x "$meltingPotScript" && -e 'org.scijava:jep' \ -e 'org.scijava:junit-benchmarks' \ -e 'org.scijava:vecmath' \ - -f -v $@ || die 'Melting pot build failed!' + -f -v -s $@ || die 'Melting pot build failed!' +# HACK: Remove known-duplicate artifactIds from version property overrides. +# The plan is for this step to become unnecessary once the melting pot has +# been improved to include a strategy for dealing with components with same +# artifactId but different groupIds. For now, we just prune these overrides. +meltScript="$meltingPotDir/melt.sh" +buildScript="$meltingPotDir/build.sh" +buildScriptBackup="$buildScript.original" +echo && +printf 'Adjusting melting pot build script... ' && +mv "$buildScript" "$buildScriptBackup" && +awk '!/-D(annotations|antlr|jocl|kryo|minlog|trove4j)\.version/' "$buildScriptBackup" > "$buildScript" || + die 'Error adjusting melting pot build script!' +echo 'Done!' + +# Run the melting pot now, unless -s flag was given. +doMelt=t +for arg in "$@" +do + if [ "$arg" = '-s' ] + then + doMelt= + fi +done +if [ "doMelt" ] +then + echo && + (cd "$meltingPotDir" && sh melt.sh) || die 'Melting pot failed!' +else + echo && + echo 'Melting the pot... SKIPPED' +fi + +# Complete! echo echo 'All checks succeeded! :-D' From 868ba7da721badfc3d4e6209f0f0bb6f09102e87 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 25 Jul 2020 14:08:00 -0500 Subject: [PATCH 133/996] Travis: run the mega-melt! --- .travis/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis/build.sh b/.travis/build.sh index 5fa365e5..84d4c560 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -1,3 +1,4 @@ #!/bin/sh curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/travis-build.sh -sh travis-build.sh $encrypted_e7761bcf8400_key $encrypted_e7761bcf8400_iv +sh travis-build.sh $encrypted_e7761bcf8400_key $encrypted_e7761bcf8400_iv && +sh tests/run.sh From 7b60dc936aab96b2da28e836d990a3c012c09b87 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 25 Jul 2020 14:26:43 -0500 Subject: [PATCH 134/996] Travis: make xmllint available --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7bf881b6..52b6f68f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ branches: only: - master - "/.*-[0-9]+\\..*/" +before_install: + - sudo apt-get install -y libxml2-utils install: true script: ".travis/build.sh" cache: From b7b20398e2f546072fdc9d8c0203826c6eb01b83 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 25 Jul 2020 14:59:52 -0500 Subject: [PATCH 135/996] mega-melt: occasionally emit output Travis CI aborts the build if 10 minutes pass without output. --- tests/run.sh | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index 66633aff..c1faa5cc 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -6,6 +6,27 @@ die () { echo "$*" >&2; exit 1; } +# Wait for a launched background command to complete, emitting +# an occasional message to avoid long periods without output. +# Return the same exit code as the launched command. +keep_alive() { + pid="$1" + if [ "$pid" = "" ] + then + echo "[ERROR] No PID given" + return + fi + i=0 + while kill -0 "$pid" 2>/dev/null; do + i=$((i+1)) + m=$((i/60)) + s=$((i%60)) + test $s -eq 0 && echo "[$m minutes elapsed]" + sleep 1 + done + wait "$pid" +} + echo && printf 'Generating mega-melt project... ' && @@ -106,7 +127,7 @@ done if [ "doMelt" ] then echo && - (cd "$meltingPotDir" && sh melt.sh) || die 'Melting pot failed!' + (cd "$meltingPotDir" && sh melt.sh) & keep_alive $! || die 'Melting pot failed!' else echo && echo 'Melting the pot... SKIPPED' From a22c88d76c942be075811a8534151c9e9d63a54b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 25 Jul 2020 14:04:36 -0500 Subject: [PATCH 136/996] Update component versions * imagej: 2.0.0-rc-72 -> 2.0.0 (preemptive) * imagej-omero: 0.8.1 -> 1.0.0-5.5 (preemptive) * imagej-omero-legacy: 0.1.2 -> 1.0.0-5.5 (preemptive) * imagej-server: 0.1.2 -> 0.2.0 (preemptive) * fiji: 2.0.0-pre-11 -> 2.0.0 (preemptive) And temporarily disable the mega-melt until imagej + fiji are released. --- .travis/build.sh | 4 ++-- pom.xml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis/build.sh b/.travis/build.sh index 84d4c560..357a2dc3 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -1,4 +1,4 @@ #!/bin/sh curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/travis-build.sh -sh travis-build.sh $encrypted_e7761bcf8400_key $encrypted_e7761bcf8400_iv && -sh tests/run.sh +sh travis-build.sh $encrypted_e7761bcf8400_key $encrypted_e7761bcf8400_iv +#sh tests/run.sh diff --git a/pom.xml b/pom.xml index b8a1bf76..f046570f 100644 --- a/pom.xml +++ b/pom.xml @@ -416,7 +416,7 @@ - 2.0.0-rc-72 + 2.0.0 1.52p @@ -450,10 +450,10 @@ 0.7.1 - 0.8.1 + 1.0.0-5.5 - 0.1.2 + 1.0.0-5.5 0.1.1 @@ -480,7 +480,7 @@ 0.8.2 - 0.1.2 + 0.2.0 1.1.5 @@ -558,7 +558,7 @@ - 2.0.0-pre-11 + 2.0.0 From d47aa718302be19739fc2d20bd56b0ed8542d082 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 26 Jul 2020 12:43:27 -0500 Subject: [PATCH 137/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f046570f..5bbc83c8 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 29.0.0-SNAPSHOT + 29.0.1-SNAPSHOT pom SciJava Parent POM From 2d1b92e94311ec7b692057965f9cdf366e29c05a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 26 Jul 2020 19:14:46 -0500 Subject: [PATCH 138/996] Travis: reenable the mega melt --- .travis/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/build.sh b/.travis/build.sh index 357a2dc3..84d4c560 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -1,4 +1,4 @@ #!/bin/sh curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/travis-build.sh -sh travis-build.sh $encrypted_e7761bcf8400_key $encrypted_e7761bcf8400_iv -#sh tests/run.sh +sh travis-build.sh $encrypted_e7761bcf8400_key $encrypted_e7761bcf8400_iv && +sh tests/run.sh From 85fd20f546cea2693079a6489990a7af7b00878d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 29 Jul 2020 17:44:55 -0500 Subject: [PATCH 139/996] Update component versions * imglib2: 5.9.2 -> 5.10.0 * Descriptor_based_registration: 2.1.4 -> 2.1.7 * FlowJ_: 2.0.0 -> 2.0.1 * View5D: 1.3.2 -> 2.3.1 * bio-formats: 6.5.0 -> 6.5.1 (multiple components) --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 5bbc83c8..865cf1a6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 29.0.1-SNAPSHOT + 29.1.0-SNAPSHOT pom SciJava Parent POM @@ -500,7 +500,7 @@ - 5.9.2 + 5.10.0 0.11.2 @@ -583,7 +583,7 @@ 2.0.3 ${CorrectBleach.version} 1.0.6 - 2.1.4 + 2.1.7 2.1.2 ${Dichromacy.version} 2.3.0 @@ -595,7 +595,7 @@ 2.0.7 2.1.1 3.1.1 - 2.0.0 + 2.0.1 ${FlowJ.version} 1.0.2 2.3.5 @@ -664,7 +664,7 @@ 2.0.3 1.0.3 2.0.1 - 1.3.2 + 2.3.1 ${View5D.version} 2.0.2 2.01.2 @@ -769,7 +769,7 @@ ${jxrlib.version} - 6.5.0 + 6.5.1 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From c2021b4e43b596b2168dcb62384b15c6c88178fb Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 29 Jul 2020 18:11:02 -0500 Subject: [PATCH 140/996] Travis: disable the mega-melt again Will fix the issues ASAP, but right now we need a new release. --- .travis/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis/build.sh b/.travis/build.sh index 84d4c560..357a2dc3 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -1,4 +1,4 @@ #!/bin/sh curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/travis-build.sh -sh travis-build.sh $encrypted_e7761bcf8400_key $encrypted_e7761bcf8400_iv && -sh tests/run.sh +sh travis-build.sh $encrypted_e7761bcf8400_key $encrypted_e7761bcf8400_iv +#sh tests/run.sh From 72552a2ad7f9aa81825934504351f8938909ac72 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 30 Jul 2020 16:48:25 -0500 Subject: [PATCH 141/996] Update component version * fiji: 2.0.0 -> 2.0.1 (preemptive) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 865cf1a6..0410f9bd 100644 --- a/pom.xml +++ b/pom.xml @@ -558,7 +558,7 @@ - 2.0.0 + 2.0.1 From 43853101c8e86554f0905a8ae4db692ac35592aa Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 30 Jul 2020 16:54:47 -0500 Subject: [PATCH 142/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0410f9bd..12a83808 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 29.1.0-SNAPSHOT + 29.1.1-SNAPSHOT pom SciJava Parent POM From 30c77723b6cdf8fb5f23c972053499b239eecb58 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 1 Aug 2020 21:45:02 -0500 Subject: [PATCH 143/996] Update component version * ij: 1.52p -> 1.53c --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d29a91be..247caf30 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 29.1.1-SNAPSHOT + 29.2.0-SNAPSHOT pom SciJava Parent POM @@ -419,7 +419,7 @@ 2.0.0 - 1.52p + 1.53c ${imagej1.version} From 01470cae125ac92219e743adeb913262cd4e2218 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 1 Aug 2020 21:53:12 -0500 Subject: [PATCH 144/996] Update component versions * imagej: 2.0.0 -> 2.1.0 (preemptive) * fiji: 2.0.1 -> 2.1.0 (preemptive) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 247caf30..76b7d292 100644 --- a/pom.xml +++ b/pom.xml @@ -416,7 +416,7 @@ - 2.0.0 + 2.1.0 1.53c @@ -558,7 +558,7 @@ - 2.0.1 + 2.1.0 From 70d9454f211778fb641df4eb7629d0671898af1f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 1 Aug 2020 21:53:46 -0500 Subject: [PATCH 145/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 76b7d292..3c520805 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 29.2.0-SNAPSHOT + 29.2.1-SNAPSHOT pom SciJava Parent POM From 8812e348260c861964e27f8960e657d7318c924e Mon Sep 17 00:00:00 2001 From: Jan Eglinger Date: Mon, 3 Aug 2020 11:48:19 +0200 Subject: [PATCH 146/996] Update component versions * scijava-plugins-io-table: 0.2.0 -> 0.3.0 * scijava-table: 0.5.0 -> 0.6.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3c520805..4840a7bf 100644 --- a/pom.xml +++ b/pom.xml @@ -348,7 +348,7 @@ 0.2.3 - 0.2.0 + 0.3.0 0.3.1 @@ -363,7 +363,7 @@ 0.7.0 - 0.5.0 + 0.6.1 0.1.7 From 10b42e8e5971bc62e885118d0e2b1c5429c032c9 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 4 Aug 2020 16:52:56 -0500 Subject: [PATCH 147/996] Update component versions * bigdataviewer-core: 9.0.5 -> 9.0.6 * fiji: 2.1.0 -> 2.1.1 (preemptive) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4840a7bf..fec4b1d6 100644 --- a/pom.xml +++ b/pom.xml @@ -558,7 +558,7 @@ - 2.1.0 + 2.1.1 @@ -707,7 +707,7 @@ - 9.0.5 + 9.0.6 3.0.0 1.0.0-beta-20 6.2.0 From eb1e756dfb829689dce2155d4d257a7909365ba3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 4 Aug 2020 16:53:46 -0500 Subject: [PATCH 148/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fec4b1d6..515cb8d2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 29.2.1-SNAPSHOT + 29.2.2-SNAPSHOT pom SciJava Parent POM From 8fa15ff3cbdd8f3f020d50e9226894f1f35724eb Mon Sep 17 00:00:00 2001 From: Christian Tischer Date: Wed, 5 Aug 2020 22:01:23 +0200 Subject: [PATCH 149/996] Update n5-aws-s3 The update includes minor changes significantly speeding up the n5 version checking. Those changes are needed, at least for the MoBIE plugin, to function properly. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 515cb8d2..4ee81b23 100644 --- a/pom.xml +++ b/pom.xml @@ -726,7 +726,7 @@ 0.9.0 2.2.1 - 3.1.2 + 3.1.3 1.1.0 3.2.2 1.1.0 From 7a9304b15b0f9440201faad3c7ba9f06d53773c8 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 11 Aug 2020 14:27:19 -0500 Subject: [PATCH 150/996] Manage kotlin-stdlib and kotlin-stdlib-common --- pom.xml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4ee81b23..b987099f 100644 --- a/pom.xml +++ b/pom.xml @@ -1138,6 +1138,8 @@ ${kotlin.version} ${kotlin.version} ${kotlin.version} + ${kotlin.version} + ${kotlin.version} @@ -3914,9 +3916,19 @@ org.jetbrains.kotlin - kotlin-stdlib-jdk8 + kotlin-stdlib ${kotlin-stdlib.version} + + org.jetbrains.kotlin + kotlin-stdlib-common + ${kotlin-stdlib-common.version} + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + ${kotlin-stdlib-jdk8.version} + From 0729d495febd9e71305c4eb7bfb69b66278a6517 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 23 Aug 2020 18:49:44 -0500 Subject: [PATCH 151/996] Add UNLICENSE --- UNLICENSE | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 UNLICENSE diff --git a/UNLICENSE b/UNLICENSE new file mode 100644 index 00000000..68a49daa --- /dev/null +++ b/UNLICENSE @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to From d59e2fb19709275026cc898236081b299dda076b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 23 Aug 2020 18:51:10 -0500 Subject: [PATCH 152/996] Change license from CC0 to Unlicense The latter is arguably more appropriate for source code. --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index b987099f..61e2a17a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,8 +23,8 @@ - CC0 1.0 Universal License - https://creativecommons.org/publicdomain/zero/1.0/ + Unlicense + https://unlicense.org/ repo @@ -321,7 +321,7 @@ 0.1.2 - 2.83.3 + 2.84.0 2.0.2 @@ -348,7 +348,7 @@ 0.2.3 - 0.3.0 + 0.4.0 0.3.1 @@ -363,7 +363,7 @@ 0.7.0 - 0.6.1 + 0.7.0 0.1.7 @@ -416,7 +416,7 @@ - 2.1.0 + 2.2.0 1.53c @@ -558,7 +558,7 @@ - 2.1.1 + 2.2.0 From 494d657686268e730de2031d5d7e16e8b686a234 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Mon, 24 Aug 2020 14:31:05 +0200 Subject: [PATCH 153/996] Update component versions * bigdataviewer-vistools: 1.0.0-beta-20 -> 1.0.0-beta-21 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 61e2a17a..e48cc070 100644 --- a/pom.xml +++ b/pom.xml @@ -709,7 +709,7 @@ 9.0.6 3.0.0 - 1.0.0-beta-20 + 1.0.0-beta-21 6.2.0 2.2.4 From c11ec0ead1975d87b04cd13a406455b6a0320f4b Mon Sep 17 00:00:00 2001 From: Stephan Saalfeld Date: Tue, 25 Aug 2020 11:58:37 -0400 Subject: [PATCH 154/996] bump to mpicbg-1.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e48cc070..b8183efd 100644 --- a/pom.xml +++ b/pom.xml @@ -696,7 +696,7 @@ ${bigwarp.version} - 1.4.0 + 1.4.1 ${mpicbg.version} From 8400a56bf5efe1512de5986bab55de562d42e8c9 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 1 Sep 2020 16:49:27 -0500 Subject: [PATCH 155/996] Update component version * imagej1: 1.53c -> 1.53d --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8183efd..f96fc457 100644 --- a/pom.xml +++ b/pom.xml @@ -419,7 +419,7 @@ 2.2.0 - 1.53c + 1.53d ${imagej1.version} From 7764a2ceb7b7e17452d9050817a51d26b94c8a3b Mon Sep 17 00:00:00 2001 From: Jan Eglinger Date: Thu, 9 Jul 2020 22:50:45 +0200 Subject: [PATCH 156/996] Update OpenCSV version: 3.9 -> 5.2 API changes can be browsed at https://abi-laboratory.pro/?view=timeline&lang=java&l=opencsv --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f96fc457..01b7f879 100644 --- a/pom.xml +++ b/pom.xml @@ -1170,7 +1170,7 @@ 45.1.1 - 3.9 + 5.2 4.3.2 From 2b057e0bfa2fc44428fa7011b804dcbdb9963c82 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 1 Sep 2020 17:07:11 -0500 Subject: [PATCH 157/996] Manage sc.fiji:FilamentDetector It depends on opencsv, and is now part of core Fiji. --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 01b7f879..24496cce 100644 --- a/pom.xml +++ b/pom.xml @@ -595,6 +595,7 @@ 2.0.7 2.1.1 3.1.1 + 1.0.0 2.0.1 ${FlowJ.version} 1.0.2 @@ -1966,6 +1967,11 @@ Fiji_Plugins ${Fiji_Plugins.version} + + sc.fiji + FilamentDetector + ${FilamentDetector.version} + sc.fiji FlowJ_ @@ -4513,6 +4519,7 @@ LATEST LATEST LATEST + LATEST LATEST LATEST LATEST From 2aa284a3f43a11efb68ddd6f14dddcfde940ffc9 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 1 Sep 2020 17:12:07 -0500 Subject: [PATCH 158/996] Bump to next major version OpenCSV changed major versions, so by transitive SemVer, we do too. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 24496cce..45ff7c7f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 29.2.2-SNAPSHOT + 30.0.0-SNAPSHOT pom SciJava Parent POM From abfc7d4d3e87edc650810839f239f6fa0f1abb1a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 1 Sep 2020 17:17:16 -0500 Subject: [PATCH 159/996] Manage version of Kappa It depends on opencsv, and is part of core Fiji now. --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 45ff7c7f..bfe3d759 100644 --- a/pom.xml +++ b/pom.xml @@ -612,6 +612,7 @@ 3.0.1 3.0.0 2.0.1 + 2.0.0 2.0.1 2.1.1 4.1.2 @@ -2042,6 +2043,11 @@ IsoData_Classifier ${IsoData_Classifier.version} + + sc.fiji + Kappa + ${Kappa.version} + sc.fiji Kuwahara_Filter @@ -4534,6 +4540,7 @@ LATEST LATEST LATEST + LATEST LATEST LATEST LATEST From bed338cc73b46ddc104a4e871537803f700e2461 Mon Sep 17 00:00:00 2001 From: Jean-Yves TINEVEZ Date: Wed, 2 Sep 2020 18:56:48 +0200 Subject: [PATCH 160/996] Update TrackMate to v6.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bfe3d759..2dfb6a95 100644 --- a/pom.xml +++ b/pom.xml @@ -656,7 +656,7 @@ ${ToAST.version} 2.0.1 ${TopoJ.version} - 6.0.0 + 6.0.1 ${TrackMate.version} 3.2.34 2.0.3 From d01072ebed485f009ce522c4042579b6663c7323 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Fri, 11 Sep 2020 13:25:08 +0200 Subject: [PATCH 161/996] Bump component versions imglib2 -> 5.10.1 imglib2-cache -> 1.0.0-beta-15 imglib2-realtransform -> 3.1.0 imglib2-roi -> 0.10.4 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 2dfb6a95..b2542aef 100644 --- a/pom.xml +++ b/pom.xml @@ -500,7 +500,7 @@ - 5.10.0 + 5.10.1 0.11.2 @@ -512,16 +512,16 @@ 0.2.4 - 1.0.0-beta-13 + 1.0.0-beta-15 2.0.0-beta-46 - 3.0.0 + 3.1.0 - 0.10.3 + 0.10.4 0.2.4 From 88b6028014314c7bafabf5d0ff0ce2b7b33cfbf5 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Thu, 24 Sep 2020 10:13:04 -0500 Subject: [PATCH 162/996] Update imagej-launcher to 6.0.0 --- melting-pot.sh | 714 +++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 2 +- 2 files changed, 715 insertions(+), 1 deletion(-) create mode 100644 melting-pot.sh diff --git a/melting-pot.sh b/melting-pot.sh new file mode 100644 index 00000000..3274e31f --- /dev/null +++ b/melting-pot.sh @@ -0,0 +1,714 @@ +#!/bin/sh + +# ============================================================================ +# melting-pot.sh +# ============================================================================ +# Tests all components of a project affected by changes in its dependencies. +# +# First, an anecdote illustrating the problem this script solves: +# +# Suppose you have a large application, org:app:1.0.0, with many dependencies: +# org:foo:1.2.3, org:bar:3.4.5, and many others. +# +# Now suppose you make some changes to foo, and want to know whether deploying +# them (i.e., releasing a new foo and updating app to depend on that release) +# will break the app. So you manually update your local copy of app to depend +# on org:foo:1.3.0-SNAPSHOT, and run the build (including tests, of course). +# +# The build passes, but this alone is insufficient: org:bar:3.4.5 also depends +# on org:foo:1.2.3, so you manually update bar to use org:foo:1.3.0-SNAPSHOT, +# then build bar to verify that it also is not broken by the update. +# +# This process quickly becomes very tedious when there are dozens of +# components of app which all depend on foo. +# +# And more importantly, testing each component individually in this manner is +# still insufficient to determine whether all of them will truly work together +# at runtime, where only a single version of each component is deployed. +# +# For example: suppose org:bar:3.4.5 depends on org:lib:8.0.0, while +# org:foo:1.2.3 depends on org:lib:7.0.0. The relevant facts are: +# +# * Your new foo (org:foo:1.3.0-SNAPSHOT) builds against lib 7, and portions +# of it rely on lib-7-specific API. +# +# * The bar component pinned to foo 1.3.0-SNAPSHOT builds against lib 8; it +# compiles with passing tests because bar only invokes portions of the foo +# API which do not require lib-7-specific API. +# +# In this scenario, it is lib 8 that is actually deployed at runtime with the +# app, so parts of foo will be broken, even though both foo and bar build with +# passing tests individually. +# +# This "melting pot" build seeks to overcome many of these issues by unifying +# all components of the app into a single multi-module build, with all +# versions uniformly pinned to the ones that will actually be deployed at +# runtime. +# +# This goal is achieved by synthesizing a multi-module build including all +# affected components (or optionally, all components period) of the specific +# project, and then executing a Maven build with uniformly overridden versions +# of all components to the ones resolved for the project itself. +# +# IMPORTANT IMPLEMENTATION DETAIL! The override works by setting a version +# property for each component of the form "artifactId.version"; it is assumed +# that all components declare their dependencies using version properties of +# this form. E.g.: +# +# +# com.google.guava +# guava +# ${guava.version} +# +# +# Using dependencyManagement is fine too, as long as it then uses this pattern +# to declare the versions as properties, which can be overridden. +# +# Any dependency which does not declare a version property matching this +# assumption will not be properly overridden in the melting pot! +# +# Author: Curtis Rueden +# ============================================================================ + +# -- Functions -- + +stderr() { + >&2 echo "$@" +} + +debug() { + test "$debug" && + stderr "+ $@" +} + +info() { + test "$verbose" && + stderr "[INFO] $@" +} + +warn() { + stderr "[WARNING] $@" +} + +error() { + stderr "[ERROR] $@" +} + +die() { + error $1 + exit $2 +} + +unknownArg() { + error "Unknown option: $@" + usage=1 +} + +checkPrereqs() { + while [ $# -gt 0 ] + do + which $1 > /dev/null 2> /dev/null + test $? -ne 0 && die "Missing prerequisite: $1" 255 + shift + done +} + +verifyPrereqs() { + checkPrereqs git mvn xmllint + git --version | grep -q 'git version 2' || + die "Please use git v2.x; older versions (<=1.7.9.5 at least) mishandle 'git clone --depth 1'" 254 +} + +parseArguments() { + while [ $# -gt 0 ] + do + case "$1" in + -b|--branch) + branch="$2" + shift + ;; + -c|--changes) + test "$changes" && changes="$changes,$2" || changes="$2" + shift + ;; + -i|--includes) + test "$includes" && includes="$includes,$2" || includes="$2" + shift + ;; + -e|--excludes) + test "$excludes" && excludes="$excludes,$2" || excludes="$2" + shift + ;; + -r|--remoteRepos) + test "$remoteRepos" && remoteRepos="$remoteRepos,$2" || remoteRepos="$2" + shift + ;; + -l|--localRepo) + repoBase="$2" + shift + ;; + -o|--outputDir) + outputDir="$2" + shift + ;; + -p|--prune) + prune=1 + ;; + -v|--verbose) + verbose=1 + ;; + -d|--debug) + debug=1 + ;; + -f|--force) + force=1 + ;; + -s|--skipBuild) + skipBuild=1 + ;; + -h|--help) + usage=1 + ;; + -*) + unknownArg "$1" + ;; + *) + test -z "$project" && project="$1" || + unknownArg "$1" + ;; + esac + shift + done + + test -z "$project" -a -z "$usage" && + error "No project specified!" && usage=1 + + if [ "$usage" ] + then + echo "Usage: $(basename "$0") [-b ] [-c ] \\ + [-i ] [-e ] [-r ] [-l ] [-o ] [-pvfsh] + + + The project to build, including dependencies, with consistent versions. + Can be either G:A:V form, or a local directory pointing at a project. +-b, --branch + Override the branch/tag of the project to build. By default, + the branch used will be the tag named \"artifactId-version\". +-c, --changes + Comma-separated list of GAVs to inject into the project, replacing + normal versions. E.g.: \"com.mycompany:myartifact:1.2.3-SNAPSHOT\" +-i, --includes + Comma-separated list of GAs (no version; wildcards OK for G or A) to + include in the build. All by default. E.g.: \"mystuff:*,myotherstuff:*\" +-e, --excludes + Comma-separated list of GAs (no version; wildcards OK for G or A) to + exclude from the build. E.g.: \"mystuff:extraneous,mystuff:irrelevant\" +-r, --remoteRepos + Comma-separated list of additional remote Maven repositories to check + for artifacts, in the format id::[layout]::url or just url. +-l, --localRepos + Overrides the directory of the Maven local repository cache. +-o, --outputDir + Overrides the output directory. The default is \"melting-pot\". +-p, --prune + Build only the components which themselves depend on a changed + artifact. This will make the build much faster, at the expense of + not fully testing runtime compatibility across all components. +-v, --verbose + Enable verbose/debugging output. +-f, --force + Wipe out the output directory if it already exists. +-s, --skipBuild + Skips the final build step. Useful for automated testing. +-h, --help + Display this usage information. + +--== Example ==-- + + sh melting-pot.sh net.imagej:imagej-common:0.15.1 \\ + -r https://maven.scijava.org/content/groups/public \\ + -c org.scijava:scijava-common:2.44.2 \\ + -i 'org.scijava:*,net.imagej:*,net.imglib2:*,io.scif:*' \\ + -e net.imglib2:imglib2-roi \\ + -v -f -s + +This command tests net.imagej:imagej-common:0.15.1 along with all of its +dependencies, pulled from its usual SciJava Maven repository location. + +The -c flag is used to override the org.scijava:scijava-common +dependency to use version 2.44.2 instead of its declared version 2.42.0. + +Note that such overrides do not need to be release versions; you can +also test SNAPSHOTs the same way. + +The -i option is used to include all imagej-common dependencies with +groupIds org.scijava, net.imagej, net.imglib2 and io.scif in the pot. + +The -e flag is used to exclude net.imglib2:imglib2-roi from the pot. +" + exit 1 + fi + + # If project is a local directory path, get its absolute path. + test -d "$project" && project=$(cd "$project" && pwd) + + # Assign default parameter values. + test "$outputDir" || outputDir="melting-pot" + test "$repoBase" || repoBase="$HOME/.m2/repository" +} + +createDir() { + test -z "$force" -a -e "$1" && + die "Directory already exists: $1" 2 + + rm -rf "$1" + mkdir -p "$1" + cd "$1" +} + +groupId() { + echo "${1%%:*}" +} + +artifactId() { + local result="${1#*:}" # strip groupId + echo "${result%%:*}" +} + +version() { + local result="${1#*:}" # strip groupId + case "$result" in + *:*) + result="${result#*:}" # strip artifactId + case "$result" in + *:*:*:*) + # G:A:P:C:V:S + result="${result#*:}" # strip packaging + result="${result#*:}" # strip classifier + ;; + *:*:*) + # G:A:P:V:S + result="${result#*:}" # strip packaging + ;; + *) + # G:A:V or G:A:V:? + ;; + esac + echo "${result%%:*}" + ;; + esac +} + +classifier() { + local result="${1#*:}" # strip groupId + case "$result" in + *:*) + result="${result#*:}" # strip artifactId + case "$result" in + *:*:*:*) + # G:A:P:C:V:S + result="${result#*:}" # strip packaging + ;; + *:*:*) + # G:A:P:V:S + result="" + ;; + *:*) + # G:A:V:C + result="${result#*:}" # strip version + ;; + *) + # G:A:V + result="" + ;; + esac + echo "${result%%:*}" + ;; + esac +} + +# Converts the given GAV into a path in the local repository cache. +repoPath() { + local gPath="$(echo "$(groupId "$1")" | tr :. /)" + local aPath="$(artifactId "$1")" + local vPath="$(version "$1")" + echo "$repoBase/$gPath/$aPath/$vPath" +} + +# Gets the path to the given GAV's POM file in the local repository cache. +pomPath() { + local pomFile="$(artifactId "$1")-$(version "$1").pom" + echo "$(repoPath "$1")/$pomFile" +} + +# Fetches the POM for the given GAV into the local repository cache. +downloadPOM() { + local g="$(groupId "$1")" + local a="$(artifactId "$1")" + local v="$(version "$1")" + debug "mvn dependency:get \\ + -DrepoUrl=\"$remoteRepos\" \\ + -DgroupId=\"$g\" \\ + -DartifactId=\"$a\" \\ + -Dversion=\"$v\" \\ + -Dpackaging=pom" + mvn dependency:get \ + -DrepoUrl="$remoteRepos" \ + -DgroupId="$g" \ + -DartifactId="$a" \ + -Dversion="$v" \ + -Dpackaging=pom > /dev/null || + die "Problem fetching $g:$a:$v from $remoteRepos" 4 +} + +# Gets the POM path for the given GAV, ensuring it exists locally. +pom() { + local pomPath="$(pomPath "$1")" + test -f "$pomPath" || downloadPOM "$1" + test -f "$pomPath" || die "Cannot access POM: $pomPath" 9 + echo "$pomPath" +} + +# For the given XML file on disk ($1), gets the value of the +# specified XPath expression of the form "//$2/$3/$4/...". +xpath() { + local xmlFile="$1" + shift + local xpath="/" + while [ $# -gt 0 ] + do + # NB: Ignore namespace issues; see: http://stackoverflow.com/a/8266075 + xpath="$xpath/*[local-name()='$1']" + shift + done + debug "xmllint --xpath \"$xpath\" \"$xmlFile\"" + xmllint --xpath "$xpath" "$xmlFile" 2> /dev/null | + sed -E 's/^[^>]*>(.*)<[^<]*$/\1/' +} + +# For the given GAV ($1), recursively gets the value of the +# specified XPath expression of the form "//$2/$3/$4/...". +pomValue() { + local pomPath="$(pom "$1")" + test "$pomPath" || die "Cannot discern POM path for $1" 6 + shift + local value="$(xpath "$pomPath" $@)" + if [ "$value" ] + then + echo "$value" + else + # Path not found in POM; look in the parent POM. + local pg="$(xpath "$pomPath" project parent groupId)" + if [ "$pg" ] + then + # There is a parent POM declaration in this POM. + local pa="$(xpath "$pomPath" project parent artifactId)" + local pv="$(xpath "$pomPath" project parent version)" + pomValue "$pg:$pa:$pv" $@ + fi + fi +} + +# Gets the SCM URL for the given GAV. +scmURL() { + pomValue "$1" project scm connection | sed -E 's/^scm:git://' +} + +# Gets the SCM tag for the given GAV. +scmTag() { + local tag=$(pomValue "$1" project scm tag) + if [ -z "$tag" -o "$tag" = "HEAD" ] + then + # The value was not set properly, + # so we try to guess the tag naming scheme. :-/ + warn "$1: improper scm tag value; scanning remote tags..." + local a=$(artifactId "$1") + local v=$(version "$1") + local scmURL="$(scmURL "$1")" + local allTags=$(git ls-remote --tags "$scmURL" | sed 's/.*refs\/tags\///' || + error "$1: Invalid scm url: $scmURL") + for tag in "$a-$v" "$v" "v$v" + do + echo "$allTags" | grep -q "^$tag$" && { + info "$1: inferred tag: $tag" + echo "$tag" + return + } + done + error "$1: inscrutable tag scheme" + else + echo "$tag" + fi +} + +# Fetches the source code for the given GAV. Returns the directory. +retrieveSource() { + local scmURL="$(scmURL "$1")" + test "$scmURL" || die "Cannot glean SCM URL for $1" 10 + local scmBranch + test "$2" && scmBranch="$2" || scmBranch="$(scmTag "$1")" + local dir="$(groupId "$1")/$(artifactId "$1")" + debug "git clone \"$scmURL\" --branch \"$scmBranch\" --depth 1 \"$dir\"" + git clone "$scmURL" --branch "$scmBranch" --depth 1 "$dir" 2> /dev/null || + die "Could not fetch project source for $1" 3 + + # Now verify that the cloned pom.xml contains the expected version! + local expectedVersion=$(version "$1") + local actualVersion=$(xpath "$dir/pom.xml" project version) + test "$expectedVersion" = "$actualVersion" || + die "POM for $1 contains wrong version: $actualVersion" 14 + + echo "$dir" +} + +# Gets the list of dependencies for the project in the CWD. +deps() { + cd "$1" + debug "mvn dependency:list" + local depList="$(mvn -B dependency:list)" || + die "Problem fetching dependencies!" 5 + echo "$depList" | grep '^\[INFO\] [^ ]' | + sed 's/\[INFO\] //' | sed 's/ *(optional) *$//' | sort + cd - > /dev/null +} + +# Checks whether the given GA(V) matches the specified filter pattern. +gaMatch() { + local ga="$1" + local filter="$2" + local g="$(groupId "$ga")" + local a="$(artifactId "$ga")" + local fg="$(groupId "$filter")" + local fa="$(artifactId "$filter")" + test "$fg" = "$g" -o "$fg" = "*" || return + test "$fa" = "$a" -o "$fa" = "*" || return + echo 1 +} + +# Determines whether the given GA(V) version is being overridden. +isChanged() { + local IFS="," + + local change + for change in $changes + do + test "$(gaMatch "$1" "$change")" && echo 1 && return + done +} + +# Determines whether the given GA(V) meets the inclusion criteria. +isIncluded() { + # do not include the changed artifacts we are testing against + test "$(isChanged "$1")" && return + + local IFS="," + + # ensure GA is not excluded + local exclude + for exclude in $excludes + do + test "$(gaMatch "$1" "$exclude")" && return + done + + # ensure GA is included + test -z "$includes" && echo 1 && return + local include + for include in $includes + do + test "$(gaMatch "$1" "$include")" && echo 1 && return + done +} + +# Deletes components which do not depend on a changed GAV. +pruneReactor() { + local dir + for dir in */* + do + info "Checking relevance of component $dir" + local deps="$(deps "$dir")" + test "$deps" || die "Cannot glean dependencies for '$dir'" 8 + + # Determine whether the component depends on a changed GAV. + local keep + unset keep + local dep + for dep in $deps + do + test "$(isChanged "$dep")" && keep=1 && break + done + + # If the component is irrelevant, prune it. + if [ -z "$keep" ] + then + info "Pruning irrelevant component: $dir" + rm -rf "$dir" + fi + done +} + +# Tests if the given directory contains the appropriate source code. +isProject() { + local a="$(xpath "$1/pom.xml" project artifactId)" + test "$1" = "LOCAL/PROJECT" -o "$a" = "$(basename "$1")" && echo 1 +} + +# Generates an aggregator POM for all modules in the current directory. +generatePOM() { + echo '' > pom.xml + echo '> pom.xml + echo ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' >> pom.xml + echo ' xsi:schemaLocation="http://maven.apache.org/POM/4.0.0' >> pom.xml + echo ' http://maven.apache.org/xsd/maven-4.0.0.xsd">' >> pom.xml + echo ' 4.0.0' >> pom.xml + echo >> pom.xml + echo ' melting-pot' >> pom.xml + echo ' melting-pot' >> pom.xml + echo ' 0.0.0-SNAPSHOT' >> pom.xml + echo ' pom' >> pom.xml + echo >> pom.xml + echo ' Melting Pot' >> pom.xml + echo >> pom.xml + echo ' ' >> pom.xml + local dir + for dir in */* + do + if [ "$(isProject "$dir")" ] + then + echo " $dir" >> pom.xml + else + # Check for a child component of a multi-module project. + local childDir="$dir/$(basename "$dir")" + test "$(isProject "$childDir")" && + echo " $childDir" >> pom.xml + fi + done + echo ' ' >> pom.xml + echo '' >> pom.xml +} + +# Generates melt.sh script for all modules in the current directory. +generateScript() { + echo '#!/bin/sh' > melt.sh + echo 'trap "exit" INT' >> melt.sh + echo 'echo "Melting the pot..."' >> melt.sh + echo 'dir=$(pwd)' >> melt.sh + echo 'failCount=0' >> melt.sh + echo 'for f in \' >> melt.sh + echo " $projectDir \\" >> melt.sh + local dir + for dir in */* + do + if [ "$(isProject "$dir")" ] + then + echo " $dir \\" >> melt.sh + else + # Check for a child component of a multi-module project. + local childDir="$dir/$(basename "$dir")" + test "$(isProject "$childDir")" && + echo " $childDir \\" >> melt.sh + fi + done + echo >> melt.sh + echo 'do (' >> melt.sh + echo ' cd "$f"' >> melt.sh + echo ' sh "$dir/build.sh" > build.log 2>&1 &&' >> melt.sh + echo ' echo "[SUCCESS] $f" || {' >> melt.sh + echo ' echo "[FAILURE] $f"' >> melt.sh + echo ' failCount=$((failCount+1))' >> melt.sh + echo ' }' >> melt.sh + echo ') done' >> melt.sh + echo 'test "$failCount" -gt 255 && failCount=255' >> melt.sh + echo 'exit "$failCount"' >> melt.sh +} + +# Creates and tests an appropriate multi-module reactor for the given project. +# All relevant dependencies which match the inclusion criteria are linked into +# the multi-module build, with each changed GAV overridding the originally +# specified version for the corresponding GA. +meltDown() { + # Fetch the project source code. + if [ -d "$1" ] + then + # Use local directory for the specified project. + test -d "$1" || die "No such directory: $1" 11 + test -f "$1/pom.xml" || die "Not a Maven project: $1" 12 + info "Local Maven project: $1" +# mkdir -p "LOCAL" +# local dir="LOCAL/PROJECT" +# ln -s "$1" "$dir" + projectDir=$1 + else + # Treat specified project as a GAV. + info "Fetching project source" + retrieveSource "$1" "$branch" + fi + + # Get the project dependencies. + info "Determining project dependencies" + local deps="$(deps "$dir")" + test "$deps" || die "Cannot glean project dependencies" 7 + + local args="-Denforcer.skip" + + # Process the dependencies. + info "Processing project dependencies" + local dep + for dep in $deps + do + local g="$(groupId "$dep")" + local a="$(artifactId "$dep")" + local v="$(version "$dep")" + local c="$(classifier "$dep")" + test -z "$c" || continue # skip secondary artifacts + local gav="$g:$a:$v" + + test -z "$(isChanged "$gav")" && + args="$args \\\\\n -D$a.version=$v" + + if [ "$(isIncluded "$gav")" ] + then + info "$a: fetching component source" + dir="$(retrieveSource "$gav")" + fi + done + + # Override versions of changed GAVs. + info "Processing changed components" + local TLS=, + local gav + for gav in $changes + do + local a="$(artifactId "$gav")" + local v="$(version "$gav")" + args="$args \\\\\n -D$a.version=$v" + done + unset TLS + + # Prune the build, if applicable. + test "$prune" && pruneReactor + + # Generate build scripts. + info "Generating build scripts" + generatePOM + echo "mvn $args \\\\\n test \$@" > build.sh + generateScript + + # Build everything. + if [ "$skipBuild" ] + then + info "Skipping the build; run melt.sh to do it." + else + info "Building the project!" + # NB: All code is fresh; no need to clean. + sh melt.sh || die "Melt failed" 13 + fi + + info "Melt complete: $1" +} + +# -- Main -- + +verifyPrereqs +parseArguments $@ +createDir "$outputDir" +meltDown "$project" diff --git a/pom.xml b/pom.xml index 2dfb6a95..b23c7fad 100644 --- a/pom.xml +++ b/pom.xml @@ -432,7 +432,7 @@ 0.1.4 - 5.0.3 + 6.0.0 0.37.4 From c9069b18c51db9f88a0c9764aabe54fbbe2e9ee1 Mon Sep 17 00:00:00 2001 From: Ignacio Arganda-Carreras Date: Mon, 28 Sep 2020 15:49:39 +0200 Subject: [PATCH 163/996] Update AnalyzeSkeleton to current release version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b23c7fad..69ec62d4 100644 --- a/pom.xml +++ b/pom.xml @@ -562,7 +562,7 @@ - 3.4.1 + 3.4.2 ${AnalyzeSkeleton.version} 2.0.1 0.5.4 From 5ac27510935f711f730433145fe19376dffdec60 Mon Sep 17 00:00:00 2001 From: bogovicj Date: Fri, 16 Oct 2020 16:36:26 -0400 Subject: [PATCH 164/996] update n5 versions, add n5-ij * n5 * n5-aws-s3 * n5-google-cloud * n5-hdf5 * n5-ij * n5-viewer_fiji * n5-zarr --- pom.xml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 69ec62d4..90defcca 100644 --- a/pom.xml +++ b/pom.xml @@ -727,14 +727,15 @@ 0.9.0 - 2.2.1 - 3.1.3 + 2.3.0 + 3.2.0 1.1.0 - 3.2.2 - 1.1.0 + 3.3.1 + 1.2.0 + 1.0.0 3.5.1 - 2.2.0 - 0.0.4 + 4.0.0 + 0.0.6 - 2.0.1 + 2.0.3 From d0f0d3a304ee7fa806fbe45349944712e8749d89 Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Fri, 23 Oct 2020 17:45:07 +0800 Subject: [PATCH 166/996] Update pom.xml Update to most recent Eclipse Collections version 10.4.0 https://github.com/eclipse/eclipse-collections/releases/tag/10.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c3aeb018..6f194ef2 100644 --- a/pom.xml +++ b/pom.xml @@ -949,7 +949,7 @@ 3.3.0 - 10.2.0 + 10.4.0 ${eclipse-collections.version} ${eclipse-collections.version} ${eclipse-collections.version} From 08631f2635d629a8867e92636a06cd50493ae84c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Oct 2020 14:37:09 -0500 Subject: [PATCH 167/996] Bump component version * imglib-algorithm-gpl: 0.2.4 -> 0.2.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 903a2ed2..4cb449a5 100644 --- a/pom.xml +++ b/pom.xml @@ -509,7 +509,7 @@ 0.2.0 - 0.2.4 + 0.2.5 1.0.0-beta-15 From 7847a06b47b12ae200f70588c4cf573ed3d74e57 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Tue, 3 Nov 2020 15:27:46 -0600 Subject: [PATCH 168/996] Bump component version * imagej-launcher: 6.0.0 -> 6.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4cb449a5..2947845e 100644 --- a/pom.xml +++ b/pom.xml @@ -432,7 +432,7 @@ 0.1.4 - 6.0.0 + 6.0.1 0.37.4 From 11f70ce76d47c3761050801b1966eedbfa4fd852 Mon Sep 17 00:00:00 2001 From: bogovicj Date: Tue, 17 Nov 2020 14:34:05 -0500 Subject: [PATCH 169/996] bump versions for n5-ij and n5-viewer --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 90defcca..794e00cd 100644 --- a/pom.xml +++ b/pom.xml @@ -732,9 +732,9 @@ 1.1.0 3.3.1 1.2.0 - 1.0.0 + 1.1.1 3.5.1 - 4.0.0 + 4.0.1 0.0.6 - - 4.0.1 + + 3.1.112 3.0.1 @@ -2148,11 +2147,6 @@ Series_Labeler ${Series_Labeler.version} - - sc.fiji - Simple_Neurite_Tracer - ${Simple_Neurite_Tracer.version} - sc.fiji Siox_Segmentation @@ -2326,18 +2320,11 @@ - + - ca.mcgill - Sholl_Analysis - ${Sholl_Analysis.version} - - - - net.imagej - imagej - - + org.morphonets + SNT + ${SNT.version} @@ -4598,7 +4585,7 @@ LATEST - LATEST + LATEST LATEST LATEST LATEST From 563c7dd27a861c635b45fcd5b4d8bd60cf7d587e Mon Sep 17 00:00:00 2001 From: David Gault Date: Tue, 15 Dec 2020 17:28:02 +0000 Subject: [PATCH 171/996] Bump Bio-Formats version to 6.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 901283f7..abfe04b8 100644 --- a/pom.xml +++ b/pom.xml @@ -770,7 +770,7 @@ ${jxrlib.version} - 6.5.1 + 6.6.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From 0faf91af9bc97f382cebe2997b6a9da1453673d6 Mon Sep 17 00:00:00 2001 From: Albert Cardona Date: Thu, 17 Dec 2020 21:30:27 +0000 Subject: [PATCH 172/996] Update pom.xml Update pom.xml to the latest script-editor version, which supports autocompletions for jython scripting. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 901283f7..0d4fc46e 100644 --- a/pom.xml +++ b/pom.xml @@ -372,7 +372,7 @@ 0.13.2 - 0.5.6 + 0.5.9 0.3.4 From 2555bc713fdef38554cdb185545febb6f10e5b91 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Wed, 13 Jan 2021 09:42:35 -0600 Subject: [PATCH 173/996] Use the doMelt variable tests/run.sh was mistakenly using the literal "doMelt" which always resolves to true since it's non-empty. Intended behavior was to use the variable named doMelt. Closes #159 --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index c1faa5cc..643af1ae 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -124,7 +124,7 @@ do doMelt= fi done -if [ "doMelt" ] +if [ "$doMelt" ] then echo && (cd "$meltingPotDir" && sh melt.sh) & keep_alive $! || die 'Melting pot failed!' From 65e4ed61c20c5226ce214c49a053e3aba5a6c0e2 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Wed, 13 Jan 2021 09:43:38 -0600 Subject: [PATCH 174/996] run.sh: support both skipBuild forms melting-pot.sh supports -s or --skipBuild, so run.sh should as well. --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index 643af1ae..abc0f6ba 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -119,7 +119,7 @@ echo 'Done!' doMelt=t for arg in "$@" do - if [ "$arg" = '-s' ] + if [ "$arg" = '-s' ] || [ "$arg" = '--skipBuild' ] then doMelt= fi From 7b6cfbd56c3d4c288a3149fbe8aabdb3ffabb42b Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Thu, 14 Jan 2021 09:45:51 -0600 Subject: [PATCH 175/996] Update to latest imglib2 * imglib2 -> 5.11.1 * imagej-common -> 0.34.0 * imglib2-unsafe -> 0.4.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 901283f7..1aab2401 100644 --- a/pom.xml +++ b/pom.xml @@ -426,7 +426,7 @@ 1.1.0 - 0.33.0 + 0.34.0 0.1.4 @@ -500,7 +500,7 @@ - 5.10.1 + 5.11.1 0.11.2 @@ -530,7 +530,7 @@ 2.0.1 - 0.3.1 + 0.4.0 From acfb6f2fe4dbea19c66d52c556b661d12f2add99 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Thu, 14 Jan 2021 09:50:59 -0600 Subject: [PATCH 176/996] Remove mistakenly bundled melting-pot script It is automatically downloaded by tests/run.sh --- melting-pot.sh | 714 ------------------------------------------------- 1 file changed, 714 deletions(-) delete mode 100644 melting-pot.sh diff --git a/melting-pot.sh b/melting-pot.sh deleted file mode 100644 index 3274e31f..00000000 --- a/melting-pot.sh +++ /dev/null @@ -1,714 +0,0 @@ -#!/bin/sh - -# ============================================================================ -# melting-pot.sh -# ============================================================================ -# Tests all components of a project affected by changes in its dependencies. -# -# First, an anecdote illustrating the problem this script solves: -# -# Suppose you have a large application, org:app:1.0.0, with many dependencies: -# org:foo:1.2.3, org:bar:3.4.5, and many others. -# -# Now suppose you make some changes to foo, and want to know whether deploying -# them (i.e., releasing a new foo and updating app to depend on that release) -# will break the app. So you manually update your local copy of app to depend -# on org:foo:1.3.0-SNAPSHOT, and run the build (including tests, of course). -# -# The build passes, but this alone is insufficient: org:bar:3.4.5 also depends -# on org:foo:1.2.3, so you manually update bar to use org:foo:1.3.0-SNAPSHOT, -# then build bar to verify that it also is not broken by the update. -# -# This process quickly becomes very tedious when there are dozens of -# components of app which all depend on foo. -# -# And more importantly, testing each component individually in this manner is -# still insufficient to determine whether all of them will truly work together -# at runtime, where only a single version of each component is deployed. -# -# For example: suppose org:bar:3.4.5 depends on org:lib:8.0.0, while -# org:foo:1.2.3 depends on org:lib:7.0.0. The relevant facts are: -# -# * Your new foo (org:foo:1.3.0-SNAPSHOT) builds against lib 7, and portions -# of it rely on lib-7-specific API. -# -# * The bar component pinned to foo 1.3.0-SNAPSHOT builds against lib 8; it -# compiles with passing tests because bar only invokes portions of the foo -# API which do not require lib-7-specific API. -# -# In this scenario, it is lib 8 that is actually deployed at runtime with the -# app, so parts of foo will be broken, even though both foo and bar build with -# passing tests individually. -# -# This "melting pot" build seeks to overcome many of these issues by unifying -# all components of the app into a single multi-module build, with all -# versions uniformly pinned to the ones that will actually be deployed at -# runtime. -# -# This goal is achieved by synthesizing a multi-module build including all -# affected components (or optionally, all components period) of the specific -# project, and then executing a Maven build with uniformly overridden versions -# of all components to the ones resolved for the project itself. -# -# IMPORTANT IMPLEMENTATION DETAIL! The override works by setting a version -# property for each component of the form "artifactId.version"; it is assumed -# that all components declare their dependencies using version properties of -# this form. E.g.: -# -# -# com.google.guava -# guava -# ${guava.version} -# -# -# Using dependencyManagement is fine too, as long as it then uses this pattern -# to declare the versions as properties, which can be overridden. -# -# Any dependency which does not declare a version property matching this -# assumption will not be properly overridden in the melting pot! -# -# Author: Curtis Rueden -# ============================================================================ - -# -- Functions -- - -stderr() { - >&2 echo "$@" -} - -debug() { - test "$debug" && - stderr "+ $@" -} - -info() { - test "$verbose" && - stderr "[INFO] $@" -} - -warn() { - stderr "[WARNING] $@" -} - -error() { - stderr "[ERROR] $@" -} - -die() { - error $1 - exit $2 -} - -unknownArg() { - error "Unknown option: $@" - usage=1 -} - -checkPrereqs() { - while [ $# -gt 0 ] - do - which $1 > /dev/null 2> /dev/null - test $? -ne 0 && die "Missing prerequisite: $1" 255 - shift - done -} - -verifyPrereqs() { - checkPrereqs git mvn xmllint - git --version | grep -q 'git version 2' || - die "Please use git v2.x; older versions (<=1.7.9.5 at least) mishandle 'git clone --depth 1'" 254 -} - -parseArguments() { - while [ $# -gt 0 ] - do - case "$1" in - -b|--branch) - branch="$2" - shift - ;; - -c|--changes) - test "$changes" && changes="$changes,$2" || changes="$2" - shift - ;; - -i|--includes) - test "$includes" && includes="$includes,$2" || includes="$2" - shift - ;; - -e|--excludes) - test "$excludes" && excludes="$excludes,$2" || excludes="$2" - shift - ;; - -r|--remoteRepos) - test "$remoteRepos" && remoteRepos="$remoteRepos,$2" || remoteRepos="$2" - shift - ;; - -l|--localRepo) - repoBase="$2" - shift - ;; - -o|--outputDir) - outputDir="$2" - shift - ;; - -p|--prune) - prune=1 - ;; - -v|--verbose) - verbose=1 - ;; - -d|--debug) - debug=1 - ;; - -f|--force) - force=1 - ;; - -s|--skipBuild) - skipBuild=1 - ;; - -h|--help) - usage=1 - ;; - -*) - unknownArg "$1" - ;; - *) - test -z "$project" && project="$1" || - unknownArg "$1" - ;; - esac - shift - done - - test -z "$project" -a -z "$usage" && - error "No project specified!" && usage=1 - - if [ "$usage" ] - then - echo "Usage: $(basename "$0") [-b ] [-c ] \\ - [-i ] [-e ] [-r ] [-l ] [-o ] [-pvfsh] - - - The project to build, including dependencies, with consistent versions. - Can be either G:A:V form, or a local directory pointing at a project. --b, --branch - Override the branch/tag of the project to build. By default, - the branch used will be the tag named \"artifactId-version\". --c, --changes - Comma-separated list of GAVs to inject into the project, replacing - normal versions. E.g.: \"com.mycompany:myartifact:1.2.3-SNAPSHOT\" --i, --includes - Comma-separated list of GAs (no version; wildcards OK for G or A) to - include in the build. All by default. E.g.: \"mystuff:*,myotherstuff:*\" --e, --excludes - Comma-separated list of GAs (no version; wildcards OK for G or A) to - exclude from the build. E.g.: \"mystuff:extraneous,mystuff:irrelevant\" --r, --remoteRepos - Comma-separated list of additional remote Maven repositories to check - for artifacts, in the format id::[layout]::url or just url. --l, --localRepos - Overrides the directory of the Maven local repository cache. --o, --outputDir - Overrides the output directory. The default is \"melting-pot\". --p, --prune - Build only the components which themselves depend on a changed - artifact. This will make the build much faster, at the expense of - not fully testing runtime compatibility across all components. --v, --verbose - Enable verbose/debugging output. --f, --force - Wipe out the output directory if it already exists. --s, --skipBuild - Skips the final build step. Useful for automated testing. --h, --help - Display this usage information. - ---== Example ==-- - - sh melting-pot.sh net.imagej:imagej-common:0.15.1 \\ - -r https://maven.scijava.org/content/groups/public \\ - -c org.scijava:scijava-common:2.44.2 \\ - -i 'org.scijava:*,net.imagej:*,net.imglib2:*,io.scif:*' \\ - -e net.imglib2:imglib2-roi \\ - -v -f -s - -This command tests net.imagej:imagej-common:0.15.1 along with all of its -dependencies, pulled from its usual SciJava Maven repository location. - -The -c flag is used to override the org.scijava:scijava-common -dependency to use version 2.44.2 instead of its declared version 2.42.0. - -Note that such overrides do not need to be release versions; you can -also test SNAPSHOTs the same way. - -The -i option is used to include all imagej-common dependencies with -groupIds org.scijava, net.imagej, net.imglib2 and io.scif in the pot. - -The -e flag is used to exclude net.imglib2:imglib2-roi from the pot. -" - exit 1 - fi - - # If project is a local directory path, get its absolute path. - test -d "$project" && project=$(cd "$project" && pwd) - - # Assign default parameter values. - test "$outputDir" || outputDir="melting-pot" - test "$repoBase" || repoBase="$HOME/.m2/repository" -} - -createDir() { - test -z "$force" -a -e "$1" && - die "Directory already exists: $1" 2 - - rm -rf "$1" - mkdir -p "$1" - cd "$1" -} - -groupId() { - echo "${1%%:*}" -} - -artifactId() { - local result="${1#*:}" # strip groupId - echo "${result%%:*}" -} - -version() { - local result="${1#*:}" # strip groupId - case "$result" in - *:*) - result="${result#*:}" # strip artifactId - case "$result" in - *:*:*:*) - # G:A:P:C:V:S - result="${result#*:}" # strip packaging - result="${result#*:}" # strip classifier - ;; - *:*:*) - # G:A:P:V:S - result="${result#*:}" # strip packaging - ;; - *) - # G:A:V or G:A:V:? - ;; - esac - echo "${result%%:*}" - ;; - esac -} - -classifier() { - local result="${1#*:}" # strip groupId - case "$result" in - *:*) - result="${result#*:}" # strip artifactId - case "$result" in - *:*:*:*) - # G:A:P:C:V:S - result="${result#*:}" # strip packaging - ;; - *:*:*) - # G:A:P:V:S - result="" - ;; - *:*) - # G:A:V:C - result="${result#*:}" # strip version - ;; - *) - # G:A:V - result="" - ;; - esac - echo "${result%%:*}" - ;; - esac -} - -# Converts the given GAV into a path in the local repository cache. -repoPath() { - local gPath="$(echo "$(groupId "$1")" | tr :. /)" - local aPath="$(artifactId "$1")" - local vPath="$(version "$1")" - echo "$repoBase/$gPath/$aPath/$vPath" -} - -# Gets the path to the given GAV's POM file in the local repository cache. -pomPath() { - local pomFile="$(artifactId "$1")-$(version "$1").pom" - echo "$(repoPath "$1")/$pomFile" -} - -# Fetches the POM for the given GAV into the local repository cache. -downloadPOM() { - local g="$(groupId "$1")" - local a="$(artifactId "$1")" - local v="$(version "$1")" - debug "mvn dependency:get \\ - -DrepoUrl=\"$remoteRepos\" \\ - -DgroupId=\"$g\" \\ - -DartifactId=\"$a\" \\ - -Dversion=\"$v\" \\ - -Dpackaging=pom" - mvn dependency:get \ - -DrepoUrl="$remoteRepos" \ - -DgroupId="$g" \ - -DartifactId="$a" \ - -Dversion="$v" \ - -Dpackaging=pom > /dev/null || - die "Problem fetching $g:$a:$v from $remoteRepos" 4 -} - -# Gets the POM path for the given GAV, ensuring it exists locally. -pom() { - local pomPath="$(pomPath "$1")" - test -f "$pomPath" || downloadPOM "$1" - test -f "$pomPath" || die "Cannot access POM: $pomPath" 9 - echo "$pomPath" -} - -# For the given XML file on disk ($1), gets the value of the -# specified XPath expression of the form "//$2/$3/$4/...". -xpath() { - local xmlFile="$1" - shift - local xpath="/" - while [ $# -gt 0 ] - do - # NB: Ignore namespace issues; see: http://stackoverflow.com/a/8266075 - xpath="$xpath/*[local-name()='$1']" - shift - done - debug "xmllint --xpath \"$xpath\" \"$xmlFile\"" - xmllint --xpath "$xpath" "$xmlFile" 2> /dev/null | - sed -E 's/^[^>]*>(.*)<[^<]*$/\1/' -} - -# For the given GAV ($1), recursively gets the value of the -# specified XPath expression of the form "//$2/$3/$4/...". -pomValue() { - local pomPath="$(pom "$1")" - test "$pomPath" || die "Cannot discern POM path for $1" 6 - shift - local value="$(xpath "$pomPath" $@)" - if [ "$value" ] - then - echo "$value" - else - # Path not found in POM; look in the parent POM. - local pg="$(xpath "$pomPath" project parent groupId)" - if [ "$pg" ] - then - # There is a parent POM declaration in this POM. - local pa="$(xpath "$pomPath" project parent artifactId)" - local pv="$(xpath "$pomPath" project parent version)" - pomValue "$pg:$pa:$pv" $@ - fi - fi -} - -# Gets the SCM URL for the given GAV. -scmURL() { - pomValue "$1" project scm connection | sed -E 's/^scm:git://' -} - -# Gets the SCM tag for the given GAV. -scmTag() { - local tag=$(pomValue "$1" project scm tag) - if [ -z "$tag" -o "$tag" = "HEAD" ] - then - # The value was not set properly, - # so we try to guess the tag naming scheme. :-/ - warn "$1: improper scm tag value; scanning remote tags..." - local a=$(artifactId "$1") - local v=$(version "$1") - local scmURL="$(scmURL "$1")" - local allTags=$(git ls-remote --tags "$scmURL" | sed 's/.*refs\/tags\///' || - error "$1: Invalid scm url: $scmURL") - for tag in "$a-$v" "$v" "v$v" - do - echo "$allTags" | grep -q "^$tag$" && { - info "$1: inferred tag: $tag" - echo "$tag" - return - } - done - error "$1: inscrutable tag scheme" - else - echo "$tag" - fi -} - -# Fetches the source code for the given GAV. Returns the directory. -retrieveSource() { - local scmURL="$(scmURL "$1")" - test "$scmURL" || die "Cannot glean SCM URL for $1" 10 - local scmBranch - test "$2" && scmBranch="$2" || scmBranch="$(scmTag "$1")" - local dir="$(groupId "$1")/$(artifactId "$1")" - debug "git clone \"$scmURL\" --branch \"$scmBranch\" --depth 1 \"$dir\"" - git clone "$scmURL" --branch "$scmBranch" --depth 1 "$dir" 2> /dev/null || - die "Could not fetch project source for $1" 3 - - # Now verify that the cloned pom.xml contains the expected version! - local expectedVersion=$(version "$1") - local actualVersion=$(xpath "$dir/pom.xml" project version) - test "$expectedVersion" = "$actualVersion" || - die "POM for $1 contains wrong version: $actualVersion" 14 - - echo "$dir" -} - -# Gets the list of dependencies for the project in the CWD. -deps() { - cd "$1" - debug "mvn dependency:list" - local depList="$(mvn -B dependency:list)" || - die "Problem fetching dependencies!" 5 - echo "$depList" | grep '^\[INFO\] [^ ]' | - sed 's/\[INFO\] //' | sed 's/ *(optional) *$//' | sort - cd - > /dev/null -} - -# Checks whether the given GA(V) matches the specified filter pattern. -gaMatch() { - local ga="$1" - local filter="$2" - local g="$(groupId "$ga")" - local a="$(artifactId "$ga")" - local fg="$(groupId "$filter")" - local fa="$(artifactId "$filter")" - test "$fg" = "$g" -o "$fg" = "*" || return - test "$fa" = "$a" -o "$fa" = "*" || return - echo 1 -} - -# Determines whether the given GA(V) version is being overridden. -isChanged() { - local IFS="," - - local change - for change in $changes - do - test "$(gaMatch "$1" "$change")" && echo 1 && return - done -} - -# Determines whether the given GA(V) meets the inclusion criteria. -isIncluded() { - # do not include the changed artifacts we are testing against - test "$(isChanged "$1")" && return - - local IFS="," - - # ensure GA is not excluded - local exclude - for exclude in $excludes - do - test "$(gaMatch "$1" "$exclude")" && return - done - - # ensure GA is included - test -z "$includes" && echo 1 && return - local include - for include in $includes - do - test "$(gaMatch "$1" "$include")" && echo 1 && return - done -} - -# Deletes components which do not depend on a changed GAV. -pruneReactor() { - local dir - for dir in */* - do - info "Checking relevance of component $dir" - local deps="$(deps "$dir")" - test "$deps" || die "Cannot glean dependencies for '$dir'" 8 - - # Determine whether the component depends on a changed GAV. - local keep - unset keep - local dep - for dep in $deps - do - test "$(isChanged "$dep")" && keep=1 && break - done - - # If the component is irrelevant, prune it. - if [ -z "$keep" ] - then - info "Pruning irrelevant component: $dir" - rm -rf "$dir" - fi - done -} - -# Tests if the given directory contains the appropriate source code. -isProject() { - local a="$(xpath "$1/pom.xml" project artifactId)" - test "$1" = "LOCAL/PROJECT" -o "$a" = "$(basename "$1")" && echo 1 -} - -# Generates an aggregator POM for all modules in the current directory. -generatePOM() { - echo '' > pom.xml - echo '> pom.xml - echo ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' >> pom.xml - echo ' xsi:schemaLocation="http://maven.apache.org/POM/4.0.0' >> pom.xml - echo ' http://maven.apache.org/xsd/maven-4.0.0.xsd">' >> pom.xml - echo ' 4.0.0' >> pom.xml - echo >> pom.xml - echo ' melting-pot' >> pom.xml - echo ' melting-pot' >> pom.xml - echo ' 0.0.0-SNAPSHOT' >> pom.xml - echo ' pom' >> pom.xml - echo >> pom.xml - echo ' Melting Pot' >> pom.xml - echo >> pom.xml - echo ' ' >> pom.xml - local dir - for dir in */* - do - if [ "$(isProject "$dir")" ] - then - echo " $dir" >> pom.xml - else - # Check for a child component of a multi-module project. - local childDir="$dir/$(basename "$dir")" - test "$(isProject "$childDir")" && - echo " $childDir" >> pom.xml - fi - done - echo ' ' >> pom.xml - echo '' >> pom.xml -} - -# Generates melt.sh script for all modules in the current directory. -generateScript() { - echo '#!/bin/sh' > melt.sh - echo 'trap "exit" INT' >> melt.sh - echo 'echo "Melting the pot..."' >> melt.sh - echo 'dir=$(pwd)' >> melt.sh - echo 'failCount=0' >> melt.sh - echo 'for f in \' >> melt.sh - echo " $projectDir \\" >> melt.sh - local dir - for dir in */* - do - if [ "$(isProject "$dir")" ] - then - echo " $dir \\" >> melt.sh - else - # Check for a child component of a multi-module project. - local childDir="$dir/$(basename "$dir")" - test "$(isProject "$childDir")" && - echo " $childDir \\" >> melt.sh - fi - done - echo >> melt.sh - echo 'do (' >> melt.sh - echo ' cd "$f"' >> melt.sh - echo ' sh "$dir/build.sh" > build.log 2>&1 &&' >> melt.sh - echo ' echo "[SUCCESS] $f" || {' >> melt.sh - echo ' echo "[FAILURE] $f"' >> melt.sh - echo ' failCount=$((failCount+1))' >> melt.sh - echo ' }' >> melt.sh - echo ') done' >> melt.sh - echo 'test "$failCount" -gt 255 && failCount=255' >> melt.sh - echo 'exit "$failCount"' >> melt.sh -} - -# Creates and tests an appropriate multi-module reactor for the given project. -# All relevant dependencies which match the inclusion criteria are linked into -# the multi-module build, with each changed GAV overridding the originally -# specified version for the corresponding GA. -meltDown() { - # Fetch the project source code. - if [ -d "$1" ] - then - # Use local directory for the specified project. - test -d "$1" || die "No such directory: $1" 11 - test -f "$1/pom.xml" || die "Not a Maven project: $1" 12 - info "Local Maven project: $1" -# mkdir -p "LOCAL" -# local dir="LOCAL/PROJECT" -# ln -s "$1" "$dir" - projectDir=$1 - else - # Treat specified project as a GAV. - info "Fetching project source" - retrieveSource "$1" "$branch" - fi - - # Get the project dependencies. - info "Determining project dependencies" - local deps="$(deps "$dir")" - test "$deps" || die "Cannot glean project dependencies" 7 - - local args="-Denforcer.skip" - - # Process the dependencies. - info "Processing project dependencies" - local dep - for dep in $deps - do - local g="$(groupId "$dep")" - local a="$(artifactId "$dep")" - local v="$(version "$dep")" - local c="$(classifier "$dep")" - test -z "$c" || continue # skip secondary artifacts - local gav="$g:$a:$v" - - test -z "$(isChanged "$gav")" && - args="$args \\\\\n -D$a.version=$v" - - if [ "$(isIncluded "$gav")" ] - then - info "$a: fetching component source" - dir="$(retrieveSource "$gav")" - fi - done - - # Override versions of changed GAVs. - info "Processing changed components" - local TLS=, - local gav - for gav in $changes - do - local a="$(artifactId "$gav")" - local v="$(version "$gav")" - args="$args \\\\\n -D$a.version=$v" - done - unset TLS - - # Prune the build, if applicable. - test "$prune" && pruneReactor - - # Generate build scripts. - info "Generating build scripts" - generatePOM - echo "mvn $args \\\\\n test \$@" > build.sh - generateScript - - # Build everything. - if [ "$skipBuild" ] - then - info "Skipping the build; run melt.sh to do it." - else - info "Building the project!" - # NB: All code is fresh; no need to clean. - sh melt.sh || die "Melt failed" 13 - fi - - info "Melt complete: $1" -} - -# -- Main -- - -verifyPrereqs -parseArguments $@ -createDir "$outputDir" -meltDown "$project" From d70966ecb9bc0009d4b40a744d5242ad15a9a6e3 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Thu, 14 Jan 2021 11:29:11 -0600 Subject: [PATCH 177/996] Update ij1-patcher -> 1.2.0 Required for imagej1 1.53d --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1aab2401..8f7ede92 100644 --- a/pom.xml +++ b/pom.xml @@ -423,7 +423,7 @@ ${imagej1.version} - 1.1.0 + 1.2.0 0.34.0 From a84f3b755a475cf4742a0eb9e0a34c97ea24974a Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Thu, 14 Jan 2021 12:29:03 -0600 Subject: [PATCH 178/996] Update component versions * scijava-common -> 2.85.0 * scifio -> 0.41.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8f7ede92..99a10dc5 100644 --- a/pom.xml +++ b/pom.xml @@ -321,7 +321,7 @@ 0.1.2 - 2.84.0 + 2.85.0 2.0.2 @@ -535,7 +535,7 @@ - 0.41.0 + 0.41.1 4.1.0 From 66759e793b11c064d24fecbadf489d6b41c65b05 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Thu, 14 Jan 2021 13:37:16 -0600 Subject: [PATCH 179/996] Bump to pom-scijava-base 12.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99a10dc5..9031825f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 11.2.0 + 12.0.0 From bff32e954aa222efa8dafdac2354fe1d87a3ae58 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Thu, 14 Jan 2021 13:39:03 -0600 Subject: [PATCH 180/996] Bump to next development cycle Signed-off-by: Mark Hiner --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9031825f..e747e381 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 30.0.0-SNAPSHOT + 30.0.1-SNAPSHOT pom SciJava Parent POM From 3e1ffd3b3e08f3beada65aa1569f9ef8bac208ed Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Sat, 14 Nov 2020 13:55:57 +0800 Subject: [PATCH 181/996] BoneJ version 7.0.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6401499b..e6979aea 100644 --- a/pom.xml +++ b/pom.xml @@ -745,7 +745,7 @@ --> - 7.0.7 + 7.0.8 ${bonej.version} ${bonej.version} ${bonej.version} From 70bbbecb52e5c0b3334e4e35a8536e5af5d70876 Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Thu, 19 Nov 2020 17:02:57 +0800 Subject: [PATCH 182/996] BoneJ version 7.0.9 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e6979aea..e24b400a 100644 --- a/pom.xml +++ b/pom.xml @@ -744,8 +744,8 @@ above. --> - - 7.0.8 + + 7.0.9 ${bonej.version} ${bonej.version} ${bonej.version} From b178a0b8d0d1c6efe87dada2c034930021619991 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Tue, 19 Jan 2021 11:55:50 -0600 Subject: [PATCH 183/996] Bump component version scijava-common -> 2.86.1 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e24b400a..96464aaf 100644 --- a/pom.xml +++ b/pom.xml @@ -321,7 +321,7 @@ 0.1.2 - 2.85.0 + 2.86.1 2.0.2 @@ -638,6 +638,7 @@ 2.0.2 ${Samples.version} 2.0.1 + 3.1.10 1.0.5 2.1.1 ${Skeletonize3D.version} From 94ab25f30ce5e951a6e8d9daf7ab5e3badc23978 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Wed, 20 Jan 2021 07:55:00 -0600 Subject: [PATCH 184/996] Bump component version multiview-reconstruction -> 0.9.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 96464aaf..03f1b55f 100644 --- a/pom.xml +++ b/pom.xml @@ -812,7 +812,7 @@ 0.5.8 - 0.7.2 + 0.9.3 0.2.0 From a57badca9296d3dbbb768ebe0c5d0d75a5ed0c23 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Wed, 20 Jan 2021 08:11:49 -0600 Subject: [PATCH 185/996] Bump TrakEM2 -> 1.3.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 03f1b55f..05099cf0 100644 --- a/pom.xml +++ b/pom.xml @@ -719,7 +719,7 @@ 1.1.3 1.1.3 - 1.3.4 + 1.3.5 ${TrakEM2.version} 2.0.2 1.0.1 From 472bcc4a1425c84ba7b731bb39d321749a32c224 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Wed, 20 Jan 2021 08:36:49 -0600 Subject: [PATCH 186/996] Bump imglib2-roi -> 0.11.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 05099cf0..137ebad8 100644 --- a/pom.xml +++ b/pom.xml @@ -521,7 +521,7 @@ 3.1.0 - 0.10.4 + 0.11.0 0.2.4 From 5a5cb41eca71ad7bc07c20bb948085a24387277c Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Thu, 21 Jan 2021 10:34:11 -0600 Subject: [PATCH 187/996] Bump ij1-patcher > 1.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 137ebad8..ccb41583 100644 --- a/pom.xml +++ b/pom.xml @@ -423,7 +423,7 @@ ${imagej1.version} - 1.2.0 + 1.2.1 0.34.0 From 8a0a3773744d5ac1028eb2c763c9105c5ac6ec4d Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Thu, 21 Jan 2021 10:59:16 -0600 Subject: [PATCH 188/996] Bump BDV components * bigdataviewer-core > 10.2.0 * bigdataviewer-vistools > 1.0.0-beta-27 * bigdataviewer-fiji > 6.2.1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ccb41583..6a43647f 100644 --- a/pom.xml +++ b/pom.xml @@ -709,10 +709,10 @@ - 9.0.6 + 10.2.0 3.0.0 - 1.0.0-beta-21 - 6.2.0 + 1.0.0-beta-27 + 6.2.1 2.2.4 From abe04f043c8f6284bcff8bab80c488f5265991af Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Fri, 5 Feb 2021 17:50:35 +0800 Subject: [PATCH 189/996] Bump BoneJ to 7.0.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a43647f..612789c9 100644 --- a/pom.xml +++ b/pom.xml @@ -746,7 +746,7 @@ --> - 7.0.9 + 7.0.10 ${bonej.version} ${bonej.version} ${bonej.version} From 86930e52a48778ba4299e6f6159dbeff62d3c26e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Feb 2021 12:36:01 -0600 Subject: [PATCH 190/996] Migrate third-party POMs from imagej/imagej-omero This will now be the place to put manually-created POMs for third-party projects that did not have their own already. --- non-maven/README.md | 2 + ...ro-client-4.4.8-452-cbe42bc-ice34-b326.pom | 47 +++++++++++++++++++ non-maven/omero-client-4.4.8p1-ice33-b304.pom | 47 +++++++++++++++++++ ...nt-5.0.0-beta1-256-019d14a-ice34-b3523.pom | 47 +++++++++++++++++++ 4 files changed, 143 insertions(+) create mode 100644 non-maven/README.md create mode 100644 non-maven/omero-client-4.4.8-452-cbe42bc-ice34-b326.pom create mode 100644 non-maven/omero-client-4.4.8p1-ice33-b304.pom create mode 100644 non-maven/omero-client-5.0.0-beta1-256-019d14a-ice34-b3523.pom diff --git a/non-maven/README.md b/non-maven/README.md new file mode 100644 index 00000000..1755e6a7 --- /dev/null +++ b/non-maven/README.md @@ -0,0 +1,2 @@ +This folder contains manually created POMs for pre-built binaries +uploaded to maven.scijava.org's thirdparty repository. diff --git a/non-maven/omero-client-4.4.8-452-cbe42bc-ice34-b326.pom b/non-maven/omero-client-4.4.8-452-cbe42bc-ice34-b326.pom new file mode 100644 index 00000000..fe31c135 --- /dev/null +++ b/non-maven/omero-client-4.4.8-452-cbe42bc-ice34-b326.pom @@ -0,0 +1,47 @@ + + + 4.0.0 + + ome + omero-client + jar + 4.4.8-452-cbe42bc-ice34-b326 + http://openmicroscopy.org/ + + + + GPL v2 or later + http://www.gnu.org/licenses/gpl-2.0.txt + repo + + + + + + org.springframework + spring-beans + 3.0.1.RELEASE + + + org.springframework + spring-context + 3.0.1.RELEASE + + + org.springframework + spring-jdbc + 3.0.1.RELEASE + + + org.springframework + spring-orm + 3.0.1.RELEASE + + + org.springframework + spring-tx + 3.0.1.RELEASE + + + + diff --git a/non-maven/omero-client-4.4.8p1-ice33-b304.pom b/non-maven/omero-client-4.4.8p1-ice33-b304.pom new file mode 100644 index 00000000..0851e71c --- /dev/null +++ b/non-maven/omero-client-4.4.8p1-ice33-b304.pom @@ -0,0 +1,47 @@ + + + 4.0.0 + + ome + omero-client + jar + 4.4.8p1-ice33-b304 + http://openmicroscopy.org/ + + + + GPL v2 or later + http://www.gnu.org/licenses/gpl-2.0.txt + repo + + + + + + org.springframework + spring-beans + 3.0.1.RELEASE + + + org.springframework + spring-context + 3.0.1.RELEASE + + + org.springframework + spring-jdbc + 3.0.1.RELEASE + + + org.springframework + spring-orm + 3.0.1.RELEASE + + + org.springframework + spring-tx + 3.0.1.RELEASE + + + + diff --git a/non-maven/omero-client-5.0.0-beta1-256-019d14a-ice34-b3523.pom b/non-maven/omero-client-5.0.0-beta1-256-019d14a-ice34-b3523.pom new file mode 100644 index 00000000..be1d9e2e --- /dev/null +++ b/non-maven/omero-client-5.0.0-beta1-256-019d14a-ice34-b3523.pom @@ -0,0 +1,47 @@ + + + 4.0.0 + + ome + omero-client + jar + 5.0.0-beta1-256-019d14a-ice34-b3523 + http://openmicroscopy.org/ + + + + GPL v2 or later + http://www.gnu.org/licenses/gpl-2.0.txt + repo + + + + + + org.springframework + spring-beans + 3.0.1.RELEASE + + + org.springframework + spring-context + 3.0.1.RELEASE + + + org.springframework + spring-jdbc + 3.0.1.RELEASE + + + org.springframework + spring-orm + 3.0.1.RELEASE + + + org.springframework + spring-tx + 3.0.1.RELEASE + + + + From f90b3b51a293ac43c2fcf62aeeb8df1759929184 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Feb 2021 18:07:48 -0600 Subject: [PATCH 191/996] Add POM for cisd:jhdf5:14.12.6 --- non-maven/jhdf5-14.12.6.pom | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 non-maven/jhdf5-14.12.6.pom diff --git a/non-maven/jhdf5-14.12.6.pom b/non-maven/jhdf5-14.12.6.pom new file mode 100644 index 00000000..7715edce --- /dev/null +++ b/non-maven/jhdf5-14.12.6.pom @@ -0,0 +1,22 @@ + +4.0.0 +cisd +jhdf5 +14.12.6 + +2.4 +1.4 + + + +commons-lang +commons-lang +${commons-lang.version} + + +commons-io +commons-io +${commons-io.version} + + + From 57494de46e1f205f8c98c1463fd0ae213c518b7e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Feb 2021 18:32:55 -0600 Subject: [PATCH 192/996] Add POMs for cisd:jhdf5:19.04.0 --- non-maven/base-18.09.0.pom | 47 ++++++++++++++++++++++++++ non-maven/jhdf5-19.04.0.pom | 66 +++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 non-maven/base-18.09.0.pom create mode 100644 non-maven/jhdf5-19.04.0.pom diff --git a/non-maven/base-18.09.0.pom b/non-maven/base-18.09.0.pom new file mode 100644 index 00000000..c18440b7 --- /dev/null +++ b/non-maven/base-18.09.0.pom @@ -0,0 +1,47 @@ + + + 4.0.0 + + cisd + base + 18.09.0 + + ETH SIS Base Library + Base library supporting JHDF5, among other projects. + + ETH Zurich Scientific IT Services + https://sis.id.ethz.ch/ + + + + Apache 2 + https://apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:git:https://sissource.ethz.ch/sispub/base + scm:git:https://sissource.ethz.ch/sispub/base + 18.09.0 + https://sissource.ethz.ch/sispub/base + + + + 2.7 + 3.10 + + + + + commons-io + commons-io + ${commons-io.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + diff --git a/non-maven/jhdf5-19.04.0.pom b/non-maven/jhdf5-19.04.0.pom new file mode 100644 index 00000000..967ec27d --- /dev/null +++ b/non-maven/jhdf5-19.04.0.pom @@ -0,0 +1,66 @@ + + + 4.0.0 + + cisd + jhdf5 + 19.04.0 + + JHDF5 (HDF5 for Java) + + HDF5 is an efficient, well-documented, non-proprietary binary data format + and library developed and maintained by the HDF Group. The library provided + by the HDF Group is written in C and available under a liberal BSD-style + Open Source software license. It has over 600 API calls and is very powerful + and configurable, but it is not trivial to use. + + JHDF5 is a Java binding for HDF5 focusing on ease-of-use, which was + developed by CISD and is now maintained by ETH SIS. It is available under + the Apache License 2.0. The library contains HDF5 1.10 from the HDF Group + and files created with JHDF5 are fully compatible with HDF 1.10 (or HDF5 1.8 + if you initialize the library appropriately). + + https://wiki-bsse.ethz.ch/display/JHDF5/ + + ETH Zurich Scientific IT Services + https://sis.id.ethz.ch/ + + + + Apache 2 + https://apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:git:https://sissource.ethz.ch/sispub/jhdf5 + scm:git:https://sissource.ethz.ch/sispub/jhdf5 + 19.04.0 + https://sissource.ethz.ch/sispub/jhdf5 + + + + 18.09.0 + 2.7 + 3.10 + + + + + cisd + base + ${base.version} + + + commons-io + commons-io + ${commons-io.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + From e4fe74587d73ee07285064f145e9cf9c36392aba Mon Sep 17 00:00:00 2001 From: Jan Eglinger Date: Tue, 23 Feb 2021 10:57:43 +0100 Subject: [PATCH 193/996] Update junit 4 and 5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6a43647f..4de9eb11 100644 --- a/pom.xml +++ b/pom.xml @@ -1113,10 +1113,10 @@ 0.1.55 - 4.13 + 4.13.2 - 5.6.2 + 5.7.1 ${junit-jupiter.version} ${junit-jupiter.version} ${junit-jupiter.version} From 5f4f1e49247c23c2c89769ab0dac22ba564f9b4c Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Thu, 25 Feb 2021 10:15:26 +0100 Subject: [PATCH 194/996] Bump imglib2-cache to 1.0.0-beta-16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a43647f..651da6a7 100644 --- a/pom.xml +++ b/pom.xml @@ -512,7 +512,7 @@ 0.2.5 - 1.0.0-beta-15 + 1.0.0-beta-16 2.0.0-beta-46 From 5ea3c57e3f488d8fa0898840344f2c1837c1f25b Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Thu, 25 Feb 2021 10:17:24 +0100 Subject: [PATCH 195/996] Bumop bigdataviewer-vistools to 1.0.0-beta-28 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a43647f..9da7a184 100644 --- a/pom.xml +++ b/pom.xml @@ -711,7 +711,7 @@ 10.2.0 3.0.0 - 1.0.0-beta-27 + 1.0.0-beta-28 6.2.1 2.2.4 From c3dd6ac43de9bf98c3c2d80124ccd65e0630768d Mon Sep 17 00:00:00 2001 From: bogovicj Date: Thu, 25 Feb 2021 08:26:26 -0500 Subject: [PATCH 196/996] bigwarp 6.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a43647f..679a050e 100644 --- a/pom.xml +++ b/pom.xml @@ -694,7 +694,7 @@ 3.0.1 - 6.0.0 + 6.1.0 ${bigwarp.version} From 7988823beea41a59c74ecec54693a25b61ad67a6 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Wed, 10 Mar 2021 13:58:42 -0600 Subject: [PATCH 197/996] Bump component version * scifio -> 0.41.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a43647f..7f4fc8de 100644 --- a/pom.xml +++ b/pom.xml @@ -535,7 +535,7 @@ - 0.41.1 + 0.41.2 4.1.0 From 3e512ce0eb94c7c4be18a20c2d9a0e336f4be31d Mon Sep 17 00:00:00 2001 From: David Gault Date: Wed, 24 Mar 2021 12:51:52 +0000 Subject: [PATCH 198/996] Bump Bio-Formats version to 6.6.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index abfe04b8..7fbdca33 100644 --- a/pom.xml +++ b/pom.xml @@ -770,7 +770,7 @@ ${jxrlib.version} - 6.6.0 + 6.6.1 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From a30cecad5d306dcc25137b50a62a77825d30c53d Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Thu, 25 Mar 2021 09:55:56 +0800 Subject: [PATCH 199/996] Bump BoneJ version to 7.0.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 612789c9..77df4008 100644 --- a/pom.xml +++ b/pom.xml @@ -746,7 +746,7 @@ --> - 7.0.10 + 7.0.11 ${bonej.version} ${bonej.version} ${bonej.version} From 21736893bc19ab492ce8d6f8ff08e0831a63d10f Mon Sep 17 00:00:00 2001 From: bogovicj Date: Mon, 12 Apr 2021 11:53:25 -0400 Subject: [PATCH 200/996] bump n5 components * n5 > 2.5.0 * n5-google-cloud > 3.3.2 * n5-hdf5 > 1.3.0 * n5-ij > 2.0.0 * n5-imglib2 > 4.0.0 * n5-viewer_fiji > 4.2.1 --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 3ca4f3de..bc1eccce 100644 --- a/pom.xml +++ b/pom.xml @@ -727,14 +727,14 @@ 0.9.0 - 2.3.0 + 2.5.0 3.2.0 1.1.0 - 3.3.1 - 1.2.0 - 1.1.1 - 3.5.1 - 4.0.1 + 3.3.2 + 1.3.0 + 2.0.0 + 4.0.0 + 4.2.1 0.0.6 - 5.11.1 + 5.12.0 0.11.2 From 2504921614fd32d46f54129a530c0bfe245e3f7e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 1 Jul 2021 19:41:02 -0500 Subject: [PATCH 202/996] Stop managing obsolete imglib2-ui component --- pom.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8aceeaa0..6e8f4231 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 30.0.1-SNAPSHOT + 31.0.0-SNAPSHOT pom SciJava Parent POM @@ -526,9 +526,6 @@ 0.2.4 - - 2.0.1 - 0.4.0 From 3226f5f1b1244e6768f7ab41b30f37481e287f07 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Fri, 9 Jul 2021 09:35:05 -0500 Subject: [PATCH 203/996] CI: switch from Travis CI to GitHub Actions --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6e8f4231..aae80def 100644 --- a/pom.xml +++ b/pom.xml @@ -190,8 +190,8 @@ https://github.com/scijava/pom-scijava/issues - Travis CI - https://travis-ci.org/scijava/pom-scijava + GitHub Actions + https://github.com/scijava/pom-scijava/actions From 2527ea958f8ac506bfae5686c1d0ed1c49ce9c1f Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Fri, 9 Jul 2021 09:35:05 -0500 Subject: [PATCH 204/996] CI: add/update main build action --- .github/workflows/build-main.yml | 44 ++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/build-main.yml diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml new file mode 100644 index 00000000..3fb56225 --- /dev/null +++ b/.github/workflows/build-main.yml @@ -0,0 +1,44 @@ +name: build + +on: + push: + branches: + - master + tags: + - "*-[0-9]+.*" + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Cache m2 folder + uses: actions/cache@v2 + env: + cache-name: cache-m2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-build-${{ env.cache-name }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'zulu' + - name: Set up CI environment + run: .github/setup.sh + - name: Execute the build + run: .github/build.sh + env: + GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + MAVEN_USER: ${{ secrets.MAVEN_USER }} + MAVEN_PASS: ${{ secrets.MAVEN_PASS }} + OSSRH_PASS: ${{ secrets.OSSRH_PASS }} + SIGNING_ASC: ${{ secrets.SIGNING_ASC }} From 432171323403213ce1ed76e895b6f930a13c53b7 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Fri, 9 Jul 2021 09:35:06 -0500 Subject: [PATCH 205/996] CI: add/update PR build action --- .github/workflows/build-pr.yml | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/build-pr.yml diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml new file mode 100644 index 00000000..92a01926 --- /dev/null +++ b/.github/workflows/build-pr.yml @@ -0,0 +1,35 @@ +name: build PR + +on: + pull_request: + branches: + - master + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Cache m2 folder + uses: actions/cache@v2 + env: + cache-name: cache-m2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-build-${{ env.cache-name }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'zulu' + - name: Set up CI environment + run: .github/setup.sh + - name: Execute the build + run: .github/build.sh From a2c3d87ac1e5d8d193a5b1971b0ea73391d399a0 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Fri, 9 Jul 2021 09:35:06 -0500 Subject: [PATCH 206/996] CI: add executable script .github/setup.sh --- .github/setup.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 .github/setup.sh diff --git a/.github/setup.sh b/.github/setup.sh new file mode 100755 index 00000000..f359bbee --- /dev/null +++ b/.github/setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh +curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh +sh ci-setup-github-actions.sh From bacd456d65fb018c250fa80e2fe122416aabd432 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Fri, 9 Jul 2021 09:35:06 -0500 Subject: [PATCH 207/996] CI: add executable script .github/build.sh --- .github/build.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 .github/build.sh diff --git a/.github/build.sh b/.github/build.sh new file mode 100755 index 00000000..7da42622 --- /dev/null +++ b/.github/build.sh @@ -0,0 +1,3 @@ +#!/bin/sh +curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh +sh ci-build.sh From d0a622b7fdc6da44895952e421c616932cf15ffa Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Fri, 9 Jul 2021 09:35:07 -0500 Subject: [PATCH 208/996] CI: deploy releases to the SciJava repository --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index aae80def..5264aa4b 100644 --- a/pom.xml +++ b/pom.xml @@ -1223,6 +1223,9 @@ 1.8 + + + sign,deploy-to-scijava From c879d564f86e0f42761ad067abeb2260d690c8f9 Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Fri, 9 Jul 2021 09:35:07 -0500 Subject: [PATCH 209/996] CI: update README.md badge link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff253494..97de3ca2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![](https://img.shields.io/maven-central/v/org.scijava/pom-scijava.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.scijava%22%20AND%20a%3A%22pom-scijava%22) -[![](https://travis-ci.org/scijava/pom-scijava.svg?branch=master)](https://travis-ci.org/scijava/pom-scijava) +[![](https://github.com/scijava/pom-scijava/actions/workflows/build-main.yml/badge.svg)](https://github.com/scijava/pom-scijava/actions/workflows/build-main.yml) This POM provides a parent from which SciJava-based projects can declare their build configurations. It ensures that projects all use a compatible build environment, as well as versions of dependencies and plugins. Projects extending this POM inherit the unified SciJava [Bill of Materials](https://imagej.net/BOM): component versions which have been tested to work together. From 9f9f7603da57dee4e43205785b6dd97abcca174b Mon Sep 17 00:00:00 2001 From: Mark Hiner Date: Fri, 9 Jul 2021 09:35:07 -0500 Subject: [PATCH 210/996] CI: remove Travis CI configuration --- .travis.yml | 19 ------------------- .travis/build.sh | 4 ---- .travis/signingkey.asc.enc | Bin 9632 -> 0 bytes 3 files changed, 23 deletions(-) delete mode 100644 .travis.yml delete mode 100755 .travis/build.sh delete mode 100644 .travis/signingkey.asc.enc diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 52b6f68f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -language: java -jdk: openjdk8 -branches: - only: - - master - - "/.*-[0-9]+\\..*/" -before_install: - - sudo apt-get install -y libxml2-utils -install: true -script: ".travis/build.sh" -cache: - directories: - - "~/.m2/repository" -env: - global: - - secure: GORCmEaorlTJ4qPyA8M1zZxiW+oa1VoD50lcBFOEvd9DrGuzpKD1hRf9Dbq880Vg1CwcnnPjylU44P+SUJt7oktYnICNdZ6R2xy/650mLiOprKHXtG4FIHGzpUYYhqukfQRDY+WoXlO3itgP1FYvC550OsOxuKLreJ8U673q/0k= - - secure: en6zzGvHbtmXjTsHi07TDc+wXGVPSi76gZD0QmU6AwX5E8psJYTDkjemb9OF75T2dV3SwRZeoLt5pIhKYBqBvOdJw8P7aRGL9nWnPP3GVBH2hmuOqtEf9eACNTzNy2QO5zI0axbrO9S3JRY4tBJWHD+O4PcXO5meNVrzYpfkJHQ= - - secure: MfYeVq5MVq6W75CexPzpdNnwvWgtnfJNEYQYFqO+2UHp2ZCO5CEZKT/LgduHJrJoocEM8Pu47PafsVOXjhmIIB6vTkaLoVIYbFXp9LffxaW7bpHfPrtwoLEEC6iB3VFMudOUM9fHzIR94d8I2iaCyofLr6h7PxZrXVPVUZm9hxw= - - secure: YOOdhFzA0nrztya42HoqovGy5DM+X+5OXEnYZ9y5uFS0QaqPI2LQ5jTvj1PZO1K/nVFOBEIyzXB3LmSEtpeEW/6/tvLbUUMCZWWrdIAVzcIDJCqVNLviRdh30744xff7mWnB7IyatIPtmUqO/yW2ayQFoG4p+pUPK0tFBWL/AyM= diff --git a/.travis/build.sh b/.travis/build.sh deleted file mode 100755 index 357a2dc3..00000000 --- a/.travis/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/travis-build.sh -sh travis-build.sh $encrypted_e7761bcf8400_key $encrypted_e7761bcf8400_iv -#sh tests/run.sh diff --git a/.travis/signingkey.asc.enc b/.travis/signingkey.asc.enc deleted file mode 100644 index 83a564703d9a5610ef54fa27c38f05e992fa8d2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9632 zcmV;RC12X*Cfp+3oZpWYu-8ML4C;Y+=u78kI`8K4;Si66D_F0t z>)P5D5^EZm(!&M|PM8CE&ul-~)-jn<6R#YhX&vTH5b4p_uxLZGHvtrB-cGO87 z>@V;yk4&f0>Sys{hsvh;;Kw(hao#wU?j#2I8@rr&%XPtqVQBCFJ5eG zEIwLGl}*QTSv(rY3{0A_aw4KnVFIy%sW04~4EmH9-ajbkgKeEetYhQNU|d+k>C34a ziz+ZPr7eL)erty zxVUFwtsOg-mliqv--T-9>$DO%OvsjPCsn5w?S&n%XCq$g9tBwvU>indMy13wVuhm{ zf?p(uP9||@3(w^c3W)*jm|-X&?ZY;g=sX+QZ_7-}&F6MvN2U^aB-VGq;h!#XO1f7;N#^ z{W&IuP|-baO4C}S@F)%p$Mi713G{gaNDaKrc}32q00T2b;!`NzX}!eZdJX5oJ1`a; ztxM+ zpG3Q!HpzAcx*R2iUr;ca1Veh#Y`T)fQ7AZl+DCihW4;7sD-Ja!op1-p?Fh;3nzD> zImXfV%8`6n1u$Es$zvRZ24@WW@D99{G7YvRG~qbEn01Q%oEw+u5SyP0Pt^muEmL@# z+j+B2h(x?X7L&x}pJn|2Bi*n=cScIK!ZZX~tMO;F8ie*Qn;yjR15;)o zwE-?bJI;-@c?31+e8q?C?!X)yK*;qlHelf8(G_v8FF`LE3n@95IHN-0xf|Q0Oz{w+ zJn+W91+6f%o3k!C4xZv&#Q`u96T{Ko>c~qD(IfV#x^c zK^D^&?-XK>|K)!({VtyqQbo8}h}WaYj7U!Us}s7@IJ8mIlsb)mFNZAtqT?n4Sr<;b zO#u>YeDOYrTUQ)ugzy74wxdsHg2Zl#l^Pswea5+6+jR+bLw^j+!~7SAa`^`^G%96z z7v26(g8w7`LFQ)S?mj}!SK zZa&dvyV6L0Pp^v;+3P2Lwc;C85|~s@S7*=oEu9fo8LcdfHl3s=-x23HF&zeKqM~tD zzePl(-FLFI3<1y^>sJUEr1r|G9MEW95-UeVu}nZ~AhS-@*M!+@j-0nln^kNAp^=%fAt3rt zi#8{gNc};k^72E{fVK7wjEY&pY(nbY# z^(U6UO=KSOpP{wEH{| zp&egLU~AzQ*xFq82rc2KdxXmkb#+u;QgKq+w5cvSBAzCkYSx>Sax#V!Rd(@+n7t9&V(>4YJC-zI4DgIkHZ)WK0{XbPB- zHU;lxu7&*@4z7+B-dwukDSI5+u)g&erG~iO;iG`2qLCuD5^P>p@HeUP3YrcxJR_oe z0)7*#apTW^Yd`kzRG=f9 z7O75cP8xMo>AB3oT=KaYqs>(P*`R%)8C?18fZ|T>d6ne@uRlk^Y$1=n9`~Eq@s9uK zmxYcU|3=A9foo+ZH`Ks;xA!V${(Pk3WIG%SswHyGr|_<0FhNy{ukC&ohhV^UBXH`X zNyMmzlz^oKrh-pshY@+s5D(k(&reCAkv@$l1y#=e0~{SOE{k}v=7oUI?E$Zc5j2dh zvZ+zF+FE$!+^;|<@tDqV6|UegRNu3f^~l3@{!bu!`d=Ez@giQaFzJh+{m*(e>dJ>Py)T=AK`b^+G_E zh>tFtnb-OwDHgfkKa-iAiUvaIp1RI7J4pco5VLOyEo-l}ZNWf*2Kf|#1%rplcR@O5 zv7X8JBhqvBsjIuRmhkSl$^P60SxZAc8>u@~v6X!6vGKEq!E-ZCCcRnCg-BY7I)D9l z@YXG-C-0+s=A`!_)v$Tnn_2C$$6waX_y%MiUFn8F9&TNOBGj#=3ic<{Tj1#6=NEpAS zH*umV3bX1)oW#hH0lD6(Qe!-oSs#CxqZq$z5v-Rh*>v@5mh2bC#QV~@=|zJnG^FXu zh!gnS+i2IsAX*OcHj97H+dP8US!ql2>lT+nYT0DAkTwWj&$3*|t77tRpP(Q2qcJxf zS&W~X)4Q{RIIzqb#ff7!w_`iLLTk?zEeFwm_-0F=v*E3vkoiiQhJq;LT}bMjGN)2g zJbVS!{_rUJRK-Jg+k*NsBBJxty9p=90l@aX&a1vgjas=@)7u&W)y`ZX3Q@+qUO6AV zbl!)Yi#q3AE32aXHcP84yUf%=)D5cFALCQ;`eKGdrupIND3eg;uigT1Xs@&1Fox{> zi{~*p56`<_FiGSE@LJXjG%FZ@h_c>-3BD9(hMCY5Z=Vc zD%t$4S2-)i*?};0efzOy?W4SNVNg@o-1m_F*DZ`9jYG>4sZsPFZ3c-6yOAZqU}xfG z-m%J>IKRky3m0W#U>yz!VAm?|DrU!|`b4T7(WidonWhi0`pyltFn{!T!;FxIZi*y_ z)Y<*cue5FGh55&ocoj7r^+P!uzHufbbct{>vE+QdY zSlU)aAHy8E#*+e;N6cNW2n26V-&ER$XVz9TfYrQ6cDs(5lHL9Z1za`!Qs0SVvzu>a zrqF*qvKZEnMf@mXq`N~Ihf@r4m7c%{*-Ub!hGnX2)mprBwF91I0_ahTX zTx?n1Irq4y4E)jbasX8oUZec@N;!$c5Flwc;^!?ivgR4e{>)MNs~g^0x8|@23Iw4M z+iRsVsE%KeB@kf^nN|lheL?BFdiNYtyCF(Op$YxXC3s(-uhb~FlsM`nFelPvc##OS zF~s^u3sjDv{A%2uwJJvQ`L&|$CT(}o=ZMn{@MHe&0$}GZr)Xt-4opN zu=_DiO$e-)N+Bc)^}`IfW47woNn2L3#`p&9d@K~B>O!A&UZ@}hV06UcE1rsK$XI*q zVs8RC_=Uj06JR>Kh>Ut?SU}TYdhpFnZEz;j4aFX$ZDdgiNpiHQ%h{KY0*(u(*p&$A zV6jm74q+qsuVY-ief3P~zB-+wVggWi22KTF>*}^w6chP_tjScr9FyApTNf(}HJL!$ z?Ii=TfcJ5vqggA)NG>>Xg2pVZXs1f8b4WqXn1de#cWcNi4ywT%BvyReI-(uJ? z!)#I7et2Ex`GTGAdu_%5s*H2lY|Ack_IRTteC_}r$-Q%ibPzP1GB2K{!Y}C5K86*Cs4)|#Y?gE4RNM#LL>P`g-=f?w*MMM*A5cBu`81yt?l z#8o-;QXcr8`@3$4*M9_e%W3YYY^ME8M5MQD&Z3$1a?J>l?j~%73*KHrz(!x9JE`+x z@$CPC0xI(=OCoxEu@g%x7+x2dJf=coB~P|)q$?xA5u8zg>M1Alxc%}3gYzOp98e17fV$e8OP!EQEX6)!tf>jD^o07L(AS~^it9- zJzn#c4ytcH^b9ROk?8AQR$S;BO;&v)tLZavCz8*Y72MSZO0%ViHX?qUs+}5cGDQ#q zl@zcWjsEiJ!n+@p0;@XgXQWm>ha8)KRa7!rP)7qnv~G*o&TDSEp}@G~#w*7{J4`lWB!nLT~8F1LCKIR zWPE^7P>;vVW8UhRbP|(97U;GmJA#$b>8sA@H+d&|g4@-J@e!dn(>|OKgXUhXUin0! zUg|;txt+ud!*Oq)e@Z!7d1_KH4D|HMy%~kk4^`ghgX!UU&Lu7bc z30%-~d9U-}?2Y4uQMRtJi&0Dz>aX}P|L3h`4us#&#j=ZwF^wHpCYuq2EO^B@SviVL zYI`h?K3yarZT^_7QuI{f0#ozZjp$2=8@48sU?nSJ6O%V2^4ZVArKZZrS-w^Jmu;-v ziyGCuqsBRDk1MiObPAk^0<76$JwhCEmuOO5P;g*Zi*yK;4NRUMaVVF%WIGOOG3TM z@6r5&$~7N%b>G%FY*$MHrm}%Min|faFKbeujjz-?TeEg6HD z__WaG!VCbPs=Qf(TqRl_Pd}DZW<5KW8F{7er`e%5AKO%6P58wSM12dMff7*NN}o>> zup7Z(;kB4d1}(&J4AxAa7%)zy1pb|q9+t5l8O9U$R_`7W3SpfVnGiHfndgqsLAmcc zvV(xy;c}q$;+%yT#n73x#<+%0z$)UaF_SUL;4y(6>w9P>Bn-n2SHUxVc9baY+%niW zW57wYC3t1h>rG_~=NbO#iXGZK3`6@mRX8K^Wh;F2hVOq{9v7LhVQ4f=!0LC&@(uXK z4F9G2`AKt__{$;tLj1jrxlnW5OhI{jho!2dx~40VjG_tsThXB{LV1;kP8As?^)z(%SV zeQ5hh`2hL-9EzMAlRAMV1r?JirE2&bsLqQD^>*4rC?7GE($Dh9S-1({#Bv#-^ebBb zp57>BM(bdVu#dUH040v-UG~Puur9!TyyFJp4zKCMfyZzLXL6oI)EF3PTxsvYA$++* zOGlt-iSf|b((B~!s4z9&MJP(br>;8f)=cg(pqIFT{*zGukEXHmblbk-jZg?dlbuQ* z?ktwX%c5>}#5d`Qzh;f-l${1O+K2etpLjd3=Rld-Kc~L7Nj76!Xoq~rgN5lzRAgrd zy#3;=xQS@2ae-k#E!_EAKQN|%KgA|w*rWg4$mmTM%4FyZGy}`V!UhZ@{AEt_63tcRL!V`cfZ3pA+B@ArEALcx8@xG`<1%?SmPCtqO+Ev8FtiLz}Ce?EXrW za^s^aur069U0dI{=M_JRHSZji)G{S{`hFAIhWWHN5k6y-R;?&bNw|ms)}M!6k0iwo z_V=$|3zJdMy-clMoPLRuThd+3c>7(ure7lr(fu0w;Yop|YD6eFh#|1QG*{XgyD9mF z)Ud>#nyJ9dyWTAMFpz+sjDa$Ibl`=HsRsMTG;v+7ak@maXpA~ zO!0iA)?V18@+++-jgsT8r*A9TF!lC`U@;SQoF_ygLX=LnmOGagcc+N$|7mP=qd2jj z(IKB<#@>w3uLBq0N3pgR-#NeK=H0h4c z5YPnmq%|KgLMa%|?BPn)^V+>hN!NJ`=eUh7pBEaP$0}GETwQCZb?*1dbDNTg883ql zVLSn&V#PGVD=M?KKiUGHC8y?{WF7s}9Su6Np=3VOPo%zw{}xu77ePp_UWlPubch!qd$jd^*ky(3A?an{W`>0HM0rIvzrrB-1$ z7sZT2`+b^ZsCjbSnxQIieS&FpmQ=W`l5cE=&%~~V>km^sxSL1M-0r5loAFbJg$td1 zr?Jxm=zhJza%K$fmjuZ|`~NNtwGH$dHdvkJK}Vc+3(C#eP|I(Qzg^J%*^uY^|9O^l z!M{4QujDfT1KcN5F%G?9Ybbr7o3nM5?WYLpLi#7A_!&7O$7s%sWf4a+bvQAY#bl9c zz>m*EC+1KD5ukfE`FOk;=UC3FwjGp3vKs@`meE;GnmNf z5j!Q_o|)Wdwcu;j=t9_C#0>ch{lj_h1KuZBinDRSL4QA-Z*>4+!(NoT3Dxc=lsPb* zvQYQ1Bh4(EXUWX+kS41Q0nNkG97Y8)e^~IsO5z)t&_Tu}cL>TCJNw4l-`m;V379p^ zlP)6T)+?q!)%1JZAW%L-E_x)LG*jQHv++Uu(nY>O6zPydb~EUi45lh|iESHpU<|8^ zP=)Y@7GwxwuGP6bmvYRoEIOKipU=q%kD>&m-wSp)dKq+5t9;Juakv&A5xN5^`!8S& zuDeV;@9pKTSO6J833iyO?U8^7LWm_x$oGcheG~ zHy%6Zh`aSRoqqy#QY8;T4i8paTz>J<5s?TLYJC%^dG5nRX3qX0Q=oei?86M#KCS-} z?`;#AcXdI3X)=-NrHT<`Xk}I~1_@UVeFs@OyiB(b+9b7i6zz#HoUlQ)qBXUP!4IlK z@Ue@9rl0~QR%||1bBvFH$o4$gF3%|be@AIxywWFk#>@x)4l?=GDZ|`sBi*pIUxF}c z9N_rTdD{x&mlc0(06qSe3v1pL-AI>wv=mi+=rIbJhsqkg7|5dYAHqw1=j|RZ%{?q^ zlJTN6f9+$|W=pCwBkFxOo>uS@y-x)pd4kc8)idpgV>*=@YuRNUfPm8XqG&ktGEDqK z2>h7Vy%+AGI}wd3{cEoW0Hbu(phb}=DdXv2pF;mX%XG znc8MZ4zWGs&*)Icc)#V7q#Azll3eQRLt6TAEX;#FGcqVpOq&`|>@Gg4D3-cZN>DI- zffec06O4mg{PzpSpIPoTA3^U;D0E9Hk<8#8O}c>Y)QDlZyL4&zHOPG|j=xChFk7t2 z6iceSiGc!#Zx*O$gi#0dN7u=*bxA9KI2g@*7pU#^87|}Lb{uhY2rL~%TO27bKpS{T zYvy5upvBv5UX=Kb=p6McBqr6&u*p7FjCw0o{Z-phywswTBIY{g?+@rcszL71@KG^{>D6IfAjN2iuUp z+G}mb&C@rj=ksmOiPm|+5(Z=3t^411qC^Jpe`0aQ;@O6w=B>{qfr2y?lkK#gD|wQr z3^$IaS*nfIpVWz5IIJnjKWilaKGT24vyi_AKsDwygv}FLT|+(7_xu!@v(7L=uEf2l zgv9vfQd@z21lK|7r6wLlO9&Ts^JO9ag{&4p62ZDZeGEErd&uWSqAm{n2gix2y;`pipC1K78Nl))YgKV2XlcLekU`LI;JV6SHn~H>!ho!DTQCzy8JfpM8AAjdGXP+Q zZi=m&InKU|k?7d95+98m-Ih`gKXbce{2~M2Ly<J8p9xGiIoSXAuX0ljSp98pkf?9ic79JU6H^hh_j8MRwTR};> zN@m4rWPr$kEqG5XW&O_-y|_#k@8*BWT@d-nc>SOiAGI83)>5aM(hMv?EXi9^tYFr{+?#uuQy*X~ zI-oWf27sSXsRh(sf!{4yxh39?Aq$PnXDfQu6*7_X7~%OfZk^SdW;&=Q{JRb?)f7tRU4YGxvU{Hgrg_O}2Aif`bKFsu^SM+B;A zd|d*%cCZr#T)4^Y9V!WxuQwE2V4vC%AgDYIUuLg{$x>-+9L;JnD0)Nqr~2}tVN2$U z`UK0Fo7x(;q8E*jKP+swC7k6s`pKvy7sZKNvQtP6)C@;?(e>*o9&rVLABgk0;E0su+~@(k^VMj zUi+7W@yuJ1jOr0LC;LD;t7WEB>6HuwyaUFb`yB^YU}mGRwe;(b&oq;pxzZas)oEtw zZ;FJ~-eQZ|{+t_LvP@tuhXqHZ`d^IL=VjQtWj9Mork$4wFds;$=qI@$Oz!#e-}wuM zWQYyKnPQ2{DRJWFLq=%0V8CtrjmG`iaSJAotY9vg&~Pw3Ip8YxA`kq5_wk1cf5hKZ Wb;^wmDe&!5y3>@+YPg`8Vv1Z-2?WFd From 3fd32735bd3bde32d7d51e2aeb7e08d57324b823 Mon Sep 17 00:00:00 2001 From: hinerm Date: Mon, 12 Jul 2021 10:16:26 -0500 Subject: [PATCH 211/996] Bump imglib2-unsafe * 0.4.0 --> 0.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5264aa4b..81efb8e8 100644 --- a/pom.xml +++ b/pom.xml @@ -527,7 +527,7 @@ 0.2.4 - 0.4.0 + 0.4.1 From 1bc8d7de88a06a291b485f96ed29616b1f901d18 Mon Sep 17 00:00:00 2001 From: hinerm Date: Mon, 12 Jul 2021 13:10:01 -0500 Subject: [PATCH 212/996] Bump native-lib-loader to 2.3.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 81efb8e8..7b072f0d 100644 --- a/pom.xml +++ b/pom.xml @@ -312,7 +312,7 @@ 2.2.2 - 2.3.4 + 2.3.6 2.0.0 From 62303a4072726e1b36c230099af0c36bc40500bf Mon Sep 17 00:00:00 2001 From: David Gault Date: Mon, 23 Aug 2021 15:32:36 +0100 Subject: [PATCH 213/996] Bump Bio-Formats version to 6.7.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7fbdca33..3852722c 100644 --- a/pom.xml +++ b/pom.xml @@ -770,7 +770,7 @@ ${jxrlib.version} - 6.6.1 + 6.7.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From d126f0c846589bdf55a26fb1b47eb7677201004d Mon Sep 17 00:00:00 2001 From: bogovicj Date: Wed, 1 Sep 2021 08:55:48 -0400 Subject: [PATCH 214/996] Bump imglib2-algorithm to 0.12.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f361b04b..7abf5b69 100644 --- a/pom.xml +++ b/pom.xml @@ -503,7 +503,7 @@ 5.12.0 - 0.11.2 + 0.12.0 0.2.0 From b6e7a7f96d03591149bd51a5ea9403375d727afa Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 3 Sep 2021 17:33:17 -0500 Subject: [PATCH 215/996] Bump TrackMate to 7.0.3 Note the change in artifactId from TrackMate_ to TrackMate. --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 7abf5b69..0000771c 100644 --- a/pom.xml +++ b/pom.xml @@ -653,8 +653,7 @@ ${ToAST.version} 2.0.1 ${TopoJ.version} - 6.0.1 - ${TrackMate.version} + 7.0.3 3.2.34 2.0.3 2.2.0 @@ -2211,8 +2210,8 @@ sc.fiji - TrackMate_ - ${TrackMate_.version} + TrackMate + ${TrackMate.version} sc.fiji From d2771d6815d8d6f7d9d7b49db022b46d6438140e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 3 Sep 2021 19:44:08 -0500 Subject: [PATCH 216/996] Remove obsolete comment block As far as I can tell, nothing uses this marker anymore. --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 0000771c..b5b4f3d8 100644 --- a/pom.xml +++ b/pom.xml @@ -733,14 +733,6 @@ 4.2.1 0.0.6 - - 7.0.11 ${bonej.version} From b189fa8994af7ea6beb79abea30f46d4df1bd5b9 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 3 Sep 2021 19:45:40 -0500 Subject: [PATCH 217/996] Add MaMuT_ to managed components --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index b5b4f3d8..e98cd11d 100644 --- a/pom.xml +++ b/pom.xml @@ -733,6 +733,10 @@ 4.2.1 0.0.6 + + 0.30.0 + ${MaMuT.version} + 7.0.11 ${bonej.version} @@ -2464,6 +2468,14 @@ ${n5-zarr.version} + + + + sc.fiji + MaMuT_ + ${MaMuT_.version} + + From 4f87fea6baddd82d69533ab51c4b1c34fd8bd962 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 3 Sep 2021 20:26:15 -0500 Subject: [PATCH 218/996] Bump imagej-ops to 0.45.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e98cd11d..ae86805a 100644 --- a/pom.xml +++ b/pom.xml @@ -459,7 +459,7 @@ 0.1.1 - 0.45.5 + 0.45.8 0.1.1 From 3c3670a8a0105b8ae8ffc46bd4de8822ce3fb0bc Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 3 Sep 2021 20:36:43 -0500 Subject: [PATCH 219/996] Remove remnants of obsolete imglib2-ui component --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index ae86805a..eb902e1e 100644 --- a/pom.xml +++ b/pom.xml @@ -1753,13 +1753,6 @@ ${imglib2-script.version} - - - net.imglib2 - imglib2-ui - ${imglib2-ui.version} - - net.imglib2 @@ -4428,7 +4421,6 @@ LATEST LATEST LATEST - LATEST LATEST From 7d04bc0a7eb123c162972ff2b55a6af782f61af3 Mon Sep 17 00:00:00 2001 From: hinerm Date: Tue, 7 Sep 2021 10:05:04 -0500 Subject: [PATCH 220/996] Bump scijava-common to 2.87.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb902e1e..4526becc 100644 --- a/pom.xml +++ b/pom.xml @@ -321,7 +321,7 @@ 0.1.2 - 2.86.1 + 2.87.0 2.0.2 From 0cfd6a33dc075bf801cfce9d1d0d4050c095f94e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 9 Sep 2021 13:17:34 -0500 Subject: [PATCH 221/996] Add missing n5-ij dependency declaration --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 4526becc..79fc5a22 100644 --- a/pom.xml +++ b/pom.xml @@ -2445,6 +2445,11 @@ n5-hdf5 ${n5-hdf5.version} + + org.janelia.saalfeldlab + n5-ij + ${n5-ij.version} + org.janelia.saalfeldlab n5-imglib2 From 50cab90a52ef6e6a5aae923190e3d87a7bea8fc5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 9 Sep 2021 14:02:45 -0500 Subject: [PATCH 222/996] mega-melt: exclude opencsv from version overrides Because we have both net.sf.opencsv and com.opencsv groupIds. Fortunately, they have different package prefixes, so there is no clash at runtime -- as long as one of the JAR files is renamed... :-/ --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index abc0f6ba..abf636ec 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -111,7 +111,7 @@ buildScriptBackup="$buildScript.original" echo && printf 'Adjusting melting pot build script... ' && mv "$buildScript" "$buildScriptBackup" && -awk '!/-D(annotations|antlr|jocl|kryo|minlog|trove4j)\.version/' "$buildScriptBackup" > "$buildScript" || +awk '!/-D(annotations|antlr|jocl|kryo|minlog|opencsv|trove4j)\.version/' "$buildScriptBackup" > "$buildScript" || die 'Error adjusting melting pot build script!' echo 'Done!' From 6c3de0b2fba04d1b07fdde74e0417cca2cc64fc3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 9 Sep 2021 16:01:13 -0500 Subject: [PATCH 223/996] Do not call ImageJ2 "ImageJ" anymore See also: * imagej/imagej.github.io@fd7ef80c04a07d2b0128747d5bbea4e8a6f7d3aa * imagej/imagej.github.io@63e854dab75079ffbb0fc33a05ac8cd373bce24d --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 79fc5a22..8bdde733 100644 --- a/pom.xml +++ b/pom.xml @@ -415,8 +415,8 @@ - - 2.2.0 + + 2.2.0 1.53d @@ -1487,11 +1487,11 @@ - + net.imagej imagej - ${imagej.version} + ${imagej2.version} @@ -4367,7 +4367,7 @@ - LATEST + LATEST LATEST LATEST LATEST From ec8c02d7a7421058c24ad359666e668071bb95c8 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 9 Sep 2021 16:36:34 -0500 Subject: [PATCH 224/996] Bump imglib2-label-multisets to 0.10.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8bdde733..328dee7c 100644 --- a/pom.xml +++ b/pom.xml @@ -722,7 +722,7 @@ - 0.9.0 + 0.10.0 2.5.0 3.2.0 1.1.0 From 77ca67f6d85718302b1e96ff01a60fa4b87a0cbf Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 10 Sep 2021 11:39:23 -0500 Subject: [PATCH 225/996] Restore imagej.version property We need a version property matching the artifactId of the artifact, which in this case is net.imagej:imagej, for the melting pot to work. I considered renaming net.imagej:imagej to net.imagej:imagej2, but that would disrupt a large ecosystem of downstream code, including e.g. PyImageJ, which defaults to using net.imagej:imagej currently. It would be possible to do this rename later, but it would be more involved, and I would prefer to do it at a time when the rest of the system is not in motion so much. --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 328dee7c..e3dd34ae 100644 --- a/pom.xml +++ b/pom.xml @@ -417,6 +417,7 @@ 2.2.0 + ${imagej2.version} 1.53d @@ -1491,7 +1492,7 @@ net.imagej imagej - ${imagej2.version} + ${imagej.version} @@ -4367,7 +4368,7 @@ - LATEST + LATEST LATEST LATEST LATEST From 7ed2a0f3d996e886edd076fd01d17f47f7b773e9 Mon Sep 17 00:00:00 2001 From: Jan Eglinger Date: Mon, 13 Sep 2021 09:22:34 +0200 Subject: [PATCH 226/996] POM: update Stitching version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3dd34ae..1209b5c4 100644 --- a/pom.xml +++ b/pom.xml @@ -644,7 +644,7 @@ ${SplineDeformationGenerator.version} 2.1.2 2.0.1 - 3.1.6 + 3.1.8 ${Stitching.version} 1.7-fiji4 2.0.1 From 37875f8a269f35c55c1f472a78a7ced378cff760 Mon Sep 17 00:00:00 2001 From: hinerm Date: Mon, 13 Sep 2021 09:50:09 -0500 Subject: [PATCH 227/996] Bump scijava-ui-swing -> 0.13.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3dd34ae..02efc5d1 100644 --- a/pom.xml +++ b/pom.xml @@ -369,7 +369,7 @@ 0.1.7 - 0.13.2 + 0.13.3 0.5.9 From c9a91ec065406acf8eba9d485005aefbe635a5c5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 10 Sep 2021 14:07:06 -0500 Subject: [PATCH 228/996] Bump MaMuT to 7.0.1 The artifactId was changed from MaMuT_ to MaMuT. --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 87ab8a17..092b3638 100644 --- a/pom.xml +++ b/pom.xml @@ -735,8 +735,7 @@ 0.0.6 - 0.30.0 - ${MaMuT.version} + 7.0.1 7.0.11 @@ -2471,8 +2470,8 @@ sc.fiji - MaMuT_ - ${MaMuT_.version} + MaMuT + ${MaMuT.version} From 89a9cd193d1bb43c6e77bdaa2bb74c21a8ae7613 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 13 Sep 2021 15:50:23 -0500 Subject: [PATCH 229/996] Update pom-scijava-base parent to 13.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 092b3638..cb9ee507 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 12.0.0 + 13.0.0 From 1d673e782385d36370df7d659ba59ffa473f500d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 13 Sep 2021 15:50:42 -0500 Subject: [PATCH 230/996] Bump ImageJ version to 1.53f This is the newest version that still works with ij1-patcher. Further work will be needed to move beyond this point. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cb9ee507..fd5411b7 100644 --- a/pom.xml +++ b/pom.xml @@ -420,7 +420,7 @@ ${imagej2.version} - 1.53d + 1.53f ${imagej1.version} From 9e0b6c42acd3276370da326bbd0724651abcffad Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 13 Sep 2021 15:52:48 -0500 Subject: [PATCH 231/996] Update component versions preemptively * imagej2: 2.2.0 -> 2.3.0 * imagej-common: 0.34.0 -> 0.34.1 * imagej-legacy: 0.37.4 -> 0.38.0 * fiji-lib: 2.1.2 -> 2.1.3 * bigwarp: 6.1.0 -> 7.0.2 * SPIM_Registration: 5.0.21 -> 5.0.22 * TrackMate: 7.0.3 -> 7.0.5 * FilamentDetector: 1.0.0 -> 2.0.0 * fiji: 2.2.0 -> 2.3.0 --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index fd5411b7..99424354 100644 --- a/pom.xml +++ b/pom.xml @@ -416,7 +416,7 @@ - 2.2.0 + 2.3.0 ${imagej2.version} @@ -427,7 +427,7 @@ 1.2.1 - 0.34.0 + 0.34.1 0.1.4 @@ -436,7 +436,7 @@ 6.0.1 - 0.37.4 + 0.38.0 0.7.4 @@ -556,7 +556,7 @@ - 2.2.0 + 2.3.0 @@ -593,7 +593,7 @@ 2.0.7 2.1.1 3.1.1 - 1.0.0 + 2.0.0 2.0.1 ${FlowJ.version} 1.0.2 @@ -632,7 +632,7 @@ ${RATS.version} 2.0.4 2.0.2 - 5.0.21 + 5.0.22 2.0.2 ${Samples.version} 2.0.1 @@ -654,7 +654,7 @@ ${ToAST.version} 2.0.1 ${TopoJ.version} - 7.0.3 + 7.0.5 3.2.34 2.0.3 2.2.0 @@ -672,7 +672,7 @@ 1.0.0 2.1.3 ${blockmatching.version} - 2.1.2 + 2.1.3 1.1.9 1.0.2 2.0.1 @@ -691,7 +691,7 @@ 3.0.1 - 6.1.0 + 7.0.2 ${bigwarp.version} From d72333eedd4ed1f424841a5d84f4b894fd33a45e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 14 Sep 2021 13:27:49 -0500 Subject: [PATCH 232/996] Deploy to OSS Sonatype, not SciJava repository --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index 99424354..cafbe037 100644 --- a/pom.xml +++ b/pom.xml @@ -1218,9 +1218,6 @@ 1.8 - - - sign,deploy-to-scijava From 4ef40a12973b061a4e0ee120b741755758b27039 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 14 Sep 2021 13:30:59 -0500 Subject: [PATCH 233/996] Update imagej.net URLs --- pom.xml | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index cafbe037..9650e406 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ ctrueden Curtis Rueden - https://imagej.net/User:Rueden + https://imagej.net/people/ctrueden founder lead @@ -48,56 +48,57 @@ Mark Hiner - https://imagej.net/User:Hinerm + https://imagej.net/people/hinerm hinerm Johannes Schindelin - https://imagej.net/User:Schindelin + https://imagej.net/people/dscho dscho Sébastien Besson - https://imagej.net/User:Sbesson + https://imagej.net/people/sbesson sbesson John Bogovic - https://imagej.net/User:Bogovic + https://imagej.net/people/bogovicj bogovicj Nicolas Chiaruttini - https://imagej.net/User:NicoKiaru + https://imagej.net/people/NicoKiaru NicoKiaru Barry DeZonia - https://imagej.net/User:Bdezonia + https://imagej.net/people/bdezonia bdezonia Richard Domander - https://imagej.net/User:Rdom + https://imagej.net/people/rimadoma rimadoma Karl Duderstadt + https://imagej.net/people/karlduderstadt karlduderstadt Jan Eglinger - https://imagej.net/User:Eglinger + https://imagej.net/people/imagejan imagejan Gabriel Einsdorf - https://imagej.net/User:Gab1one + https://imagej.net/people/gab1one gab1one Tiago Ferreira - https://imagej.net/User:Tiago + https://imagej.net/people/tferr tferr @@ -106,65 +107,67 @@ Ulrik Günther - https://imagej.net/User:Skalarproduktraum + https://imagej.net/people/skalarproduktraum skalarproduktraum Philipp Hanslovsky - https://imagej.net/User:Hanslovsky + https://imagej.net/people/hanslovsky hanslovsky Stefan Helfrich - https://imagej.net/User:stelfrich + https://imagej.net/people/stelfrich stelfrich Cameron Lloyd + https://imagej.net/people/camlloyd camlloyd Hadrien Mary - https://imagej.net/User:Hadim + https://imagej.net/people/hadim hadim Tobias Pietzsch - https://imagej.net/User:Pietzsch + https://imagej.net/people/tpietzsch tpietzsch Stephan Preibisch - https://imagej.net/User:StephanP + https://imagej.net/people/StephanPreibisch StephanPreibisch Stephan Saalfeld - https://imagej.net/User:Saalfeld + https://imagej.net/people/axtimwalde axtimwalde Deborah Schmidt - https://imagej.net/User:Frauzufall + https://imagej.net/people/frauzufall frauzufall Lorenzo Scianatico - https://imagej.net/User:LoreScianatico + https://imagej.net/people/LoreScianatico LoreScianatico Jean-Yves Tinevez - https://imagej.net/User:JeanYvesTinevez + https://imagej.net/people/tinevez tinevez Christian Tischer + https://imagej.net/people/tischi tischi Gabriella Turek - https://imagej.net/User:Turek + https://imagej.net/people/turekg turekg From 54c5aa4f9eb61b3580f53ddee799ead1772df309 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 14 Sep 2021 13:32:21 -0500 Subject: [PATCH 234/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9650e406..108f3a4f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 31.0.0-SNAPSHOT + 31.0.1-SNAPSHOT pom SciJava Parent POM From bfc54d8f35f0e1784113ff8b8d05ca983524f102 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 15 Sep 2021 10:22:04 -0500 Subject: [PATCH 235/996] Manage version of imglib2-imglyb --- pom.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 108f3a4f..6fd45cef 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 31.0.1-SNAPSHOT + 31.1.0-SNAPSHOT pom SciJava Parent POM @@ -521,6 +521,9 @@ 2.0.0-beta-46 + + 1.0.0 + 3.1.0 @@ -1732,6 +1735,13 @@ ${imglib2-ij.version} + + + net.imglib2 + imglib2-imglyb + ${imglib2-imglyb.version} + + net.imglib2 From ea372378d053f2fec0c84a5ec9cb8598ccb18f17 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 15 Sep 2021 12:45:03 -0500 Subject: [PATCH 236/996] Update component versions * scifio: 0.41.2 -> 0.42.0 * Trainable_Segmentation: 3.2.34 -> 3.2.35 * View5D: 2.3.1 -> 2.3.4 * ome-common: 6.0.4 -> 6.0.7 * metakit: 5.3.2 -> 5.3.3 * ome-poi: 5.3.3 -> 5.3.4 * ome-xml: 6.1.0 -> 6.2.3 --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 6fd45cef..b51f24d1 100644 --- a/pom.xml +++ b/pom.xml @@ -539,7 +539,7 @@ - 0.41.2 + 0.42.0 4.1.0 @@ -661,7 +661,7 @@ 2.0.1 ${TopoJ.version} 7.0.5 - 3.2.34 + 3.2.35 2.0.3 2.2.0 3.0.3 @@ -669,7 +669,7 @@ 2.0.3 1.0.3 2.0.1 - 2.3.1 + 2.3.4 ${View5D.version} 2.0.2 2.01.2 @@ -754,16 +754,16 @@ - 6.0.4 + 6.0.7 - 5.3.2 + 5.3.3 - 5.3.3 + 5.3.4 - 6.1.0 + 6.2.3 0.2.4 From a6b793ec805acd2deb0dedbbf52878ea11ffb2f5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 15 Sep 2021 12:45:03 -0500 Subject: [PATCH 237/996] Update component versions * View5D: 2.3.4 -> 2.3.6 * TrakEM2: 1.3.5 -> 1.3.6 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b51f24d1..14647ec4 100644 --- a/pom.xml +++ b/pom.xml @@ -669,7 +669,7 @@ 2.0.3 1.0.3 2.0.1 - 2.3.4 + 2.3.6 ${View5D.version} 2.0.2 2.01.2 @@ -722,7 +722,7 @@ 1.1.3 1.1.3 - 1.3.5 + 1.3.6 ${TrakEM2.version} 2.0.2 1.0.1 From 1be10f7bc99672f972a0c1082f70d4c0ffb76d7d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 15 Sep 2021 18:05:43 -0500 Subject: [PATCH 238/996] Manage shared components * google-http-client * jackson * jcodings The google-http-client dependencies are shared between: * Bio-Formats (ome-common via minio) * N5 (n5-google-cloud via google-cloud-storage) The jackson dependencies are shared between: * Bio-Formats - formats-gpl via cdm - ome-common via minio * N5 - n5-aws-s3 via aws-java-sdk - n5-google-cloud via google-cloud-* via google-http-client-jackson2 The jcodings dependency is shared between: * N5 (n5-ij vai jackson-iq via joni) * scripting-jruby (jruby-core) Without managing these versions, older versions of them win in the Fiji dependency tree (and probably other dependency trees). --- pom.xml | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 14647ec4..4e5dd3d6 100644 --- a/pom.xml +++ b/pom.xml @@ -946,7 +946,7 @@ 3.3.0 - + 10.4.0 ${eclipse-collections.version} @@ -976,6 +976,12 @@ 0.117.2-alpha 1.108.0 + + 1.40.0 + ${google-http-client.version} + ${google-http-client.version} + ${google-http-client.version} + 2.8.6 @@ -992,7 +998,11 @@ 2.21.1 - 2.11.0 + 2.12.5 + ${jackson.version} + ${jackson.version} + ${jackson.version} + ${jackson.version} 1.1.3 @@ -1011,6 +1021,9 @@ 3.27.0-GA + + 1.0.55 + 2.0.6 @@ -3510,6 +3523,28 @@ ${google-cloud-storage.version} + + + com.google.http-client + google-http-client + ${google-http-client.version} + + + com.google.http-client + google-http-client-appengine + ${google-http-client-appengine.version} + + + com.google.http-client + google-http-client-jackson2 + ${google-http-client-jackson2.version} + + + com.google.http-client + google-http-client-xml + ${google-http-client-xml.version} + + com.google.code.gson @@ -3558,11 +3593,26 @@ + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-annotations.version} + + + com.fasterxml.jackson.core + jackson-core + ${jackson-core.version} + com.fasterxml.jackson.core jackson-databind ${jackson-databind.version} + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + ${jackson-dataformat-cbor.version} + @@ -3607,6 +3657,13 @@ ${javassist.version} + + + org.jruby.jcodings + jcodings + ${jcodings.version} + + org.jdom From 029d34f6cce55bb03270d06607a6cafbe02a687c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 15 Sep 2021 18:17:00 -0500 Subject: [PATCH 239/996] Update fiji preemptively to 2.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e5dd3d6..b1a22551 100644 --- a/pom.xml +++ b/pom.xml @@ -562,7 +562,7 @@ - 2.3.0 + 2.3.1 From 307a9d424c0a4c04aad6de604ffcd78594b05ec4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 15 Sep 2021 18:17:50 -0500 Subject: [PATCH 240/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b1a22551..ce549781 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 31.1.0-SNAPSHOT + 31.1.1-SNAPSHOT pom SciJava Parent POM From c38bcfc4c95e02e55f10005653086524ddd5bf1b Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Mon, 20 Sep 2021 14:12:39 +0200 Subject: [PATCH 241/996] Bump bigdataviewer-core to 10.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc1eccce..2378edf8 100644 --- a/pom.xml +++ b/pom.xml @@ -709,7 +709,7 @@ - 10.2.0 + 10.2.1 3.0.0 1.0.0-beta-28 6.2.1 From a8574094adb4adcaa466a1abc81f5bab17a47390 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Mon, 20 Sep 2021 14:12:52 +0200 Subject: [PATCH 242/996] Bump bigdataviewer-vistools to 1.0.0-beta-29 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2378edf8..a7d4bfc4 100644 --- a/pom.xml +++ b/pom.xml @@ -711,7 +711,7 @@ 10.2.1 3.0.0 - 1.0.0-beta-28 + 1.0.0-beta-29 6.2.1 2.2.4 From 9cb79f9f2a2e44d6d800d0ba24b5d5ad955262f4 Mon Sep 17 00:00:00 2001 From: Ignacio Arganda-Carreras Date: Tue, 28 Sep 2021 10:06:35 +0200 Subject: [PATCH 243/996] Update Trainable Segmentation version Use latest release (3.3.0) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c7917be..4a117e3f 100644 --- a/pom.xml +++ b/pom.xml @@ -661,7 +661,7 @@ 2.0.1 ${TopoJ.version} 7.0.5 - 3.2.35 + 3.3.0 2.0.3 2.2.0 3.0.3 From 2b6c66fa3bae08a1960e13d341aea144e2ea7fd0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 28 Sep 2021 10:53:59 -0500 Subject: [PATCH 244/996] Stop managing imglib2-script It is now retired: imglib/imglib2-script@d3347cbde955642d49b21ff8bf6a5615d87ba0f4 --- pom.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 7c7917be..e4c8c8a3 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 31.1.1-SNAPSHOT + 32.0.0-SNAPSHOT pom SciJava Parent POM @@ -530,9 +530,6 @@ 0.11.0 - - 0.2.4 - 0.4.1 @@ -1769,13 +1766,6 @@ ${imglib2-roi.version} - - - net.imglib2 - imglib2-script - ${imglib2-script.version} - - net.imglib2 @@ -4492,7 +4482,6 @@ LATEST LATEST LATEST - LATEST LATEST From f40c150c50fdae351b3d2d1c5cf666f0d21229d7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 1 Oct 2021 22:18:47 -0500 Subject: [PATCH 245/996] Update component versions * native-lib-loader: 2.3.6 -> 2.4.0 * parsington: 2.0.0 -> 2.0.1 * scripting-matlab: 0.5.2 -> 0.5.3 * ui-behaviour: 2.0.3 -> 2.0.5 * imagej-deprecated: 0.1.4 -> 0.1.5 * imagej-launcher: 6.0.1 -> 6.0.2 * imagej-mesh: 0.8.0 -> 0.8.1 * imagej-tensorflow: 1.1.5 -> 1.1.6 * imagej-ui-swing: 0.23.2 -> 0.23.3 * imagej-updater: 0.10.5 -> 0.10.6 * imglib2-algorithm-fft: 0.2.0 -> 0.2.1 * imglib2-algorithm-gpl: 0.2.5 -> 0.3.0 * imglib2-imglyb: 1.0.0 -> 1.0.1 * imglib2-realtransform: 3.1.0 -> 3.1.1 * TrackMate: 7.0.5 -> 7.0.7 * register_virtual_stack_slices: 3.0.5 -> 3.0.7 * SNT: 3.1.112 -> 4.0.1 * spim_data: 2.2.4 -> 2.2.6 * n5: 2.5.0 -> 2.5.1 * n5-hdf5: 1.3.0 -> 1.4.1 * n5-ij: 2.0.0 -> 3.0.0 * n5-imglib2: 4.0.0 -> 4.1.1 * n5-viewer_fiji: 4.2.1 -> 4.3.0 * omero-blitz: 5.5.6 -> 5.5.8 * omero-common: 5.5.5 -> 5.5.7 * omero-dsl-plugin: 5.5.0 -> 5.5.2 * omero-gateway: 5.6.3 -> 5.6.7 * omero-model: 5.6.0 -> 5.6.3 * omero-renderer: 5.5.5 -> 5.5.7 * omero-romio: 5.6.0 -> 5.6.2 * omero-server: 5.5.6 -> 5.6.1 * BigStitcher: 0.5.8 -> 0.8.2 * multiview-reconstruction: 0.9.3 -> 0.11.0 * sciview: 0.2.0-beta-5 -> 0.2.0-beta-9 * groovy: 3.0.4 -> 3.0.9 * maven-artifact-transfer: 0.12.0 -> 0.13.1 * maven-common-artifact-filters: 3.1.0 -> 3.2.0 * maven-core: 3.6.3 -> 3.8.2 * maven-plugin-tools-api: 3.6.0 -> 3.6.1 * spark: 2.3.1 -> 2.4.8 * httpclient: 4.5.12 -> 4.5.13 * httpcore: 4.4.13 -> 4.4.14 * batik: 1.13 -> 1.14 * xmlgraphics-commons: 2.4 -> 2.6 * commons-compress: 1.20 -> 1.21 * commons-lang3: 3.10 -> 3.12.0 * commons-text: 1.8 -> 1.9 * jackrabbit-webdav: 2.21.1 -> 2.21.7 * javassist: 3.27.0-GA -> 3.28.0-GA * jfreechart: 1.5.0 -> 1.5.3 * jfreesvg: 3.4 -> 3.4.1 * jgrapht: 1.4.0 -> 1.5.1 * jmh: 1.23 -> 1.33 * joml: 1.9.25 -> 1.10.2 * junit-jupiter: 5.7.1 -> 5.8.1 * lz4-java: 1.7.1 -> 1.8.0 * postgresql: 42.2.12 -> 42.2.24 * slf4j: 1.7.30 -> 1.7.32 * snakeyaml: 1.26 -> 1.29 * snakeyaml-engine: 2.1 -> 2.3 * weka: 3.9.4 -> 3.9.5 * xz: 1.8 -> 1.9 --- pom.xml | 127 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 64 insertions(+), 63 deletions(-) diff --git a/pom.xml b/pom.xml index aba5e1b4..4767b0cf 100644 --- a/pom.xml +++ b/pom.xml @@ -315,10 +315,10 @@ 2.2.2 - 2.3.6 + 2.4.0 - 2.0.0 + 2.0.1 0.1.2 @@ -402,7 +402,7 @@ 0.1.1 - 0.5.2 + 0.5.3 0.2.3 @@ -414,7 +414,7 @@ 1.0.2 - 2.0.3 + 2.0.5 @@ -433,10 +433,10 @@ 0.34.1 - 0.1.4 + 0.1.5 - 6.0.1 + 6.0.2 0.38.0 @@ -445,7 +445,7 @@ 0.7.4 - 0.8.0 + 0.8.1 0.1.2 @@ -487,16 +487,16 @@ 0.2.0 - 1.1.5 + 1.1.6 0.3.1 - 0.23.2 + 0.23.3 - 0.10.5 + 0.10.6 0.1.4 @@ -510,10 +510,10 @@ 0.12.0 - 0.2.0 + 0.2.1 - 0.2.5 + 0.3.0 1.0.0-beta-16 @@ -522,10 +522,10 @@ 2.0.0-beta-46 - 1.0.0 + 1.0.1 - 3.1.0 + 3.1.1 0.11.0 @@ -657,7 +657,7 @@ ${ToAST.version} 2.0.1 ${TopoJ.version} - 7.0.5 + 7.0.7 3.3.0 2.0.3 2.2.0 @@ -681,14 +681,14 @@ 2.0.1 3.0.2 ${panorama.version} - 3.0.5 + 3.0.7 2.0.1 2.1.1 - 3.1.112 + 4.0.1 3.0.1 @@ -713,7 +713,7 @@ 3.0.0 1.0.0-beta-29 6.2.1 - 2.2.4 + 2.2.6 @@ -727,14 +727,14 @@ 0.10.0 - 2.5.0 + 2.5.1 3.2.0 1.1.0 3.3.2 - 1.3.0 - 2.0.0 - 4.0.0 - 4.2.1 + 1.4.1 + 3.0.0 + 4.1.1 + 4.3.0 0.0.6 @@ -774,28 +774,28 @@ ${bio-formats.version} - 5.5.6 + 5.5.8 - 5.5.5 + 5.5.7 - 5.5.0 + 5.5.2 - 5.6.3 + 5.6.7 - 5.6.0 + 5.6.3 - 5.5.5 + 5.5.7 - 5.6.0 + 5.6.2 - 5.5.6 + 5.6.1 @@ -804,10 +804,10 @@ ${MorphoLibJ.version} - 0.5.8 + 0.8.2 - 0.9.3 + 0.11.0 0.2.0 @@ -822,7 +822,7 @@ 0.7.0-beta-7 - 0.2.0-beta-5 + 0.2.0-beta-9 @@ -830,7 +830,7 @@ 1.11.796 - 3.0.4 + 3.0.9 ${groovy.version} ${groovy.version} ${groovy.version} @@ -858,10 +858,10 @@ ${groovy.version} - 0.12.0 - 3.1.0 - 3.6.3 - 3.6.0 + 0.13.1 + 3.2.0 + 3.8.2 + 3.6.1 2.6.0 2.6.0 @@ -869,14 +869,15 @@ 3.17 - 2.3.1 + 2.4.8 + ${spark.version} - 4.5.12 - 4.4.13 + 4.5.13 + 4.4.14 - 1.13 + 1.14 ${batik.version} ${batik.version} ${batik.version} @@ -904,7 +905,7 @@ ${batik.version} ${batik.version} ${batik.version} - 2.4 + 2.6 1.0.1 @@ -923,14 +924,14 @@ 3.2.2 - 1.20 + 1.21 2.7 2.6 - 3.10 + 3.12.0 1.2 @@ -939,7 +940,7 @@ 3.6.1 - 1.8 + 1.9 3.3.0 @@ -992,7 +993,7 @@ 5.5.13.1 - 2.21.1 + 2.21.7 2.12.5 @@ -1016,7 +1017,7 @@ ${java3d.version} - 3.27.0-GA + 3.28.0-GA 1.0.55 @@ -1069,13 +1070,13 @@ ${jetty.version} - 1.5.0 + 1.5.3 - 3.4 + 3.4.1 - 1.4.0 + 1.5.1 ${jgrapht.version} ${jgrapht.version} ${jgrapht.version} @@ -1090,7 +1091,7 @@ 14.12.6 - 1.23 + 1.33 ${jmh.version} ${jmh.version} @@ -1111,7 +1112,7 @@ ${jogl.version} - 1.9.25 + 1.10.2 2.80b11 @@ -1124,7 +1125,7 @@ 4.13.2 - 5.7.1 + 5.8.1 ${junit-jupiter.version} ${junit-jupiter.version} ${junit-jupiter.version} @@ -1159,7 +1160,7 @@ ${logback.version} - 1.7.1 + 1.8.0 3.0.8 @@ -1187,7 +1188,7 @@ 4.3.2 - 42.2.12 + 42.2.24 3.1.1 @@ -1195,7 +1196,7 @@ 3.1.0 - 1.7.30 + 1.7.32 ${slf4j.version} ${slf4j.version} ${slf4j.version} @@ -1205,10 +1206,10 @@ ${slf4j.version} - 1.26 + 1.29 - 2.1 + 2.3 - 3.9.4 + 3.9.5 ${weka.version} - 1.8 + 1.9 @@ -3013,7 +3014,7 @@ org.apache.spark spark-core_2.11 - ${spark.version} + ${spark-core_2.11.version} - - dev.ome - - - ${user.home}/.scijava/dev.ome - - - - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - - - - scijava.public - https://maven.scijava.org/content/groups/public - - - - - scijava.public - https://maven.scijava.org/content/groups/public - - true - - - - - - dev.scijava - - - ${user.home}/.scijava/dev.scijava - - - - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - - - - scijava.public - https://maven.scijava.org/content/groups/public - - - - - scijava.public - https://maven.scijava.org/content/groups/public - - true - - - - - - dev.imagej - - - ${user.home}/.scijava/dev.imagej - - - - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - - - - scijava.public - https://maven.scijava.org/content/groups/public - - - - - scijava.public - https://maven.scijava.org/content/groups/public - - true - - - - - - dev.imglib2 - - - ${user.home}/.scijava/dev.imglib2 - - - - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - - - - scijava.public - https://maven.scijava.org/content/groups/public - - - - - scijava.public - https://maven.scijava.org/content/groups/public - - true - - - - - - dev.scifio - - - ${user.home}/.scijava/dev.scifio - - - - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - - - - scijava.public - https://maven.scijava.org/content/groups/public - - - - - scijava.public - https://maven.scijava.org/content/groups/public - - true - - - - - - dev.fiji - - - ${user.home}/.scijava/dev.fiji - - - - - LATEST - - - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - - - LATEST - LATEST - LATEST - LATEST - LATEST - LATEST - - - - scijava.public - https://maven.scijava.org/content/groups/public - - - - - scijava.public - https://maven.scijava.org/content/groups/public - - true - - - - - - dev.bdv - - - ${user.home}/.scijava/dev.bdv - - - - LATEST - LATEST - LATEST - LATEST - LATEST - - - - scijava.public - https://maven.scijava.org/content/groups/public - - - - - scijava.public - https://maven.scijava.org/content/groups/public - - true - - - - - - dev.trakem2 - - - ${user.home}/.scijava/dev.trakem2 - - - - LATEST - LATEST - LATEST - LATEST - LATEST - - - - scijava.public - https://maven.scijava.org/content/groups/public - - - - - scijava.public - https://maven.scijava.org/content/groups/public - - true - - - - - From f61e2e7bfbadcf5646dc3cba56f99f0163b58a7e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 13 Oct 2021 13:42:13 -0500 Subject: [PATCH 247/996] Improve Fiji-related section labels --- pom.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 23122d70..6640a621 100644 --- a/pom.xml +++ b/pom.xml @@ -685,7 +685,7 @@ 2.0.1 2.1.1 - + 4.0.1 @@ -737,6 +737,8 @@ 4.3.0 0.0.6 + + 7.0.1 @@ -2322,7 +2324,7 @@ ${weave_jy2java.version} - + @@ -2480,6 +2482,8 @@ ${n5-zarr.version} + + From 7568f331f17cef044eca4a1e9054e619b2721c83 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 13 Oct 2021 13:46:06 -0500 Subject: [PATCH 248/996] Move SNT and MorphoLibJ to Fiji-adjacent section They are ImageJ plugins distributed on their own update sites. --- pom.xml | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 6640a621..d7899216 100644 --- a/pom.xml +++ b/pom.xml @@ -687,9 +687,6 @@ - - 4.0.1 - 3.0.1 @@ -742,6 +739,13 @@ 7.0.1 + + 1.4.2.1 + ${MorphoLibJ.version} + + + 4.0.1 + 7.0.11 ${bonej.version} @@ -801,10 +805,6 @@ - - 1.4.2.1 - ${MorphoLibJ.version} - 0.8.2 @@ -2326,13 +2326,6 @@ - - - org.morphonets - SNT - ${SNT.version} - - jitk @@ -2485,13 +2478,26 @@ - sc.fiji MaMuT ${MaMuT.version} + + + fr.inra.ijpb + MorphoLibJ_ + ${MorphoLibJ_.version} + + + + + org.morphonets + SNT + ${SNT.version} + + @@ -2771,13 +2777,6 @@ - - - fr.inra.ijpb - MorphoLibJ_ - ${MorphoLibJ_.version} - - net.preibisch From ba3ac34e28b921f4669db79bc6c2bf43a9e0be9e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 13 Oct 2021 13:46:34 -0500 Subject: [PATCH 249/996] Improve BoneJ2 section label --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d7899216..547718d5 100644 --- a/pom.xml +++ b/pom.xml @@ -746,7 +746,7 @@ 4.0.1 - + 7.0.11 ${bonej.version} ${bonej.version} @@ -2498,8 +2498,7 @@ ${SNT.version} - - + org.bonej bonej-plugins From 2d3ca14b9e28794be5e1bd83c3df518ced53f526 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 13 Oct 2021 13:52:55 -0500 Subject: [PATCH 250/996] Remove unused libblosc.version property --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 547718d5..73d0793d 100644 --- a/pom.xml +++ b/pom.xml @@ -911,7 +911,6 @@ 1.0.1 - 1.18.1 1.2 From 5b173f48aec73877e9d4aabedce29acd0c7234cc Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 13 Oct 2021 12:57:08 -0500 Subject: [PATCH 251/996] Use fully qualified version properties Every managed component now declares its version using the fully qualified property, to avoid artifactId name clashes. We keep the short properties as well for backwards compatibility and convenience. --- pom.xml | 1531 ++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 1067 insertions(+), 464 deletions(-) diff --git a/pom.xml b/pom.xml index 73d0793d..0835470f 100644 --- a/pom.xml +++ b/pom.xml @@ -307,444 +307,793 @@ 0.4.1 + ${batch-processor.version} 0.7.4-scijava + ${junit-benchmarks.version} 2.2.2 + ${minimaven.version} 2.4.0 + ${native-lib-loader.version} 2.0.1 + ${parsington.version} 0.1.2 + ${scijava-cache.version} 2.87.0 + ${scijava-common.version} 2.0.2 + ${scijava-config.version} 0.1.0 + ${scijava-grab.version} 0.2.1 + ${scijava-io-http.version} 0.1.0 + ${scijava-java3d.version} 1.0.0-beta-3 + ${scijava-listeners.version} 1.0.5 + ${scijava-log-slf4j.version} 1.0.0 + ${scijava-optional.version} 0.2.3 + ${scijava-plugins-commands.version} 0.4.0 + ${scijava-plugins-io-table.version} 0.3.1 + ${scijava-plugins-platforms.version} 0.1.3 + ${scijava-plugins-text-markdown.version} 0.1.3 + ${scijava-plugins-text-plain.version} 0.7.0 + ${scijava-search.version} 0.7.0 + ${scijava-table.version} 0.1.7 + ${scijava-ui-awt.version} 0.13.3 + ${scijava-ui-swing.version} 0.5.9 + ${script-editor.version} 0.3.4 + ${scripting-beanshell.version} 0.1.6 + ${scripting-clojure.version} 0.3.0 + ${scripting-groovy.version} 0.4.1 + ${scripting-java.version} 0.5.0 + ${scripting-javascript.version} 0.3.1 + ${scripting-jruby.version} 1.0.0 + ${scripting-jython.version} 0.1.1 + ${scripting-kotlin.version} 0.5.3 + ${scripting-matlab.version} 0.2.3 + ${scripting-renjin.version} 0.2.2 + ${scripting-scala.version} 1.0.2 + ${swing-checkbox-tree.version} 2.0.5 + ${ui-behaviour.version} 2.3.0 ${imagej2.version} + ${imagej.version} 1.53f ${imagej1.version} + ${ij.version} 1.2.1 + ${ij1-patcher.version} 0.34.1 + ${imagej-common.version} 0.1.5 + ${imagej-deprecated.version} 6.0.2 + ${imagej-launcher.version} 0.38.0 + ${imagej-legacy.version} 0.7.4 + ${imagej-matlab.version} 0.8.1 + ${imagej-mesh.version} 0.1.2 + ${imagej-mesh-io.version} 0.7.1 + ${imagej-notebook.version} 1.0.0-5.5 + ${imagej-omero.version} 1.0.0-5.5 + ${imagej-omero-legacy.version} 0.1.1 + ${imagej-opencv.version} 0.45.8 + ${imagej-ops.version} 0.1.1 + ${imagej-plugins-batch.version} 0.8.1 + ${imagej-plugins-commands.version} 0.3.1 + ${imagej-plugins-tools.version} 0.3.2 + ${imagej-plugins-uploader-ssh.version} 0.3.2 + ${imagej-plugins-uploader-webdav.version} 0.8.2 + ${imagej-scripting.version} 0.2.0 + ${imagej-server.version} 1.1.6 + ${imagej-tensorflow.version} 0.3.1 + ${imagej-ui-awt.version} 0.23.3 + ${imagej-ui-swing.version} 0.10.6 + ${imagej-updater.version} 0.1.4 + ${op-finder.version} 5.12.0 + ${imglib2.version} 0.12.0 + ${imglib2-algorithm.version} 0.2.1 + ${imglib2-algorithm-fft.version} 0.3.0 + ${imglib2-algorithm-gpl.version} 1.0.0-beta-16 + ${imglib2-cache.version} 2.0.0-beta-46 + ${imglib2-ij.version} 1.0.1 + ${imglib2-imglyb.version} 3.1.1 + ${imglib2-realtransform.version} 0.11.0 + ${imglib2-roi.version} 0.4.1 + ${imglib2-unsafe.version} 0.42.0 + ${scifio.version} 4.1.0 + ${scifio-bf-compat.version} 0.6.1 + ${scifio-cli.version} 0.2.1 + ${scifio-hdf5.version} 1.1.1 + ${scifio-jai-imageio.version} 0.9.0 + ${scifio-lifesci.version} 0.16.1 + ${scifio-ome-xml.version} 2.3.1 + ${fiji.version} 3.4.2 ${AnalyzeSkeleton.version} + ${AnalyzeSkeleton_.version} + 2.0.1 + ${Anisotropic_Diffusion_2D.version} + 0.5.4 + ${Archipelago_Plugins.version} + 2.0.2 ${Arrow.version} + ${Arrow_.version} + 1.10.1 + ${Auto_Local_Threshold.version} + 1.17.2 + ${Auto_Threshold.version} + 3.0.1 + ${BalloonSegmentation.version} + ${BalloonSegmentation.version} + ${BalloonSegmentation_.version} + 2.1.1 + ${Bug_Submitter.version} + 2.0.1 + ${CPU_Meter.version} + 2.0.1 + ${Calculator_Plus.version} + 3.0.0 + ${Cell_Counter.version} + 3.0.5 + ${Colocalisation_Analysis.version} + 2.0.7 + ${Color_Histogram.version} + 2.5.0 + ${Color_Inspector_3D.version} + 3.0.3 + ${Colour_Deconvolution.version} + 2.0.3 ${CorrectBleach.version} + ${CorrectBleach_.version} + 1.0.6 + ${Correct_3D_Drift.version} + 2.1.7 + ${Descriptor_based_registration.version} + 2.1.2 ${Dichromacy.version} + ${Dichromacy_.version} + 2.3.0 ${Directionality.version} + ${Directionality_.version} + 2.0.3 + ${FS_Align_TrakEM2.version} + 2.0.2 + ${Feature_Detection.version} + 3.0.1 + ${Fiji_3D_Blob_Segmentation.version} + 2.0.1 + ${Fiji_Archipelago.version} + 2.0.7 + ${Fiji_Developer.version} + 2.1.1 + ${Fiji_Package_Maker.version} + 3.1.1 + ${Fiji_Plugins.version} + 2.0.0 + ${FilamentDetector.version} + 2.0.1 ${FlowJ.version} + ${FlowJ_.version} + 1.0.2 + ${Graph_Cut.version} + 2.3.5 + ${Gray_Morphology.version} + 1.1.0 + ${H5J_Loader_Plugin.version} + 1.1.0 + ${HDF5_Vibez.version} + 2.0.2 + ${Helmholtz_Analysis.version} + 2.0.1 + ${IJ_Robot.version} + 4.1.0 ${IO.version} + ${IO_.version} + 2.0.1 + ${ImageJ_3D_Objects_Counter.version} + 4.0.3 + ${ImageJ_3D_Viewer.version} + 2.0.2 + ${Image_5D.version} + 3.0.1 + ${Image_Expression_Parser.version} + 3.0.0 + ${Interactive_3D_Surface_Plot.version} + 2.0.1 + ${IsoData_Classifier.version} + 2.0.0 + ${Kappa.version} + 2.0.1 + ${Kuwahara_Filter.version} + 2.1.1 + ${KymographBuilder.version} + 4.1.2 + ${LSM_Reader.version} + 4.1.2 + ${LSM_Toolbox.version} + 2.0.2 + ${Lasso_and_Blow_Tool.version} + 2.0.1 + ${Linear_Kuwahara.version} + 4.0.3 + ${LocalThickness.version} + ${LocalThickness.version} + ${LocalThickness_.version} + 2.0.1 ${MTrack2.version} + ${MTrack2_.version} + 2.0.1 + ${M_I_P.version} + 2.1.1 + ${Manual_Tracking.version} + 3.0.1 + ${Multi_Kymograph.version} + 2.0.0 + ${OMEVisual.version} + 1.1.2 + ${PIV_analyser.version} + 1.1.2 ${QuickPALM.version} + ${QuickPALM_.version} + 2.0.2 ${RATS.version} + ${RATS_.version} + 2.0.4 + ${Reconstruct_Reader.version} + 2.0.2 + ${SPIM_Opener.version} + 5.0.22 + ${SPIM_Registration.version} + 2.0.2 ${Samples.version} + ${Samples_.version} + 2.0.1 + ${Series_Labeler.version} + 3.1.10 + ${Simple_Neurite_Tracer.version} + 1.0.5 + ${Siox_Segmentation.version} + 2.1.1 ${Skeletonize3D.version} + ${Skeletonize3D_.version} + 2.0.2 ${SplineDeformationGenerator.version} + ${SplineDeformationGenerator_.version} + 2.1.2 + ${Stack_Manipulation.version} + 2.0.1 + ${Statistical_Region_Merging.version} + 3.1.8 ${Stitching.version} + ${Stitching_.version} + 1.7-fiji4 + ${Sync_Win.version} + 2.0.1 + ${Thread_Killer.version} + 2.1.1 + ${Time_Lapse.version} + 2.1.0 + ${Time_Stamper.version} + 25.0.2 ${ToAST.version} + ${ToAST_.version} + 2.0.1 ${TopoJ.version} + ${TopoJ_.version} + 7.0.7 + ${TrackMate.version} + 3.3.0 + ${Trainable_Segmentation.version} + 2.0.3 + ${TrakEM2_Archipelago.version} + 2.2.0 + ${VIB-lib.version} + 3.0.3 ${VIB.version} + ${VIB_.version} + 2.0.3 + ${Vaa3d_Reader.version} + 1.0.3 + ${Vaa3d_Writer.version} + 2.0.1 + ${Video_Editing.version} + 2.3.6 ${View5D.version} + ${View5D_.version} + 2.0.2 + ${Volume_Calculator.version} + 2.01.2 + ${Volume_Viewer.version} + 2.6.13 ${bUnwarpJ.version} + ${bUnwarpJ_.version} + 1.0.0 + ${bij.version} + 2.1.3 ${blockmatching.version} + ${blockmatching_.version} + 2.1.3 + ${fiji-lib.version} + 1.1.9 + ${legacy-imglib1.version} + 1.0.2 + ${level_sets.version} + 2.0.1 + ${pal-optimization.version} + 3.0.2 ${panorama.version} + ${panorama_.version} + 3.0.7 + ${register_virtual_stack_slices.version} + 2.0.1 + ${registration_3d.version} + 2.1.1 + ${weave_jy2java.version} 3.0.1 + ${jitk-tps.version} 7.0.2 ${bigwarp.version} + ${bigwarp_fiji.version} 1.4.1 ${mpicbg.version} + ${mpicbg.version} + ${mpicbg_.version} 1.1.4 + ${trakem2_tps.version} 1.1.1 + ${z_spacing.version} + 10.2.1 + ${bigdataviewer-core.version} + + 3.0.0 + ${bigdataviewer-server.version} + + 1.0.0-beta-29 + ${bigdataviewer-vistools.version} + + 6.2.1 + ${bigdataviewer_fiji.version} + + 2.2.6 + ${spim_data.version} + 1.1.3 + ${T2-NIT.version} + + 1.1.3 + ${T2-TreelineGraph.version} + + 1.3.6 ${TrakEM2.version} + ${TrakEM2_.version} + + 2.0.2 + ${VectorString.version} + + 1.0.1 + ${trakem2-transform.version} + 0.10.0 + ${imglib2-label-multisets.version} + + 2.5.1 + ${n5.version} + + 3.2.0 + ${n5-aws-s3.version} + + 1.1.0 + ${n5-blosc.version} + + 3.3.2 + ${n5-google-cloud.version} + + 1.4.1 + ${n5-hdf5.version} + + 3.0.0 + ${n5-ij.version} + + 4.1.1 + ${n5-imglib2.version} + + 4.3.0 + ${n5-viewer_fiji.version} + + 0.0.6 + ${n5-zarr.version} + + 7.0.1 + ${MaMuT.version} 1.4.2.1 ${MorphoLibJ.version} + ${MorphoLibJ_.version} 4.0.1 + ${SNT.version} 7.0.11 @@ -753,24 +1102,34 @@ ${bonej.version} ${bonej.version} ${bonej.version} + ${bonej-plugins.version} + ${bonej-ops.version} + ${bonej-legacy-plugins_.version} + ${bonej-legacy-util_.version} + ${bonej-utilities.version} 6.0.7 + ${ome-common.version} 5.3.3 + ${metakit.version} 5.3.4 + ${ome-poi.version} 6.2.3 + ${ome-xml.version} 0.2.4 ${jxrlib.version} + ${jxrlib-all.version} 6.7.0 @@ -778,58 +1137,78 @@ ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} + ${bio-formats_plugins.version} + ${formats-api.version} + ${formats-bsd.version} + ${formats-gpl.version} 5.5.8 + ${omero-blitz.version} 5.5.7 + ${omero-common.version} 5.5.2 + ${omero-dsl-plugin.version} 5.6.7 + ${omero-gateway.version} 5.6.3 + ${omero-model.version} 5.5.7 + ${omero-renderer.version} 5.6.2 + ${omero-romio.version} 5.6.1 + ${omero-server.version} 0.8.2 + ${BigStitcher.version} 0.11.0 + ${multiview-reconstruction.version} 0.2.0 + ${multiview-simulation.version} 0.4.8 + ${coremem.version} 2.2.10 + ${cleargl.version} 0.7.0-beta-7 + ${scenery.version} 0.2.0-beta-9 + ${sciview.version} 1.11.796 + ${aws-java-sdk-s3.version} 3.0.9 @@ -858,6 +1237,32 @@ ${groovy.version} ${groovy.version} ${groovy.version} + ${groovy.version} + ${groovy-ant.version} + ${groovy-astbuilder.version} + ${groovy-bsf.version} + ${groovy-cli-commons.version} + ${groovy-cli-picocli.version} + ${groovy-console.version} + ${groovy-datetime.version} + ${groovy-dateutil.version} + ${groovy-docgenerator.version} + ${groovy-groovydoc.version} + ${groovy-groovysh.version} + ${groovy-jaxb.version} + ${groovy-jmx.version} + ${groovy-json.version} + ${groovy-macro.version} + ${groovy-nio.version} + ${groovy-servlet.version} + ${groovy-sql.version} + ${groovy-swing.version} + ${groovy-templates.version} + ${groovy-test.version} + ${groovy-test-junit5.version} + ${groovy-testng.version} + ${groovy-xml.version} + ${groovy-yaml.version} 0.13.1 @@ -866,17 +1271,27 @@ 3.6.1 2.6.0 2.6.0 + ${maven-artifact-transfer.version} + ${maven-common-artifact-filters.version} + ${maven-core.version} + ${maven-plugin-tools-api.version} + ${sisu-inject-bean.version} + ${sisu-inject-plexus.version} 3.17 + ${poi.version} 2.4.8 ${spark.version} + ${spark-core_2.11.version} 4.5.13 4.4.14 + ${httpclient.version} + ${httpcore.version} 1.14 @@ -908,49 +1323,94 @@ ${batik.version} ${batik.version} 2.6 + ${batik-anim.version} + ${batik-awt-util.version} + ${batik-bridge.version} + ${batik-codec.version} + ${batik-constants.version} + ${batik-css.version} + ${batik-dom.version} + ${batik-ext.version} + ${batik-extension.version} + ${batik-gui-util.version} + ${batik-gvt.version} + ${batik-i18n.version} + ${batik-parser.version} + ${batik-rasterizer.version} + ${batik-rasterizer-ext.version} + ${batik-script.version} + ${batik-slideshow.version} + ${batik-squiggle.version} + ${batik-squiggle-ext.version} + ${batik-svg-dom.version} + ${batik-svggen.version} + ${batik-svgpp.version} + ${batik-swing.version} + ${batik-transcoder.version} + ${batik-ttf2svg.version} + ${batik-util.version} + ${batik-xml.version} + ${xmlgraphics-commons.version} 1.0.1 + ${jblosc.version} 1.2 + ${cdi-api.version} 1.9.4 + ${commons-beanutils.version} 1.14 + ${commons-codec.version} 3.2.2 + ${commons-collections.version} 1.21 + ${commons-compress.version} 2.7 + ${commons-io.version} 2.6 3.12.0 + ${commons-lang.version} + ${commons-lang3.version} 1.2 + ${commons-logging.version} 3.6.1 + ${commons-math3.version} 1.9 + ${commons-text.version} 3.3.0 + ${cglib.version} 10.4.0 ${eclipse-collections.version} ${eclipse-collections.version} ${eclipse-collections.version} + ${eclipse-collections.version} + ${eclipse-collections-api.version} + ${eclipse-collections-forkjoin.version} + ${eclipse-collections-testutils.version} 4.3 @@ -969,32 +1429,59 @@ ${eclipse-swt.version} ${eclipse-swt.version} ${eclipse-swt.version} + ${org.eclipse.swt.cocoa.macosx.version} + ${org.eclipse.swt.cocoa.macosx.x86_64.version} + ${org.eclipse.swt.gtk.aix.ppc.version} + ${org.eclipse.swt.gtk.aix.ppc64.version} + ${org.eclipse.swt.gtk.hpux.ia64.version} + ${org.eclipse.swt.gtk.linux.ppc.version} + ${org.eclipse.swt.gtk.linux.ppc64.version} + ${org.eclipse.swt.gtk.linux.s390.version} + ${org.eclipse.swt.gtk.linux.s390x.version} + ${org.eclipse.swt.gtk.linux.x86.version} + ${org.eclipse.swt.gtk.linux.x86_64.version} + ${org.eclipse.swt.gtk.solaris.sparc.version} + ${org.eclipse.swt.gtk.solaris.x86.version} + ${org.eclipse.swt.win32.win32.x86.version} + ${org.eclipse.swt.win32.win32.x86_64.version} 0.120.0-alpha 0.117.2-alpha 1.108.0 + ${google-cloud-nio.version} + ${google-cloud-resourcemanager.version} + ${google-cloud-storage.version} 1.40.0 ${google-http-client.version} ${google-http-client.version} ${google-http-client.version} + ${google-http-client.version} + ${google-http-client-appengine.version} + ${google-http-client-jackson2.version} + ${google-http-client-xml.version} 2.8.6 + ${gson.version} 21.0 + ${guava.version} 1.8.0.10 + ${hsqldb.version} 5.5.13.1 + ${itextpdf.version} 2.21.7 + ${jackrabbit-webdav.version} 2.12.5 @@ -1002,32 +1489,46 @@ ${jackson.version} ${jackson.version} ${jackson.version} + ${jackson-annotations.version} + ${jackson-core.version} + ${jackson-databind.version} + ${jackson-dataformat-cbor.version} 1.1.3 ${jai.version} ${jai.version} + ${jai-codec.version} + ${jai-core.version} 1.0.3 + ${jama.version} 1.6.0-scijava-2 ${java3d.version} ${java3d.version} ${java3d.version} + ${j3dcore.version} + ${j3dutils.version} + ${vecmath.version} 3.28.0-GA + ${javassist.version} 1.0.55 + ${jcodings.version} 2.0.6 + ${jdom2.version} 2.4.2 + ${jep.version} 9.4.29.v20200521 @@ -1069,12 +1570,39 @@ ${jetty.version} ${jetty.version} ${jetty.version} + ${jetty-annotations.version} + ${jetty-client.version} + ${jetty-continuation.version} + ${jetty-deploy.version} + ${jetty-http.version} + ${jetty-http-spi.version} + ${jetty-io.version} + ${jetty-jaas.version} + ${jetty-jaspi.version} + ${jetty-jmx.version} + ${jetty-jndi.version} + ${jetty-nosql.version} + ${jetty-plus.version} + ${jetty-proxy.version} + ${jetty-rewrite.version} + ${jetty-security.version} + ${jetty-server.version} + ${jetty-servlet.version} + ${jetty-servlets.version} + ${jetty-spring.version} + ${jetty-start.version} + ${jetty-util.version} + ${jetty-util-ajax.version} + ${jetty-webapp.version} + ${jetty-xml.version} 1.5.3 + ${jfreechart.version} 3.4.1 + ${jfreesvg.version} 1.5.1 @@ -1084,26 +1612,39 @@ ${jgrapht.version} ${jgrapht.version} ${jgrapht.version} + ${jgrapht-core.version} + ${jgrapht-demo.version} + ${jgrapht-ext.version} + ${jgrapht-guava.version} + ${jgrapht-io.version} + ${jgrapht-opt.version} 4.1.0 + ${jgraphx.version} 14.12.6 + ${jhdf5.version} 1.33 ${jmh.version} ${jmh.version} + ${jmh-core.version} + ${jmh-generator-annprocess.version} 1.49 + ${jmockit.version} 4.5.2 + ${jna.version} 2.10.6 + ${joda-time.version} 2.3.2 @@ -1111,19 +1652,27 @@ ${jogl.version} ${jogl.version} ${jogl.version} + ${gluegen-rt-main.version} + ${joal-main.version} + ${jocl-main.version} + ${jogl-all-main.version} 1.10.2 + ${joml.version} 2.80b11 ${jpedal.version} + ${jpedalSTD.version} 0.1.55 + ${jsch.version} 4.13.2 + ${junit.version} 5.8.1 @@ -1132,13 +1681,21 @@ ${junit-jupiter.version} ${junit-jupiter.version} ${junit-jupiter.version} + ${junit-jupiter-api.version} + ${junit-jupiter-engine.version} + ${junit-jupiter-migrationsupport.version} + ${junit-jupiter-params.version} + ${junit-jupiter.version} + ${junit-vintage-engine.version} 2.7.2 ${jython.version} + ${jython-slim.version} 1.1.3 + ${jzlib.version} @@ -1153,48 +1710,74 @@ ${kotlin.version} ${kotlin.version} ${kotlin.version} - + ${kotlin-compiler-embeddable.version} + ${kotlin-daemon-embeddable.version} + ${kotlin-reflect.version} + ${kotlin-script-runtime.version} + ${kotlin-script-util.version} + ${kotlin-scripting-common.version} + ${kotlin-scripting-compiler-embeddable.version} + ${kotlin-scripting-jvm.version} + ${kotlin-stdlib.version} + ${kotlin-stdlib-common.version} + ${kotlin-stdlib-jdk8.version} 1.2.3 ${logback.version} ${logback.version} + ${logback-classic.version} + ${logback-core.version} 1.8.0 + ${lz4-java.version} 3.0.8 + ${mapdb.version} 5.2 ${miglayout.version} ${miglayout.version} ${miglayout.version} + ${miglayout-core.version} + ${miglayout-swing.version} + ${miglayout-swt.version} 20151125 + ${mines-jtk.version} 2.19.0 ${mockito.version} + ${mockito-core.version} 45.1.1 + ${ojalgo.version} 5.2 + ${opencsv.version} 4.3.2 + ${picocli.version} 42.2.24 + ${postgresql.version} 3.1.1 3.1.0 3.1.0 + ${rsyntaxtextarea.version} + ${autocomplete.version} + ${languagesupport.version} 1.7.32 @@ -1205,12 +1788,21 @@ ${slf4j.version} ${slf4j.version} ${slf4j.version} + ${slf4j-api.version} + ${slf4j-ext.version} + ${slf4j-jcl.version} + ${slf4j-jdk14.version} + ${slf4j-nop.version} + ${slf4j-simple.version} + ${jcl-over-slf4j.version} 1.29 + ${snakeyaml.version} 2.3 + ${snakeyaml-engine.version} 3.2.9.RELEASE + ${spring-aop.version} 1.12.0 @@ -1226,16 +1819,24 @@ ${tensorflow.version} ${tensorflow.version} ${tensorflow.version} + ${tensorflow.version} + ${libtensorflow.version} + ${libtensorflow_jni.version} + ${libtensorflow_jni_gpu.version} + ${proto.version} 3.0.3 + ${trove4j.version} 3.9.5 ${weka.version} + ${weka-dev.version} 1.9 + ${xz.version} @@ -1246,47 +1847,47 @@ org.scijava batch-processor - ${batch-processor.version} + ${org.scijava.batch-processor.version} org.scijava minimaven - ${minimaven.version} + ${org.scijava.minimaven.version} org.scijava native-lib-loader - ${native-lib-loader.version} + ${org.scijava.native-lib-loader.version} org.scijava parsington - ${parsington.version} + ${org.scijava.parsington.version} org.scijava scijava-cache - ${scijava-cache.version} + ${org.scijava.scijava-cache.version} org.scijava scijava-common - ${scijava-common.version} + ${org.scijava.scijava-common.version} org.scijava scijava-common - ${scijava-common.version} + ${org.scijava.scijava-common.version} tests @@ -1294,210 +1895,210 @@ org.scijava scijava-config - ${scijava-config.version} + ${org.scijava.scijava-config.version} org.scijava scijava-grab - ${scijava-grab.version} + ${org.scijava.scijava-grab.version} org.scijava scijava-io-http - ${scijava-io-http.version} + ${org.scijava.scijava-io-http.version} org.scijava scijava-java3d - ${scijava-java3d.version} + ${org.scijava.scijava-java3d.version} org.scijava scijava-listeners - ${scijava-listeners.version} + ${org.scijava.scijava-listeners.version} org.scijava scijava-log-slf4j - ${scijava-log-slf4j.version} + ${org.scijava.scijava-log-slf4j.version} org.scijava scijava-optional - ${scijava-optional.version} + ${org.scijava.scijava-optional.version} org.scijava scijava-plugins-commands - ${scijava-plugins-commands.version} + ${org.scijava.scijava-plugins-commands.version} org.scijava scijava-plugins-io-table - ${scijava-plugins-io-table.version} + ${org.scijava.scijava-plugins-io-table.version} org.scijava scijava-plugins-platforms - ${scijava-plugins-platforms.version} + ${org.scijava.scijava-plugins-platforms.version} org.scijava scijava-plugins-text-markdown - ${scijava-plugins-text-markdown.version} + ${org.scijava.scijava-plugins-text-markdown.version} org.scijava scijava-plugins-text-plain - ${scijava-plugins-text-plain.version} + ${org.scijava.scijava-plugins-text-plain.version} org.scijava scijava-search - ${scijava-search.version} + ${org.scijava.scijava-search.version} org.scijava scijava-table - ${scijava-table.version} + ${org.scijava.scijava-table.version} org.scijava scijava-ui-awt - ${scijava-ui-awt.version} + ${org.scijava.scijava-ui-awt.version} org.scijava scijava-ui-swing - ${scijava-ui-swing.version} + ${org.scijava.scijava-ui-swing.version} org.scijava script-editor - ${script-editor.version} + ${org.scijava.script-editor.version} org.scijava scripting-beanshell - ${scripting-beanshell.version} + ${org.scijava.scripting-beanshell.version} org.scijava scripting-clojure - ${scripting-clojure.version} + ${org.scijava.scripting-clojure.version} org.scijava scripting-groovy - ${scripting-groovy.version} + ${org.scijava.scripting-groovy.version} org.scijava scripting-java - ${scripting-java.version} + ${org.scijava.scripting-java.version} org.scijava scripting-javascript - ${scripting-javascript.version} + ${org.scijava.scripting-javascript.version} org.scijava scripting-jruby - ${scripting-jruby.version} + ${org.scijava.scripting-jruby.version} org.scijava scripting-jython - ${scripting-jython.version} + ${org.scijava.scripting-jython.version} org.scijava scripting-kotlin - ${scripting-kotlin.version} + ${org.scijava.scripting-kotlin.version} org.scijava scripting-matlab - ${scripting-matlab.version} + ${org.scijava.scripting-matlab.version} org.scijava scripting-renjin - ${scripting-renjin.version} + ${org.scijava.scripting-renjin.version} org.scijava scripting-scala - ${scripting-scala.version} + ${org.scijava.scripting-scala.version} org.scijava swing-checkbox-tree - ${swing-checkbox-tree.version} + ${org.scijava.swing-checkbox-tree.version} org.scijava ui-behaviour - ${ui-behaviour.version} + ${org.scijava.ui-behaviour.version} @@ -1506,14 +2107,14 @@ net.imagej imagej - ${imagej.version} + ${net.imagej.imagej.version} net.imagej ij - ${ij.version} + ${net.imagej.ij.version} com.sun @@ -1526,173 +2127,173 @@ net.imagej ij1-patcher - ${ij1-patcher.version} + ${net.imagej.ij1-patcher.version} net.imagej imagej-common - ${imagej-common.version} + ${net.imagej.imagej-common.version} net.imagej imagej-deprecated - ${imagej-deprecated.version} + ${net.imagej.imagej-deprecated.version} net.imagej imagej-launcher - ${imagej-launcher.version} + ${net.imagej.imagej-launcher.version} net.imagej imagej-legacy - ${imagej-legacy.version} + ${net.imagej.imagej-legacy.version} net.imagej imagej-matlab - ${imagej-matlab.version} + ${net.imagej.imagej-matlab.version} net.imagej imagej-mesh - ${imagej-mesh.version} + ${net.imagej.imagej-mesh.version} net.imagej imagej-mesh-io - ${imagej-mesh-io.version} + ${net.imagej.imagej-mesh-io.version} net.imagej imagej-notebook - ${imagej-notebook.version} + ${net.imagej.imagej-notebook.version} net.imagej imagej-omero - ${imagej-omero.version} + ${net.imagej.imagej-omero.version} net.imagej imagej-omero-legacy - ${imagej-omero-legacy.version} + ${net.imagej.imagej-omero-legacy.version} net.imagej imagej-opencv - ${imagej-opencv.version} + ${net.imagej.imagej-opencv.version} net.imagej imagej-ops - ${imagej-ops.version} + ${net.imagej.imagej-ops.version} net.imagej imagej-plugins-batch - ${imagej-plugins-batch.version} + ${net.imagej.imagej-plugins-batch.version} net.imagej imagej-plugins-commands - ${imagej-plugins-commands.version} + ${net.imagej.imagej-plugins-commands.version} net.imagej imagej-plugins-tools - ${imagej-plugins-tools.version} + ${net.imagej.imagej-plugins-tools.version} net.imagej imagej-plugins-uploader-ssh - ${imagej-plugins-uploader-ssh.version} + ${net.imagej.imagej-plugins-uploader-ssh.version} net.imagej imagej-plugins-uploader-webdav - ${imagej-plugins-uploader-webdav.version} + ${net.imagej.imagej-plugins-uploader-webdav.version} net.imagej imagej-scripting - ${imagej-scripting.version} + ${net.imagej.imagej-scripting.version} net.imagej imagej-server - ${imagej-server.version} + ${net.imagej.imagej-server.version} net.imagej imagej-tensorflow - ${imagej-tensorflow.version} + ${net.imagej.imagej-tensorflow.version} net.imagej imagej-ui-awt - ${imagej-ui-awt.version} + ${net.imagej.imagej-ui-awt.version} net.imagej imagej-ui-swing - ${imagej-ui-swing.version} + ${net.imagej.imagej-ui-swing.version} net.imagej imagej-updater - ${imagej-updater.version} + ${net.imagej.imagej-updater.version} net.imagej imagej-updater - ${imagej-updater.version} + ${net.imagej.imagej-updater.version} tests @@ -1700,7 +2301,7 @@ net.imagej op-finder - ${op-finder.version} + ${net.imagej.op-finder.version} @@ -1709,70 +2310,70 @@ net.imglib2 imglib2 - ${imglib2.version} + ${net.imglib2.imglib2.version} net.imglib2 imglib2-algorithm - ${imglib2-algorithm.version} + ${net.imglib2.imglib2-algorithm.version} net.imglib2 imglib2-algorithm-fft - ${imglib2-algorithm-fft.version} + ${net.imglib2.imglib2-algorithm-fft.version} net.imglib2 imglib2-algorithm-gpl - ${imglib2-algorithm-gpl.version} + ${net.imglib2.imglib2-algorithm-gpl.version} net.imglib2 imglib2-cache - ${imglib2-cache.version} + ${net.imglib2.imglib2-cache.version} net.imglib2 imglib2-ij - ${imglib2-ij.version} + ${net.imglib2.imglib2-ij.version} net.imglib2 imglib2-imglyb - ${imglib2-imglyb.version} + ${net.imglib2.imglib2-imglyb.version} net.imglib2 imglib2-realtransform - ${imglib2-realtransform.version} + ${net.imglib2.imglib2-realtransform.version} net.imglib2 imglib2-roi - ${imglib2-roi.version} + ${net.imglib2.imglib2-roi.version} net.imglib2 imglib2-unsafe - ${imglib2-unsafe.version} + ${net.imglib2.imglib2-unsafe.version} @@ -1781,49 +2382,49 @@ io.scif scifio - ${scifio.version} + ${io.scif.scifio.version} io.scif scifio-bf-compat - ${scifio-bf-compat.version} + ${io.scif.scifio-bf-compat.version} io.scif scifio-cli - ${scifio-cli.version} + ${io.scif.scifio-cli.version} io.scif scifio-hdf5 - ${scifio-hdf5.version} + ${io.scif.scifio-hdf5.version} io.scif scifio-jai-imageio - ${scifio-jai-imageio.version} + ${io.scif.scifio-jai-imageio.version} io.scif scifio-lifesci - ${scifio-lifesci.version} + ${io.scif.scifio-lifesci.version} io.scif scifio-ome-xml - ${scifio-ome-xml.version} + ${io.scif.scifio-ome-xml.version} @@ -1832,7 +2433,7 @@ sc.fiji fiji - ${fiji.version} + ${sc.fiji.fiji.version} @@ -1840,487 +2441,487 @@ sc.fiji AnalyzeSkeleton_ - ${AnalyzeSkeleton_.version} + ${sc.fiji.AnalyzeSkeleton_.version} sc.fiji Anisotropic_Diffusion_2D - ${Anisotropic_Diffusion_2D.version} + ${sc.fiji.Anisotropic_Diffusion_2D.version} sc.fiji Archipelago_Plugins - ${Archipelago_Plugins.version} + ${sc.fiji.Archipelago_Plugins.version} sc.fiji Arrow_ - ${Arrow_.version} + ${sc.fiji.Arrow_.version} sc.fiji Auto_Local_Threshold - ${Auto_Local_Threshold.version} + ${sc.fiji.Auto_Local_Threshold.version} sc.fiji Auto_Threshold - ${Auto_Threshold.version} + ${sc.fiji.Auto_Threshold.version} sc.fiji BalloonSegmentation_ - ${BalloonSegmentation_.version} + ${sc.fiji.BalloonSegmentation_.version} sc.fiji Bug_Submitter - ${Bug_Submitter.version} + ${sc.fiji.Bug_Submitter.version} sc.fiji CPU_Meter - ${CPU_Meter.version} + ${sc.fiji.CPU_Meter.version} sc.fiji Calculator_Plus - ${Calculator_Plus.version} + ${sc.fiji.Calculator_Plus.version} sc.fiji Cell_Counter - ${Cell_Counter.version} + ${sc.fiji.Cell_Counter.version} sc.fiji Colocalisation_Analysis - ${Colocalisation_Analysis.version} + ${sc.fiji.Colocalisation_Analysis.version} sc.fiji Color_Histogram - ${Color_Histogram.version} + ${sc.fiji.Color_Histogram.version} sc.fiji Color_Inspector_3D - ${Color_Inspector_3D.version} + ${sc.fiji.Color_Inspector_3D.version} sc.fiji Colour_Deconvolution - ${Colour_Deconvolution.version} + ${sc.fiji.Colour_Deconvolution.version} sc.fiji CorrectBleach_ - ${CorrectBleach_.version} + ${sc.fiji.CorrectBleach_.version} sc.fiji Correct_3D_Drift - ${Correct_3D_Drift.version} + ${sc.fiji.Correct_3D_Drift.version} sc.fiji Descriptor_based_registration - ${Descriptor_based_registration.version} + ${sc.fiji.Descriptor_based_registration.version} sc.fiji Dichromacy_ - ${Dichromacy_.version} + ${sc.fiji.Dichromacy_.version} sc.fiji Directionality_ - ${Directionality_.version} + ${sc.fiji.Directionality_.version} sc.fiji FS_Align_TrakEM2 - ${FS_Align_TrakEM2.version} + ${sc.fiji.FS_Align_TrakEM2.version} sc.fiji Feature_Detection - ${Feature_Detection.version} + ${sc.fiji.Feature_Detection.version} sc.fiji 3D_Blob_Segmentation - ${Fiji_3D_Blob_Segmentation.version} + ${sc.fiji.Fiji_3D_Blob_Segmentation.version} sc.fiji Fiji_Archipelago - ${Fiji_Archipelago.version} + ${sc.fiji.Fiji_Archipelago.version} sc.fiji Fiji_Developer - ${Fiji_Developer.version} + ${sc.fiji.Fiji_Developer.version} sc.fiji Fiji_Package_Maker - ${Fiji_Package_Maker.version} + ${sc.fiji.Fiji_Package_Maker.version} sc.fiji Fiji_Plugins - ${Fiji_Plugins.version} + ${sc.fiji.Fiji_Plugins.version} sc.fiji FilamentDetector - ${FilamentDetector.version} + ${sc.fiji.FilamentDetector.version} sc.fiji FlowJ_ - ${FlowJ_.version} + ${sc.fiji.FlowJ_.version} sc.fiji Graph_Cut - ${Graph_Cut.version} + ${sc.fiji.Graph_Cut.version} sc.fiji Gray_Morphology - ${Gray_Morphology.version} + ${sc.fiji.Gray_Morphology.version} org.janelia H5J_Loader_Plugin - ${H5J_Loader_Plugin.version} + ${org.janelia.H5J_Loader_Plugin.version} sc.fiji HDF5_Vibez - ${HDF5_Vibez.version} + ${sc.fiji.HDF5_Vibez.version} sc.fiji Helmholtz_Analysis - ${Helmholtz_Analysis.version} + ${sc.fiji.Helmholtz_Analysis.version} sc.fiji IJ_Robot - ${IJ_Robot.version} + ${sc.fiji.IJ_Robot.version} sc.fiji IO_ - ${IO_.version} + ${sc.fiji.IO_.version} sc.fiji Image_5D - ${Image_5D.version} + ${sc.fiji.Image_5D.version} sc.fiji 3D_Objects_Counter - ${ImageJ_3D_Objects_Counter.version} + ${sc.fiji.ImageJ_3D_Objects_Counter.version} sc.fiji 3D_Viewer - ${ImageJ_3D_Viewer.version} + ${sc.fiji.ImageJ_3D_Viewer.version} sc.fiji Image_Expression_Parser - ${Image_Expression_Parser.version} + ${sc.fiji.Image_Expression_Parser.version} sc.fiji Interactive_3D_Surface_Plot - ${Interactive_3D_Surface_Plot.version} + ${sc.fiji.Interactive_3D_Surface_Plot.version} sc.fiji IsoData_Classifier - ${IsoData_Classifier.version} + ${sc.fiji.IsoData_Classifier.version} sc.fiji Kappa - ${Kappa.version} + ${sc.fiji.Kappa.version} sc.fiji Kuwahara_Filter - ${Kuwahara_Filter.version} + ${sc.fiji.Kuwahara_Filter.version} sc.fiji KymographBuilder - ${KymographBuilder.version} + ${sc.fiji.KymographBuilder.version} sc.fiji LSM_Reader - ${LSM_Reader.version} + ${sc.fiji.LSM_Reader.version} sc.fiji LSM_Toolbox - ${LSM_Toolbox.version} + ${sc.fiji.LSM_Toolbox.version} sc.fiji Lasso_and_Blow_Tool - ${Lasso_and_Blow_Tool.version} + ${sc.fiji.Lasso_and_Blow_Tool.version} sc.fiji Linear_Kuwahara - ${Linear_Kuwahara.version} + ${sc.fiji.Linear_Kuwahara.version} sc.fiji LocalThickness_ - ${LocalThickness_.version} + ${sc.fiji.LocalThickness_.version} sc.fiji MTrack2_ - ${MTrack2_.version} + ${sc.fiji.MTrack2_.version} sc.fiji M_I_P - ${M_I_P.version} + ${sc.fiji.M_I_P.version} sc.fiji Manual_Tracking - ${Manual_Tracking.version} + ${sc.fiji.Manual_Tracking.version} sc.fiji Multi_Kymograph - ${Multi_Kymograph.version} + ${sc.fiji.Multi_Kymograph.version} sc.fiji OMEVisual - ${OMEVisual.version} + ${sc.fiji.OMEVisual.version} sc.fiji PIV_analyser - ${PIV_analyser.version} + ${sc.fiji.PIV_analyser.version} sc.fiji QuickPALM_ - ${QuickPALM_.version} + ${sc.fiji.QuickPALM_.version} sc.fiji RATS_ - ${RATS_.version} + ${sc.fiji.RATS_.version} sc.fiji Reconstruct_Reader - ${Reconstruct_Reader.version} + ${sc.fiji.Reconstruct_Reader.version} sc.fiji SPIM_Opener - ${SPIM_Opener.version} + ${sc.fiji.SPIM_Opener.version} sc.fiji SPIM_Registration - ${SPIM_Registration.version} + ${sc.fiji.SPIM_Registration.version} sc.fiji Samples_ - ${Samples_.version} + ${sc.fiji.Samples_.version} sc.fiji Series_Labeler - ${Series_Labeler.version} + ${sc.fiji.Series_Labeler.version} sc.fiji Siox_Segmentation - ${Siox_Segmentation.version} + ${sc.fiji.Siox_Segmentation.version} sc.fiji Skeletonize3D_ - ${Skeletonize3D_.version} + ${sc.fiji.Skeletonize3D_.version} sc.fiji SplineDeformationGenerator_ - ${SplineDeformationGenerator_.version} + ${sc.fiji.SplineDeformationGenerator_.version} sc.fiji Stack_Manipulation - ${Stack_Manipulation.version} + ${sc.fiji.Stack_Manipulation.version} sc.fiji Statistical_Region_Merging - ${Statistical_Region_Merging.version} + ${sc.fiji.Statistical_Region_Merging.version} sc.fiji Stitching_ - ${Stitching_.version} + ${sc.fiji.Stitching_.version} sc.fiji Sync_Win - ${Sync_Win.version} + ${sc.fiji.Sync_Win.version} sc.fiji Thread_Killer - ${Thread_Killer.version} + ${sc.fiji.Thread_Killer.version} sc.fiji Time_Lapse - ${Time_Lapse.version} + ${sc.fiji.Time_Lapse.version} sc.fiji Time_Stamper - ${Time_Stamper.version} + ${sc.fiji.Time_Stamper.version} sc.fiji ToAST_ - ${ToAST_.version} + ${sc.fiji.ToAST_.version} sc.fiji TopoJ_ - ${TopoJ_.version} + ${sc.fiji.TopoJ_.version} sc.fiji TrackMate - ${TrackMate.version} + ${sc.fiji.TrackMate.version} sc.fiji Trainable_Segmentation - ${Trainable_Segmentation.version} + ${sc.fiji.Trainable_Segmentation.version} sc.fiji TrakEM2_Archipelago - ${TrakEM2_Archipelago.version} + ${sc.fiji.TrakEM2_Archipelago.version} sc.fiji VIB-lib - ${VIB-lib.version} + ${sc.fiji.VIB-lib.version} sc.fiji VIB_ - ${VIB_.version} + ${sc.fiji.VIB_.version} sc.fiji Vaa3d_Reader - ${Vaa3d_Reader.version} + ${sc.fiji.Vaa3d_Reader.version} sc.fiji Vaa3d_Writer - ${Vaa3d_Writer.version} + ${sc.fiji.Vaa3d_Writer.version} sc.fiji Video_Editing - ${Video_Editing.version} + ${sc.fiji.Video_Editing.version} sc.fiji View5D_ - ${View5D_.version} + ${sc.fiji.View5D_.version} sc.fiji Volume_Calculator - ${Volume_Calculator.version} + ${sc.fiji.Volume_Calculator.version} sc.fiji Volume_Viewer - ${Volume_Viewer.version} + ${sc.fiji.Volume_Viewer.version} sc.fiji bUnwarpJ_ - ${bUnwarpJ_.version} + ${sc.fiji.bUnwarpJ_.version} sc.fiji bij - ${bij.version} + ${sc.fiji.bij.version} sc.fiji blockmatching_ - ${blockmatching_.version} + ${sc.fiji.blockmatching_.version} sc.fiji fiji-lib - ${fiji-lib.version} + ${sc.fiji.fiji-lib.version} sc.fiji legacy-imglib1 - ${legacy-imglib1.version} + ${sc.fiji.legacy-imglib1.version} sc.fiji level_sets - ${level_sets.version} + ${sc.fiji.level_sets.version} sc.fiji pal-optimization - ${pal-optimization.version} + ${sc.fiji.pal-optimization.version} sc.fiji panorama_ - ${panorama_.version} + ${sc.fiji.panorama_.version} sc.fiji register_virtual_stack_slices - ${register_virtual_stack_slices.version} + ${sc.fiji.register_virtual_stack_slices.version} sc.fiji registration_3d - ${registration_3d.version} + ${sc.fiji.registration_3d.version} sc.fiji weave_jy2java - ${weave_jy2java.version} + ${sc.fiji.weave_jy2java.version} @@ -2329,40 +2930,40 @@ jitk jitk-tps - ${jitk-tps.version} + ${jitk.jitk-tps.version} sc.fiji bigwarp_fiji - ${bigwarp_fiji.version} + ${sc.fiji.bigwarp_fiji.version} mpicbg mpicbg - ${mpicbg.version} + ${mpicbg.mpicbg.version} mpicbg mpicbg_ - ${mpicbg_.version} + ${mpicbg.mpicbg_.version} sc.fiji trakem2_tps - ${trakem2_tps.version} + ${sc.fiji.trakem2_tps.version} sc.fiji z_spacing - ${z_spacing.version} + ${sc.fiji.z_spacing.version} @@ -2370,27 +2971,27 @@ sc.fiji bigdataviewer-core - ${bigdataviewer-core.version} + ${sc.fiji.bigdataviewer-core.version} sc.fiji bigdataviewer-server - ${bigdataviewer-server.version} + ${sc.fiji.bigdataviewer-server.version} sc.fiji bigdataviewer-vistools - ${bigdataviewer-vistools.version} + ${sc.fiji.bigdataviewer-vistools.version} sc.fiji bigdataviewer_fiji - ${bigdataviewer_fiji.version} + ${sc.fiji.bigdataviewer_fiji.version} sc.fiji spim_data - ${spim_data.version} + ${sc.fiji.spim_data.version} @@ -2398,27 +2999,27 @@ sc.fiji T2-NIT - ${T2-NIT.version} + ${sc.fiji.T2-NIT.version} sc.fiji T2-TreelineGraph - ${T2-TreelineGraph.version} + ${sc.fiji.T2-TreelineGraph.version} sc.fiji TrakEM2_ - ${TrakEM2_.version} + ${sc.fiji.TrakEM2_.version} sc.fiji VectorString - ${VectorString.version} + ${sc.fiji.VectorString.version} sc.fiji trakem2-transform - ${trakem2-transform.version} + ${sc.fiji.trakem2-transform.version} @@ -2426,52 +3027,52 @@ net.imglib2 imglib2-label-multisets - ${imglib2-label-multisets.version} + ${net.imglib2.imglib2-label-multisets.version} org.janelia.saalfeldlab n5 - ${n5.version} + ${org.janelia.saalfeldlab.n5.version} org.janelia.saalfeldlab n5-aws-s3 - ${n5-aws-s3.version} + ${org.janelia.saalfeldlab.n5-aws-s3.version} org.janelia.saalfeldlab n5-blosc - ${n5-blosc.version} + ${org.janelia.saalfeldlab.n5-blosc.version} org.janelia.saalfeldlab n5-google-cloud - ${n5-google-cloud.version} + ${org.janelia.saalfeldlab.n5-google-cloud.version} org.janelia.saalfeldlab n5-hdf5 - ${n5-hdf5.version} + ${org.janelia.saalfeldlab.n5-hdf5.version} org.janelia.saalfeldlab n5-ij - ${n5-ij.version} + ${org.janelia.saalfeldlab.n5-ij.version} org.janelia.saalfeldlab n5-imglib2 - ${n5-imglib2.version} + ${org.janelia.saalfeldlab.n5-imglib2.version} org.janelia.saalfeldlab n5-viewer_fiji - ${n5-viewer_fiji.version} + ${org.janelia.saalfeldlab.n5-viewer_fiji.version} org.janelia.saalfeldlab n5-zarr - ${n5-zarr.version} + ${org.janelia.saalfeldlab.n5-zarr.version} @@ -2480,48 +3081,48 @@ sc.fiji MaMuT - ${MaMuT.version} + ${sc.fiji.MaMuT.version} fr.inra.ijpb MorphoLibJ_ - ${MorphoLibJ_.version} + ${fr.inra.ijpb.MorphoLibJ_.version} org.morphonets SNT - ${SNT.version} + ${org.morphonets.SNT.version} org.bonej bonej-plugins - ${bonej-plugins.version} + ${org.bonej.bonej-plugins.version} org.bonej bonej-ops - ${bonej-ops.version} + ${org.bonej.bonej-ops.version} org.bonej bonej-legacy-plugins_ - ${bonej-legacy-plugins_.version} + ${org.bonej.bonej-legacy-plugins_.version} org.bonej bonej-legacy-util_ - ${bonej-legacy-util_.version} + ${org.bonej.bonej-legacy-util_.version} org.bonej bonej-utilities - ${bonej-utilities.version} + ${org.bonej.bonej-utilities.version} @@ -2530,7 +3131,7 @@ org.openmicroscopy metakit - ${metakit.version} + ${org.openmicroscopy.metakit.version} org.openmicroscopy ome-xml - ${ome-xml.version} + ${org.openmicroscopy.ome-xml.version} ome jxrlib-all - ${jxrlib-all.version} + ${ome.jxrlib-all.version} ome bio-formats_plugins - ${bio-formats_plugins.version} + ${ome.bio-formats_plugins.version} ome formats-api - ${formats-api.version} + ${ome.formats-api.version} xalan @@ -2627,7 +3228,7 @@ ome formats-bsd - ${formats-bsd.version} + ${ome.formats-bsd.version} xalan @@ -2646,14 +3247,14 @@ ome formats-gpl - ${formats-gpl.version} + ${ome.formats-gpl.version} org.openmicroscopy omero-blitz - ${omero-blitz.version} + ${org.openmicroscopy.omero-blitz.version} @@ -2672,7 +3273,7 @@ org.openmicroscopy omero-common - ${omero-common.version} + ${org.openmicroscopy.omero-common.version} org.openmicroscopy omero-gateway - ${omero-gateway.version} + ${org.openmicroscopy.omero-gateway.version} org.openmicroscopy omero-model - ${omero-model.version} + ${org.openmicroscopy.omero-model.version} @@ -2724,7 +3325,7 @@ org.openmicroscopy omero-renderer - ${omero-renderer.version} + ${org.openmicroscopy.omero-renderer.version} @@ -2738,14 +3339,14 @@ org.openmicroscopy omero-romio - ${omero-romio.version} + ${org.openmicroscopy.omero-romio.version} org.openmicroscopy omero-server - ${omero-server.version} + ${org.openmicroscopy.omero-server.version} @@ -2773,34 +3374,36 @@ - + net.preibisch BigStitcher - ${BigStitcher.version} + ${net.preibisch.BigStitcher.version} net.preibisch multiview-reconstruction - ${multiview-reconstruction.version} + ${net.preibisch.multiview-reconstruction.version} net.preibisch multiview-simulation - ${multiview-simulation.version} + ${net.preibisch.multiview-simulation.version} + + net.clearcontrol coremem - ${coremem.version} + ${net.clearcontrol.coremem.version} @@ -2814,21 +3417,21 @@ net.clearvolume cleargl - ${cleargl.version} + ${net.clearvolume.cleargl.version} graphics.scenery scenery - ${scenery.version} + ${graphics.scenery.scenery.version} sc.iview sciview - ${sciview.version} + ${sc.iview.sciview.version} @@ -2837,185 +3440,185 @@ com.amazonaws aws-java-sdk-s3 - ${aws-java-sdk-s3.version} + ${com.amazonaws.aws-java-sdk-s3.version} org.codehaus.groovy groovy - ${groovy.version} + ${org.codehaus.groovy.groovy.version} org.codehaus.groovy groovy-ant - ${groovy-ant.version} + ${org.codehaus.groovy.groovy-ant.version} org.codehaus.groovy groovy-astbuilder - ${groovy-astbuilder.version} + ${org.codehaus.groovy.groovy-astbuilder.version} org.codehaus.groovy groovy-bsf - ${groovy-bsf.version} + ${org.codehaus.groovy.groovy-bsf.version} org.codehaus.groovy groovy-cli-commons - ${groovy-cli-commons.version} + ${org.codehaus.groovy.groovy-cli-commons.version} org.codehaus.groovy groovy-cli-picocli - ${groovy-cli-picocli.version} + ${org.codehaus.groovy.groovy-cli-picocli.version} org.codehaus.groovy groovy-console - ${groovy-console.version} + ${org.codehaus.groovy.groovy-console.version} org.codehaus.groovy groovy-datetime - ${groovy-datetime.version} + ${org.codehaus.groovy.groovy-datetime.version} org.codehaus.groovy groovy-dateutil - ${groovy-dateutil.version} + ${org.codehaus.groovy.groovy-dateutil.version} org.codehaus.groovy groovy-docgenerator - ${groovy-docgenerator.version} + ${org.codehaus.groovy.groovy-docgenerator.version} org.codehaus.groovy groovy-groovydoc - ${groovy-groovydoc.version} + ${org.codehaus.groovy.groovy-groovydoc.version} org.codehaus.groovy groovy-groovysh - ${groovy-groovysh.version} + ${org.codehaus.groovy.groovy-groovysh.version} org.codehaus.groovy groovy-jaxb - ${groovy-jaxb.version} + ${org.codehaus.groovy.groovy-jaxb.version} org.codehaus.groovy groovy-jmx - ${groovy-jmx.version} + ${org.codehaus.groovy.groovy-jmx.version} org.codehaus.groovy groovy-json - ${groovy-json.version} + ${org.codehaus.groovy.groovy-json.version} org.codehaus.groovy groovy-macro - ${groovy-macro.version} + ${org.codehaus.groovy.groovy-macro.version} org.codehaus.groovy groovy-nio - ${groovy-nio.version} + ${org.codehaus.groovy.groovy-nio.version} org.codehaus.groovy groovy-servlet - ${groovy-servlet.version} + ${org.codehaus.groovy.groovy-servlet.version} org.codehaus.groovy groovy-sql - ${groovy-sql.version} + ${org.codehaus.groovy.groovy-sql.version} org.codehaus.groovy groovy-swing - ${groovy-swing.version} + ${org.codehaus.groovy.groovy-swing.version} org.codehaus.groovy groovy-templates - ${groovy-templates.version} + ${org.codehaus.groovy.groovy-templates.version} org.codehaus.groovy groovy-test - ${groovy-test.version} + ${org.codehaus.groovy.groovy-test.version} org.codehaus.groovy groovy-test-junit5 - ${groovy-test-junit5.version} + ${org.codehaus.groovy.groovy-test-junit5.version} org.codehaus.groovy groovy-testng - ${groovy-testng.version} + ${org.codehaus.groovy.groovy-testng.version} org.codehaus.groovy groovy-xml - ${groovy-xml.version} + ${org.codehaus.groovy.groovy-xml.version} org.codehaus.groovy groovy-yaml - ${groovy-yaml.version} + ${org.codehaus.groovy.groovy-yaml.version} org.apache.maven.shared maven-artifact-transfer - ${maven-artifact-transfer.version} + ${org.apache.maven.shared.maven-artifact-transfer.version} org.apache.maven.shared maven-common-artifact-filters - ${maven-common-artifact-filters.version} + ${org.apache.maven.shared.maven-common-artifact-filters.version} org.apache.maven maven-core - ${maven-core.version} + ${org.apache.maven.maven-core.version} org.apache.maven.plugin-tools maven-plugin-tools-api - ${maven-plugin-tools-api.version} + ${org.apache.maven.plugin-tools.maven-plugin-tools-api.version} org.sonatype.sisu sisu-inject-bean - ${sisu-inject-bean.version} + ${org.sonatype.sisu.sisu-inject-bean.version} org.sonatype.sisu sisu-inject-plexus - ${sisu-inject-plexus.version} + ${org.sonatype.sisu.sisu-inject-plexus.version} org.apache.poi poi - ${poi.version} + ${org.apache.poi.poi.version} org.apache.spark spark-core_2.11 - ${spark-core_2.11.version} + ${org.apache.spark.spark-core_2.11.version} org.apache.xmlgraphics batik-anim - ${batik-anim.version} + ${org.apache.xmlgraphics.batik-anim.version} xml-apis @@ -3073,12 +3676,12 @@ org.apache.xmlgraphics batik-awt-util - ${batik-awt-util.version} + ${org.apache.xmlgraphics.batik-awt-util.version} org.apache.xmlgraphics batik-bridge - ${batik-bridge.version} + ${org.apache.xmlgraphics.batik-bridge.version} xalan @@ -3093,7 +3696,7 @@ org.apache.xmlgraphics batik-codec - ${batik-codec.version} + ${org.apache.xmlgraphics.batik-codec.version} xml-apis @@ -3104,12 +3707,12 @@ org.apache.xmlgraphics batik-constants - ${batik-constants.version} + ${org.apache.xmlgraphics.batik-constants.version} org.apache.xmlgraphics batik-css - ${batik-css.version} + ${org.apache.xmlgraphics.batik-css.version} xml-apis @@ -3120,7 +3723,7 @@ org.apache.xmlgraphics batik-dom - ${batik-dom.version} + ${org.apache.xmlgraphics.batik-dom.version} xalan @@ -3135,7 +3738,7 @@ org.apache.xmlgraphics batik-ext - ${batik-ext.version} + ${org.apache.xmlgraphics.batik-ext.version} xml-apis @@ -3146,7 +3749,7 @@ org.apache.xmlgraphics batik-extension - ${batik-extension.version} + ${org.apache.xmlgraphics.batik-extension.version} xml-apis @@ -3157,22 +3760,22 @@ org.apache.xmlgraphics batik-gui-util - ${batik-gui-util.version} + ${org.apache.xmlgraphics.batik-gui-util.version} org.apache.xmlgraphics batik-gvt - ${batik-gvt.version} + ${org.apache.xmlgraphics.batik-gvt.version} org.apache.xmlgraphics batik-i18n - ${batik-i18n.version} + ${org.apache.xmlgraphics.batik-i18n.version} org.apache.xmlgraphics batik-parser - ${batik-parser.version} + ${org.apache.xmlgraphics.batik-parser.version} xml-apis @@ -3183,12 +3786,12 @@ org.apache.xmlgraphics batik-rasterizer - ${batik-rasterizer.version} + ${org.apache.xmlgraphics.batik-rasterizer.version} org.apache.xmlgraphics batik-rasterizer-ext - ${batik-rasterizer-ext.version} + ${org.apache.xmlgraphics.batik-rasterizer-ext.version} org.apache.xmlgraphics @@ -3199,7 +3802,7 @@ org.apache.xmlgraphics batik-script - ${batik-script.version} + ${org.apache.xmlgraphics.batik-script.version} xml-apis @@ -3210,7 +3813,7 @@ org.apache.xmlgraphics batik-slideshow - ${batik-slideshow.version} + ${org.apache.xmlgraphics.batik-slideshow.version} xml-apis @@ -3221,7 +3824,7 @@ org.apache.xmlgraphics batik-squiggle - ${batik-squiggle.version} + ${org.apache.xmlgraphics.batik-squiggle.version} xml-apis @@ -3232,7 +3835,7 @@ org.apache.xmlgraphics batik-squiggle-ext - ${batik-squiggle-ext.version} + ${org.apache.xmlgraphics.batik-squiggle-ext.version} org.apache.xmlgraphics @@ -3243,7 +3846,7 @@ org.apache.xmlgraphics batik-svg-dom - ${batik-svg-dom.version} + ${org.apache.xmlgraphics.batik-svg-dom.version} xml-apis @@ -3254,7 +3857,7 @@ org.apache.xmlgraphics batik-svggen - ${batik-svggen.version} + ${org.apache.xmlgraphics.batik-svggen.version} xml-apis @@ -3265,12 +3868,12 @@ org.apache.xmlgraphics batik-svgpp - ${batik-svgpp.version} + ${org.apache.xmlgraphics.batik-svgpp.version} org.apache.xmlgraphics batik-swing - ${batik-swing.version} + ${org.apache.xmlgraphics.batik-swing.version} xml-apis @@ -3281,7 +3884,7 @@ org.apache.xmlgraphics batik-transcoder - ${batik-transcoder.version} + ${org.apache.xmlgraphics.batik-transcoder.version} xml-apis @@ -3292,284 +3895,284 @@ org.apache.xmlgraphics batik-ttf2svg - ${batik-ttf2svg.version} + ${org.apache.xmlgraphics.batik-ttf2svg.version} org.apache.xmlgraphics batik-util - ${batik-util.version} + ${org.apache.xmlgraphics.batik-util.version} org.apache.xmlgraphics batik-xml - ${batik-xml.version} + ${org.apache.xmlgraphics.batik-xml.version} org.apache.xmlgraphics xmlgraphics-commons - ${xmlgraphics-commons.version} + ${org.apache.xmlgraphics.xmlgraphics-commons.version} org.lasersonlab jblosc - ${jblosc.version} + ${org.lasersonlab.jblosc.version} javax.enterprise cdi-api - ${cdi-api.version} + ${javax.enterprise.cdi-api.version} commons-beanutils commons-beanutils - ${commons-beanutils.version} + ${commons-beanutils.commons-beanutils.version} commons-codec commons-codec - ${commons-codec.version} + ${commons-codec.commons-codec.version} commons-collections commons-collections - ${commons-collections.version} + ${commons-collections.commons-collections.version} org.apache.commons commons-compress - ${commons-compress.version} + ${org.apache.commons.commons-compress.version} commons-io commons-io - ${commons-io.version} + ${commons-io.commons-io.version} commons-lang commons-lang - ${commons-lang.version} + ${commons-lang.commons-lang.version} org.apache.commons commons-lang3 - ${commons-lang3.version} + ${org.apache.commons.commons-lang3.version} commons-logging commons-logging - ${commons-logging.version} + ${commons-logging.commons-logging.version} org.apache.commons commons-math3 - ${commons-math3.version} + ${org.apache.commons.commons-math3.version} org.apache.commons commons-text - ${commons-text.version} + ${org.apache.commons.commons-text.version} cglib cglib - ${cglib.version} + ${cglib.cglib.version} org.eclipse.collections eclipse-collections - ${eclipse-collections.version} + ${org.eclipse.collections.eclipse-collections.version} org.eclipse.collections eclipse-collections-api - ${eclipse-collections-api.version} + ${org.eclipse.collections.eclipse-collections-api.version} org.eclipse.collections eclipse-collections-forkjoin - ${eclipse-collections-forkjoin.version} + ${org.eclipse.collections.eclipse-collections-forkjoin.version} org.eclipse.collections eclipse-collections-testutils - ${eclipse-collections-testutils.version} + ${org.eclipse.collections.eclipse-collections-testutils.version} org.eclipse.swt org.eclipse.swt.cocoa.macosx - ${org.eclipse.swt.cocoa.macosx.version} + ${org.eclipse.swt.org.eclipse.swt.cocoa.macosx.version} org.eclipse.swt org.eclipse.swt.cocoa.macosx.x86_64 - ${org.eclipse.swt.cocoa.macosx.x86_64.version} + ${org.eclipse.swt.org.eclipse.swt.cocoa.macosx.x86_64.version} org.eclipse.swt org.eclipse.swt.gtk.aix.ppc - ${org.eclipse.swt.gtk.aix.ppc.version} + ${org.eclipse.swt.org.eclipse.swt.gtk.aix.ppc.version} org.eclipse.swt org.eclipse.swt.gtk.aix.ppc64 - ${org.eclipse.swt.gtk.aix.ppc64.version} + ${org.eclipse.swt.org.eclipse.swt.gtk.aix.ppc64.version} org.eclipse.swt org.eclipse.swt.gtk.hpux.ia64 - ${org.eclipse.swt.gtk.hpux.ia64.version} + ${org.eclipse.swt.org.eclipse.swt.gtk.hpux.ia64.version} org.eclipse.swt org.eclipse.swt.gtk.linux.ppc - ${org.eclipse.swt.gtk.linux.ppc.version} + ${org.eclipse.swt.org.eclipse.swt.gtk.linux.ppc.version} org.eclipse.swt org.eclipse.swt.gtk.linux.ppc64 - ${org.eclipse.swt.gtk.linux.ppc64.version} + ${org.eclipse.swt.org.eclipse.swt.gtk.linux.ppc64.version} org.eclipse.swt org.eclipse.swt.gtk.linux.s390 - ${org.eclipse.swt.gtk.linux.s390.version} + ${org.eclipse.swt.org.eclipse.swt.gtk.linux.s390.version} org.eclipse.swt org.eclipse.swt.gtk.linux.s390x - ${org.eclipse.swt.gtk.linux.s390x.version} + ${org.eclipse.swt.org.eclipse.swt.gtk.linux.s390x.version} org.eclipse.swt org.eclipse.swt.gtk.linux.x86 - ${org.eclipse.swt.gtk.linux.x86.version} + ${org.eclipse.swt.org.eclipse.swt.gtk.linux.x86.version} org.eclipse.swt org.eclipse.swt.gtk.linux.x86_64 - ${org.eclipse.swt.gtk.linux.x86_64.version} + ${org.eclipse.swt.org.eclipse.swt.gtk.linux.x86_64.version} org.eclipse.swt org.eclipse.swt.gtk.solaris.sparc - ${org.eclipse.swt.gtk.solaris.sparc.version} + ${org.eclipse.swt.org.eclipse.swt.gtk.solaris.sparc.version} org.eclipse.swt org.eclipse.swt.gtk.solaris.x86 - ${org.eclipse.swt.gtk.solaris.x86.version} + ${org.eclipse.swt.org.eclipse.swt.gtk.solaris.x86.version} org.eclipse.swt org.eclipse.swt.win32.win32.x86 - ${org.eclipse.swt.win32.win32.x86.version} + ${org.eclipse.swt.org.eclipse.swt.win32.win32.x86.version} org.eclipse.swt org.eclipse.swt.win32.win32.x86_64 - ${org.eclipse.swt.win32.win32.x86_64.version} + ${org.eclipse.swt.org.eclipse.swt.win32.win32.x86_64.version} com.google.cloud google-cloud-nio - ${google-cloud-nio.version} + ${com.google.cloud.google-cloud-nio.version} com.google.cloud google-cloud-resourcemanager - ${google-cloud-resourcemanager.version} + ${com.google.cloud.google-cloud-resourcemanager.version} com.google.cloud google-cloud-storage - ${google-cloud-storage.version} + ${com.google.cloud.google-cloud-storage.version} com.google.http-client google-http-client - ${google-http-client.version} + ${com.google.http-client.google-http-client.version} com.google.http-client google-http-client-appengine - ${google-http-client-appengine.version} + ${com.google.http-client.google-http-client-appengine.version} com.google.http-client google-http-client-jackson2 - ${google-http-client-jackson2.version} + ${com.google.http-client.google-http-client-jackson2.version} com.google.http-client google-http-client-xml - ${google-http-client-xml.version} + ${com.google.http-client.google-http-client-xml.version} com.google.code.gson gson - ${gson.version} + ${com.google.code.gson.gson.version} com.google.guava guava - ${guava.version} + ${com.google.guava.guava.version} hsqldb hsqldb - ${hsqldb.version} + ${hsqldb.hsqldb.version} com.itextpdf itextpdf - ${itextpdf.version} + ${com.itextpdf.itextpdf.version} org.apache.jackrabbit jackrabbit-webdav - ${jackrabbit-webdav.version} + ${org.apache.jackrabbit.jackrabbit-webdav.version} com.sun.media jai-codec - ${jai-codec.version} + ${com.sun.media.jai-codec.version} javax.media jai-core - ${jai-core.version} + ${javax.media.jai-core.version} gov.nist.math jama - ${jama.version} + ${gov.nist.math.jama.version} org.scijava j3dcore - ${j3dcore.version} + ${org.scijava.j3dcore.version} org.scijava j3dutils - ${j3dutils.version} + ${org.scijava.j3dutils.version} org.scijava vecmath - ${vecmath.version} + ${org.scijava.vecmath.version} org.javassist javassist - ${javassist.version} + ${org.javassist.javassist.version} org.jruby.jcodings jcodings - ${jcodings.version} + ${org.jruby.jcodings.jcodings.version} org.jdom jdom2 - ${jdom2.version} + ${org.jdom.jdom2.version} org.scijava jep - ${jep.version} + ${org.scijava.jep.version} org.eclipse.jetty jetty-annotations - ${jetty-annotations.version} + ${org.eclipse.jetty.jetty-annotations.version} org.eclipse.jetty jetty-client - ${jetty-client.version} + ${org.eclipse.jetty.jetty-client.version} org.eclipse.jetty jetty-continuation - ${jetty-continuation.version} + ${org.eclipse.jetty.jetty-continuation.version} org.eclipse.jetty jetty-deploy - ${jetty-deploy.version} + ${org.eclipse.jetty.jetty-deploy.version} org.eclipse.jetty jetty-http - ${jetty-http.version} + ${org.eclipse.jetty.jetty-http.version} org.eclipse.jetty jetty-http-spi - ${jetty-http-spi.version} + ${org.eclipse.jetty.jetty-http-spi.version} org.eclipse.jetty jetty-io - ${jetty-io.version} + ${org.eclipse.jetty.jetty-io.version} org.eclipse.jetty jetty-jaas - ${jetty-jaas.version} + ${org.eclipse.jetty.jetty-jaas.version} org.eclipse.jetty jetty-jaspi - ${jetty-jaspi.version} + ${org.eclipse.jetty.jetty-jaspi.version} org.eclipse.jetty jetty-jmx - ${jetty-jmx.version} + ${org.eclipse.jetty.jetty-jmx.version} org.eclipse.jetty jetty-jndi - ${jetty-jndi.version} + ${org.eclipse.jetty.jetty-jndi.version} org.eclipse.jetty jetty-nosql - ${jetty-nosql.version} + ${org.eclipse.jetty.jetty-nosql.version} org.eclipse.jetty jetty-plus - ${jetty-plus.version} + ${org.eclipse.jetty.jetty-plus.version} org.eclipse.jetty jetty-proxy - ${jetty-proxy.version} + ${org.eclipse.jetty.jetty-proxy.version} org.eclipse.jetty jetty-rewrite - ${jetty-rewrite.version} + ${org.eclipse.jetty.jetty-rewrite.version} org.eclipse.jetty jetty-security - ${jetty-security.version} + ${org.eclipse.jetty.jetty-security.version} org.eclipse.jetty jetty-server - ${jetty-server.version} + ${org.eclipse.jetty.jetty-server.version} org.eclipse.jetty jetty-servlet - ${jetty-servlet.version} + ${org.eclipse.jetty.jetty-servlet.version} org.eclipse.jetty jetty-servlets - ${jetty-servlets.version} + ${org.eclipse.jetty.jetty-servlets.version} org.eclipse.jetty jetty-spring - ${jetty-spring.version} + ${org.eclipse.jetty.jetty-spring.version} org.eclipse.jetty jetty-start - ${jetty-start.version} + ${org.eclipse.jetty.jetty-start.version} org.eclipse.jetty jetty-util - ${jetty-util.version} + ${org.eclipse.jetty.jetty-util.version} org.eclipse.jetty jetty-util-ajax - ${jetty-util-ajax.version} + ${org.eclipse.jetty.jetty-util-ajax.version} org.eclipse.jetty jetty-webapp - ${jetty-webapp.version} + ${org.eclipse.jetty.jetty-webapp.version} org.eclipse.jetty jetty-xml - ${jetty-xml.version} + ${org.eclipse.jetty.jetty-xml.version} org.jfree jfreechart - ${jfreechart.version} + ${org.jfree.jfreechart.version} xml-apis @@ -3814,207 +4417,207 @@ org.jfree jfreesvg - ${jfreesvg.version} + ${org.jfree.jfreesvg.version} org.jgrapht jgrapht-core - ${jgrapht-core.version} + ${org.jgrapht.jgrapht-core.version} org.jgrapht jgrapht-demo - ${jgrapht-demo.version} + ${org.jgrapht.jgrapht-demo.version} org.jgrapht jgrapht-ext - ${jgrapht-ext.version} + ${org.jgrapht.jgrapht-ext.version} org.jgrapht jgrapht-guava - ${jgrapht-guava.version} + ${org.jgrapht.jgrapht-guava.version} org.jgrapht jgrapht-io - ${jgrapht-io.version} + ${org.jgrapht.jgrapht-io.version} org.jgrapht jgrapht-opt - ${jgrapht-opt.version} + ${org.jgrapht.jgrapht-opt.version} com.github.vlsi.mxgraph jgraphx - ${jgraphx.version} + ${com.github.vlsi.mxgraph.jgraphx.version} cisd jhdf5 - ${jhdf5.version} + ${cisd.jhdf5.version} net.java.dev.jna jna - ${jna.version} + ${net.java.dev.jna.jna.version} joda-time joda-time - ${joda-time.version} + ${joda-time.joda-time.version} org.jogamp.gluegen gluegen-rt-main - ${gluegen-rt-main.version} + ${org.jogamp.gluegen.gluegen-rt-main.version} org.jogamp.joal joal-main - ${joal-main.version} + ${org.jogamp.joal.joal-main.version} org.jogamp.jocl jocl-main - ${jocl-main.version} + ${org.jogamp.jocl.jocl-main.version} org.jogamp.jogl jogl-all-main - ${jogl-all-main.version} + ${org.jogamp.jogl.jogl-all-main.version} org.joml joml - ${joml.version} + ${org.joml.joml.version} org.jpedal jpedalSTD - ${jpedalSTD.version} + ${org.jpedal.jpedalSTD.version} com.jcraft jsch - ${jsch.version} + ${com.jcraft.jsch.version} org.python jython-slim - ${jython-slim.version} + ${org.python.jython-slim.version} com.jcraft jzlib - ${jzlib.version} + ${com.jcraft.jzlib.version} org.jetbrains.kotlin kotlin-compiler-embeddable - ${kotlin-compiler-embeddable.version} + ${org.jetbrains.kotlin.kotlin-compiler-embeddable.version} org.jetbrains.kotlin kotlin-daemon-embeddable - ${kotlin-daemon-embeddable.version} + ${org.jetbrains.kotlin.kotlin-daemon-embeddable.version} org.jetbrains.kotlin kotlin-reflect - ${kotlin-reflect.version} + ${org.jetbrains.kotlin.kotlin-reflect.version} org.jetbrains.kotlin kotlin-script-runtime - ${kotlin-script-runtime.version} + ${org.jetbrains.kotlin.kotlin-script-runtime.version} org.jetbrains.kotlin kotlin-script-util - ${kotlin-script-util.version} + ${org.jetbrains.kotlin.kotlin-script-util.version} org.jetbrains.kotlin kotlin-scripting-common - ${kotlin-scripting-common.version} + ${org.jetbrains.kotlin.kotlin-scripting-common.version} org.jetbrains.kotlin kotlin-scripting-compiler-embeddable - ${kotlin-scripting-compiler-embeddable.version} + ${org.jetbrains.kotlin.kotlin-scripting-compiler-embeddable.version} org.jetbrains.kotlin kotlin-scripting-jvm - ${kotlin-scripting-jvm.version} + ${org.jetbrains.kotlin.kotlin-scripting-jvm.version} org.jetbrains.kotlin kotlin-stdlib - ${kotlin-stdlib.version} + ${org.jetbrains.kotlin.kotlin-stdlib.version} org.jetbrains.kotlin kotlin-stdlib-common - ${kotlin-stdlib-common.version} + ${org.jetbrains.kotlin.kotlin-stdlib-common.version} org.jetbrains.kotlin kotlin-stdlib-jdk8 - ${kotlin-stdlib-jdk8.version} + ${org.jetbrains.kotlin.kotlin-stdlib-jdk8.version} ch.qos.logback logback-classic - ${logback-classic.version} + ${ch.qos.logback.logback-classic.version} ch.qos.logback logback-core - ${logback-core.version} + ${ch.qos.logback.logback-core.version} org.lz4 lz4-java - ${lz4-java.version} + ${org.lz4.lz4-java.version} org.mapdb mapdb - ${mapdb.version} + ${org.mapdb.mapdb.version} edu.mines mines-jtk - ${mines-jtk.version} + ${edu.mines.mines-jtk.version} org.ojalgo ojalgo - ${ojalgo.version} + ${org.ojalgo.ojalgo.version} com.opencsv opencsv - ${opencsv.version} + ${com.opencsv.opencsv.version} info.picocli picocli - ${picocli.version} + ${info.picocli.picocli.version} org.postgresql postgresql - ${postgresql.version} + ${org.postgresql.postgresql.version} com.fifesoft rsyntaxtextarea - ${rsyntaxtextarea.version} + ${com.fifesoft.rsyntaxtextarea.version} com.fifesoft autocomplete - ${autocomplete.version} + ${com.fifesoft.autocomplete.version} com.fifesoft languagesupport - ${languagesupport.version} + ${com.fifesoft.languagesupport.version} org.slf4j slf4j-api - ${slf4j-api.version} + ${org.slf4j.slf4j-api.version} org.slf4j slf4j-ext - ${slf4j-ext.version} + ${org.slf4j.slf4j-ext.version} org.slf4j slf4j-jcl - ${slf4j-jcl.version} + ${org.slf4j.slf4j-jcl.version} org.slf4j slf4j-jdk14 - ${slf4j-jdk14.version} + ${org.slf4j.slf4j-jdk14.version} org.slf4j slf4j-nop - ${slf4j-nop.version} + ${org.slf4j.slf4j-nop.version} org.slf4j slf4j-simple - ${slf4j-simple.version} + ${org.slf4j.slf4j-simple.version} org.slf4j jcl-over-slf4j - ${jcl-over-slf4j.version} + ${org.slf4j.jcl-over-slf4j.version} org.yaml snakeyaml - ${snakeyaml.version} + ${org.yaml.snakeyaml.version} org.snakeyaml snakeyaml-engine - ${snakeyaml-engine.version} + ${org.snakeyaml.snakeyaml-engine.version} org.springframework spring-aop - ${spring-aop.version} + ${org.springframework.spring-aop.version} org.tensorflow tensorflow - ${tensorflow.version} + ${org.tensorflow.tensorflow.version} org.tensorflow libtensorflow - ${libtensorflow.version} + ${org.tensorflow.libtensorflow.version} org.tensorflow libtensorflow_jni - ${libtensorflow_jni.version} + ${org.tensorflow.libtensorflow_jni.version} org.tensorflow libtensorflow_jni_gpu - ${libtensorflow_jni_gpu.version} + ${org.tensorflow.libtensorflow_jni_gpu.version} org.tensorflow proto - ${proto.version} + ${org.tensorflow.proto.version} net.sf.trove4j trove4j - ${trove4j.version} + ${net.sf.trove4j.trove4j.version} nz.ac.waikato.cms.weka weka-dev - ${weka-dev.version} + ${nz.ac.waikato.cms.weka.weka-dev.version} com.github.fommil.netlib @@ -4226,7 +4829,7 @@ org.tukaani xz - ${xz.version} + ${org.tukaani.xz.version} @@ -4235,7 +4838,7 @@ junit junit - ${junit.version} + ${junit.junit.version} test @@ -4243,31 +4846,31 @@ org.junit.jupiter junit-jupiter-api - ${junit-jupiter-api.version} + ${org.junit.jupiter.junit-jupiter-api.version} test org.junit.jupiter junit-jupiter-engine - ${junit-jupiter-engine.version} + ${org.junit.jupiter.junit-jupiter-engine.version} test org.junit.jupiter junit-jupiter-migrationsupport - ${junit-jupiter-migrationsupport.version} + ${org.junit.jupiter.junit-jupiter-migrationsupport.version} test org.junit.jupiter junit-jupiter-params - ${junit-jupiter-params.version} + ${org.junit.jupiter.junit-jupiter-params.version} test org.junit.vintage junit-vintage-engine - ${junit-vintage-engine.version} + ${org.junit.vintage.junit-vintage-engine.version} test @@ -4275,7 +4878,7 @@ org.scijava junit-benchmarks - ${junit-benchmarks.version} + ${org.scijava.junit-benchmarks.version} test @@ -4283,7 +4886,7 @@ org.jmockit jmockit - ${jmockit.version} + ${org.jmockit.jmockit.version} test @@ -4291,7 +4894,7 @@ org.mockito mockito-core - ${mockito-core.version} + ${org.mockito.mockito-core.version} test @@ -4299,13 +4902,13 @@ org.openjdk.jmh jmh-core - ${jmh-core.version} + ${org.openjdk.jmh.jmh-core.version} test org.openjdk.jmh jmh-generator-annprocess - ${jmh-generator-annprocess.version} + ${org.openjdk.jmh.jmh-generator-annprocess.version} test From 45d09252f050d63b702133c356af6b468912147e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 13 Oct 2021 17:00:32 -0500 Subject: [PATCH 252/996] Downgrade jgrapht to 1.4.0 This version is the final version compiled for Java 8+. Starting with Java 1.5.0, jgrapht requires Java 11+. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0835470f..6760ca70 100644 --- a/pom.xml +++ b/pom.xml @@ -1605,7 +1605,7 @@ ${jfreesvg.version} - 1.5.1 + 1.4.0 ${jgrapht.version} ${jgrapht.version} ${jgrapht.version} From 8797995664f7841a96a7d16ef9a961c8ce7d5259 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 13 Oct 2021 17:07:48 -0500 Subject: [PATCH 253/996] tests/run.sh: run Maven in batch mode This suppresses the ANSI color codes, which disrupt the log files. --- tests/run.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index abf636ec..31f91cae 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -48,8 +48,8 @@ meltingPotScript="$megaMeltDir/melting-pot.sh" meltingPotDir="$megaMeltDir/melting-pot" rm -rf "$megaMeltDir" && mkdir -p "$megaMeltDir" || die "Creation of $megaMeltDir failed!" -mvn -f "$pom" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" && -mvn -f "$pom" install >> "$versionSwapLog" || +mvn -B -f "$pom" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" && +mvn -B -f "$pom" install >> "$versionSwapLog" || die "pom-scijava version swap failed:\n$(cat "$versionSwapLog")" mv -f "$pom.versionsBackup" "$pom" || die 'POM restoration failed!' python "$generateMegaMeltScript" "$megaMeltDir" || die 'Generation failed!' @@ -61,9 +61,9 @@ echo 'Done!' # any duplicate classes across artifacts on the classpath. echo && printf 'Validating mega-melt project... ' && -mvn -f "$megaMeltPOM" dependency:tree > "$dependencyTreeLog" || +mvn -B -f "$megaMeltPOM" dependency:tree > "$dependencyTreeLog" || die "Invalid dependency tree:\n$(cat "$dependencyTreeLog")" -mvn -f "$megaMeltPOM" -U clean package > "$validationLog" || { +mvn -B -f "$megaMeltPOM" -U clean package > "$validationLog" || { python "$filterBuildLogScript" "$validationLog" > "$validationErrorsLog" die "Validation build failed!\n\nDependency tree:\n$(cat "$dependencyTreeLog")\n\nBuild log:\n$(cat "$validationErrorsLog")" } From 090df661e644b740424982886e3b5734ce3c019f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 13 Oct 2021 17:08:13 -0500 Subject: [PATCH 254/996] Exclude com.sun.activation:jakarta.activation The weka-dev library depends on jakarta.activation:jakarta.activation-api directly, but also com.sun.activation:jakarta.activation transitively via org.glassfish.jaxb:jaxb-runtime. The current groupId is jakarta.activation. --- pom.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6760ca70..faf8aac3 100644 --- a/pom.xml +++ b/pom.xml @@ -3360,7 +3360,7 @@ javax.activation @@ -4810,6 +4810,14 @@ com.googlecode.netlib-java netlib-java + + + com.sun.activation + jakarta.activation + nz.ac.waikato.cms.weka.thirdparty java-cup-11b From 841d9c8237ea23296991fa956e199167ab6ef884 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 13 Oct 2021 19:35:50 -0500 Subject: [PATCH 255/996] mega-melt: simplify parent POM adjustment logic We don't need to 'mvn install' anything. And it is better not to, to avoid corrupting the maven-metadata-local.xml. --- tests/mega-melt-template.xml | 1 - tests/run.sh | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/mega-melt-template.xml b/tests/mega-melt-template.xml index fe60a916..c8709f34 100644 --- a/tests/mega-melt-template.xml +++ b/tests/mega-melt-template.xml @@ -5,7 +5,6 @@ org.scijava pom-scijava 999-mega-melt - mega-melt 0-SNAPSHOT diff --git a/tests/run.sh b/tests/run.sh index 31f91cae..35e7b6c4 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -38,6 +38,7 @@ generateMegaMeltScript="$dir/generate-mega-melt.py" filterBuildLogScript="$dir/filter-build-log.py" megaMeltDir="$dir/../target/mega-melt" +pomParent="$megaMeltDir/../pom.xml" versionSwapLog="$megaMeltDir/version-swap.log" dependencyTreeLog="$megaMeltDir/dependency-tree.log" validationLog="$megaMeltDir/validation.log" @@ -48,10 +49,9 @@ meltingPotScript="$megaMeltDir/melting-pot.sh" meltingPotDir="$megaMeltDir/melting-pot" rm -rf "$megaMeltDir" && mkdir -p "$megaMeltDir" || die "Creation of $megaMeltDir failed!" -mvn -B -f "$pom" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" && -mvn -B -f "$pom" install >> "$versionSwapLog" || - die "pom-scijava version swap failed:\n$(cat "$versionSwapLog")" -mv -f "$pom.versionsBackup" "$pom" || die 'POM restoration failed!' +cp "$pom" "$pomParent" && +mvn -B -f "$pomParent" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" || + die "pom-scijava version update failed:\n$(cat "$versionSwapLog")" python "$generateMegaMeltScript" "$megaMeltDir" || die 'Generation failed!' echo 'Done!' From d0bf752070d96a2613c42e4e1ab86ebdd07c29ee Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 15 Oct 2021 12:43:47 -0500 Subject: [PATCH 256/996] Fix artifactId version props with leading digit See https://gitter.im/scijava/scijava-common?at=6167f1e4a41fd20699e1a7d5 Maven properties (at least in XML) cannot begin with a numeral though, so we need to prefix the short properties with something. Using underscore is a general-purpose workaround. --- pom.xml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index faf8aac3..4cc9cb3e 100644 --- a/pom.xml +++ b/pom.xml @@ -645,6 +645,15 @@ + <_3D_Blob_Segmentation.version>3.0.1 + ${_3D_Blob_Segmentation.version} + + <_3D_Objects_Counter.version>2.0.1 + ${_3D_Objects_Counter.version} + + <_3D_Viewer.version>4.0.3 + ${_3D_Viewer.version} + 3.4.2 ${AnalyzeSkeleton.version} ${AnalyzeSkeleton_.version} @@ -719,9 +728,6 @@ 2.0.2 ${Feature_Detection.version} - 3.0.1 - ${Fiji_3D_Blob_Segmentation.version} - 2.0.1 ${Fiji_Archipelago.version} @@ -763,12 +769,6 @@ ${IO.version} ${IO_.version} - 2.0.1 - ${ImageJ_3D_Objects_Counter.version} - - 4.0.3 - ${ImageJ_3D_Viewer.version} - 2.0.2 ${Image_5D.version} @@ -2438,6 +2438,21 @@ + + sc.fiji + 3D_Blob_Segmentation + ${sc.fiji.3D_Blob_Segmentation.version} + + + sc.fiji + 3D_Objects_Counter + ${sc.fiji.3D_Objects_Counter.version} + + + sc.fiji + 3D_Viewer + ${sc.fiji.3D_Viewer.version} + sc.fiji AnalyzeSkeleton_ @@ -2548,11 +2563,6 @@ Feature_Detection ${sc.fiji.Feature_Detection.version} - - sc.fiji - 3D_Blob_Segmentation - ${sc.fiji.Fiji_3D_Blob_Segmentation.version} - sc.fiji Fiji_Archipelago @@ -2623,16 +2633,6 @@ Image_5D ${sc.fiji.Image_5D.version} - - sc.fiji - 3D_Objects_Counter - ${sc.fiji.ImageJ_3D_Objects_Counter.version} - - - sc.fiji - 3D_Viewer - ${sc.fiji.ImageJ_3D_Viewer.version} - sc.fiji Image_Expression_Parser From e163815ca1c054c947a71ed1b0fd15a3e7e05ec2 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 25 Oct 2021 12:30:36 -0500 Subject: [PATCH 257/996] Update component versions * scijava-common: 2.87.0 -> 2.87.1 * scijava-optional: 1.0.0 -> 1.0.1 * scijava-search: 0.7.0 -> 1.0.0 * scripting-groovy: 0.3.0 -> 0.4.1 * imagej-legacy: 0.38.0 -> 0.38.1 * imglib2-roi: 0.11.0 -> 0.12.0 * Auto_Local_Threshold: 1.10.1 -> 1.11.0 * H5J_Loader_Plugin: 1.1.0 -> 1.1.2 * IO: 4.1.0 -> 4.2.0 * Interactive_3D_Surface_Plot: 3.0.0 -> 3.0.1 * Samples: 2.0.2 -> 2.0.3 * View5D: 2.3.6 -> 2.4.0 * bigwarp: 7.0.2 -> 7.0.4 * mpicbg: 1.4.1 -> 1.4.2 * MaMuT: 7.0.1 -> 7.0.2 * SNT: 4.0.1 -> 4.0.2 * ome-xml: 6.2.3 -> 6.3.0 --- pom.xml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pom.xml b/pom.xml index 4cc9cb3e..52562dc3 100644 --- a/pom.xml +++ b/pom.xml @@ -330,7 +330,7 @@ ${scijava-cache.version} - 2.87.0 + 2.87.1 ${scijava-common.version} @@ -358,7 +358,7 @@ ${scijava-log-slf4j.version} - 1.0.0 + 1.0.1 ${scijava-optional.version} @@ -382,7 +382,7 @@ ${scijava-plugins-text-plain.version} - 0.7.0 + 1.0.0 ${scijava-search.version} @@ -410,7 +410,7 @@ ${scripting-clojure.version} - 0.3.0 + 0.4.1 ${scripting-groovy.version} @@ -482,7 +482,7 @@ ${imagej-launcher.version} - 0.38.0 + 0.38.1 ${imagej-legacy.version} @@ -600,7 +600,7 @@ ${imglib2-realtransform.version} - 0.11.0 + 0.12.0 ${imglib2-roi.version} @@ -668,7 +668,7 @@ ${Arrow.version} ${Arrow_.version} - 1.10.1 + 1.11.0 ${Auto_Local_Threshold.version} 1.17.2 @@ -753,7 +753,7 @@ 2.3.5 ${Gray_Morphology.version} - 1.1.0 + 1.1.2 ${H5J_Loader_Plugin.version} 1.1.0 @@ -765,7 +765,7 @@ 2.0.1 ${IJ_Robot.version} - 4.1.0 + 4.2.0 ${IO.version} ${IO_.version} @@ -775,7 +775,7 @@ 3.0.1 ${Image_Expression_Parser.version} - 3.0.0 + 3.0.1 ${Interactive_3D_Surface_Plot.version} 2.0.1 @@ -844,7 +844,7 @@ 5.0.22 ${SPIM_Registration.version} - 2.0.2 + 2.0.3 ${Samples.version} ${Samples_.version} @@ -920,7 +920,7 @@ 2.0.1 ${Video_Editing.version} - 2.3.6 + 2.4.0 ${View5D.version} ${View5D_.version} @@ -973,12 +973,12 @@ ${jitk-tps.version} - 7.0.2 + 7.0.4 ${bigwarp.version} ${bigwarp_fiji.version} - 1.4.1 + 1.4.2 ${mpicbg.version} ${mpicbg.version} ${mpicbg_.version} @@ -1083,7 +1083,7 @@ - 7.0.1 + 7.0.2 ${MaMuT.version} @@ -1092,7 +1092,7 @@ ${MorphoLibJ_.version} - 4.0.1 + 4.0.2 ${SNT.version} @@ -1123,7 +1123,7 @@ ${ome-poi.version} - 6.2.3 + 6.3.0 ${ome-xml.version} From 608abe67030cfe26c224ebc6862524d2191b7fe4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 8 Nov 2021 15:42:07 -0600 Subject: [PATCH 258/996] POM: Stop using git:// protocol with github.com The GitHub platform is discontinuing support for it. See: https://github.blog/2021-09-01-improving-git-protocol-security-github/#whats-changing --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 52562dc3..6703d7aa 100644 --- a/pom.xml +++ b/pom.xml @@ -183,7 +183,7 @@ - scm:git:git://github.com/scijava/pom-scijava + scm:git:https://github.com/scijava/pom-scijava scm:git:git@github.com:scijava/pom-scijava HEAD https://github.com/scijava/pom-scijava From 229ee712f492c92572d57dbe325c0d7ca83949f0 Mon Sep 17 00:00:00 2001 From: Matthias Arzt Date: Thu, 9 Dec 2021 14:04:11 +0100 Subject: [PATCH 259/996] Add NativeLibs4Java BridJ --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 6703d7aa..7c2df6cc 100644 --- a/pom.xml +++ b/pom.xml @@ -1356,6 +1356,10 @@ 1.0.1 ${jblosc.version} + + 0.7.0 + ${bridj.version} + 1.2 ${cdi-api.version} @@ -3920,6 +3924,13 @@ ${org.lasersonlab.jblosc.version} + + + com.nativelibs4java + bridj + ${com.nativelibs4java.bridj.version} + + javax.enterprise From 911bdfb127f4c197a1cfb27bd97e0a36fdb93582 Mon Sep 17 00:00:00 2001 From: Matthias Arzt Date: Thu, 9 Dec 2021 14:04:53 +0100 Subject: [PATCH 260/996] Add jocl --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 7c2df6cc..d6d69a3e 100644 --- a/pom.xml +++ b/pom.xml @@ -1650,6 +1650,10 @@ 2.10.6 ${joda-time.version} + + 2.0.4 + ${jocl.version} + 2.3.2 ${jogl.version} @@ -4491,6 +4495,13 @@ ${joda-time.joda-time.version} + + + org.jocl + jocl + ${org.jocl.jocl.version} + + org.jogamp.gluegen From 82b298ebb4d9761e5f42ba5eb68d28a84fe56ba1 Mon Sep 17 00:00:00 2001 From: Matthias Arzt Date: Thu, 9 Dec 2021 14:06:00 +0100 Subject: [PATCH 261/996] Add Apache Commons Pool2 --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index d6d69a3e..c9cbbc68 100644 --- a/pom.xml +++ b/pom.xml @@ -1398,6 +1398,10 @@ 3.6.1 ${commons-math3.version} + + 2.11.1 + ${commons-pool2.version} + 1.9 ${commons-text.version} @@ -4003,6 +4007,13 @@ ${org.apache.commons.commons-math3.version} + + + org.apache.commons + commons-pool2 + ${org.apache.commons.commons-pool2.version} + + org.apache.commons From 32c53cb440415419f2f68e4ccb78cb30f631abca Mon Sep 17 00:00:00 2001 From: Matthias Arzt Date: Thu, 9 Dec 2021 14:06:24 +0100 Subject: [PATCH 262/996] Add CLIJ --- pom.xml | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/pom.xml b/pom.xml index c9cbbc68..046beb07 100644 --- a/pom.xml +++ b/pom.xml @@ -1196,6 +1196,31 @@ 2.2.10 ${cleargl.version} + + 1.9.0.1 + ${clij_.version} + + 1.8.1.1 + ${clij-core.version} + + 2.3.0.4 + ${clij-coremem.version} + + 2.5.0.1 + ${clij-clearcl.version} + + 2.5.1.4 + ${clij2_.version} + + 2.5.1.1 + ${clij2-assistant_.version} + + 0.32.1.1 + ${clijx_.version} + + 0.32.1.1 + ${clijx-weka_.version} + 0.7.0-beta-7 ${scenery.version} @@ -3432,6 +3457,48 @@ ${net.clearvolume.cleargl.version} + + + net.haesleinhuepf + clij_ + ${net.heasleinhuepf.clij_.version} + + + net.haesleinhuepf + clij-core + ${net.heasleinhuepf.clij-core.version} + + + net.haesleinhuepf + clij-coremem + ${net.heasleinhuepf.clij-coremem.version} + + + net.haesleinhuepf + clij-clearcl + ${net.heasleinhuepf.clij-clearcl.version} + + + net.haesleinhuepf + clij2_ + ${net.heasleinhuepf.clij2_.version} + + + net.haesleinhuepf + clij2-assistant_ + ${net.heasleinhuepf.clij2-assistant_.version} + + + net.haesleinhuepf + clijx_ + ${net.heasleinhuepf.clijx_.version} + + + net.haesleinhuepf + clijx-weka_ + ${net.heasleinhuepf.clijx-weka_.version} + + graphics.scenery From 3d5cf96d25753fb1b406d28d5f614f39c16061bb Mon Sep 17 00:00:00 2001 From: Matthias Arzt Date: Thu, 9 Dec 2021 14:14:54 +0100 Subject: [PATCH 263/996] Add Labkit --- pom.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml index 046beb07..c3eeec04 100644 --- a/pom.xml +++ b/pom.xml @@ -1759,6 +1759,12 @@ ${kotlin-stdlib-common.version} ${kotlin-stdlib-jdk8.version} + + 0.3.0 + ${labkit-ui.version} + 0.1.13 + ${labkit.pixel-classification.version} + 1.2.3 ${logback.version} @@ -4694,6 +4700,18 @@ ${org.jetbrains.kotlin.kotlin-stdlib-jdk8.version} + + + sc.fiji + labkit-ui + ${sc.fiji.labkit-ui.version} + + + sc.fiji + labkit-pixel-classification + ${sc.fiji.labkit-pixel-classification.version} + + ch.qos.logback From 5626a8b5a9cf9cbcf5250fb46bca58424fc8a128 Mon Sep 17 00:00:00 2001 From: David Gault Date: Thu, 9 Dec 2021 16:49:17 +0000 Subject: [PATCH 264/996] Bump Bio-Formats version to 6.8.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3852722c..cf5d51f8 100644 --- a/pom.xml +++ b/pom.xml @@ -770,7 +770,7 @@ ${jxrlib.version} - 6.7.0 + 6.8.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From 55ad7235c13481628e3549a7eab772771b394938 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 16 Dec 2021 18:52:14 -0600 Subject: [PATCH 265/996] Update parent to pom-scijava-base 14.0.0 This updates the default Sonatype repository from oss.sonatype.org (legacy infrastructure) to s01.oss.sonatype.org (new infrastructure). It also removes the banCircularDependencies rule. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6703d7aa..a23a2a64 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 13.0.0 + 14.0.0 From 4d803cea3301aa1fa37feaaacf2ebb39a3aeca17 Mon Sep 17 00:00:00 2001 From: David Gault Date: Thu, 13 Jan 2022 15:39:03 +0000 Subject: [PATCH 266/996] Bump Bio-Formats version to 6.8.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cf5d51f8..4dd91cb0 100644 --- a/pom.xml +++ b/pom.xml @@ -770,7 +770,7 @@ ${jxrlib.version} - 6.8.0 + 6.8.1 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From 35817580121e985fce50c155a9e80137c573d985 Mon Sep 17 00:00:00 2001 From: bogovicj Date: Thu, 13 Jan 2022 16:22:13 -0500 Subject: [PATCH 267/996] Update n5 artifact versions * n5-imglib2 4.3.0 * n5-ij 3.2.0 * n5-viewer_fiji 4.5.0 * n5-zarr 0.0.7 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index a23a2a64..f4dd8f5a 100644 --- a/pom.xml +++ b/pom.xml @@ -1063,19 +1063,19 @@ ${n5-hdf5.version} - 3.0.0 + 3.2.0 ${n5-ij.version} - 4.1.1 + 4.3.0 ${n5-imglib2.version} - 4.3.0 + 4.5.0 ${n5-viewer_fiji.version} - 0.0.6 + 0.0.7 ${n5-zarr.version} From f5b0cda9ba59ebdc89a551fd15e535bec445cc35 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 15 Feb 2022 11:58:11 -0600 Subject: [PATCH 268/996] README: update a few things * Link destinations aligned with the revamped ImageJ wiki. * Terminology: ImageJ2, not the original ImageJ. * Add link to another pom-scijava wiki page. --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 97de3ca2..7eccbd13 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,37 @@ [![](https://img.shields.io/maven-central/v/org.scijava/pom-scijava.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.scijava%22%20AND%20a%3A%22pom-scijava%22) [![](https://github.com/scijava/pom-scijava/actions/workflows/build-main.yml/badge.svg)](https://github.com/scijava/pom-scijava/actions/workflows/build-main.yml) -This POM provides a parent from which SciJava-based projects can declare their build configurations. It ensures that projects all use a compatible build environment, as well as versions of dependencies and plugins. Projects extending this POM inherit the unified SciJava [Bill of Materials](https://imagej.net/BOM): component versions which have been tested to work together. +This POM provides a parent from which SciJava-based projects can declare their build configurations. It ensures that projects all use a compatible build environment, as well as versions of dependencies and plugins. Projects extending this POM inherit the unified SciJava [Bill of Materials](https://imagej.net/develop/architecture#bill-of-materials): component versions which have been tested to work together. This POM serves as the base for all Maven-based SciJava software, including: -| Fiji | ImageJ | ImgLib2 | KNIME | LOCI | SCIFIO | SciJava | FLIMLib | Virtual Cell | -|:----:|:------:|:-------:|:-----:|:----:|:------:|:-------:|:----------:|:------------:| -| [![Fiji](https://scijava.org/icons/fiji-icon-64.png)](https://github.com/fiji) | [![ImageJ](https://scijava.org/icons/imagej2-icon-64.png)](https://github.com/imagej) | [![ImgLib2](https://scijava.org/icons/imglib2-icon-64.png)](https://github.com/imglib) | [![KNIME](https://scijava.org/icons/knime-icon-64.png)](https://knime.org) | [![LOCI](https://scijava.org/icons/loci-icon-64.png)](https://github.com/uw-loci) | [![SCIFIO](https://scijava.org/icons/scifio-icon-64.png)](https://github.com/scifio) | [![SciJava](https://scijava.org/icons/scijava-icon-64.png)](https://github.com/scijava) | [![FLIMLib](https://scijava.org/icons/flimlib-icon-64.png)](https://github.com/flimlib) | [![Virtual Cell](https://scijava.org/icons/vcell-icon-64.png)](https://github.com/virtualcell) | +| Fiji | ImageJ2 | ImgLib2 | KNIME | LOCI | SCIFIO | SciJava | FLIMLib | Virtual Cell | +|:----:|:-------:|:-------:|:-----:|:----:|:------:|:-------:|:----------:|:------------:| +| [![Fiji](https://scijava.org/icons/fiji-icon-64.png)](https://github.com/fiji) | [![ImageJ2](https://scijava.org/icons/imagej2-icon-64.png)](https://github.com/imagej) | [![ImgLib2](https://scijava.org/icons/imglib2-icon-64.png)](https://github.com/imglib) | [![KNIME](https://scijava.org/icons/knime-icon-64.png)](https://knime.org) | [![LOCI](https://scijava.org/icons/loci-icon-64.png)](https://github.com/uw-loci) | [![SCIFIO](https://scijava.org/icons/scifio-icon-64.png)](https://github.com/scifio) | [![SciJava](https://scijava.org/icons/scijava-icon-64.png)](https://github.com/scijava) | [![FLIMLib](https://scijava.org/icons/flimlib-icon-64.png)](https://github.com/flimlib) | [![Virtual Cell](https://scijava.org/icons/vcell-icon-64.png)](https://github.com/virtualcell) | This POM is intended for use as the parent of your own Maven-based code. ## Examples -* [ImageJ command template](https://github.com/imagej/example-imagej-command) +* [ImageJ2 command template](https://github.com/imagej/example-imagej-command) * [ImageJ 1.x plugin template](https://github.com/imagej/example-legacy-plugin) -* [ImageJ tutorials](https://github.com/imagej/tutorials/tree/master/maven-projects) +* [ImageJ2 tutorials](https://github.com/imagej/tutorials/tree/master/maven-projects) ## Documentation The pom-scijava wiki contains articles on several topics: * [Adding a new project to the SciJava POM](https://github.com/scijava/pom-scijava/wiki/Adding-a-new-project-to-the-SciJava-POM) +* [Addressing dependency clash](https://github.com/scijava/pom-scijava/wiki/Addressing-dependency-clash) * [Versioning of SciJava projects](https://github.com/scijava/pom-scijava/wiki/Versioning-of-SciJava-projects) ## Getting help with Maven For more information about Maven, see: -* [ImageJ Maven overview](https://imagej.net/Maven) -* [ImageJ Maven FAQ](https://imagej.net/Maven_-_Frequently_Asked_Questions) +* [ImageJ Maven overview](https://imagej.net/develop/maven) +* [ImageJ Maven FAQ](https://imagej.net/develop/maven-faq) ## Troubleshooting - * [Setting empty metadata fields](https://github.com/scijava/pom-scijava-base#how-to-override-a-field-with-an-empty-value) From 90c13d5aca45a455ee6dbfa508c344bcd1df28f4 Mon Sep 17 00:00:00 2001 From: tferr Date: Tue, 15 Feb 2022 22:45:39 -0500 Subject: [PATCH 269/996] Add jython auto-completion --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index a23a2a64..c93bb1c5 100644 --- a/pom.xml +++ b/pom.xml @@ -781,6 +781,9 @@ 2.0.1 ${IsoData_Classifier.version} + 0.0.4 + ${jython-autocompletion.version} + 2.0.0 ${Kappa.version} @@ -2648,6 +2651,11 @@ IsoData_Classifier ${sc.fiji.IsoData_Classifier.version} + + sc.fiji + jython-autocompletion + ${sc.fiji.jython-autocompletion.version} + sc.fiji Kappa From 50caea4409ea72fc90eec097751dd98233ec4f3c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 16 Feb 2022 19:28:43 -0600 Subject: [PATCH 270/996] Fix groupId of jython-autocompletion project --- pom.xml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index c93bb1c5..01302479 100644 --- a/pom.xml +++ b/pom.xml @@ -313,6 +313,10 @@ 0.7.4-scijava ${junit-benchmarks.version} + + 0.0.4 + ${jython-autocompletion.version} + 2.2.2 ${minimaven.version} @@ -781,9 +785,6 @@ 2.0.1 ${IsoData_Classifier.version} - 0.0.4 - ${jython-autocompletion.version} - 2.0.0 ${Kappa.version} @@ -1853,6 +1854,13 @@ ${org.scijava.batch-processor.version} + + + org.scijava + jython-autocompletion + ${org.scijava.jython-autocompletion.version} + + org.scijava @@ -2651,11 +2659,6 @@ IsoData_Classifier ${sc.fiji.IsoData_Classifier.version} - - sc.fiji - jython-autocompletion - ${sc.fiji.jython-autocompletion.version} - sc.fiji Kappa From 930dcd451695a1286b701d1a2160b741ceb7f1b6 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 18 Feb 2022 18:51:53 -0600 Subject: [PATCH 271/996] Update parent to pom-scijava-base 15.0.0 This introduces configuration for the therapi annotation processor, and also improves how the scijava.natives.classifier logic works. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01302479..f9c0fe3a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 14.0.0 + 15.0.0 From 7e38eedd93ad0114cdd45e3c2107d26879007272 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 18 Feb 2022 18:55:01 -0600 Subject: [PATCH 272/996] Update jruby exclusions comment Unfortunately, despite the fact that the JRuby issue has been resolved, and jruby-base 9.3.x.x is now available, we cannot upgrade to it, due to some change in the JRuby script language behavior. For further details, see the new referenced issue in the comment. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f9c0fe3a..7fbb7083 100644 --- a/pom.xml +++ b/pom.xml @@ -223,7 +223,7 @@ org.apache.maven:maven-core (guice) + org.apache.maven.shared:maven-common-artifact-filters (sisu-guice) == - TEMP: Until jruby/jruby#6205 is addressed. + TEMP: Until scijava/scripting-jruby#5 is resolved. Classes: jnr.ffi.* Part of: com.github.jnr:jnr-ffi Also in: org.jruby:jruby-core From a242e2ba72fe5547dfb9f3a3e19f8810a1d8ca9b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 20 Feb 2022 08:27:37 -0600 Subject: [PATCH 273/996] Remove kryo from allowed duplicate classes The relevant work is long merged and released. --- pom.xml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 67dc2ba4..90f46cc2 100644 --- a/pom.xml +++ b/pom.xml @@ -202,20 +202,6 @@ HACK: The following list of allowed-to-be-duplicated classes facilitates intended combinations of artifacts: == - TEMP: Until ome/ome-common-java#50 and ome/bioformats#3557 merge. - Classes: - com.esotericsoftware.kryo.*, - com.esotericsoftware.minlog.*, - com.esotericsoftware.reflectasm.* - Part of: - com.esotericsoftware.kryo:kryo, - com.esotericsoftware:kryo, - com.esotericsoftware:minlog, - com.esotericsoftware:reflectasm - Enables: - org.openmicroscopy:ome-common (com.esotericsoftware.kryo:kryo) + - graphics.scenery:scenery (com.esotericsoftware:kryo) - == Classes: com.google.inject.* Part of: com.google.inject:guice:no_aop Also in: org.sonatype.sisu:sisu-guice @@ -257,7 +243,7 @@ org.jetbrains.kotlin:kotlin-compiler-embeddable (kotlin-daemon-embeddable) + org.jetbrains.kotlin:kotlin-script-util (kotlin-compiler-client) --> - com.esotericsoftware.kryo.*,com.esotericsoftware.minlog.*,com.esotericsoftware.reflectasm.*,com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.jetbrains.kotlin.daemon.common.*,org.junit.runner.Runner + com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.jetbrains.kotlin.daemon.common.*,org.junit.runner.Runner + it.unimi.dsi + fastutil + + From 4c1adc74981ec172d339ddf42561f3b62d18deb5 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Fri, 18 Feb 2022 10:57:04 -0600 Subject: [PATCH 275/996] Add therapi-runtime-javadoc --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index df72b91b..3b08fdc7 100644 --- a/pom.xml +++ b/pom.xml @@ -1815,6 +1815,10 @@ ${libtensorflow_jni_gpu.version} ${proto.version} + + + ${therapi.version} + 3.0.3 ${trove4j.version} @@ -4788,6 +4792,13 @@ ${org.tensorflow.proto.version} + + + com.github.therapi + therapi-runtime-javadoc + ${com.github.therapi.therapi-runtime-javadoc.version} + + net.sf.trove4j From 832b7c16ae389d11d476810c4d61a47e9b834cac Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 20 Feb 2022 09:46:47 -0600 Subject: [PATCH 276/996] Update Trove project URL --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 16ee1abc..df72b91b 100644 --- a/pom.xml +++ b/pom.xml @@ -1815,7 +1815,7 @@ ${libtensorflow_jni_gpu.version} ${proto.version} - + 3.0.3 ${trove4j.version} @@ -4788,7 +4788,7 @@ ${org.tensorflow.proto.version} - + net.sf.trove4j trove4j From 2f7d665290f938d43320c37be411247877a4268a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 20 Feb 2022 10:55:27 -0600 Subject: [PATCH 277/996] Update cisd:jhdf5 to 19.04.0 See #181. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d691061..1cd111ac 100644 --- a/pom.xml +++ b/pom.xml @@ -1647,7 +1647,7 @@ ${jgraphx.version} - 14.12.6 + 19.04.0 ${jhdf5.version} From b86838a2a3b060bf1fb647607d53e18b73203c58 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 20 Feb 2022 13:29:21 -0600 Subject: [PATCH 278/996] Add script-editor-jython and bump script-editor The Jython-specific Script Editor code, including improved Jython autocompletion from Albert Cardona, was split to its own component. --- pom.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1cd111ac..f039723d 100644 --- a/pom.xml +++ b/pom.xml @@ -388,9 +388,13 @@ ${scijava-ui-swing.version} - 0.5.9 + 0.6.1 ${script-editor.version} + + 0.1.1 + ${script-editor-jython.version} + 0.3.4 ${scripting-beanshell.version} @@ -2054,6 +2058,13 @@ ${org.scijava.script-editor.version} + + + org.scijava + script-editor-jython + ${org.scijava.script-editor-jython.version} + + org.scijava From dd4e8aee4e39f0be746ffc2ca28aa955e9144560 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 20 Feb 2022 13:32:05 -0600 Subject: [PATCH 279/996] Bump jitk-tps and bigwarp_fiji versions This eliminates the log4j dependency for each of them. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f039723d..e9c285a7 100644 --- a/pom.xml +++ b/pom.xml @@ -963,11 +963,11 @@ - 3.0.1 + 3.0.2 ${jitk-tps.version} - 7.0.4 + 7.0.5 ${bigwarp.version} ${bigwarp_fiji.version} From 25607b457466e3135fa608eb17fc9fdd1b8ae384 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 20 Feb 2022 14:28:38 -0600 Subject: [PATCH 280/996] Use HTTPS for URLs where feasible --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e9c285a7..2f98f61f 100644 --- a/pom.xml +++ b/pom.xml @@ -1816,7 +1816,7 @@ ${autocomplete.version} ${languagesupport.version} - + 1.7.32 ${slf4j.version} ${slf4j.version} @@ -4290,7 +4290,7 @@ Conflicts with commons-logging:commons-logging. If you depend on jackrabbit-webdav, add either commons-logging or jcl-over-slfj to your deps. - See: http://www.slf4j.org/legacy.html#jcl-over-slf4j + See: https://www.slf4j.org/legacy.html#jcl-over-slf4j --> org.slf4j jcl-over-slf4j @@ -4819,7 +4819,7 @@ ${org.postgresql.postgresql.version} - + com.fifesoft rsyntaxtextarea @@ -4836,7 +4836,7 @@ ${com.fifesoft.languagesupport.version} - + org.slf4j slf4j-api From 30cd3a53eedd2c4a3541a7c1e0976812118e2e03 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 20 Feb 2022 14:28:49 -0600 Subject: [PATCH 281/996] Manage ch.qos.reload4j:reload4j --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 2f98f61f..768168e1 100644 --- a/pom.xml +++ b/pom.xml @@ -1808,6 +1808,10 @@ 42.2.24 ${postgresql.version} + + 1.2.18.3 + ${reload4j.version} + 3.1.1 3.1.0 @@ -4819,6 +4823,13 @@ ${org.postgresql.postgresql.version} + + + ch.qos.reload4j + reload4j + ${ch.qos.reload4j.reload4j.version} + + com.fifesoft From b5a043e7634022a3434a408ad95822f1092af07f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 20 Feb 2022 14:38:49 -0600 Subject: [PATCH 282/996] Bump SNT to 4.0.10 This purges the log4j dependency. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 768168e1..7a311d30 100644 --- a/pom.xml +++ b/pom.xml @@ -1086,7 +1086,7 @@ ${MorphoLibJ_.version} - 4.0.2 + 4.0.10 ${SNT.version} From 08ca6bce8c55c9aa7d6a80e77fa368a949cf0f48 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 20 Feb 2022 15:12:32 -0600 Subject: [PATCH 283/996] Ignore org.eclipse.aether and org.jzy3d duplicates The Maven core libraries are a mess, with duplicate classes all over the place. I could not find a way around it using exclusions. And the jzy3d libraries duplicate some classes across JARs. Unfortunate. --- pom.xml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7a311d30..b647d50f 100644 --- a/pom.xml +++ b/pom.xml @@ -225,6 +225,15 @@ Part of: org.apache.spark:spark-* Enables: org.apache.spark:spark-core_2.11 (spark-*) == + Classes: org.eclipse.aether.* + Part of: + org.apache.maven.resolver:maven-resolver-api + org.apache.maven.resolver:maven-resolver-util + org.apache.maven.shared:maven-artifact-transfer + org.eclipse.aether:aether-api + org.eclipse.aether:aether-util + Enables: dependence on Apache Maven libraries + == Classes: org.hibernate.stat.ConcurrentStatisticsImpl Part of: org.hibernate:hibernate-core Also in: org.openmicroscopy:omero-blitz @@ -242,8 +251,13 @@ Enables: org.jetbrains.kotlin:kotlin-compiler-embeddable (kotlin-daemon-embeddable) + org.jetbrains.kotlin:kotlin-script-util (kotlin-compiler-client) + == + Classes: org.jzy3d.plot3d.pipelines.* + Part of: org.jzy3d:jzy3d-core, org.jzy3d:jzy3d-native-jogl-awt + Enables: org.jzy3d:jzy3d-core + org.jzy3d:jzy3d-native-jogl-awt --> - com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.hibernate.stat.ConcurrentStatisticsImpl,org.jetbrains.kotlin.daemon.common.*,org.junit.runner.Runner + com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.jetbrains.kotlin.daemon.common.*,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* + - 6.8.1 + 6.9.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From e0317c9ff0e889b9c92b32272f95aab45ababc7a Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Thu, 24 Feb 2022 11:24:39 -0500 Subject: [PATCH 285/996] Bump RSyntaxTextArea to latest versions --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b647d50f..445b33b4 100644 --- a/pom.xml +++ b/pom.xml @@ -1827,9 +1827,9 @@ ${reload4j.version} - 3.1.1 - 3.1.0 - 3.1.0 + 3.1.6 + 3.1.5 + 3.1.4 ${rsyntaxtextarea.version} ${autocomplete.version} ${languagesupport.version} From da5e18b325923057de433ecfec886d617c1ab1a4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 24 Feb 2022 09:33:47 -0600 Subject: [PATCH 286/996] Remove scenery and sciview from the BOM These projects have switched to an incompatible release process. I do not have the tools to ensure that they work with other components. If this change creates any problems for you, please reach out on the pom-scijava issue tracker for assistance. --- pom.xml | 22 ---------------------- tests/generate-mega-melt.py | 2 -- tests/run.sh | 3 --- 3 files changed, 27 deletions(-) diff --git a/pom.xml b/pom.xml index 445b33b4..84b791a1 100644 --- a/pom.xml +++ b/pom.xml @@ -1229,14 +1229,6 @@ 0.32.1.1 ${clijx-weka_.version} - - 0.7.0-beta-7 - ${scenery.version} - - - 0.2.0-beta-9 - ${sciview.version} - @@ -3535,20 +3527,6 @@ ${net.heasleinhuepf.clijx-weka_.version} - - - graphics.scenery - scenery - ${graphics.scenery.scenery.version} - - - - - sc.iview - sciview - ${sc.iview.sciview.version} - - diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index 36af4220..8b3a1d7b 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -21,8 +21,6 @@ def child(node, tag): # Artifacts to exclude from the mega melt. ignoredArtifacts = [ - # TEMP: Until scenerygraphics/scenery#314 is addressed. - 'scenery', # TEMP: Until imagej-omero is updated for pom-scijava 29. 'imagej-omero', 'imagej-omero-legacy', diff --git a/tests/run.sh b/tests/run.sh index 35e7b6c4..9cd85f19 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -78,7 +78,6 @@ chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ -o "$meltingPotDir" \ -i 'ca.mcgill:*' \ - -i 'graphics.scenery:*' \ -i 'io.scif:*' \ -i 'jitk:*' \ -i 'mpicbg:*' \ @@ -90,8 +89,6 @@ chmod +x "$meltingPotScript" && -i 'org.janelia:*' \ -i 'org.scijava:*' \ -i 'sc.fiji:*' \ - -i 'sc.iview:*' \ - -e 'graphics.scenery:scenery' \ -e 'org.janelia.saalfeldlab:n5-blosc' \ -e 'org.janelia.saalfeldlab:n5-zarr' \ -e 'org.scijava:j3dcore' \ From bf048290e814b09f0f4d5d07806c4b861b8abfd8 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 24 Feb 2022 09:37:06 -0600 Subject: [PATCH 287/996] Update Apache POI to 5.2.0 And manage the various components in the suite. --- pom.xml | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 84b791a1..64a32326 100644 --- a/pom.xml +++ b/pom.xml @@ -1304,8 +1304,18 @@ ${sisu-inject-plexus.version} - 3.17 + 5.2.0 + ${poi.version} + ${poi.version} + ${poi.version} + ${poi.version} + ${poi.version} ${poi.version} + ${poi-examples.version} + ${poi-excelant.version} + ${poi-ooxml.version} + ${poi-ooxml-lite.version} + ${poi-scratchpad.version} 2.4.8 @@ -3706,6 +3716,37 @@ poi ${org.apache.poi.poi.version} + + org.apache.poi + poi-examples + ${org.apache.poi.poi-examples.version} + + + org.apache.poi + poi-excelant + ${org.apache.poi.poi-excelant.version} + + + org.apache.poi + poi-ooxml + ${org.apache.poi.poi-ooxml.version} + + + xml-apis + xml-apis + + + + + org.apache.poi + poi-ooxml-lite + ${org.apache.poi.poi-ooxml-lite.version} + + + org.apache.poi + poi-scratchpad + ${org.apache.poi.poi-scratchpad.version} + From f38c834ba0d565d36bde18e6030ba8e623186c06 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 24 Feb 2022 11:27:38 -0600 Subject: [PATCH 288/996] POM: use HTTPS for schema location URL Maven no longer supports plain HTTP for the schema location. And using HTTP now generates errors in Eclipse (and probably other IDEs). --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64a32326..7e669b4b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 From 739887258ffcf0a32b33a196002b6d3a254084a4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 24 Feb 2022 11:43:04 -0600 Subject: [PATCH 289/996] mega-melt: update scijava-scripts main branch name --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index 9cd85f19..cfebc2d0 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -44,7 +44,7 @@ dependencyTreeLog="$megaMeltDir/dependency-tree.log" validationLog="$megaMeltDir/validation.log" validationErrorsLog="$megaMeltDir/validation-errors.log" megaMeltPOM="$megaMeltDir/pom.xml" -meltingPotURL=https://raw.githubusercontent.com/scijava/scijava-scripts/master/melting-pot.sh +meltingPotURL=https://raw.githubusercontent.com/scijava/scijava-scripts/main/melting-pot.sh meltingPotScript="$megaMeltDir/melting-pot.sh" meltingPotDir="$megaMeltDir/melting-pot" From 7e81353bc0a004622fc94c35aec2cfe42cdb33ee Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 24 Feb 2022 12:17:05 -0600 Subject: [PATCH 290/996] Remove org.morphonets:SNT from the BOM Its dependencies are a terrible mess. It brings in scenery, which brings in biojava, with has many duplicate classes, and even a dependency with an invalid POM (org.biojava.thirdparty:forester:jar:1.038). We won't be able to promise that SNT is compatible with the SciJava component collection until the scenery dependencies get cleaned up. See also https://gitter.im/fiji/fiji?at=6217cf210909252318f6f3df --- pom.xml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 7e669b4b..0fe63422 100644 --- a/pom.xml +++ b/pom.xml @@ -1099,10 +1099,6 @@ ${MorphoLibJ.version} ${MorphoLibJ_.version} - - 4.0.10 - ${SNT.version} - 7.0.11 ${bonej.version} @@ -3085,6 +3081,12 @@ sc.fiji TrakEM2_ ${sc.fiji.TrakEM2_.version} + + + org.morphonets + SNT + + sc.fiji @@ -3166,13 +3168,6 @@ ${fr.inra.ijpb.MorphoLibJ_.version} - - - org.morphonets - SNT - ${org.morphonets.SNT.version} - - org.bonej From 50c9b8d5077865586f357e9ad24165e1f08c112e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 24 Feb 2022 13:08:30 -0600 Subject: [PATCH 291/996] Update H5J_Loader_Plugin to 1.1.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0fe63422..bd29ca49 100644 --- a/pom.xml +++ b/pom.xml @@ -761,7 +761,7 @@ 2.3.5 ${Gray_Morphology.version} - 1.1.2 + 1.1.3 ${H5J_Loader_Plugin.version} 1.1.0 From c99a2579fe9b1476fa00790ae75cfebd5c0c2baa Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 24 Feb 2022 15:02:50 -0600 Subject: [PATCH 292/996] Update script-editor to 0.7.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd29ca49..b4e850b1 100644 --- a/pom.xml +++ b/pom.xml @@ -402,7 +402,7 @@ ${scijava-ui-swing.version} - 0.6.1 + 0.7.0 ${script-editor.version} From 31725f8d2e5a45f069d5a2c2d4234b90ea5a66f9 Mon Sep 17 00:00:00 2001 From: Jean-Yves Tinevez Date: Sat, 26 Mar 2022 20:20:10 +0100 Subject: [PATCH 293/996] Use TrackMate v7.6.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99513e74..6d2046b7 100644 --- a/pom.xml +++ b/pom.xml @@ -903,7 +903,7 @@ ${TopoJ.version} ${TopoJ_.version} - 7.0.7 + 7.6.1 ${TrackMate.version} 3.3.0 From 5260195b4436de9782e52ca0e63f82f5f99ddcba Mon Sep 17 00:00:00 2001 From: hinerm Date: Tue, 29 Mar 2022 11:04:48 -0500 Subject: [PATCH 294/996] Bump scifio-hdf5 > 0.2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d2046b7..9e5daae1 100644 --- a/pom.xml +++ b/pom.xml @@ -630,7 +630,7 @@ ${scifio-cli.version} - 0.2.1 + 0.2.2 ${scifio-hdf5.version} From c9df9fd49768cb7bd2462489d01ae61bffa321a7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 7 Apr 2022 11:50:45 -0500 Subject: [PATCH 295/996] Manage scijava-plot And update scijava-ui-swing to 0.14.0, which includes a JFreeChart-based backend for the SciJava PlotService. Many thanks to Matthias Arzt for implementing this! --- pom.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e5daae1..d3307de6 100644 --- a/pom.xml +++ b/pom.xml @@ -365,6 +365,10 @@ 1.0.1 ${scijava-optional.version} + + 0.2.0 + ${scijava-plot.version} + 0.2.3 ${scijava-plugins-commands.version} @@ -398,7 +402,7 @@ ${scijava-ui-awt.version} - 0.13.3 + 0.14.0 ${scijava-ui-swing.version} @@ -2004,6 +2008,13 @@ ${org.scijava.scijava-optional.version} + + + org.scijava + scijava-plot + ${org.scijava.scijava-plot.version} + + org.scijava From 4631d9403ca219e927b0d18b34b59ac68b17e3c2 Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Mon, 11 Apr 2022 18:18:47 +0800 Subject: [PATCH 296/996] BoneJ release 7.0.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d3307de6..2e7b6bda 100644 --- a/pom.xml +++ b/pom.xml @@ -1104,7 +1104,7 @@ ${MorphoLibJ_.version} - 7.0.11 + 7.0.12 ${bonej.version} ${bonej.version} ${bonej.version} From 1d0a4f6d773fa6be8bc164e2738425735ceb2edc Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Tue, 19 Apr 2022 15:43:52 +0800 Subject: [PATCH 297/996] Update Eclipse Collections to 11.0.0 New major release of Eclipse Collections with performance enhancements but some breaking changes as listed in the release notes: https://github.com/eclipse/eclipse-collections/releases/tag/11.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2e7b6bda..e79b195f 100644 --- a/pom.xml +++ b/pom.xml @@ -1446,7 +1446,7 @@ ${cglib.version} - 10.4.0 + 11.0.0 ${eclipse-collections.version} ${eclipse-collections.version} ${eclipse-collections.version} From 575a7382f4bf15038f626c589c88ea3bc7c8828d Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Wed, 20 Apr 2022 16:07:49 +0800 Subject: [PATCH 298/996] bonej-7.0.13 https://github.com/bonej-org/BoneJ2/releases/tag/bonej-7.0.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e79b195f..2ca6c5e7 100644 --- a/pom.xml +++ b/pom.xml @@ -1104,7 +1104,7 @@ ${MorphoLibJ_.version} - 7.0.12 + 7.0.13 ${bonej.version} ${bonej.version} ${bonej.version} From 7f2d6d97ac74a924a0f0e8c22a2efd4357fcc564 Mon Sep 17 00:00:00 2001 From: David Gault Date: Wed, 20 Apr 2022 15:16:38 +0100 Subject: [PATCH 299/996] Bump Bio-Formats version to 6.9.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ca6c5e7..300226a4 100644 --- a/pom.xml +++ b/pom.xml @@ -1140,7 +1140,7 @@ ${jxrlib-all.version} - 6.9.0 + 6.9.1 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From e5b2b24b3caf883e4892f0cf3f7ddac2b9b5c07c Mon Sep 17 00:00:00 2001 From: hinerm Date: Mon, 25 Apr 2022 15:09:38 -0500 Subject: [PATCH 300/996] Bump imagej-scripting to 0.8.3 0.8.2 unit tests will fail with imglib2-algorithm >= 0.12.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 300226a4..6e9d7a53 100644 --- a/pom.xml +++ b/pom.xml @@ -550,7 +550,7 @@ ${imagej-plugins-uploader-webdav.version} - 0.8.2 + 0.8.3 ${imagej-scripting.version} From 3f8c722deac0d1ff73da48cf71bcd819d1958c33 Mon Sep 17 00:00:00 2001 From: hinerm Date: Mon, 25 Apr 2022 16:54:04 -0500 Subject: [PATCH 301/996] Update imglib2-realtransform to 3.1.2 Removes the log4j dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e9d7a53..a2b665e7 100644 --- a/pom.xml +++ b/pom.xml @@ -608,7 +608,7 @@ ${imglib2-imglyb.version} - 3.1.1 + 3.1.2 ${imglib2-realtransform.version} From eebea2287758e66f5ef72c558b142f17af6106ce Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 26 Apr 2022 08:27:21 -0500 Subject: [PATCH 302/996] mega-melt: remove keep-alive logic It prevents ^C to halt, and it breaks the script's exit code. --- tests/run.sh | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index cfebc2d0..989c39f1 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -6,27 +6,6 @@ die () { echo "$*" >&2; exit 1; } -# Wait for a launched background command to complete, emitting -# an occasional message to avoid long periods without output. -# Return the same exit code as the launched command. -keep_alive() { - pid="$1" - if [ "$pid" = "" ] - then - echo "[ERROR] No PID given" - return - fi - i=0 - while kill -0 "$pid" 2>/dev/null; do - i=$((i+1)) - m=$((i/60)) - s=$((i%60)) - test $s -eq 0 && echo "[$m minutes elapsed]" - sleep 1 - done - wait "$pid" -} - echo && printf 'Generating mega-melt project... ' && @@ -124,7 +103,7 @@ done if [ "$doMelt" ] then echo && - (cd "$meltingPotDir" && sh melt.sh) & keep_alive $! || die 'Melting pot failed!' + cd "$meltingPotDir" && sh melt.sh || die 'Melting pot failed!' else echo && echo 'Melting the pot... SKIPPED' From bbb8b0591814825ee687b52d61b02abcfb86e85e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 26 Apr 2022 08:28:04 -0500 Subject: [PATCH 303/996] mega-melt: use local melting-pot.sh if available Save bandwidth, and make debugging easier: only download the script if it's not available from a sibling scijava-scripts directory. --- tests/run.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index 989c39f1..e8223a9b 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -23,6 +23,7 @@ dependencyTreeLog="$megaMeltDir/dependency-tree.log" validationLog="$megaMeltDir/validation.log" validationErrorsLog="$megaMeltDir/validation-errors.log" megaMeltPOM="$megaMeltDir/pom.xml" +meltingPotLocal="$dir/../../scijava-scripts/melting-pot.sh" meltingPotURL=https://raw.githubusercontent.com/scijava/scijava-scripts/main/melting-pot.sh meltingPotScript="$megaMeltDir/melting-pot.sh" meltingPotDir="$megaMeltDir/melting-pot" @@ -52,7 +53,12 @@ echo 'Done!' # minus excluded artifacts (see ignoredArtifacts in generate-mega-melt.py). echo && echo 'Generating melting pot...' && -curl -fsL "$meltingPotURL" > "$meltingPotScript" && +if [ -e "$meltingPotLocal" ] +then + cp "$meltingPotLocal" "$meltingPotScript" +else + curl -fsL "$meltingPotURL" > "$meltingPotScript" +fi && chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ -o "$meltingPotDir" \ From 4bf5cc32c48dc8afb6a4758daf90cbb991d32559 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 28 Apr 2022 20:50:30 -0500 Subject: [PATCH 304/996] mega-melt: clean up run.sh script * Fix whitespace issues * Filter out confusing melting-pot output * Remove unused variable --- tests/run.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index e8223a9b..8627cf08 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -55,9 +55,9 @@ echo && echo 'Generating melting pot...' && if [ -e "$meltingPotLocal" ] then - cp "$meltingPotLocal" "$meltingPotScript" + cp "$meltingPotLocal" "$meltingPotScript" else - curl -fsL "$meltingPotURL" > "$meltingPotScript" + curl -fsL "$meltingPotURL" > "$meltingPotScript" fi && chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ @@ -80,14 +80,13 @@ chmod +x "$meltingPotScript" && -e 'org.scijava:j3dutils' \ -e 'org.scijava:jep' \ -e 'org.scijava:junit-benchmarks' \ - -e 'org.scijava:vecmath' \ - -f -v -s $@ || die 'Melting pot build failed!' + -e 'org.scijava:vecmath' \ + -f -v -s $@ | grep -v '\(Skipping the build\|Melt complete\)' || die 'Melting pot build failed!' # HACK: Remove known-duplicate artifactIds from version property overrides. # The plan is for this step to become unnecessary once the melting pot has # been improved to include a strategy for dealing with components with same # artifactId but different groupIds. For now, we just prune these overrides. -meltScript="$meltingPotDir/melt.sh" buildScript="$meltingPotDir/build.sh" buildScriptBackup="$buildScript.original" echo && From 71f7fb5f114f3799bc0e8cb81a9a1e9ec861908a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 28 Apr 2022 20:55:45 -0500 Subject: [PATCH 305/996] mega-melt: adjust component POMs for HTTPS And maven.imagej.net -> maven.scijava.org while we're at it. --- tests/run.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/run.sh b/tests/run.sh index 8627cf08..c7497436 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -96,6 +96,17 @@ awk '!/-D(annotations|antlr|jocl|kryo|minlog|opencsv|trove4j)\.version/' "$build die 'Error adjusting melting pot build script!' echo 'Done!' +# HACK: Adjust component POMs to satisfy Maven HTTPS strictness. +echo && +printf 'Adjusting melting pot project POMs... ' && +find "$meltingPotDir" -name pom.xml | while read pom +do + mv "$pom" "$pom.original" && + sed -e 's_\(https\?://maven.imagej.net\|http://maven.scijava.org\)_https://maven.scijava.org_g' \ + -e 's_http://maven.apache.org/xsd_https://maven.apache.org/xsd_g' "$pom.original" > "$pom" || + die "Failed to adjust $pom" +done + # Run the melting pot now, unless -s flag was given. doMelt=t for arg in "$@" From 9152a028aa23f95bb8b0591063c36e2cbe9ad7d5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 28 Apr 2022 21:39:35 -0500 Subject: [PATCH 306/996] Update component versions * scijava-grab: 0.1.0 -> 0.1.1 * imagej2: 2.3.0 -> 2.4.0 (preemptive) * ij: 1.53f -> 1.53r * ij1-patcher: 1.2.1 -> 1.2.2 (preemptive) * imagej-opencv: 0.1.1 -> 0.1.2 * fiji: 2.3.1 -> 2.4.0 (preemptive) --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index a2b665e7..e250903d 100644 --- a/pom.xml +++ b/pom.xml @@ -342,7 +342,7 @@ ${scijava-config.version} - 0.1.0 + 0.1.1 ${scijava-grab.version} @@ -468,17 +468,17 @@ - 2.3.0 + 2.4.0 ${imagej2.version} ${imagej.version} - 1.53f + 1.53r ${imagej1.version} ${ij.version} - 1.2.1 + 1.2.2 ${ij1-patcher.version} @@ -522,7 +522,7 @@ ${imagej-omero-legacy.version} - 0.1.1 + 0.1.2 ${imagej-opencv.version} @@ -652,7 +652,7 @@ - 2.3.1 + 2.4.0 ${fiji.version} From a68ef274f7a2603713b216f01c4f95792cae5c4f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 29 Apr 2022 00:05:25 -0500 Subject: [PATCH 307/996] Update parent to pom-scijava-base 15.0.1 This disables therapi for now to avoid problems; see: scijava/pom-scijava-base@62b618df505dfe8ac9536f105bed41f2727853a3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e250903d..29a688e1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 15.0.0 + 15.0.1 From 30449d1e086ff1a4386d1eea23ade1c2df56ea9d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 29 Apr 2022 01:18:30 -0500 Subject: [PATCH 308/996] Update scifio to 0.43.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 29a688e1..ff7b12f1 100644 --- a/pom.xml +++ b/pom.xml @@ -622,7 +622,7 @@ - 0.42.0 + 0.43.1 ${scifio.version} From 3c336ccbaa60fd33eafea284181e36baa532939e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 29 Apr 2022 01:30:42 -0500 Subject: [PATCH 309/996] Update component versions * parsington: 2.0.1 -> 3.0.0 * scripting-kotlin: 0.1.1 -> 0.2.0 * imagej-common: 0.34.1 -> 0.34.2 * imagej-ops: 0.45.8 -> 0.46.1 * imglib2-algorithm: 0.12.0 -> 0.12.1 * imglib2-roi: 0.12.0 -> 0.12.1 * PIV_analyser: 1.1.2 -> 2.0.0 * Trainable_Segmentation: 3.3.0 -> 3.3.1 * Volume_Viewer: 2.01.2 -> 2.01.3 * bigdataviewer-core: 10.2.1 -> 10.2.2 * bigdataviewer_fiji: 6.2.1 -> 6.2.2 * imglib2-label-multisets: 0.10.0 -> 0.11.0 * BigStitcher: 0.8.2 -> 0.8.3 * multiview-reconstruction: 0.11.0 -> 0.11.5 --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index ff7b12f1..8c5113bf 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,7 @@ ${native-lib-loader.version} - 2.0.1 + 3.0.0 ${parsington.version} @@ -442,7 +442,7 @@ ${scripting-jython.version} - 0.1.1 + 0.2.0 ${scripting-kotlin.version} @@ -482,7 +482,7 @@ ${ij1-patcher.version} - 0.34.1 + 0.34.2 ${imagej-common.version} @@ -526,7 +526,7 @@ ${imagej-opencv.version} - 0.45.8 + 0.46.1 ${imagej-ops.version} @@ -584,7 +584,7 @@ ${imglib2.version} - 0.12.0 + 0.12.1 ${imglib2-algorithm.version} @@ -612,7 +612,7 @@ ${imglib2-realtransform.version} - 0.12.0 + 0.12.1 ${imglib2-roi.version} @@ -836,7 +836,7 @@ 2.0.0 ${OMEVisual.version} - 1.1.2 + 2.0.0 ${PIV_analyser.version} 1.1.2 @@ -910,7 +910,7 @@ 7.6.1 ${TrackMate.version} - 3.3.0 + 3.3.1 ${Trainable_Segmentation.version} 2.0.3 @@ -939,7 +939,7 @@ 2.0.2 ${Volume_Calculator.version} - 2.01.2 + 2.01.3 ${Volume_Viewer.version} 2.6.13 @@ -1006,7 +1006,7 @@ - 10.2.1 + 10.2.2 ${bigdataviewer-core.version} @@ -1018,7 +1018,7 @@ ${bigdataviewer-vistools.version} - 6.2.1 + 6.2.2 ${bigdataviewer_fiji.version} @@ -1051,7 +1051,7 @@ - 0.10.0 + 0.11.0 ${imglib2-label-multisets.version} @@ -1185,11 +1185,11 @@ - 0.8.2 + 0.8.3 ${BigStitcher.version} - 0.11.0 + 0.11.5 ${multiview-reconstruction.version} From dcceafdb3adeb4b67d726130d5f7452f4a3e45d1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 29 Apr 2022 02:20:32 -0500 Subject: [PATCH 310/996] Update component versions * imagej2: 2.4.0 -> 2.4.1 * fiji: 2.4.0 -> 2.4.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8c5113bf..b09d866a 100644 --- a/pom.xml +++ b/pom.xml @@ -468,7 +468,7 @@ - 2.4.0 + 2.4.1 ${imagej2.version} ${imagej.version} @@ -652,7 +652,7 @@ - 2.4.0 + 2.4.1 ${fiji.version} From 751f86a91a25814572311f3eb4a7e291dcf7fec3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 29 Apr 2022 02:23:52 -0500 Subject: [PATCH 311/996] Remove org.scijava:jython-autocompletion It was replaced by org.scijava:script-editor-jython. --- pom.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pom.xml b/pom.xml index b09d866a..16392623 100644 --- a/pom.xml +++ b/pom.xml @@ -313,10 +313,6 @@ 0.7.4-scijava ${junit-benchmarks.version} - - 0.0.4 - ${jython-autocompletion.version} - 2.2.2 ${minimaven.version} @@ -1911,13 +1907,6 @@ ${org.scijava.batch-processor.version} - - - org.scijava - jython-autocompletion - ${org.scijava.jython-autocompletion.version} - - org.scijava From b088af931b8a781f3bae39668f99a0fb64e41e11 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 29 Apr 2022 02:31:43 -0500 Subject: [PATCH 312/996] Add org.codehaus.groovy:groovy-jsr223 --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 16392623..9216e208 100644 --- a/pom.xml +++ b/pom.xml @@ -1247,6 +1247,7 @@ ${groovy.version} ${groovy.version} ${groovy.version} + ${groovy.version} ${groovy.version} ${groovy.version} ${groovy.version} @@ -1273,6 +1274,7 @@ ${groovy-jaxb.version} ${groovy-jmx.version} ${groovy-json.version} + ${groovy-jsr223.version} ${groovy-macro.version} ${groovy-nio.version} ${groovy-servlet.version} @@ -3617,6 +3619,11 @@ groovy-json ${org.codehaus.groovy.groovy-json.version} + + org.codehaus.groovy + groovy-jsr223 + ${org.codehaus.groovy.groovy-jsr223.version} + org.codehaus.groovy groovy-macro From 29c79ad24e6c0c467feb33c87c472a9b079d17a1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 29 Apr 2022 03:16:29 -0500 Subject: [PATCH 313/996] Update script-editor to 0.7.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9216e208..5541dd6d 100644 --- a/pom.xml +++ b/pom.xml @@ -402,7 +402,7 @@ ${scijava-ui-swing.version} - 0.7.0 + 0.7.7 ${script-editor.version} From 8efe354e89c1c07f951d6c540e518237237a9538 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 29 Apr 2022 03:31:04 -0500 Subject: [PATCH 314/996] Update scijava-common to 2.88.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5541dd6d..9a06bddd 100644 --- a/pom.xml +++ b/pom.xml @@ -330,7 +330,7 @@ ${scijava-cache.version} - 2.87.1 + 2.88.1 ${scijava-common.version} From 801a142c9037edbd5a9370383e559b7e4e197a61 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 29 Apr 2022 03:37:58 -0500 Subject: [PATCH 315/996] Downgrade Groovy from 3.0.9 to 3.0.4 3.0.9 and 3.0.10 do not play nicely with scripting-groovy's import retainer: java.lang.ClassCastException: java.util.ArrayList cannot be cast to java.util.Map at org.scijava.plugins.scripting.groovy.ImportRetainer.call(ImportRetainer.java:79) Further investigation needed. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a06bddd..43610338 100644 --- a/pom.xml +++ b/pom.xml @@ -1232,7 +1232,7 @@ ${aws-java-sdk-s3.version} - 3.0.9 + 3.0.4 ${groovy.version} ${groovy.version} ${groovy.version} From ff35ca810a8717c4f461ef24df4986bf1914c673 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 29 Apr 2022 03:39:54 -0500 Subject: [PATCH 316/996] Update imagej2 and fiji to 2.5.0 (preemptive) --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 43610338..8850a2ec 100644 --- a/pom.xml +++ b/pom.xml @@ -464,7 +464,7 @@ - 2.4.1 + 2.5.0 ${imagej2.version} ${imagej.version} @@ -648,7 +648,7 @@ - 2.4.1 + 2.5.0 ${fiji.version} From e6e17ce946b4844ba3713823e56170b8e4b19d53 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 19 May 2022 14:22:45 -0500 Subject: [PATCH 317/996] Update bigdataviewer-core to 10.3.1 This updates to match JHDF 19.04. Thanks to @tischi for noticing. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8850a2ec..7ff30d28 100644 --- a/pom.xml +++ b/pom.xml @@ -1002,7 +1002,7 @@ - 10.2.2 + 10.3.1 ${bigdataviewer-core.version} From d58ce8a29ed2d78736edcb90459f35cf8e5c10fd Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 23 May 2022 12:15:43 -0500 Subject: [PATCH 318/996] Update imagej-common to 0.35.0 Among other changes, this introduces converter plugins from Java types to ImgLib2 types; see: https://github.com/imagej/imagej-common/pull/82 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7ff30d28..c73ea813 100644 --- a/pom.xml +++ b/pom.xml @@ -478,7 +478,7 @@ ${ij1-patcher.version} - 0.34.2 + 0.35.0 ${imagej-common.version} From 54f8dd98f2d19c27910a07a8c16613d10280f747 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 25 May 2022 10:53:34 -0500 Subject: [PATCH 319/996] Manage bio-formats-tools And exclude serializer (and therefore xml-apis). Otherwise, dependence on bio-formats-tools can clash with xpp3: Warning: Rule 3: org.apache.maven.plugins.enforcer.BanDuplicateClasses failed with message: No Duplicate Classes Allowed! - For duplicate transitive dependencies, add dependency exclusions. - For duplications between direct dependencies, resolve or add ignored classes to this rule's configuration. Found in: xml-apis:xml-apis:jar:1.3.04:runtime xpp3:xpp3:jar:1.1.4c:compile Duplicate classes: javax/xml/namespace/QName.class See: https://gitter.im/fiji/DevOps?at=628e4adbc9382316a6211f18 --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index c73ea813..38d2635b 100644 --- a/pom.xml +++ b/pom.xml @@ -1137,10 +1137,12 @@ 6.9.1 + ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} + ${bio-formats-tools.version} ${bio-formats_plugins.version} ${formats-api.version} ${formats-bsd.version} @@ -3277,6 +3279,17 @@ + + ome + bio-formats-tools + ${ome.bio-formats-tools.version} + + + xalan + serializer + + + ome bio-formats_plugins From 6f17b6c710003061379ed7e1ffe5d67e90cffe64 Mon Sep 17 00:00:00 2001 From: David Gault Date: Tue, 31 May 2022 15:58:19 +0100 Subject: [PATCH 320/996] Bump Bio-Formats version to 6.10.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 38d2635b..dc5a30eb 100644 --- a/pom.xml +++ b/pom.xml @@ -1136,7 +1136,7 @@ ${jxrlib-all.version} - 6.9.1 + 6.10.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From ee7c81232b4a302f4dd34bee76646b56e878d3f1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 14 Jun 2022 15:53:55 -0500 Subject: [PATCH 321/996] CI: cache ~/.m2/repository correctly --- .github/workflows/build-main.yml | 18 +++--------------- .github/workflows/build-pr.yml | 18 +++--------------- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml index 3fb56225..5ef56920 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build-main.yml @@ -13,24 +13,12 @@ jobs: steps: - uses: actions/checkout@v2 - - - name: Cache m2 folder - uses: actions/cache@v2 - env: - cache-name: cache-m2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-build-${{ env.cache-name }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - - name: Set up JDK 8 - uses: actions/setup-java@v2 + - name: Set up Java + uses: actions/setup-java@v3 with: java-version: '8' distribution: 'zulu' + cache: 'maven' - name: Set up CI environment run: .github/setup.sh - name: Execute the build diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 92a01926..925b5765 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -11,24 +11,12 @@ jobs: steps: - uses: actions/checkout@v2 - - - name: Cache m2 folder - uses: actions/cache@v2 - env: - cache-name: cache-m2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-build-${{ env.cache-name }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - - name: Set up JDK 8 - uses: actions/setup-java@v2 + - name: Set up Java + uses: actions/setup-java@v3 with: java-version: '8' distribution: 'zulu' + cache: 'maven' - name: Set up CI environment run: .github/setup.sh - name: Execute the build From e2e87ff25861f13c57e93abd38c5af3e776ba1bd Mon Sep 17 00:00:00 2001 From: hinerm Date: Fri, 13 May 2022 13:57:22 -0500 Subject: [PATCH 322/996] Bump script-editor-jython to 0.1.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc5a30eb..59812b78 100644 --- a/pom.xml +++ b/pom.xml @@ -406,7 +406,7 @@ ${script-editor.version} - 0.1.1 + 0.1.3 ${script-editor-jython.version} From ab7b6410dd812fe4cfe7beebd5dfa073d639f8b9 Mon Sep 17 00:00:00 2001 From: hinerm Date: Mon, 20 Jun 2022 09:31:34 -0500 Subject: [PATCH 323/996] Bump scifio to 0.43.2 (preemptive) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 59812b78..a1542e0c 100644 --- a/pom.xml +++ b/pom.xml @@ -618,7 +618,7 @@ - 0.43.1 + 0.43.2 ${scifio.version} From bd40e86638013d066910230541c5f05df6399e14 Mon Sep 17 00:00:00 2001 From: hinerm Date: Wed, 22 Jun 2022 14:56:04 -0500 Subject: [PATCH 324/996] Bump scifio-ome-xml to 0.17.0 Necessary for compatibility with the removal of OBF from SCIFIO. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1542e0c..a8c8e77a 100644 --- a/pom.xml +++ b/pom.xml @@ -642,7 +642,7 @@ ${scifio-lifesci.version} - 0.16.1 + 0.17.0 ${scifio-ome-xml.version} From a4efdeed0c5a128eb41ef1a9920741722a74d474 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Tue, 28 Jun 2022 11:39:26 -0400 Subject: [PATCH 325/996] Add Ejml (#203) Manage ejml as version 0.25 Co-authored-by: Jan Eglinger Co-authored-by: Curtis Rueden --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index a8c8e77a..495e9fce 100644 --- a/pom.xml +++ b/pom.xml @@ -1488,6 +1488,10 @@ ${org.eclipse.swt.win32.win32.x86.version} ${org.eclipse.swt.win32.win32.x86_64.version} + + 0.25 + ${ejml.version} + 0.120.0-alpha 0.117.2-alpha @@ -4264,6 +4268,13 @@ ${org.eclipse.swt.org.eclipse.swt.win32.win32.x86_64.version} + + + com.googlecode.efficient-java-matrix-library + ejml + ${com.googlecode.efficient-java-matrix-library.ejml.version} + + com.google.cloud From c32c23b2e1f098ebd85f2c3b91368352f1d1dc61 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Mon, 27 Jun 2022 21:42:28 +0200 Subject: [PATCH 326/996] Bump bigdataviewer versions ui-behaviour -> 2.0.6 bigdataviewer-core -> 10.4.1 bigdataviewer-vistools -> 1.0.0-beta-30 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 495e9fce..4682f1ff 100644 --- a/pom.xml +++ b/pom.xml @@ -458,7 +458,7 @@ ${swing-checkbox-tree.version} - 2.0.5 + 2.0.6 ${ui-behaviour.version} @@ -1002,7 +1002,7 @@ - 10.3.1 + 10.4.1 ${bigdataviewer-core.version} @@ -1010,7 +1010,7 @@ ${bigdataviewer-server.version} - 1.0.0-beta-29 + 1.0.0-beta-30 ${bigdataviewer-vistools.version} From 92e1c2bcaed02f4f89e6e2249942252738eb397f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 30 Jun 2022 16:43:41 -0500 Subject: [PATCH 327/996] Bump gson from 2.8.6 to 2.9.0 This includes a security fix identified by Dependabot: The package com.google.code.gson:gson before 2.8.9 is vulnerable to Deserialization of Untrusted Data via the writeReplace() method in internal classes, which may lead to denial of service attacks. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4682f1ff..d13e18f9 100644 --- a/pom.xml +++ b/pom.xml @@ -1511,7 +1511,7 @@ ${google-http-client-xml.version} - 2.8.6 + 2.9.0 ${gson.version} From 1329965deb1792e8cce9e1f334b789ac40bdeeae Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Tue, 19 Jul 2022 13:33:01 +0200 Subject: [PATCH 328/996] Bump bigdataviewer-core from 10.4.1 to 10.4.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d13e18f9..8df5ae88 100644 --- a/pom.xml +++ b/pom.xml @@ -1002,7 +1002,7 @@ - 10.4.1 + 10.4.2 ${bigdataviewer-core.version} From 0ce3c70abb71eed5362c0c2b10090d4c09472120 Mon Sep 17 00:00:00 2001 From: hinerm Date: Thu, 21 Jul 2022 10:57:03 -0500 Subject: [PATCH 329/996] Bump OMERO component versions --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 8df5ae88..83935ac0 100644 --- a/pom.xml +++ b/pom.xml @@ -1149,11 +1149,11 @@ ${formats-gpl.version} - 5.5.8 + 5.5.10 ${omero-blitz.version} - 5.5.7 + 5.5.9 ${omero-common.version} @@ -1161,23 +1161,23 @@ ${omero-dsl-plugin.version} - 5.6.7 + 5.6.9 ${omero-gateway.version} - 5.6.3 + 5.6.5 ${omero-model.version} - 5.5.7 + 5.5.9 ${omero-renderer.version} - 5.6.2 + 5.6.4 ${omero-romio.version} - 5.6.1 + 5.6.3 ${omero-server.version} From d8d2f3e2833b446bdbd402241d6b3e993c03f5e8 Mon Sep 17 00:00:00 2001 From: hinerm Date: Thu, 21 Jul 2022 11:01:17 -0500 Subject: [PATCH 330/996] Manage zeroc software dependencies Add version and dependency management for ice and glacier2 --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index 83935ac0..b5465d03 100644 --- a/pom.xml +++ b/pom.xml @@ -1114,6 +1114,10 @@ + + 3.6.5 + ${ice.version} + 6.0.7 ${ome-common.version} @@ -3205,6 +3209,18 @@ + + + com.zeroc + glacier2 + ${glacier2.version} + + + com.zeroc + ice + ${ice.version} + + org.openmicroscopy From 9886b0ad01069adf9d294c54a65803ea19039115 Mon Sep 17 00:00:00 2001 From: hinerm Date: Thu, 21 Jul 2022 11:07:05 -0500 Subject: [PATCH 331/996] Update imagej-omero component versions Bump to 1.0.0-5.6 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b5465d03..a041d617 100644 --- a/pom.xml +++ b/pom.xml @@ -510,11 +510,11 @@ ${imagej-notebook.version} - 1.0.0-5.5 + 1.0.0-5.6 ${imagej-omero.version} - 1.0.0-5.5 + 1.0.0-5.6 ${imagej-omero-legacy.version} From a09e8272df1185588588f0de28a3dc7082596400 Mon Sep 17 00:00:00 2001 From: David Gault Date: Mon, 15 Aug 2022 15:46:39 +0100 Subject: [PATCH 332/996] Bump Bio-Formats version to 6.10.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a041d617..048a0735 100644 --- a/pom.xml +++ b/pom.xml @@ -1140,7 +1140,7 @@ ${jxrlib-all.version} - 6.10.0 + 6.10.1 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From cab455c2e20d29782a00f8f0b78b7526bfff7939 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 15 Aug 2022 16:15:40 -0500 Subject: [PATCH 333/996] Exclude xalan from bio-formats_tools The xalan artifact appears to be an uber-JAR containing classes from other projects, which is why we exclude it everywhere, even though Bio-Formats needs it at runtime for 100% correct XML-related behavior... In this specific case, the errors we are avoiding are as follows: No Duplicate Classes Allowed! - For duplicate transitive dependencies, add dependency exclusions. - For duplications between direct dependencies, resolve or add ignored classes to this rule's configuration. Found in: com.github.vbmacher:java-cup:jar:11b-20160615:compile xalan:xalan:jar:2.7.2:runtime Duplicate packages: java_cup/runtime Found in: xalan:xalan:jar:2.7.2:runtime regexp:regexp:jar:1.3:compile Duplicate packages: org/apache/regexp --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 048a0735..56f1074d 100644 --- a/pom.xml +++ b/pom.xml @@ -3308,6 +3308,10 @@ xalan serializer + + xalan + xalan + From e08c51ecca6b2b61d45abdeb45f6891905dc9d47 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 16 Aug 2022 12:41:35 -0500 Subject: [PATCH 334/996] mega-melt: log melting pot generation output --- tests/run.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index c7497436..586c2a18 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -26,6 +26,7 @@ megaMeltPOM="$megaMeltDir/pom.xml" meltingPotLocal="$dir/../../scijava-scripts/melting-pot.sh" meltingPotURL=https://raw.githubusercontent.com/scijava/scijava-scripts/main/melting-pot.sh meltingPotScript="$megaMeltDir/melting-pot.sh" +meltingPotLog="$megaMeltDir/melting-pot.log" meltingPotDir="$megaMeltDir/melting-pot" rm -rf "$megaMeltDir" && mkdir -p "$megaMeltDir" || die "Creation of $megaMeltDir failed!" @@ -81,7 +82,8 @@ chmod +x "$meltingPotScript" && -e 'org.scijava:jep' \ -e 'org.scijava:junit-benchmarks' \ -e 'org.scijava:vecmath' \ - -f -v -s $@ | grep -v '\(Skipping the build\|Melt complete\)' || die 'Melting pot build failed!' + -f -v -s $@ 2>&1 | tee "$meltingPotLog" || + die 'Melting pot build failed!' # HACK: Remove known-duplicate artifactIds from version property overrides. # The plan is for this step to become unnecessary once the melting pot has From b2650c125af08f04a04bc1c322fcd90925cb127e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 16 Aug 2022 13:17:00 -0500 Subject: [PATCH 335/996] mega-melt: do not include the original ImageJ ImageJ requires Java 9+ to compile, but the rest of the components require Java 8 with JavaFX. There is no single Java compiler that can be used in both scenarios. Anyway, the original ImageJ has no dependencies, so no changes to version pins will affect its compilation regardless, making it pointless to include in the mega melt. --- tests/generate-mega-melt.py | 4 ++++ tests/run.sh | 1 + 2 files changed, 5 insertions(+) diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index 8b3a1d7b..c50e00ca 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -21,6 +21,10 @@ def child(node, tag): # Artifacts to exclude from the mega melt. ignoredArtifacts = [ + # TEMP: The original ImageJ requires Java 9+ to compile, + # because it has a module-info.java, so skip it until the + # component collection is updated from Java 8 to Java 11. + 'ij', # TEMP: Until imagej-omero is updated for pom-scijava 29. 'imagej-omero', 'imagej-omero-legacy', diff --git a/tests/run.sh b/tests/run.sh index 586c2a18..3a2a3b7a 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -75,6 +75,7 @@ chmod +x "$meltingPotScript" && -i 'org.janelia:*' \ -i 'org.scijava:*' \ -i 'sc.fiji:*' \ + -e 'net.imagej:ij' \ -e 'org.janelia.saalfeldlab:n5-blosc' \ -e 'org.janelia.saalfeldlab:n5-zarr' \ -e 'org.scijava:j3dcore' \ From 6b7a68a2725b2c3da5ad239bae3a97ba15710c34 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 16 Aug 2022 13:27:23 -0500 Subject: [PATCH 336/996] mega-melt: fix POM adjustment on macOS BSD sed strikes again. --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index 3a2a3b7a..e7b429db 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -105,7 +105,7 @@ printf 'Adjusting melting pot project POMs... ' && find "$meltingPotDir" -name pom.xml | while read pom do mv "$pom" "$pom.original" && - sed -e 's_\(https\?://maven.imagej.net\|http://maven.scijava.org\)_https://maven.scijava.org_g' \ + sed -E -e 's_(https?://maven.imagej.net|http://maven.scijava.org)_https://maven.scijava.org_g' \ -e 's_http://maven.apache.org/xsd_https://maven.apache.org/xsd_g' "$pom.original" > "$pom" || die "Failed to adjust $pom" done From 90f39bbb8d0abb435875f6eb308acafb40b64c7f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 16 Aug 2022 14:41:28 -0500 Subject: [PATCH 337/996] Update HDF5_Vibez: 1.1.0 -> 1.1.1 This brings it in line with jhdf5 19.04.0. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56f1074d..7a71e2a6 100644 --- a/pom.xml +++ b/pom.xml @@ -764,7 +764,7 @@ 1.1.3 ${H5J_Loader_Plugin.version} - 1.1.0 + 1.1.1 ${HDF5_Vibez.version} 2.0.2 From 04472e3f58071a4550910d7aa4d682e8a1d42ce7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 16 Aug 2022 15:01:36 -0500 Subject: [PATCH 338/996] Update guava: 21.0 -> 27.1-jre The google-cloud-core component at the managed version requires a version of Guava newer than 21.0, due to the Maven build mechanism trying to pull in the Guava BOM at version ${guava.version}. But version 21.0 of guava does not have guava-bom yet. So an error like the following occurs: [ERROR] Failed to execute goal on project n5-google-cloud: Could not resolve dependencies for project org.janelia.saalfeldlab:n5-google-cloud:jar:3.3.2: Failed to collect dependencies at com.google.cloud:google-cloud-storage:jar:1.108.0 -> com.google.cloud:google-cloud-core:jar:1.93.4: Failed to read artifact descriptor for com.google.cloud:google-cloud-core:jar:1.93.4: Could not find artifact com.google.guava:guava-bom:pom:21.0 in scijava.public (https://maven.scijava.org/content/groups/public) -> [Help 1] So we are forced to upgrade Guava. I hope the fallout is minimal. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7a71e2a6..95a948c6 100644 --- a/pom.xml +++ b/pom.xml @@ -1519,7 +1519,7 @@ ${gson.version} - 21.0 + 27.1-jre ${guava.version} From b87837dbc481262aa2b59fde6112db2f9ba57c75 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 16 Aug 2022 15:19:57 -0500 Subject: [PATCH 339/996] Update imagej-ops: 0.46.1 -> 0.48.0 This brings it in line with parsington 3.0.0. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95a948c6..968e486a 100644 --- a/pom.xml +++ b/pom.xml @@ -522,7 +522,7 @@ ${imagej-opencv.version} - 0.46.1 + 0.48.0 ${imagej-ops.version} From 6cd6c9f0b81415891ea6e3a129d300d079d6a8b3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 16 Aug 2022 17:20:21 -0500 Subject: [PATCH 340/996] Stop excluding xml-apis This is a tricky situation. The xml-apis component contains classes that also ship with the core JRE. However, there can be cases where something wants to build against a newer version of the XML APIs than is provided by the version of Java being used to build. For example, when testing the org.janelia.saalfeldlab:n5-viewer_fiji component with the latest BOM as of this writing, I encountered the following error: [ERROR] sixDimTests(org.janelia.saalfeldlab.n5.bdv.BdvAxisMetadataTest) Time elapsed: 0.653 s <<< ERROR! java.lang.NoClassDefFoundError: org/w3c/dom/ElementTraversal at org.janelia.saalfeldlab.n5.bdv.BdvAxisMetadataTest.setUp(BdvAxisMetadataTest.java:27) Caused by: java.lang.ClassNotFoundException: org.w3c.dom.ElementTraversal at org.janelia.saalfeldlab.n5.bdv.BdvAxisMetadataTest.setUp(BdvAxisMetadataTest.java:27) And BdvAxisMetadataTest:27 is a call to: new org.janelia.saalfeldlab.n5.N5FSReader(...) Which is part of org.janelia.saalfeldlab:n5 The org.w3c.dom.ElementTraversal class is part of xml-apis v1.4.01, but not part of the Java 8 JRE. It *is* part of the Java 11 JRE, though. This leads me to conclude that somehow, n5 or one of its dependencies was built against a version of xml-apis newer than what Java 8 provides, and the reference to the ElementTraversal class made it into the bytecode, and then when classes are being loaded, we see this crash. Anyway, the problem goes away if we stop excluding xml-apis, because then everything that wants to build against xml-apis at compile time, and depend on it at runtime, can do so, rather than relying on the core JRE XML classes. Although... I believe the core JRE XML classes still take precedence over the user classpath, so really, it's then relying on a *mixture* of the core JRE XML classes plus xml-apis, and that seems like a bad idea to me, but what I do I know. --- pom.xml | 113 +++----------------------------------------------------- 1 file changed, 6 insertions(+), 107 deletions(-) diff --git a/pom.xml b/pom.xml index 968e486a..e256f779 100644 --- a/pom.xml +++ b/pom.xml @@ -209,6 +209,11 @@ org.apache.maven:maven-core (guice) + org.apache.maven.shared:maven-common-artifact-filters (sisu-guice) == + Class: javax.xml.namespace.QName + Part of: Java Runtime Environment + Also in: xml-apis:xml-apis, xpp3:xpp3 + Enables: xml-apis:xml-apis + xpp3:xpp3 + == TEMP: Until scijava/scripting-jruby#5 is resolved. Classes: jnr.ffi.* Part of: com.github.jnr:jnr-ffi @@ -256,7 +261,7 @@ Part of: org.jzy3d:jzy3d-core, org.jzy3d:jzy3d-native-jogl-awt Enables: org.jzy3d:jzy3d-core + org.jzy3d:jzy3d-native-jogl-awt --> - com.google.inject.*,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.jetbrains.kotlin.daemon.common.*,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* + com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.jetbrains.kotlin.daemon.common.*,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* From ef53474a4e21290abf401841a11871bbdb87ea88 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 16 Aug 2022 17:30:02 -0500 Subject: [PATCH 341/996] Update trakem2_tps: 1.1.4 -> 2.0.0 This replaces the log4j dependency with slf4j-api. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e256f779..3bfabdb2 100644 --- a/pom.xml +++ b/pom.xml @@ -997,7 +997,7 @@ ${mpicbg_.version} - 1.1.4 + 2.0.0 ${trakem2_tps.version} From 3aa9c04693f993a3e04f7307dd962c6a4efeb225 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 17 Aug 2022 06:34:46 -0500 Subject: [PATCH 342/996] Update MaMuT: 7.0.2 -> 7.0.6 This brings it in line with bigdataviewer 10.4.3. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3bfabdb2..51cea5ed 100644 --- a/pom.xml +++ b/pom.xml @@ -1096,7 +1096,7 @@ - 7.0.2 + 7.0.6 ${MaMuT.version} From 3cd1b1f1b02237509f099cb58c4239952f6ee017 Mon Sep 17 00:00:00 2001 From: hinerm Date: Wed, 17 Aug 2022 09:14:01 -0500 Subject: [PATCH 343/996] Add args4j management --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index 51cea5ed..41778cb5 100644 --- a/pom.xml +++ b/pom.xml @@ -1238,6 +1238,9 @@ + + 2.33 + 1.11.796 ${aws-java-sdk-s3.version} @@ -3574,6 +3577,13 @@ + + + args4j + args4j + ${args4j.version} + + com.amazonaws From dc4ca50b61f939298ab12b68018545a42eb37d2e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 17 Aug 2022 16:44:56 -0500 Subject: [PATCH 344/996] Update jhdf5: 19.04.0 -> 19.04.1 This introduces support for M1 Macs. Thanks to @mkitti for driving this work. --- non-maven/jhdf5-19.04.1.pom | 66 +++++++++++++++++++++++++++++++++++++ pom.xml | 2 +- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 non-maven/jhdf5-19.04.1.pom diff --git a/non-maven/jhdf5-19.04.1.pom b/non-maven/jhdf5-19.04.1.pom new file mode 100644 index 00000000..7c1b70d2 --- /dev/null +++ b/non-maven/jhdf5-19.04.1.pom @@ -0,0 +1,66 @@ + + + 4.0.0 + + cisd + jhdf5 + 19.04.1 + + JHDF5 (HDF5 for Java) + + HDF5 is an efficient, well-documented, non-proprietary binary data format + and library developed and maintained by the HDF Group. The library provided + by the HDF Group is written in C and available under a liberal BSD-style + Open Source software license. It has over 600 API calls and is very powerful + and configurable, but it is not trivial to use. + + JHDF5 is a Java binding for HDF5 focusing on ease-of-use, which was + developed by CISD and is now maintained by ETH SIS. It is available under + the Apache License 2.0. The library contains HDF5 1.10 from the HDF Group + and files created with JHDF5 are fully compatible with HDF 1.10 (or HDF5 1.8 + if you initialize the library appropriately). + + https://unlimited.ethz.ch/display/JHDF/ + + ETH Zurich Scientific IT Services + https://sis.id.ethz.ch/ + + + + Apache 2 + https://apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:git:https://sissource.ethz.ch/sispub/jhdf5 + scm:git:https://sissource.ethz.ch/sispub/jhdf5 + 19.04.1 + https://sissource.ethz.ch/sispub/jhdf5 + + + + 18.09.0 + 2.6 + 3.7 + + + + + cisd + base + ${base.version} + + + commons-io + commons-io + ${commons-io.version} + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + diff --git a/pom.xml b/pom.xml index 41778cb5..b4ef2810 100644 --- a/pom.xml +++ b/pom.xml @@ -1683,7 +1683,7 @@ ${jgraphx.version} - 19.04.0 + 19.04.1 ${jhdf5.version} From bb09a90598f37619b81c0f1068891c69040a6299 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 17 Aug 2022 16:51:15 -0500 Subject: [PATCH 345/996] Update scifio-ome-xml: 0.17.0 -> 0.17.1 This brings it in line with scifio 0.43.1. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b4ef2810..5e0b18ac 100644 --- a/pom.xml +++ b/pom.xml @@ -647,7 +647,7 @@ ${scifio-lifesci.version} - 0.17.0 + 0.17.1 ${scifio-ome-xml.version} From f4677f6def170e860a10a2e68e15c3ef6b3f1052 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 18 Aug 2022 12:52:28 -0500 Subject: [PATCH 346/996] mega-melt: fail fast if melting-pot build fails --- tests/run.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/run.sh b/tests/run.sh index e7b429db..a1333ab5 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -60,6 +60,12 @@ then else curl -fsL "$meltingPotURL" > "$meltingPotScript" fi && + +# Prevent tee from eating the melting-pot error code. +# See: https://stackoverflow.com/a/6872163/1207769 +set -o pipefail + +# Build the melting pot structure. chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ -o "$meltingPotDir" \ @@ -86,6 +92,9 @@ chmod +x "$meltingPotScript" && -f -v -s $@ 2>&1 | tee "$meltingPotLog" || die 'Melting pot build failed!' +# Restore original exit code behavior. +set +o pipefail + # HACK: Remove known-duplicate artifactIds from version property overrides. # The plan is for this step to become unnecessary once the melting pot has # been improved to include a strategy for dealing with components with same From 1f2dcc608e2f6bad4c5f775b797e3b9279ce9a15 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 18 Aug 2022 16:40:06 -0500 Subject: [PATCH 347/996] mega-melt: skip problematic project tests Some projects have tests that are not well-behaved cross-platform on plain systems. Let's skip those to avoid headaches, with comments describing why each one is excluded from testing. --- tests/run.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/run.sh b/tests/run.sh index a1333ab5..bf9f3bb9 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -28,6 +28,8 @@ meltingPotURL=https://raw.githubusercontent.com/scijava/scijava-scripts/main/mel meltingPotScript="$megaMeltDir/melting-pot.sh" meltingPotLog="$megaMeltDir/melting-pot.log" meltingPotDir="$megaMeltDir/melting-pot" +skipTestsFile="$meltingPotDir/skipTests.txt" +meltScript="$meltingPotDir/melt.sh" rm -rf "$megaMeltDir" && mkdir -p "$megaMeltDir" || die "Creation of $megaMeltDir failed!" cp "$pom" "$pomParent" && @@ -118,6 +120,29 @@ do -e 's_http://maven.apache.org/xsd_https://maven.apache.org/xsd_g' "$pom.original" > "$pom" || die "Failed to adjust $pom" done +echo 'Done!' + +# HACK: Skip tests for projects with known problems. + +echo && +printf 'Adjusting melting pot melt script... ' && +mv "$meltScript" "$meltScript.original" && +sed 's_\s*sh "$dir/build.sh"_\ +# HACK: If project is on the skipTests list, then skip the tests.\ +buildFlags=\ +grep -qF ":$f:" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ +\ +& $buildFlags_' "$meltScript.original" > "$meltScript" || + die "Failed to adjust $meltScript" +echo 'Done!' + +# com.amazonaws.services.s3.model.AmazonS3Exception: The specified bucket does +# not exist (Service: Amazon S3; Status Code: 404; Error Code: NoSuchBucket; +# Request ID: null; S3 Extended Request ID: null; Proxy: null) +echo ":org.janelia.saalfeldlab/n5-aws-s3:" > "$skipTestsFile" + +# Error while checking the CLIJ2 installation: null +echo ":sc.fiji/labkit-pixel-classification:" >> "$skipTestsFile" # Run the melting pot now, unless -s flag was given. doMelt=t From e05673bb74118b3a1a77a22c10e09ab67a05f92f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 18 Aug 2022 16:41:37 -0500 Subject: [PATCH 348/996] mega-melt: add n5-blosc and n5-zarr They were excluded because their tests are problematic. But now we have a mechanism to skip their unit tests, while still testing their compilation step. So let's do that. --- tests/generate-mega-melt.py | 4 ---- tests/run.sh | 6 ++++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index c50e00ca..4b436e4a 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -41,10 +41,6 @@ def child(node, tag): 'jep', 'junit-benchmarks', 'vecmath', - # NB: The following artifacts require native libraries to - # build/test successfully, which might not be installed. - 'n5-blosc', - 'n5-zarr', # NB: All the SWT platform JARs have the same classes. # The current platform will be brought in transitively. 'org.eclipse.swt.cocoa.macosx', diff --git a/tests/run.sh b/tests/run.sh index bf9f3bb9..aa2cc275 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -84,8 +84,6 @@ chmod +x "$meltingPotScript" && -i 'org.scijava:*' \ -i 'sc.fiji:*' \ -e 'net.imagej:ij' \ - -e 'org.janelia.saalfeldlab:n5-blosc' \ - -e 'org.janelia.saalfeldlab:n5-zarr' \ -e 'org.scijava:j3dcore' \ -e 'org.scijava:j3dutils' \ -e 'org.scijava:jep' \ @@ -141,6 +139,10 @@ echo 'Done!' # Request ID: null; S3 Extended Request ID: null; Proxy: null) echo ":org.janelia.saalfeldlab/n5-aws-s3:" > "$skipTestsFile" +# java.lang.UnsatisfiedLinkError: Unable to load library 'blosc' +echo ":org.janelia.saalfeldlab/n5-blosc:" >> "$skipTestsFile" +echo ":org.janelia.saalfeldlab/n5-zarr:" >> "$skipTestsFile" + # Error while checking the CLIJ2 installation: null echo ":sc.fiji/labkit-pixel-classification:" >> "$skipTestsFile" From 516dfaddcd8dba1aa52d53850d5f9ab14390d5bd Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 18 Aug 2022 16:42:13 -0500 Subject: [PATCH 349/996] mega-melt: enable imagej-omero artifacts Thanks to @hinerm's hard work, ImageJ-OMERO is functional again, and version 1.0.0-5.5 has been released. Let's add it to the melting pot. --- tests/generate-mega-melt.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index 4b436e4a..0cfd7f68 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -25,9 +25,6 @@ def child(node, tag): # because it has a module-info.java, so skip it until the # component collection is updated from Java 8 to Java 11. 'ij', - # TEMP: Until imagej-omero is updated for pom-scijava 29. - 'imagej-omero', - 'imagej-omero-legacy', # NB: The following artifacts have messy dependency trees. # Too many problems to test as part of the mega-melt. # See WARNING block in pom-scijava's pom.xml for details. From 623d3eac58efc28bdeb544af9f50ddcecb2a2c75 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Aug 2022 10:00:15 -0500 Subject: [PATCH 350/996] Update bigdataviewer-server: 3.0.0 -> 3.1.0 This brings it in line with bigdataviewer-core 10.4.2. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e0b18ac..549ea887 100644 --- a/pom.xml +++ b/pom.xml @@ -1011,7 +1011,7 @@ ${bigdataviewer-core.version} - 3.0.0 + 3.1.0 ${bigdataviewer-server.version} From fe9065a4a536c4b665fac7a64c55c3ef9f1253fb Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 23 Aug 2022 14:13:32 -0500 Subject: [PATCH 351/996] Reintroduce org.morphonets:SNT This reverts commit 7e81353bc0a004622fc94c35aec2cfe42cdb33ee, but with the latest 4.1.2 version of SNT, which improves its dependency structure, making scenery optional and excluding biojava. And it adds the org.morphonets groupId to the mega-melt. --- pom.xml | 17 +++++++++++------ tests/run.sh | 1 + 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 549ea887..ee2f4230 100644 --- a/pom.xml +++ b/pom.xml @@ -1104,6 +1104,10 @@ ${MorphoLibJ.version} ${MorphoLibJ_.version} + + 4.1.2 + ${SNT.version} + 7.0.13 ${bonej.version} @@ -3101,12 +3105,6 @@ sc.fiji TrakEM2_ ${sc.fiji.TrakEM2_.version} - - - org.morphonets - SNT - - sc.fiji @@ -3188,6 +3186,13 @@ ${fr.inra.ijpb.MorphoLibJ_.version} + + + org.morphonets + SNT + ${org.morphonets.SNT.version} + + org.bonej diff --git a/tests/run.sh b/tests/run.sh index aa2cc275..30b7a84f 100644 --- a/tests/run.sh +++ b/tests/run.sh @@ -81,6 +81,7 @@ chmod +x "$meltingPotScript" && -i 'org.bonej:*' \ -i 'org.janelia.saalfeldlab:*' \ -i 'org.janelia:*' \ + -i 'org.morphonets:*' \ -i 'org.scijava:*' \ -i 'sc.fiji:*' \ -e 'net.imagej:ij' \ From f03d919fc44e93802320a8934a2fb3672a3ad68a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 23 Aug 2022 16:43:04 -0500 Subject: [PATCH 352/996] Update pom-scijava-base parent: 15.0.1 -> 15.0.3 * Fix Eclipse warning about maven-help-plugin * Improve "mvn -Pexec" and make "mvn exec:java" work * Improve scijava.platform.* and scijava.natives.* properties --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ee2f4230..66627500 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 15.0.1 + 15.0.3 From dd8ee11c4bdca48881aceca1767d54d376a1c15c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 23 Aug 2022 16:49:16 -0500 Subject: [PATCH 353/996] Update n5-hdf5: 1.4.1 -> 1.4.2 This brings it in line with jhdf5 19.04.1 and n5 2.5.1. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66627500..c346345f 100644 --- a/pom.xml +++ b/pom.xml @@ -1072,7 +1072,7 @@ ${n5-google-cloud.version} - 1.4.1 + 1.4.2 ${n5-hdf5.version} From d853fe95ec5f7454272a8e542b78186b8934a2d7 Mon Sep 17 00:00:00 2001 From: hinerm Date: Wed, 24 Aug 2022 14:40:35 -0500 Subject: [PATCH 354/996] Add kotlin-scripting-jsr223 management Used by scripting-kotlin and sciview --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index c346345f..47cd6b63 100644 --- a/pom.xml +++ b/pom.xml @@ -1773,6 +1773,7 @@ ${kotlin.version} ${kotlin.version} ${kotlin.version} + ${kotlin.version} ${kotlin.version} ${kotlin.version} ${kotlin.version} @@ -1784,6 +1785,7 @@ ${kotlin-script-util.version} ${kotlin-scripting-common.version} ${kotlin-scripting-compiler-embeddable.version} + ${kotlin-scripting-jsr223.version} ${kotlin-scripting-jvm.version} ${kotlin-stdlib.version} ${kotlin-stdlib-common.version} @@ -4695,6 +4697,11 @@ kotlin-scripting-compiler-embeddable ${org.jetbrains.kotlin.kotlin-scripting-compiler-embeddable.version} + + org.jetbrains.kotlin + kotlin-scripting-jsr223 + ${org.jetbrains.kotlin.kotlin-scripting-jsr223.version} + org.jetbrains.kotlin kotlin-scripting-jvm From 2e4b55c307854a2b206db35343b890ddd60ade58 Mon Sep 17 00:00:00 2001 From: hinerm Date: Thu, 25 Aug 2022 09:14:57 -0500 Subject: [PATCH 355/996] Bump jitk-tps to 3.0.3 Now consistent with managed EJML --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47cd6b63..77d0c884 100644 --- a/pom.xml +++ b/pom.xml @@ -982,7 +982,7 @@ - 3.0.2 + 3.0.3 ${jitk-tps.version} From 2403cb775dd8102b5d6573674ee0668a25c31eb5 Mon Sep 17 00:00:00 2001 From: hinerm Date: Thu, 25 Aug 2022 09:35:51 -0500 Subject: [PATCH 356/996] Bump scripting-kotlin to 0.2.1 Now consistent with managed kotlin version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 77d0c884..46f6a261 100644 --- a/pom.xml +++ b/pom.xml @@ -443,7 +443,7 @@ ${scripting-jython.version} - 0.2.0 + 0.2.1 ${scripting-kotlin.version} From 30d038e63687e7a4c7bdbb90374ee11b69af1a74 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 25 Aug 2022 10:03:43 -0500 Subject: [PATCH 357/996] mega-melt: use bash to execute Unfortunately, the pipefail flag is not POSIX-friendly, or at least not supported by dash. So to make this script work on Linux, we need to use a shell that supports it (e.g. bash or zsh). --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 tests/run.sh diff --git a/tests/run.sh b/tests/run.sh old mode 100644 new mode 100755 index 30b7a84f..27aa05cd --- a/tests/run.sh +++ b/tests/run.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # run.sh - Tests correctness of the pom-scijava BOM. From c0648a3050e333409cb138cd55f5066f609e42fc Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 25 Aug 2022 13:45:19 -0500 Subject: [PATCH 358/996] Update component versions * scijava-common: 2.88.1 -> 2.89.0 * scripting-beanshell: 0.3.4 -> 0.4.0 * ui-behaviour: 2.0.6 -> 2.0.7 * ij: 1.53r -> 1.53t * Fiji_Plugins: 3.1.1 -> 3.1.2 * TrackMate: 7.6.1 -> 7.7.2 * Trainable_Segmentation: 3.3.1 -> 3.3.2 * bigwarp: 7.0.5 -> 7.0.6 * bigdataviewer-core: 10.4.2 -> 10.4.3 * spim_data: 2.2.6 -> 2.2.7 * imglib2-label-multisets: 0.11.0 -> 0.11.4 * n5-ij: 3.2.0 -> 3.2.2 * ome-common: 6.0.7 -> 6.0.13 * metakit: 5.3.3 -> 5.3.4 * ome-poi: 5.3.4 -> 5.3.7 * ome-xml: 6.3.0 -> 6.3.1 * labkit-ui: 0.3.0 -> 0.3.7 * labkit.pixel-classification: 0.1.13 -> 0.1.14 --- pom.xml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 46f6a261..bddaf264 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.88.1 + 2.89.0 ${scijava-common.version} @@ -415,7 +415,7 @@ ${script-editor-jython.version} - 0.3.4 + 0.4.0 ${scripting-beanshell.version} @@ -463,7 +463,7 @@ ${swing-checkbox-tree.version} - 2.0.6 + 2.0.7 ${ui-behaviour.version} @@ -474,7 +474,7 @@ ${imagej.version} - 1.53r + 1.53t ${imagej1.version} ${ij.version} @@ -750,7 +750,7 @@ 2.1.1 ${Fiji_Package_Maker.version} - 3.1.1 + 3.1.2 ${Fiji_Plugins.version} 2.0.0 @@ -908,10 +908,10 @@ ${TopoJ.version} ${TopoJ_.version} - 7.6.1 + 7.7.2 ${TrackMate.version} - 3.3.1 + 3.3.2 ${Trainable_Segmentation.version} 2.0.3 @@ -986,7 +986,7 @@ ${jitk-tps.version} - 7.0.5 + 7.0.6 ${bigwarp.version} ${bigwarp_fiji.version} @@ -1007,7 +1007,7 @@ - 10.4.2 + 10.4.3 ${bigdataviewer-core.version} @@ -1023,7 +1023,7 @@ ${bigdataviewer_fiji.version} - 2.2.6 + 2.2.7 ${spim_data.version} @@ -1052,7 +1052,7 @@ - 0.11.0 + 0.11.4 ${imglib2-label-multisets.version} @@ -1076,7 +1076,7 @@ ${n5-hdf5.version} - 3.2.0 + 3.2.2 ${n5-ij.version} @@ -1128,19 +1128,19 @@ ${ice.version} - 6.0.7 + 6.0.13 ${ome-common.version} - 5.3.3 + 5.3.4 ${metakit.version} - 5.3.4 + 5.3.7 ${ome-poi.version} - 6.3.0 + 6.3.1 ${ome-xml.version} @@ -1792,9 +1792,9 @@ ${kotlin-stdlib-jdk8.version} - 0.3.0 + 0.3.7 ${labkit-ui.version} - 0.1.13 + 0.1.14 ${labkit.pixel-classification.version} From 44784c5793b66212c3bee75fe0197af6b493bc4f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 25 Aug 2022 17:21:51 -0500 Subject: [PATCH 359/996] Update SPIM_Registration: 5.0.22 -> 5.0.23 This un-excludes xml-apis as a dependency, so that org.janelia.saalfeldlab:n5-viewer_fiji and sc.fiji:fiji inherit it and work correctly at runtime; see 6cd6c9f0b81415891ea6e3a129d300d079d6a8b3. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bddaf264..b9974ca0 100644 --- a/pom.xml +++ b/pom.xml @@ -854,7 +854,7 @@ 2.0.2 ${SPIM_Opener.version} - 5.0.22 + 5.0.23 ${SPIM_Registration.version} 2.0.3 From e5534a46846d313248ef248a56c2bed12f8d4c82 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 25 Aug 2022 19:02:16 -0500 Subject: [PATCH 360/996] Update TrakEM2: 1.3.6 -> 1.3.7 This brings it in line with SNT 4.1.2, and makes the SNT dependency optional. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9974ca0..73b7b4ae 100644 --- a/pom.xml +++ b/pom.xml @@ -1037,7 +1037,7 @@ ${T2-TreelineGraph.version} - 1.3.6 + 1.3.7 ${TrakEM2.version} ${TrakEM2_.version} From 9a5c4057efc6f940171152f5373507bfc636f660 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 25 Aug 2022 21:55:16 -0500 Subject: [PATCH 361/996] mega-melt: add hack for imagej1.version property This property was used for the net.imagej:ij version prior to pom-scijava 28.0.0. Older releases (e.g. sc.fiji:KymographBuilder:2.1.1) built on too-old pom-scijava parents cannot update their net.imagej:ij version based on consistently named net.imagej.ij.version nor ij.version property overrides, since those properties had not yet been introduced. --- tests/run.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index 27aa05cd..0977fcd1 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -105,10 +105,16 @@ buildScriptBackup="$buildScript.original" echo && printf 'Adjusting melting pot build script... ' && mv "$buildScript" "$buildScriptBackup" && -awk '!/-D(annotations|antlr|jocl|kryo|minlog|opencsv|trove4j)\.version/' "$buildScriptBackup" > "$buildScript" || +awk '!/-D(annotations|antlr|jocl|kryo|minlog|opencsv|trove4j)\.version/' "$buildScriptBackup" > "$buildScript" && +# HACK: Add non-standard net.imagej:ij version property used prior to +# pom-scijava 28.0.0; see 7d2cc442b107b3ac2dcb799d282f2c0b5822649d. +mv "$buildScript" "$buildScriptBackup" && +sed -E 's_ -Dij\.version=([^ ]*)_& -Dimagej1.version=\1_' "$buildScriptBackup" > "$buildScript" || die 'Error adjusting melting pot build script!' echo 'Done!' +echo && + # HACK: Adjust component POMs to satisfy Maven HTTPS strictness. echo && printf 'Adjusting melting pot project POMs... ' && From 8fe8caac9c93f939e4d360e803143e703d2e4ce1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 11:24:27 -0500 Subject: [PATCH 362/996] Update scripting-groovy: 0.4.1 -> 0.4.2 This fixes a NullPointerException when caching imports in some cases. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 73b7b4ae..bffd453b 100644 --- a/pom.xml +++ b/pom.xml @@ -423,7 +423,7 @@ ${scripting-clojure.version} - 0.4.1 + 0.4.2 ${scripting-groovy.version} From b49a1dd98c4d86bba465c95bc9effe73617fa18f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 11:52:44 -0500 Subject: [PATCH 363/996] Update scijava-ui-swing: 0.14.0 -> 0.15.0 This introduces new API for working with tasks from the TaskService. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bffd453b..da1b3137 100644 --- a/pom.xml +++ b/pom.xml @@ -403,7 +403,7 @@ ${scijava-ui-awt.version} - 0.14.0 + 0.15.0 ${scijava-ui-swing.version} From 314d24670eb995d6c01374e2972e90b5543fe4e3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 13:12:13 -0500 Subject: [PATCH 364/996] mega-melt: fail fast if no melting-pot script --- tests/run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index 0977fcd1..b06bfde4 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -61,7 +61,8 @@ then cp "$meltingPotLocal" "$meltingPotScript" else curl -fsL "$meltingPotURL" > "$meltingPotScript" -fi && +fi || + die "Failed to obtain melting pot script!" # Prevent tee from eating the melting-pot error code. # See: https://stackoverflow.com/a/6872163/1207769 From 3196faa258098caabd15b549f904ebb8c41f09ab Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 13:12:48 -0500 Subject: [PATCH 365/996] mega-melt: fix melting-pot fail fast behavior Even with pipefail, it wasn't propagating the error code, so the mega-melt process was continuing erroneously. The good thing is: without the POSIX-unfriendly pipefail flag, we can go back to /bin/sh now. --- tests/run.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index b06bfde4..93ac85c8 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # # run.sh - Tests correctness of the pom-scijava BOM. @@ -64,10 +64,6 @@ else fi || die "Failed to obtain melting pot script!" -# Prevent tee from eating the melting-pot error code. -# See: https://stackoverflow.com/a/6872163/1207769 -set -o pipefail - # Build the melting pot structure. chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ @@ -91,11 +87,13 @@ chmod +x "$meltingPotScript" && -e 'org.scijava:jep' \ -e 'org.scijava:junit-benchmarks' \ -e 'org.scijava:vecmath' \ - -f -v -s $@ 2>&1 | tee "$meltingPotLog" || - die 'Melting pot build failed!' + -f -v -s $@ 2>&1 | tee "$meltingPotLog" -# Restore original exit code behavior. -set +o pipefail +# NB: The pipe to tee eats the melting-pot error code. +# Even with the POSIX-unfriendly pipefail flag set. +# So we resort to this hacky error check of the log. +grep -qF "[ERROR]" "$meltingPotLog" && + die 'Melting pot generation failed!' # HACK: Remove known-duplicate artifactIds from version property overrides. # The plan is for this step to become unnecessary once the melting pot has From c070b8487739bee2004fa4cc6048505cb2835478 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 13:14:37 -0500 Subject: [PATCH 366/996] mega-melt: deal with digit-leading version props There are a couple of artifacts in pom-scijava that begin with a digit: * sc.fiji:3D_Blob_Segmentation * sc.fiji:3D_Objects_Counter * sc.fiji:3D_Viewer Prior to d0bf752070d96a2613c42e4e1ab86ebdd07c29ee, these used a "Fiji_" or "ImageJ_" prefix for their version properties. But this was standardized to a leading underscore instead, for consistency. So, for backwards compatibility with older pom-scijava parents, we need to set: A) the version props with Fiji/ImageJ prefix; and B) the version props with underscore prefix. Otherwise, these components might not get their versions pinned properly for builds of older components. --- tests/run.sh | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 93ac85c8..462feea8 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -100,16 +100,26 @@ grep -qF "[ERROR]" "$meltingPotLog" && # been improved to include a strategy for dealing with components with same # artifactId but different groupIds. For now, we just prune these overrides. buildScript="$meltingPotDir/build.sh" -buildScriptBackup="$buildScript.original" +buildScriptTemp="$buildScript.tmp" echo && printf 'Adjusting melting pot build script... ' && -mv "$buildScript" "$buildScriptBackup" && -awk '!/-D(annotations|antlr|jocl|kryo|minlog|opencsv|trove4j)\.version/' "$buildScriptBackup" > "$buildScript" && +cp "$buildScript" "$buildScript.original" && +mv -f "$buildScript" "$buildScriptTemp" && +awk '!/-D(annotations|antlr|jocl|kryo|minlog|opencsv|trove4j)\.version/' "$buildScriptTemp" > "$buildScript" && +# HACK: Add leading underscore to version properties that start with a digit. +mv -f "$buildScript" "$buildScriptTemp" && +sed -E 's; -D([0-9][^ ]*);& -D_\1;' "$buildScriptTemp" > "$buildScript" && +# HACK: Add non-standard version properties used prior to +# pom-scijava 32.0.0-beta-1; see d0bf752070d96a2613c42e4e1ab86ebdd07c29ee. +mv -f "$buildScript" "$buildScriptTemp" && +sed -E 's; -Dsc.fiji.3D_Blob_Segmentation\.version=([^ ]*);& -DFiji_3D_Blob_Segmentation.version=\1;' "$buildScriptTemp" > "$buildScript" && +mv -f "$buildScript" "$buildScriptTemp" && +sed -E 's; -Dsc.fiji.(3D_Objects_Counter|3D_Viewer)\.version=([^ ]*);& -DImageJ_\1.version=\2;' "$buildScriptTemp" > "$buildScript" && # HACK: Add non-standard net.imagej:ij version property used prior to # pom-scijava 28.0.0; see 7d2cc442b107b3ac2dcb799d282f2c0b5822649d. -mv "$buildScript" "$buildScriptBackup" && -sed -E 's_ -Dij\.version=([^ ]*)_& -Dimagej1.version=\1_' "$buildScriptBackup" > "$buildScript" || - die 'Error adjusting melting pot build script!' +mv -f "$buildScript" "$buildScriptTemp" && +sed -E 's; -Dij\.version=([^ ]*);& -Dimagej1.version=\1;' "$buildScriptTemp" > "$buildScript" && +rm "$buildScriptTemp" || die 'Error adjusting melting pot build script!' echo 'Done!' echo && From c364426609176898777b15eae4f915f17f84f4da Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 13:38:25 -0500 Subject: [PATCH 367/996] Update batch-processor: 0.4.1 -> 0.4.2 (preemptive) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index da1b3137..3c3b795d 100644 --- a/pom.xml +++ b/pom.xml @@ -311,7 +311,7 @@ - 0.4.1 + 0.4.2 ${batch-processor.version} From 7ccb8f7d3a309c23d9d491a6f13105cf54b49e5d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 14:41:25 -0500 Subject: [PATCH 368/996] Update imagej-legacy: 0.38.1 -> 0.39.0 This brings it in line with net.imagej:ij:1.53t. It also includes new functionality and bug-fixes. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c3b795d..cae604e2 100644 --- a/pom.xml +++ b/pom.xml @@ -495,7 +495,7 @@ ${imagej-launcher.version} - 0.38.1 + 0.39.0 ${imagej-legacy.version} From 25a74453e2ce2d6c21cfa04b1f7d13ae45df7ef9 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 15:48:00 -0500 Subject: [PATCH 369/996] Update H5J_Loader_Plugin: 1.1.3 -> 1.1.4 This updates it from FFMPEG 4.1-1.4.4 to 4.2.1-1.5.2, which brings it in line with SNT 4.1.2, which transitively+optionally depends on that version of FFMPEG via scenery. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cae604e2..72fd3213 100644 --- a/pom.xml +++ b/pom.xml @@ -766,7 +766,7 @@ 2.3.5 ${Gray_Morphology.version} - 1.1.3 + 1.1.4 ${H5J_Loader_Plugin.version} 1.1.1 From d910a5195208995b7725ea967d0f03b7c9cfa768 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 16:06:07 -0500 Subject: [PATCH 370/996] Manage version of jackson-dataformat-yaml It is used by sc.fiji:labkit-ui, so let's manage it with the other monoversioned jackson components. --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 72fd3213..1a8a3588 100644 --- a/pom.xml +++ b/pom.xml @@ -1552,10 +1552,12 @@ ${jackson.version} ${jackson.version} ${jackson.version} + ${jackson.version} ${jackson-annotations.version} ${jackson-core.version} ${jackson-databind.version} ${jackson-dataformat-cbor.version} + ${jackson-dataformat-yaml.version} 1.1.3 @@ -4324,6 +4326,11 @@ jackson-dataformat-cbor ${com.fasterxml.jackson.dataformat.jackson-dataformat-cbor.version} + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${com.fasterxml.jackson.dataformat.jackson-dataformat-yaml.version} + From f23d07822211e143bfb46ef178f878609f8480f2 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 16:43:10 -0500 Subject: [PATCH 371/996] Update scripting-beanshell: 0.4.0 -> 0.4.1 This fixes a bug where scripting-beanshell claims ownership over .java files, which clashes with scripting-java. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a8a3588..703c9f88 100644 --- a/pom.xml +++ b/pom.xml @@ -415,7 +415,7 @@ ${script-editor-jython.version} - 0.4.0 + 0.4.1 ${scripting-beanshell.version} From 4375d304bc49429cb909f86d8ac31576a2e71f1e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 16:44:40 -0500 Subject: [PATCH 372/996] Prepare for ImageJ2 and Fiji 2.6.0 releases These are preemptive version bumps. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 703c9f88..3bac2c6b 100644 --- a/pom.xml +++ b/pom.xml @@ -469,7 +469,7 @@ - 2.5.0 + 2.6.0 ${imagej2.version} ${imagej.version} @@ -653,7 +653,7 @@ - 2.5.0 + 2.6.0 ${fiji.version} From 8af6b14e0182c98c7b08e4d5f7bd0d59832c70f9 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 17:23:22 -0500 Subject: [PATCH 373/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3bac2c6b..eadb9062 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 32.0.0-SNAPSHOT + 32.0.1-SNAPSHOT pom SciJava Parent POM From 11b147b2394048b874f3c6467c5c02adae7d7d0e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Aug 2022 20:51:43 -0500 Subject: [PATCH 374/996] Update jna: 4.5.2 -> 5.12.1 I was concerned this update might break some components, but the mega-melt identifies no problems with it, so we're good to go. Closes #163. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index eadb9062..e9837cde 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 32.0.1-SNAPSHOT + 33.0.0-SNAPSHOT pom SciJava Parent POM @@ -1704,7 +1704,7 @@ ${jmockit.version} - 4.5.2 + 5.12.1 ${jna.version} From 4a434862a1c2b780a848e9e360dc9cbcfbb8c34d Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Thu, 1 Sep 2022 08:43:15 +0800 Subject: [PATCH 375/996] Update BoneJ 7.0.13 -> 7.0.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e9837cde..9bb70570 100644 --- a/pom.xml +++ b/pom.xml @@ -1109,7 +1109,7 @@ ${SNT.version} - 7.0.13 + 7.0.14 ${bonej.version} ${bonej.version} ${bonej.version} From 59c4cb86931ba2c6857f48de9d454253e8963157 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 1 Sep 2022 11:22:28 -0500 Subject: [PATCH 376/996] Move tests classifiers to test scope section And manage tests classifier for net.imagej:imagej-ops. --- pom.xml | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index e9837cde..b027015e 100644 --- a/pom.xml +++ b/pom.xml @@ -1969,12 +1969,6 @@ scijava-common ${org.scijava.scijava-common.version} - - org.scijava - scijava-common - ${org.scijava.scijava-common.version} - tests - @@ -2389,12 +2383,6 @@ imagej-updater ${net.imagej.imagej-updater.version} - - net.imagej - imagej-updater - ${net.imagej.imagej-updater.version} - tests - @@ -5004,6 +4992,33 @@ + + + org.scijava + scijava-common + ${org.scijava.scijava-common.version} + tests + test + + + + + net.imagej + imagej-ops + ${net.imagej.imagej-ops.version} + tests + test + + + + + net.imagej + imagej-updater + ${net.imagej.imagej-updater.version} + tests + test + + junit From f71eea00f555db50a7a1a234c65abfb2d8f9d6bd Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 1 Sep 2022 11:23:30 -0500 Subject: [PATCH 377/996] Manage JavaCPP and some of its subprojects This list was derived from: 1. Components being used in SciJava-related projects downstream; and 2. Components I already had in my local Maven repository cache. We can add more JavaCPP-based projects to this collection as needed. --- pom.xml | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 227 insertions(+) diff --git a/pom.xml b/pom.xml index b027015e..82769e7f 100644 --- a/pom.xml +++ b/pom.xml @@ -1579,6 +1579,59 @@ ${j3dutils.version} ${vecmath.version} + + + 1.5.2 + ${javacpp.version} + ${org.bytedeco.javacpp.version} + ${javacpp-presets.version} + ${org.bytedeco.javacpp.version} + ${javacv.version} + + 2.3.1-${org.bytedeco.javacpp.version} + ${artoolkitplus.version} + 4.2.1-${org.bytedeco.javacpp.version} + ${ffmpeg.version} + 1.07-${org.bytedeco.javacpp.version} + ${flandmark.version} + 2.13.3.31-${org.bytedeco.javacpp.version} + ${flycapture.version} + 1.10.5-${org.bytedeco.javacpp.version} + ${hdf5.version} + 1.78.0-${org.bytedeco.javacpp.version} + ${leptonica.version} + 2.2.6-${org.bytedeco.javacpp.version} + ${libdc1394.version} + 0.5.7-${org.bytedeco.javacpp.version} + ${libfreenect.version} + 0.2.0-${org.bytedeco.javacpp.version} + ${libfreenect2.version} + 1.12.4-${org.bytedeco.javacpp.version} + ${librealsense.version} + 0.3.7-${org.bytedeco.javacpp.version} + ${openblas.version} + 4.1.2-${org.bytedeco.javacpp.version} + ${opencv.version} + 4.1.0-${org.bytedeco.javacpp.version} + ${tesseract.version} + 0.200-${org.bytedeco.javacpp.version} + ${videoinput.version} + + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + ${scijava.natives.classifier.javacpp} + 3.28.0-GA ${javassist.version} @@ -4356,6 +4409,180 @@ ${org.scijava.vecmath.version} + + + + org.bytedeco + javacpp + ${org.bytedeco.javacpp.version} + + + org.bytedeco + javacpp-presets + ${org.bytedeco.javacpp-presets.version} + + + org.bytedeco + javacv + ${org.bytedeco.javacv.version} + + + + org.bytedeco + artoolkitplus + ${org.bytedeco.artoolkitplus.version} + + + org.bytedeco + ffmpeg + ${org.bytedeco.ffmpeg.version} + + + org.bytedeco + flandmark + ${org.bytedeco.flandmark.version} + + + org.bytedeco + flycapture + ${org.bytedeco.flycapture.version} + + + org.bytedeco + hdf5 + ${org.bytedeco.hdf5.version} + + + org.bytedeco + leptonica + ${org.bytedeco.leptonica.version} + + + org.bytedeco + libdc1394 + ${org.bytedeco.libdc1394.version} + + + org.bytedeco + libfreenect + ${org.bytedeco.libfreenect.version} + + + org.bytedeco + libfreenect2 + ${org.bytedeco.libfreenect2.version} + + + org.bytedeco + librealsense + ${org.bytedeco.librealsense.version} + + + org.bytedeco + openblas + ${org.bytedeco.openblas.version} + + + org.bytedeco + opencv + ${org.bytedeco.opencv.version} + + + org.bytedeco + tesseract + ${org.bytedeco.tesseract.version} + + + org.bytedeco + videoinput + ${org.bytedeco.videoinput.version} + + + + org.bytedeco + artoolkitplus + ${org.bytedeco.artoolkitplus.version} + ${scijava.natives.classifier.artoolkitplus} + + + org.bytedeco + ffmpeg + ${org.bytedeco.ffmpeg.version} + ${scijava.natives.classifier.ffmpeg} + + + org.bytedeco + flandmark + ${org.bytedeco.flandmark.version} + ${scijava.natives.classifier.flandmark} + + + org.bytedeco + flycapture + ${org.bytedeco.flycapture.version} + ${scijava.natives.classifier.flycapture} + + + org.bytedeco + hdf5 + ${org.bytedeco.hdf5.version} + ${scijava.natives.classifier.hdf5} + + + org.bytedeco + leptonica + ${org.bytedeco.leptonica.version} + ${scijava.natives.classifier.leptonica} + + + org.bytedeco + libdc1394 + ${org.bytedeco.libdc1394.version} + ${scijava.natives.classifier.libdc1394} + + + org.bytedeco + libfreenect + ${org.bytedeco.libfreenect.version} + ${scijava.natives.classifier.libfreenect} + + + org.bytedeco + libfreenect2 + ${org.bytedeco.libfreenect2.version} + ${scijava.natives.classifier.libfreenect2} + + + org.bytedeco + librealsense + ${org.bytedeco.librealsense.version} + ${scijava.natives.classifier.librealsense} + + + org.bytedeco + openblas + ${org.bytedeco.openblas.version} + ${scijava.natives.classifier.openblas} + + + org.bytedeco + opencv + ${org.bytedeco.opencv.version} + ${scijava.natives.classifier.opencv} + + + org.bytedeco + tesseract + ${org.bytedeco.tesseract.version} + ${scijava.natives.classifier.tesseract} + + + org.bytedeco + videoinput + ${org.bytedeco.videoinput.version} + ${scijava.natives.classifier.videoinput} + + org.javassist From 2b8c0774ec9417b15e043a25862ea9d85c589f56 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 1 Sep 2022 12:14:31 -0500 Subject: [PATCH 378/996] Manage tests classifier of more projects These are all the ones I see being used in the wild. --- pom.xml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/pom.xml b/pom.xml index 82769e7f..a65f8c21 100644 --- a/pom.xml +++ b/pom.xml @@ -5228,6 +5228,15 @@ test + + + net.imagej + imagej-legacy + ${net.imagej.imagej-legacy.version} + tests + test + + net.imagej @@ -5246,6 +5255,24 @@ test + + + net.imglib2 + imglib2 + ${net.imglib2.imglib2.version} + tests + test + + + + + org.janelia.saalfeldlab + n5 + ${org.janelia.saalfeldlab.n5.version} + tests + test + + junit From 4dd2c4c765bcb67539cbaa1b02c47cf5a3556f5e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 2 Sep 2022 13:38:27 -0500 Subject: [PATCH 379/996] Fix JavaCPP version property order In other blocks, it's all short names then all long names. So we do the same here. I personally find it a bit easier to read. --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index a65f8c21..cd8d6959 100644 --- a/pom.xml +++ b/pom.xml @@ -1582,39 +1582,39 @@ 1.5.2 - ${javacpp.version} ${org.bytedeco.javacpp.version} - ${javacpp-presets.version} ${org.bytedeco.javacpp.version} + ${javacpp.version} + ${javacpp-presets.version} ${javacv.version} 2.3.1-${org.bytedeco.javacpp.version} - ${artoolkitplus.version} 4.2.1-${org.bytedeco.javacpp.version} - ${ffmpeg.version} 1.07-${org.bytedeco.javacpp.version} - ${flandmark.version} 2.13.3.31-${org.bytedeco.javacpp.version} - ${flycapture.version} 1.10.5-${org.bytedeco.javacpp.version} - ${hdf5.version} 1.78.0-${org.bytedeco.javacpp.version} - ${leptonica.version} 2.2.6-${org.bytedeco.javacpp.version} - ${libdc1394.version} 0.5.7-${org.bytedeco.javacpp.version} - ${libfreenect.version} 0.2.0-${org.bytedeco.javacpp.version} - ${libfreenect2.version} 1.12.4-${org.bytedeco.javacpp.version} - ${librealsense.version} 0.3.7-${org.bytedeco.javacpp.version} - ${openblas.version} 4.1.2-${org.bytedeco.javacpp.version} - ${opencv.version} 4.1.0-${org.bytedeco.javacpp.version} - ${tesseract.version} 0.200-${org.bytedeco.javacpp.version} + ${artoolkitplus.version} + ${ffmpeg.version} + ${flandmark.version} + ${flycapture.version} + ${hdf5.version} + ${leptonica.version} + ${libdc1394.version} + ${libfreenect.version} + ${libfreenect2.version} + ${librealsense.version} + ${openblas.version} + ${opencv.version} + ${tesseract.version} ${videoinput.version} ${scijava.natives.classifier.javacpp} From 4268ae54acc3f2eb72d4a6696e47a351b10c6fae Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 2 Sep 2022 13:39:02 -0500 Subject: [PATCH 380/996] Fix URL for JOCL project at jocl.org Unfortunately, HTTPS does not seem to be configured for that site. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cd8d6959..a16f4433 100644 --- a/pom.xml +++ b/pom.xml @@ -1764,7 +1764,7 @@ 2.10.6 ${joda-time.version} - + 2.0.4 ${jocl.version} @@ -4819,7 +4819,7 @@ ${joda-time.joda-time.version} - + org.jocl jocl From afa7c60589390db506802cb3e14763dadfaaab0f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 2 Sep 2022 13:39:40 -0500 Subject: [PATCH 381/996] Improve management of JogAmp project components It is now consistent with JavaCPP, with dedicated native classifier properties. And we now manage all non-mobile-platform component options. --- pom.xml | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 119 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index a16f4433..a5085966 100644 --- a/pom.xml +++ b/pom.xml @@ -1768,16 +1768,41 @@ 2.0.4 ${jocl.version} - - 2.3.2 - ${jogl.version} - ${jogl.version} - ${jogl.version} - ${jogl.version} - ${gluegen-rt-main.version} - ${joal-main.version} - ${jocl-main.version} - ${jogl-all-main.version} + + + 2.3.2 + + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + ${jogamp.version} + + ${scijava.natives.classifier.jogamp} + ${scijava.natives.classifier.jogamp} + ${scijava.natives.classifier.jogamp} + ${scijava.natives.classifier.jogamp} 1.10.2 @@ -4826,27 +4851,110 @@ ${org.jocl.jocl.version} - + + + + org.jogamp.gluegen + gluegen + ${org.jogamp.gluegen.gluegen.version} + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + org.jogamp.gluegen gluegen-rt-main ${org.jogamp.gluegen.gluegen-rt-main.version} + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + org.jogamp.joal joal-main ${org.jogamp.joal.joal-main.version} + + org.jogamp.jocl + jocl + ${org.jogamp.jocl.jocl.version} + org.jogamp.jocl jocl-main ${org.jogamp.jocl.jocl-main.version} + + org.jogamp.jogl + jogl + ${org.jogamp.jogl.jogl.version} + + + org.jogamp.jogl + jogl-main + ${org.jogamp.jogl.jogl-main.version} + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + org.jogamp.jogl jogl-all-main ${org.jogamp.jogl.jogl-all-main.version} + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + + + org.jogamp.jogl + jogl-all-noawt-main + ${org.jogamp.jogl.jogl-all-noawt-main.version} + + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + ${scijava.natives.classifier.gluegen} + + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + ${scijava.natives.classifier.joal} + + + org.jogamp.jocl + jocl + ${org.jogamp.jocl.jocl.version} + ${scijava.natives.classifier.jocl} + + + org.jogamp.jogl + jogl + ${org.jogamp.jogl.jogl.version} + ${scijava.natives.classifier.jogl} + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + ${scijava.natives.classifier.jogl} + + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + ${scijava.natives.classifier.jogl} + From 61971fc99ebd5c5e354f65c5f6b0d89379c1a71b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 2 Sep 2022 15:41:39 -0500 Subject: [PATCH 382/996] Manage the version of com.formdev:flatlaf --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index dda04961..345e429c 100644 --- a/pom.xml +++ b/pom.xml @@ -1508,6 +1508,10 @@ 0.25 ${ejml.version} + + 2.4 + 2.4 + 0.120.0-alpha 0.117.2-alpha @@ -4285,6 +4289,13 @@ ${com.googlecode.efficient-java-matrix-library.ejml.version} + + + com.formdev + flatlaf + ${com.formdev.flatlaf.version} + + com.google.cloud From 6303fd841ee2c5af727da4e8a1944d038f0e10e3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 2 Sep 2022 15:51:18 -0500 Subject: [PATCH 383/996] Update scijava-ui-swing: 0.15.0 -> 0.16.0 This release adds FlatLaf, to better support HiDPI displays. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 345e429c..86cc196f 100644 --- a/pom.xml +++ b/pom.xml @@ -403,7 +403,7 @@ ${scijava-ui-awt.version} - 0.15.0 + 0.16.0 ${scijava-ui-swing.version} From c507b0455ad0f392aa5bba24e091c73ef93c7de4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 2 Sep 2022 17:43:21 -0500 Subject: [PATCH 384/996] Update scijava-ui-swing: 0.16.0 -> 0.16.1 This includes scijava/scijava-ui-swing#72. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 86cc196f..93ba77de 100644 --- a/pom.xml +++ b/pom.xml @@ -403,7 +403,7 @@ ${scijava-ui-awt.version} - 0.16.0 + 0.16.1 ${scijava-ui-swing.version} From 533c2658203e623d2684081bfbdbcb0caf3d095b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 3 Sep 2022 13:48:26 -0500 Subject: [PATCH 385/996] Update TrakEM2_: 1.3.7 -> 1.3.8 This has fixes for ImageJ 1.53+ and HiDPI displays: trakem2/TrakEM2#31. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 93ba77de..ba62357e 100644 --- a/pom.xml +++ b/pom.xml @@ -1037,7 +1037,7 @@ ${T2-TreelineGraph.version} - 1.3.7 + 1.3.8 ${TrakEM2.version} ${TrakEM2_.version} From 87b6f7537b33effeb0f09dd8074c3ca71f84c8cb Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 9 Sep 2022 13:21:28 -0500 Subject: [PATCH 386/996] Update JogAmp: 2.3.2 -> 2.4.0-rc-20210111 This is not a release version of the software, but the last release was 2.3.2 almost 7 years ago, and there are so many bugs we need to update. The 2.4.0-rc-20210111 version comes from this link: https://jogamp.org/deployment/jogamp-next/archive/jogamp-all-platforms.7z and is deployed to the maven.scijava.org thirdparty repository at: https://maven.scijava.org/content/repositories/thirdparty/org/jogamp/ which like everything else is part of maven.scijava.org's public group. At some point we may need to build JogAmp ourselves from source, to create arm64 binaries for Mac M1, since this version does not have them, and the project is apparently stuck trying to deal with it: https://forum.jogamp.org/Any-plans-of-providing-builds-for-Mac-M1-Apple-Silicon-soon-td4041208.html --- pom.xml | 57 +-------------------------------------------------------- 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/pom.xml b/pom.xml index ba62357e..0ce86fbf 100644 --- a/pom.xml +++ b/pom.xml @@ -1774,34 +1774,20 @@ - 2.3.2 + 2.4.0-rc-20210111 ${jogamp.version} ${jogamp.version} - ${jogamp.version} ${jogamp.version} - ${jogamp.version} - ${jogamp.version} - ${jogamp.version} - ${jogamp.version} ${jogamp.version} - ${jogamp.version} ${jogamp.version} - ${jogamp.version} ${jogamp.version} ${jogamp.version} - ${jogamp.version} ${jogamp.version} - ${jogamp.version} ${jogamp.version} - ${jogamp.version} - ${jogamp.version} - ${jogamp.version} ${jogamp.version} - ${jogamp.version} ${jogamp.version} - ${jogamp.version} ${scijava.natives.classifier.jogamp} ${scijava.natives.classifier.jogamp} @@ -4874,61 +4860,26 @@ gluegen-rt ${org.jogamp.gluegen.gluegen-rt.version} - - org.jogamp.gluegen - gluegen-rt-main - ${org.jogamp.gluegen.gluegen-rt-main.version} - org.jogamp.joal joal ${org.jogamp.joal.joal.version} - - org.jogamp.joal - joal-main - ${org.jogamp.joal.joal-main.version} - org.jogamp.jocl jocl ${org.jogamp.jocl.jocl.version} - - org.jogamp.jocl - jocl-main - ${org.jogamp.jocl.jocl-main.version} - - - org.jogamp.jogl - jogl - ${org.jogamp.jogl.jogl.version} - - - org.jogamp.jogl - jogl-main - ${org.jogamp.jogl.jogl-main.version} - org.jogamp.jogl jogl-all ${org.jogamp.jogl.jogl-all.version} - - org.jogamp.jogl - jogl-all-main - ${org.jogamp.jogl.jogl-all-main.version} - org.jogamp.jogl jogl-all-noawt ${org.jogamp.jogl.jogl-all-noawt.version} - - org.jogamp.jogl - jogl-all-noawt-main - ${org.jogamp.jogl.jogl-all-noawt-main.version} - org.jogamp.gluegen @@ -4948,12 +4899,6 @@ ${org.jogamp.jocl.jocl.version} ${scijava.natives.classifier.jocl} - - org.jogamp.jogl - jogl - ${org.jogamp.jogl.jogl.version} - ${scijava.natives.classifier.jogl} - org.jogamp.jogl jogl-all From e912c3803bc216ec34b0c55f02f01dd743cf6cc5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 12 Sep 2022 10:41:09 -0500 Subject: [PATCH 387/996] Update component versions scijava-ui-swing: 0.16.1 -> 0.16.2 imagej2: 2.6.0 -> 2.7.0 (preemptive) fiji: 2.6.0 -> 2.7.0 (preemptive) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0ce86fbf..5c8fd1b1 100644 --- a/pom.xml +++ b/pom.xml @@ -403,7 +403,7 @@ ${scijava-ui-awt.version} - 0.16.1 + 0.16.2 ${scijava-ui-swing.version} @@ -469,7 +469,7 @@ - 2.6.0 + 2.7.0 ${imagej2.version} ${imagej.version} @@ -653,7 +653,7 @@ - 2.6.0 + 2.7.0 ${fiji.version} From 41290bd0d2392e7ab9586800a3769fe25d628992 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 12 Sep 2022 10:45:01 -0500 Subject: [PATCH 388/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c8fd1b1..f8eee7c6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 33.0.0-SNAPSHOT + 33.0.1-SNAPSHOT pom SciJava Parent POM From 9379bd97e8563b1524f5e8d07c134e023ee45080 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 13 Sep 2022 14:18:01 -0500 Subject: [PATCH 389/996] Update component versions * scijava-ui-swing: 0.16.2 -> 0.17.0 * imagej-legacy: 0.39.0 -> 0.39.1 (preemptive) * imagej2: 2.7.0 -> 2.8.0 (preemptive) * fiji: 2.7.0 -> 2.8.0 (preemptive) This updates scijava-ui-swing to include a SwingLookAndFeelService, with revamped OptionsLookAndFeel settings, and updates ImageJ2 and Fiji to integrate it appropriately (requires code changes to imagej-legacy). --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index f8eee7c6..a616b6fb 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 33.0.1-SNAPSHOT + 33.1.0-SNAPSHOT pom SciJava Parent POM @@ -403,7 +403,7 @@ ${scijava-ui-awt.version} - 0.16.2 + 0.17.0 ${scijava-ui-swing.version} @@ -469,7 +469,7 @@ - 2.7.0 + 2.8.0 ${imagej2.version} ${imagej.version} @@ -495,7 +495,7 @@ ${imagej-launcher.version} - 0.39.0 + 0.39.1 ${imagej-legacy.version} @@ -653,7 +653,7 @@ - 2.7.0 + 2.8.0 ${fiji.version} From 5ba1a03f1bc9bb2efd2afde54322f183b0357ee5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 13 Sep 2022 14:21:52 -0500 Subject: [PATCH 390/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a616b6fb..6b0df8f9 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 33.1.0-SNAPSHOT + 33.1.1-SNAPSHOT pom SciJava Parent POM From 5caa5a95e850d2480d9a29ee0c3cd09ea394be31 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 13 Sep 2022 19:54:58 -0500 Subject: [PATCH 391/996] Update imagej-updater: 0.10.6 -> 0.11.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6b0df8f9..c1d77679 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 33.1.1-SNAPSHOT + 33.2.0-SNAPSHOT pom SciJava Parent POM @@ -571,7 +571,7 @@ ${imagej-ui-swing.version} - 0.10.6 + 0.11.0 ${imagej-updater.version} From ccc599ab4cc356ae672e510ad90dd77c2d405908 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 13 Sep 2022 19:55:10 -0500 Subject: [PATCH 392/996] Update imglib2-ij: 2.0.0-beta-46 -> 2.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1d77679..8909dbd5 100644 --- a/pom.xml +++ b/pom.xml @@ -601,7 +601,7 @@ ${imglib2-cache.version} - 2.0.0-beta-46 + 2.0.0 ${imglib2-ij.version} From 10de116b8a7f95a7701fa0ae1620fca7fece4464 Mon Sep 17 00:00:00 2001 From: hinerm Date: Wed, 14 Sep 2022 11:52:28 -0500 Subject: [PATCH 393/996] Bump labkit component versions labkit-ui ==> 0.3.8 labkit-pixel-classification ==> 0.1.15 These versions remove their compile-time dependency on clij --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8909dbd5..dec240e9 100644 --- a/pom.xml +++ b/pom.xml @@ -1862,9 +1862,9 @@ ${kotlin-stdlib-jdk8.version} - 0.3.7 + 0.3.8 ${labkit-ui.version} - 0.1.14 + 0.1.15 ${labkit.pixel-classification.version} From 08a08222da25b0bc06b1eb5d76836a827e48d7bf Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 14 Sep 2022 12:09:38 -0500 Subject: [PATCH 394/996] Bump component versions * script-editor: 0.7.7 -> 0.7.8 * imagej-legacy: 0.39.1 -> 0.39.2 This fixes a problem with ImageJ Macro language behavior (e.g. syntax highlighting) in the SciJava Script Editor. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dec240e9..cc243ff1 100644 --- a/pom.xml +++ b/pom.xml @@ -407,7 +407,7 @@ ${scijava-ui-swing.version} - 0.7.7 + 0.7.8 ${script-editor.version} @@ -495,7 +495,7 @@ ${imagej-launcher.version} - 0.39.1 + 0.39.2 ${imagej-legacy.version} From a184d85f3991da3ec62745c371d1c97577ddddef Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 14 Sep 2022 13:08:37 -0500 Subject: [PATCH 395/996] Remove missing JavaCPP projects * javacpp-presets is only a POM. * flycapture and videoinput do not have natives for macOS. Normally we would bump to 34.0.0-SNAPSHOT when removing managed components, but these three never worked properly (at least on macOS), so I consider removing them to be a bug-fix. --- pom.xml | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/pom.xml b/pom.xml index cc243ff1..512cafb3 100644 --- a/pom.xml +++ b/pom.xml @@ -1586,16 +1586,13 @@ 1.5.2 - ${org.bytedeco.javacpp.version} ${org.bytedeco.javacpp.version} ${javacpp.version} - ${javacpp-presets.version} ${javacv.version} 2.3.1-${org.bytedeco.javacpp.version} 4.2.1-${org.bytedeco.javacpp.version} 1.07-${org.bytedeco.javacpp.version} - 2.13.3.31-${org.bytedeco.javacpp.version} 1.10.5-${org.bytedeco.javacpp.version} 1.78.0-${org.bytedeco.javacpp.version} 2.2.6-${org.bytedeco.javacpp.version} @@ -1605,11 +1602,9 @@ 0.3.7-${org.bytedeco.javacpp.version} 4.1.2-${org.bytedeco.javacpp.version} 4.1.0-${org.bytedeco.javacpp.version} - 0.200-${org.bytedeco.javacpp.version} ${artoolkitplus.version} ${ffmpeg.version} ${flandmark.version} - ${flycapture.version} ${hdf5.version} ${leptonica.version} ${libdc1394.version} @@ -1619,12 +1614,10 @@ ${openblas.version} ${opencv.version} ${tesseract.version} - ${videoinput.version} ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} - ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} @@ -1634,7 +1627,6 @@ ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} - ${scijava.natives.classifier.javacpp} 3.28.0-GA @@ -4438,11 +4430,6 @@ javacpp ${org.bytedeco.javacpp.version} - - org.bytedeco - javacpp-presets - ${org.bytedeco.javacpp-presets.version} - org.bytedeco javacv @@ -4464,11 +4451,6 @@ flandmark ${org.bytedeco.flandmark.version} - - org.bytedeco - flycapture - ${org.bytedeco.flycapture.version} - org.bytedeco hdf5 @@ -4514,11 +4496,6 @@ tesseract ${org.bytedeco.tesseract.version} - - org.bytedeco - videoinput - ${org.bytedeco.videoinput.version} - org.bytedeco @@ -4538,12 +4515,6 @@ ${org.bytedeco.flandmark.version} ${scijava.natives.classifier.flandmark} - - org.bytedeco - flycapture - ${org.bytedeco.flycapture.version} - ${scijava.natives.classifier.flycapture} - org.bytedeco hdf5 @@ -4598,12 +4569,6 @@ ${org.bytedeco.tesseract.version} ${scijava.natives.classifier.tesseract} - - org.bytedeco - videoinput - ${org.bytedeco.videoinput.version} - ${scijava.natives.classifier.videoinput} - From 8cced3ca8c84086c67c3accd1c8511ece8104f43 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 14 Sep 2022 14:01:03 -0500 Subject: [PATCH 396/996] mega-melt: skip alternate jogamp component flavors Testing with the most common options is sufficient. --- tests/generate-mega-melt.py | 3 +++ tests/run.sh | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index 0cfd7f68..929091ac 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -38,6 +38,9 @@ def child(node, tag): 'jep', 'junit-benchmarks', 'vecmath', + # NB: Skip alternate flavors of other managed components. + 'gluegen', # uberjar flavor of gluegen-rt + 'jogl-all-noawt', # slimmed down flavor of jogl-all # NB: All the SWT platform JARs have the same classes. # The current platform will be brought in transitively. 'org.eclipse.swt.cocoa.macosx', diff --git a/tests/run.sh b/tests/run.sh index 462feea8..8fa0d3a8 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -122,8 +122,6 @@ sed -E 's; -Dij\.version=([^ ]*);& -Dimagej1.version=\1;' "$buildScriptTemp" > " rm "$buildScriptTemp" || die 'Error adjusting melting pot build script!' echo 'Done!' -echo && - # HACK: Adjust component POMs to satisfy Maven HTTPS strictness. echo && printf 'Adjusting melting pot project POMs... ' && From 61e815eca125135caa2cd41282237f460850c7d3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 14 Sep 2022 15:33:55 -0500 Subject: [PATCH 397/996] Update SNT: 4.1.2 -> 4.1.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 512cafb3..e697c066 100644 --- a/pom.xml +++ b/pom.xml @@ -1105,7 +1105,7 @@ ${MorphoLibJ_.version} - 4.1.2 + 4.1.3 ${SNT.version} From 23096ba2796cda1692a29868d09b78972b052c53 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 14 Sep 2022 15:34:13 -0500 Subject: [PATCH 398/996] Fix labkit-pixel-classification version property There was a typo: the first dot should have been a dash, to align with the artifactId. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e697c066..13d7cc91 100644 --- a/pom.xml +++ b/pom.xml @@ -1856,8 +1856,8 @@ 0.3.8 ${labkit-ui.version} - 0.1.15 - ${labkit.pixel-classification.version} + 0.1.15 + ${labkit-pixel-classification.version} 1.2.3 From c0160e421d09ae4f9990b2d0704f4c3eb8059bd1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 14 Sep 2022 15:59:18 -0500 Subject: [PATCH 399/996] Update scijava-ui-swing: 0.17.0 -> 0.17.1 This fixes a recently introduced bug in the object widget. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 13d7cc91..4668b04a 100644 --- a/pom.xml +++ b/pom.xml @@ -403,7 +403,7 @@ ${scijava-ui-awt.version} - 0.17.0 + 0.17.1 ${scijava-ui-swing.version} From 8d7bbe7129393b68010013e115f334faf66c9a20 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 14 Sep 2022 16:15:54 -0500 Subject: [PATCH 400/996] Finish fixing labkit-pixel-classification property My fix from two commits ago introduced an XML syntax error. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4668b04a..7f2888c1 100644 --- a/pom.xml +++ b/pom.xml @@ -1856,7 +1856,7 @@ 0.3.8 ${labkit-ui.version} - 0.1.15 + 0.1.15 ${labkit-pixel-classification.version} From 267ec6fd3b8d912ea0c15855b1d0e7f0d61f8fa4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 14 Sep 2022 16:14:54 -0500 Subject: [PATCH 401/996] Update imagej2 and fiji: 2.8.0 -> 2.9.0 These are preemptive bumps. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7f2888c1..221e6b31 100644 --- a/pom.xml +++ b/pom.xml @@ -469,7 +469,7 @@ - 2.8.0 + 2.9.0 ${imagej2.version} ${imagej.version} @@ -653,7 +653,7 @@ - 2.8.0 + 2.9.0 ${fiji.version} From 73f863ab2e652b6ecb995ec4934706601de2eba6 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 14 Sep 2022 16:17:04 -0500 Subject: [PATCH 402/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 221e6b31..14f0537d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 33.2.0-SNAPSHOT + 33.2.1-SNAPSHOT pom SciJava Parent POM From 9031e2081c1c9ae07a01feacf2d2b884b7a66e0f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 14 Sep 2022 16:25:08 -0500 Subject: [PATCH 403/996] CI: consolidate CI workflows --- .github/workflows/build-pr.yml | 23 ------------------- .../workflows/{build-main.yml => build.yml} | 3 +++ 2 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 .github/workflows/build-pr.yml rename .github/workflows/{build-main.yml => build.yml} (94%) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml deleted file mode 100644 index 925b5765..00000000 --- a/.github/workflows/build-pr.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: build PR - -on: - pull_request: - branches: - - master - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up Java - uses: actions/setup-java@v3 - with: - java-version: '8' - distribution: 'zulu' - cache: 'maven' - - name: Set up CI environment - run: .github/setup.sh - - name: Execute the build - run: .github/build.sh diff --git a/.github/workflows/build-main.yml b/.github/workflows/build.yml similarity index 94% rename from .github/workflows/build-main.yml rename to .github/workflows/build.yml index 5ef56920..368b50f2 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,9 @@ on: - master tags: - "*-[0-9]+.*" + pull_request: + branches: + - master jobs: build: From 3776cf68a3553038060ce6435b35ea7ad05928ae Mon Sep 17 00:00:00 2001 From: hinerm Date: Thu, 15 Sep 2022 09:42:54 -0500 Subject: [PATCH 404/996] Bump Trainable_Segmentation => 3.3.3 Fixes failing unit tests --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 14f0537d..e1578cf0 100644 --- a/pom.xml +++ b/pom.xml @@ -911,7 +911,7 @@ 7.7.2 ${TrackMate.version} - 3.3.2 + 3.3.3 ${Trainable_Segmentation.version} 2.0.3 From 05cd8de253b12f82e92d2e0ad632f175c7b214bc Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Sat, 17 Sep 2022 15:00:32 +0200 Subject: [PATCH 405/996] Update bigdataviewer-vistools: 1.0.0-beta-30 -> 1.0.0-beta-31 This should fix https://github.com/bigdataviewer/bigdataviewer-vistools/issues/57 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e1578cf0..a0fcbf9c 100644 --- a/pom.xml +++ b/pom.xml @@ -1015,7 +1015,7 @@ ${bigdataviewer-server.version} - 1.0.0-beta-30 + 1.0.0-beta-31 ${bigdataviewer-vistools.version} From c3606d681b3c5678c56b766c670565338f766df9 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 19 Sep 2022 11:28:35 -0500 Subject: [PATCH 406/996] Update n5-viewer_fiji: 4.5.0 -> 5.1.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a0fcbf9c..a120a730 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 33.2.1-SNAPSHOT + 34.0.0-SNAPSHOT pom SciJava Parent POM @@ -1084,7 +1084,7 @@ ${n5-imglib2.version} - 4.5.0 + 5.1.0 ${n5-viewer_fiji.version} From d53390fbcb76a8a73141aba7ed8197fbed74b727 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 19 Sep 2022 21:47:52 -0500 Subject: [PATCH 407/996] mega-melt: allow labkit-pixel-classification tests Now that CLIJ is optional, tests pass without it. --- tests/run.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 8fa0d3a8..b5968e88 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -157,9 +157,6 @@ echo ":org.janelia.saalfeldlab/n5-aws-s3:" > "$skipTestsFile" echo ":org.janelia.saalfeldlab/n5-blosc:" >> "$skipTestsFile" echo ":org.janelia.saalfeldlab/n5-zarr:" >> "$skipTestsFile" -# Error while checking the CLIJ2 installation: null -echo ":sc.fiji/labkit-pixel-classification:" >> "$skipTestsFile" - # Run the melting pot now, unless -s flag was given. doMelt=t for arg in "$@" From d0586f49ce01e20d296d91eb587571f50ef021e3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 19 Sep 2022 19:50:51 -0500 Subject: [PATCH 408/996] mega-melt: set executable bit for shell scripts --- tests/run.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index b5968e88..e6d3f0d4 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -119,7 +119,9 @@ sed -E 's; -Dsc.fiji.(3D_Objects_Counter|3D_Viewer)\.version=([^ ]*);& -DImageJ_ # pom-scijava 28.0.0; see 7d2cc442b107b3ac2dcb799d282f2c0b5822649d. mv -f "$buildScript" "$buildScriptTemp" && sed -E 's; -Dij\.version=([^ ]*);& -Dimagej1.version=\1;' "$buildScriptTemp" > "$buildScript" && -rm "$buildScriptTemp" || die 'Error adjusting melting pot build script!' +chmod +x "$buildScript" && +rm "$buildScriptTemp" || + die 'Error adjusting melting pot build script!' echo 'Done!' # HACK: Adjust component POMs to satisfy Maven HTTPS strictness. @@ -144,7 +146,8 @@ sed 's_\s*sh "$dir/build.sh"_\ buildFlags=\ grep -qF ":$f:" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ \ -& $buildFlags_' "$meltScript.original" > "$meltScript" || +& $buildFlags_' "$meltScript.original" > "$meltScript" && +chmod +x "$meltScript" || die "Failed to adjust $meltScript" echo 'Done!' From 26b03f7e9ef19e9a19063f9eebfb903e8b5baf93 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 19 Sep 2022 21:48:22 -0500 Subject: [PATCH 409/996] mega-melt: run build.sh directly, not via sh --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index e6d3f0d4..99483a7a 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -141,7 +141,7 @@ echo 'Done!' echo && printf 'Adjusting melting pot melt script... ' && mv "$meltScript" "$meltScript.original" && -sed 's_\s*sh "$dir/build.sh"_\ +sed 's_\s*"$dir/build.sh"_\ # HACK: If project is on the skipTests list, then skip the tests.\ buildFlags=\ grep -qF ":$f:" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ From 6e8594b52a190e34fc502798792deee39501654b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 20 Sep 2022 11:16:06 -0500 Subject: [PATCH 410/996] Revert "mega-melt: allow labkit-pixel-classification tests" This reverts commit d53390fbcb76a8a73141aba7ed8197fbed74b727. I was too hasty -- I still see the CLIJ2-related failures on macOS. --- tests/run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/run.sh b/tests/run.sh index 99483a7a..f09aef4b 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -160,6 +160,9 @@ echo ":org.janelia.saalfeldlab/n5-aws-s3:" > "$skipTestsFile" echo ":org.janelia.saalfeldlab/n5-blosc:" >> "$skipTestsFile" echo ":org.janelia.saalfeldlab/n5-zarr:" >> "$skipTestsFile" +# Error while checking the CLIJ2 installation: null +echo ":sc.fiji/labkit-pixel-classification:" >> "$skipTestsFile" + # Run the melting pot now, unless -s flag was given. doMelt=t for arg in "$@" From c17811bc73a04f25fc77f13b16180f08136e9f02 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 20 Sep 2022 14:34:45 -0500 Subject: [PATCH 411/996] mega-melt: use grep -x flag instead of colons hack And fail the melt if skipTests.txt cannot be generated. --- tests/run.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index f09aef4b..457e7999 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -144,7 +144,7 @@ mv "$meltScript" "$meltScript.original" && sed 's_\s*"$dir/build.sh"_\ # HACK: If project is on the skipTests list, then skip the tests.\ buildFlags=\ -grep -qF ":$f:" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ +grep -qxF "$f" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ \ & $buildFlags_' "$meltScript.original" > "$meltScript" && chmod +x "$meltScript" || @@ -154,14 +154,15 @@ echo 'Done!' # com.amazonaws.services.s3.model.AmazonS3Exception: The specified bucket does # not exist (Service: Amazon S3; Status Code: 404; Error Code: NoSuchBucket; # Request ID: null; S3 Extended Request ID: null; Proxy: null) -echo ":org.janelia.saalfeldlab/n5-aws-s3:" > "$skipTestsFile" +echo "org.janelia.saalfeldlab/n5-aws-s3" > "$skipTestsFile" && # java.lang.UnsatisfiedLinkError: Unable to load library 'blosc' -echo ":org.janelia.saalfeldlab/n5-blosc:" >> "$skipTestsFile" -echo ":org.janelia.saalfeldlab/n5-zarr:" >> "$skipTestsFile" +echo "org.janelia.saalfeldlab/n5-blosc" >> "$skipTestsFile" && +echo "org.janelia.saalfeldlab/n5-zarr" >> "$skipTestsFile" && # Error while checking the CLIJ2 installation: null -echo ":sc.fiji/labkit-pixel-classification:" >> "$skipTestsFile" +echo "sc.fiji/labkit-pixel-classification" >> "$skipTestsFile" || + die "Failed to generate $skipTestsFile" # Run the melting pot now, unless -s flag was given. doMelt=t From e2a7601825efd23250f065dead90670e85ba4420 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 20 Sep 2022 14:35:24 -0500 Subject: [PATCH 412/996] mega-melt: time each step of mega-melt generation --- tests/run.sh | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 457e7999..ff55702f 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -6,8 +6,18 @@ die () { echo "$*" >&2; exit 1; } -echo && -printf 'Generating mega-melt project... ' && +sectionStart() { + startTime=$(date +%s) + echo + printf "$1... " +} + +sectionEnd() { + endTime=$(date +%s) + echo "Done! [$((endTime-startTime))s]" +} + +sectionStart 'Generating mega-melt project' dir=$(dirname "$0") pom="$dir/../pom.xml" @@ -36,21 +46,20 @@ cp "$pom" "$pomParent" && mvn -B -f "$pomParent" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" || die "pom-scijava version update failed:\n$(cat "$versionSwapLog")" python "$generateMegaMeltScript" "$megaMeltDir" || die 'Generation failed!' -echo 'Done!' +sectionEnd # Generating mega-melt project # Ensure the mega-melt dependency structure validates. # In particular, this runs our enforcer rules: the build # will fail if there are any snapshot dependencies, or # any duplicate classes across artifacts on the classpath. -echo && -printf 'Validating mega-melt project... ' && +sectionStart 'Validating mega-melt project' mvn -B -f "$megaMeltPOM" dependency:tree > "$dependencyTreeLog" || die "Invalid dependency tree:\n$(cat "$dependencyTreeLog")" mvn -B -f "$megaMeltPOM" -U clean package > "$validationLog" || { python "$filterBuildLogScript" "$validationLog" > "$validationErrorsLog" die "Validation build failed!\n\nDependency tree:\n$(cat "$dependencyTreeLog")\n\nBuild log:\n$(cat "$validationErrorsLog")" } -echo 'Done!' +sectionEnd # Validating mega-melt project # Run mega-melt through the melting pot, with all SciJava-affiliated groupIds, # minus excluded artifacts (see ignoredArtifacts in generate-mega-melt.py). @@ -95,14 +104,14 @@ chmod +x "$meltingPotScript" && grep -qF "[ERROR]" "$meltingPotLog" && die 'Melting pot generation failed!' +sectionStart 'Adjusting the melting pot' + # HACK: Remove known-duplicate artifactIds from version property overrides. # The plan is for this step to become unnecessary once the melting pot has # been improved to include a strategy for dealing with components with same # artifactId but different groupIds. For now, we just prune these overrides. buildScript="$meltingPotDir/build.sh" buildScriptTemp="$buildScript.tmp" -echo && -printf 'Adjusting melting pot build script... ' && cp "$buildScript" "$buildScript.original" && mv -f "$buildScript" "$buildScriptTemp" && awk '!/-D(annotations|antlr|jocl|kryo|minlog|opencsv|trove4j)\.version/' "$buildScriptTemp" > "$buildScript" && @@ -122,11 +131,8 @@ sed -E 's; -Dij\.version=([^ ]*);& -Dimagej1.version=\1;' "$buildScriptTemp" > " chmod +x "$buildScript" && rm "$buildScriptTemp" || die 'Error adjusting melting pot build script!' -echo 'Done!' # HACK: Adjust component POMs to satisfy Maven HTTPS strictness. -echo && -printf 'Adjusting melting pot project POMs... ' && find "$meltingPotDir" -name pom.xml | while read pom do mv "$pom" "$pom.original" && @@ -134,12 +140,9 @@ do -e 's_http://maven.apache.org/xsd_https://maven.apache.org/xsd_g' "$pom.original" > "$pom" || die "Failed to adjust $pom" done -echo 'Done!' # HACK: Skip tests for projects with known problems. -echo && -printf 'Adjusting melting pot melt script... ' && mv "$meltScript" "$meltScript.original" && sed 's_\s*"$dir/build.sh"_\ # HACK: If project is on the skipTests list, then skip the tests.\ @@ -149,7 +152,6 @@ grep -qxF "$f" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ & $buildFlags_' "$meltScript.original" > "$meltScript" && chmod +x "$meltScript" || die "Failed to adjust $meltScript" -echo 'Done!' # com.amazonaws.services.s3.model.AmazonS3Exception: The specified bucket does # not exist (Service: Amazon S3; Status Code: 404; Error Code: NoSuchBucket; @@ -164,6 +166,8 @@ echo "org.janelia.saalfeldlab/n5-zarr" >> "$skipTestsFile" && echo "sc.fiji/labkit-pixel-classification" >> "$skipTestsFile" || die "Failed to generate $skipTestsFile" +sectionEnd # Adjusting the melting pot + # Run the melting pot now, unless -s flag was given. doMelt=t for arg in "$@" From b2de8d13d19740e95fba4b71edefef4b89371aff Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 20 Sep 2022 16:02:54 -0500 Subject: [PATCH 413/996] Remove duplicate section divider --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index a120a730..b378204e 100644 --- a/pom.xml +++ b/pom.xml @@ -1093,8 +1093,6 @@ - - 7.0.6 ${MaMuT.version} From 2573e7956ee5a24ac154306d4fedf18feaa83bea Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 20 Sep 2022 16:03:22 -0500 Subject: [PATCH 414/996] Add long-form version property for args4j --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b378204e..f7c91e34 100644 --- a/pom.xml +++ b/pom.xml @@ -1242,6 +1242,7 @@ 2.33 + ${args4j.version} 1.11.796 @@ -3636,7 +3637,7 @@ args4j args4j - ${args4j.version} + ${args4j.args4j.version} From a751fcc545da0293fa8a17825f5b9349d95699eb Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 20 Sep 2022 16:03:35 -0500 Subject: [PATCH 415/996] Manage antlr, kryo and minlog artifacts These come up often in SciJava-based project dependency trees. Let's manage them directly, to avoid future version skew. --- pom.xml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/pom.xml b/pom.xml index f7c91e34..46656f44 100644 --- a/pom.xml +++ b/pom.xml @@ -1240,6 +1240,13 @@ + + 3.5.2 + ${antlr.version} + 2.7.7 + ${antlr.version} + ${antlr-runtime.version} + 2.33 ${args4j.version} @@ -1852,6 +1859,12 @@ ${kotlin-stdlib-common.version} ${kotlin-stdlib-jdk8.version} + + 4.0.2 + ${kryo.version} + 1.3.0 + ${minlog.version} + 0.3.8 ${labkit-ui.version} @@ -3633,6 +3646,23 @@ + + + antlr + antlr + ${antlr.antlr.version} + + + org.antlr + antlr + ${org.antlr.antlr.version} + + + org.antlr + antlr-runtime + ${org.antlr.antlr-runtime.version} + + args4j @@ -4973,6 +5003,18 @@ ${org.jetbrains.kotlin.kotlin-stdlib-jdk8.version} + + + com.esotericsoftware + kryo + ${com.esotericsoftware.kryo.version} + + + com.esotericsoftware + minlog + ${com.esotericsoftware.minlog.version} + + sc.fiji From 66d808c9472cf529c4a2191d2352e7e6703ff0a1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 20 Sep 2022 16:11:46 -0500 Subject: [PATCH 416/996] Fix CLIJ property names and order --- pom.xml | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 46656f44..3d3cc25c 100644 --- a/pom.xml +++ b/pom.xml @@ -1215,28 +1215,21 @@ 1.9.0.1 - ${clij_.version} - 1.8.1.1 - ${clij-core.version} - 2.3.0.4 - ${clij-coremem.version} - 2.5.0.1 - ${clij-clearcl.version} - 2.5.1.4 - ${clij2_.version} - 2.5.1.1 - ${clij2-assistant_.version} - 0.32.1.1 - ${clijx_.version} - 0.32.1.1 - ${clijx-weka_.version} + ${clij_.version} + ${clij-core.version} + ${clij-coremem.version} + ${clij-clearcl.version} + ${clij2_.version} + ${clij2-assistant_.version} + ${clijx_.version} + ${clijx-weka_.version} @@ -3606,42 +3599,42 @@ net.haesleinhuepf clij_ - ${net.heasleinhuepf.clij_.version} + ${net.haesleinhuepf.clij_.version} net.haesleinhuepf clij-core - ${net.heasleinhuepf.clij-core.version} + ${net.haesleinhuepf.clij-core.version} net.haesleinhuepf clij-coremem - ${net.heasleinhuepf.clij-coremem.version} + ${net.haesleinhuepf.clij-coremem.version} net.haesleinhuepf clij-clearcl - ${net.heasleinhuepf.clij-clearcl.version} + ${net.haesleinhuepf.clij-clearcl.version} net.haesleinhuepf clij2_ - ${net.heasleinhuepf.clij2_.version} + ${net.haesleinhuepf.clij2_.version} net.haesleinhuepf clij2-assistant_ - ${net.heasleinhuepf.clij2-assistant_.version} + ${net.haesleinhuepf.clij2-assistant_.version} net.haesleinhuepf clijx_ - ${net.heasleinhuepf.clijx_.version} + ${net.haesleinhuepf.clijx_.version} net.haesleinhuepf clijx-weka_ - ${net.heasleinhuepf.clijx-weka_.version} + ${net.haesleinhuepf.clijx-weka_.version} From d128ae1923ef58359928d9cd5195f91f5349065f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 21 Sep 2022 15:24:58 -0500 Subject: [PATCH 417/996] Update scifio: 0.43.2 -> 0.43.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3d3cc25c..a1b15512 100644 --- a/pom.xml +++ b/pom.xml @@ -623,7 +623,7 @@ - 0.43.2 + 0.43.3 ${scifio.version} From 2ed7db940cce5fd6be44ee7af5527b058c8f3973 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 20 Sep 2022 17:00:25 -0500 Subject: [PATCH 418/996] Update imagej-scripting: 0.8.3 -> 0.8.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a1b15512..4496b3be 100644 --- a/pom.xml +++ b/pom.xml @@ -551,7 +551,7 @@ ${imagej-plugins-uploader-webdav.version} - 0.8.3 + 0.8.4 ${imagej-scripting.version} From 95e1fef0513866be5e2e398b376f10ed00161753 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 20 Sep 2022 16:27:12 -0500 Subject: [PATCH 419/996] mega-melt: stop pruning kryo and minlog These components are now converged to the same groupId across the BOM. So we no longer need to prune them to avoid conflicts. --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index ff55702f..f84e9171 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -114,7 +114,7 @@ buildScript="$meltingPotDir/build.sh" buildScriptTemp="$buildScript.tmp" cp "$buildScript" "$buildScript.original" && mv -f "$buildScript" "$buildScriptTemp" && -awk '!/-D(annotations|antlr|jocl|kryo|minlog|opencsv|trove4j)\.version/' "$buildScriptTemp" > "$buildScript" && +awk '!/-D(annotations|antlr|jocl|opencsv|trove4j)\.version/' "$buildScriptTemp" > "$buildScript" && # HACK: Add leading underscore to version properties that start with a digit. mv -f "$buildScript" "$buildScriptTemp" && sed -E 's; -D([0-9][^ ]*);& -D_\1;' "$buildScriptTemp" > "$buildScript" && From 9058af7d814ae2da8a0bee088de37ea759d5be61 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 22 Sep 2022 13:02:00 -0500 Subject: [PATCH 420/996] mega-melt: prune short properties in a better way We now only prune the duplicate short property from the inferior component's groupId, rather than pruning *all* properties for matching artifactIds. This commit also generalizes the logic into a loop, for DRYness. --- tests/run.sh | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index f84e9171..22160d14 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -41,6 +41,14 @@ meltingPotDir="$megaMeltDir/melting-pot" skipTestsFile="$meltingPotDir/skipTests.txt" meltScript="$meltingPotDir/melt.sh" +# HACK: List of artifacts with known-duplicate short version properties. +shortVersionClashes=\ +'net.sourceforge.findbugs.annotations'\ +'|antr.antlr'\ +'|org.jogamp.jocl.jocl'\ +'|net.sf.opencsv.opencsv'\ +'|org.jetbrains.intellij.deps.trove4j' + rm -rf "$megaMeltDir" && mkdir -p "$megaMeltDir" || die "Creation of $megaMeltDir failed!" cp "$pom" "$pomParent" && mvn -B -f "$pomParent" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" || @@ -106,28 +114,33 @@ grep -qF "[ERROR]" "$meltingPotLog" && sectionStart 'Adjusting the melting pot' -# HACK: Remove known-duplicate artifactIds from version property overrides. -# The plan is for this step to become unnecessary once the melting pot has -# been improved to include a strategy for dealing with components with same -# artifactId but different groupIds. For now, we just prune these overrides. buildScript="$meltingPotDir/build.sh" buildScriptTemp="$buildScript.tmp" cp "$buildScript" "$buildScript.original" && + +# HACK: Remove known-duplicate short version properties, keeping +# the short version declaration only for the more common groupId. +# E.g.: org.antlr:antlr is preferred over antlr:antlr, so we set +# antlr.version to match org.antlr:antlr, not antlr:antlr. mv -f "$buildScript" "$buildScriptTemp" && -awk '!/-D(annotations|antlr|jocl|opencsv|trove4j)\.version/' "$buildScriptTemp" > "$buildScript" && +sed -E 's;(-D('"$shortVersionClashes"').version=[^ ]*) -D[^ ]*;\1;' "$buildScriptTemp" > "$buildScript" && + # HACK: Add leading underscore to version properties that start with a digit. mv -f "$buildScript" "$buildScriptTemp" && sed -E 's; -D([0-9][^ ]*);& -D_\1;' "$buildScriptTemp" > "$buildScript" && + # HACK: Add non-standard version properties used prior to # pom-scijava 32.0.0-beta-1; see d0bf752070d96a2613c42e4e1ab86ebdd07c29ee. mv -f "$buildScript" "$buildScriptTemp" && sed -E 's; -Dsc.fiji.3D_Blob_Segmentation\.version=([^ ]*);& -DFiji_3D_Blob_Segmentation.version=\1;' "$buildScriptTemp" > "$buildScript" && mv -f "$buildScript" "$buildScriptTemp" && sed -E 's; -Dsc.fiji.(3D_Objects_Counter|3D_Viewer)\.version=([^ ]*);& -DImageJ_\1.version=\2;' "$buildScriptTemp" > "$buildScript" && + # HACK: Add non-standard net.imagej:ij version property used prior to # pom-scijava 28.0.0; see 7d2cc442b107b3ac2dcb799d282f2c0b5822649d. mv -f "$buildScript" "$buildScriptTemp" && sed -E 's; -Dij\.version=([^ ]*);& -Dimagej1.version=\1;' "$buildScriptTemp" > "$buildScript" && + chmod +x "$buildScript" && rm "$buildScriptTemp" || die 'Error adjusting melting pot build script!' From b1bbac7ad0f7a66fede9f46ef5a926fa29094e56 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 22 Sep 2022 16:53:03 -0500 Subject: [PATCH 421/996] Update VectorString: 2.0.2 -> 2.0.3 This release fixes the scope of Java-3D-related dependencies. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4496b3be..7e53bd86 100644 --- a/pom.xml +++ b/pom.xml @@ -1042,7 +1042,7 @@ ${TrakEM2_.version} - 2.0.2 + 2.0.3 ${VectorString.version} From 9f416ec4b68afb6653a997bab67dffe1bf421281 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 22 Sep 2022 16:53:43 -0500 Subject: [PATCH 422/996] Update jackson: 2.12.5 -> 2.13.4 Some projects in the SciJava component collection are inheriting 2.12.7 instead of 2.12.5, because they extend a version of pom-scijava from before the jackson components started being managed. So we should be managing jackson at version 2.12.7 at minimum, to avoid downgrading the dependency trees of those components when they update to a newer POM parent. But better: let's just manage it at the latest version instead. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e53bd86..edfae7d2 100644 --- a/pom.xml +++ b/pom.xml @@ -1550,7 +1550,7 @@ ${jackrabbit-webdav.version} - 2.12.5 + 2.13.4 ${jackson.version} ${jackson.version} ${jackson.version} From 7e99468e0161802ddf2f4f24435e047a67200035 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 22 Sep 2022 19:41:58 -0500 Subject: [PATCH 423/996] Update component versions * scifio-bf-compat: 4.1.0 -> 4.1.1 * 3D_Blob_Segmentation: 3.0.1 -> 3.0.2 * 3D_Viewer: 4.0.3 -> 4.0.4 * Descriptor_based_registration: 2.1.7 -> 2.1.8 * FS_Align_TrakEM2: 2.0.3 -> 2.0.4 * Feature_Detection: 2.0.2 -> 2.0.3 * Fiji_Developer: 2.0.7 -> 2.0.8 * Reconstruct_Reader: 2.0.4 -> 2.0.5 * SPIM_Registration: 5.0.23 -> 5.0.24 * Stitching: 3.1.8 -> 3.1.9 * TrakEM2_Archipelago: 2.0.3 -> 2.0.4 * VIB: 3.0.3 -> 3.0.4 * Volume_Calculator: 2.0.2 -> 2.0.3 * blockmatching: 2.1.3 -> 2.1.4 * legacy-imglib1: 1.1.9 -> 1.1.10 * register_virtual_stack_slices: 3.0.7 -> 3.0.8 * bigwarp: 7.0.6 -> 7.0.7 * bigdataviewer-core: 10.4.3 -> 10.4.5 * bigdataviewer-server: 3.1.0 -> 3.1.1 * bigdataviewer_fiji: 6.2.2 -> 6.2.3 * T2-NIT: 1.1.3 -> 1.1.4 * T2-TreelineGraph: 1.1.3 -> 1.1.4 The goal for most of these releases is better dependency convergence. --- pom.xml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index edfae7d2..70d8d90a 100644 --- a/pom.xml +++ b/pom.xml @@ -627,7 +627,7 @@ ${scifio.version} - 4.1.0 + 4.1.1 ${scifio-bf-compat.version} @@ -658,13 +658,13 @@ - <_3D_Blob_Segmentation.version>3.0.1 + <_3D_Blob_Segmentation.version>3.0.2 ${_3D_Blob_Segmentation.version} <_3D_Objects_Counter.version>2.0.1 ${_3D_Objects_Counter.version} - <_3D_Viewer.version>4.0.3 + <_3D_Viewer.version>4.0.4 ${_3D_Viewer.version} 3.4.2 @@ -724,7 +724,7 @@ 1.0.6 ${Correct_3D_Drift.version} - 2.1.7 + 2.1.8 ${Descriptor_based_registration.version} 2.1.2 @@ -735,16 +735,16 @@ ${Directionality.version} ${Directionality_.version} - 2.0.3 + 2.0.4 ${FS_Align_TrakEM2.version} - 2.0.2 + 2.0.3 ${Feature_Detection.version} 2.0.1 ${Fiji_Archipelago.version} - 2.0.7 + 2.0.8 ${Fiji_Developer.version} 2.1.1 @@ -848,13 +848,13 @@ ${RATS.version} ${RATS_.version} - 2.0.4 + 2.0.5 ${Reconstruct_Reader.version} 2.0.2 ${SPIM_Opener.version} - 5.0.23 + 5.0.24 ${SPIM_Registration.version} 2.0.3 @@ -884,7 +884,7 @@ 2.0.1 ${Statistical_Region_Merging.version} - 3.1.8 + 3.1.9 ${Stitching.version} ${Stitching_.version} @@ -914,13 +914,13 @@ 3.3.3 ${Trainable_Segmentation.version} - 2.0.3 + 2.0.4 ${TrakEM2_Archipelago.version} 2.2.0 ${VIB-lib.version} - 3.0.3 + 3.0.4 ${VIB.version} ${VIB_.version} @@ -937,7 +937,7 @@ ${View5D.version} ${View5D_.version} - 2.0.2 + 2.0.3 ${Volume_Calculator.version} 2.01.3 @@ -950,14 +950,14 @@ 1.0.0 ${bij.version} - 2.1.3 + 2.1.4 ${blockmatching.version} ${blockmatching_.version} 2.1.3 ${fiji-lib.version} - 1.1.9 + 1.1.10 ${legacy-imglib1.version} 1.0.2 @@ -970,7 +970,7 @@ ${panorama.version} ${panorama_.version} - 3.0.7 + 3.0.8 ${register_virtual_stack_slices.version} 2.0.1 @@ -986,7 +986,7 @@ ${jitk-tps.version} - 7.0.6 + 7.0.7 ${bigwarp.version} ${bigwarp_fiji.version} @@ -1007,11 +1007,11 @@ - 10.4.3 + 10.4.5 ${bigdataviewer-core.version} - 3.1.0 + 3.1.1 ${bigdataviewer-server.version} @@ -1019,7 +1019,7 @@ ${bigdataviewer-vistools.version} - 6.2.2 + 6.2.3 ${bigdataviewer_fiji.version} @@ -1029,11 +1029,11 @@ - 1.1.3 + 1.1.4 ${T2-NIT.version} - 1.1.3 + 1.1.4 ${T2-TreelineGraph.version} From 88559e5e92fbe791d9ffe8cc09eab1361c7a354c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 23 Sep 2022 09:10:11 -0500 Subject: [PATCH 424/996] imagej-ops: 0.48.0 -> 0.49.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 70d8d90a..66b670c9 100644 --- a/pom.xml +++ b/pom.xml @@ -527,7 +527,7 @@ ${imagej-opencv.version} - 0.48.0 + 0.49.0 ${imagej-ops.version} From ca1984a44dd3e628fc020c94f4bffc1ad13da1f2 Mon Sep 17 00:00:00 2001 From: hinerm Date: Fri, 23 Sep 2022 11:18:17 -0500 Subject: [PATCH 425/996] Bump scijava-common > 2.89.2 Fixes a bug in ArrayToStringConverter that was breaking opening images with SCIFIO. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66b670c9..8c5f5f03 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.89.0 + 2.89.2 ${scijava-common.version} From 4a95ff69be506ac2c2a2fbe303ea84e9074d204b Mon Sep 17 00:00:00 2001 From: hinerm Date: Fri, 23 Sep 2022 14:30:36 -0500 Subject: [PATCH 426/996] Run the melting-pot as part of CI --- .github/build.sh | 25 +++++++++++++++++++++++++ .github/setup.sh | 3 +++ .github/workflows/build.yml | 26 ++++++++++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/.github/build.sh b/.github/build.sh index 7da42622..07810b21 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -1,3 +1,28 @@ #!/bin/sh curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh sh ci-build.sh + +# Record the last time of cache modification before running melting-pot +cache_modified_pre=0 +cache_modified_post=0 + +if [ -f "~/.cache/scijava/melting-pot" ]; then + cache_modified_pre=$(find ~/.cache/scijava/melting-pot -printf '%T@\n' | sort -r | head -n 1) + cache_modified_pre=${cache_modified_pre%.*} +fi + +# run melting-pot +sh tests/run.sh + +# Record the last time of cache modification after running melting-pot +if [ -f "~/.cache/scijava/melting-pot" ]; then + cache_modified_post=$(find ~/.cache/scijava/melting-pot -printf '%T@\n' | sort -r | head -n 1) + cache_modified_post=${cache_modified_post%.*} +fi + +# Determine if cache needs to be re-generated +if [ "$cache_modified_post" -gt "$cache_modified_pre" ]; then + echo "update-cache=true" >> $GITHUB_ENV +else + echo "update-cache=false" >> $GITHUB_ENV +fi diff --git a/.github/setup.sh b/.github/setup.sh index f359bbee..a38f3d77 100755 --- a/.github/setup.sh +++ b/.github/setup.sh @@ -1,3 +1,6 @@ #!/bin/sh curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh sh ci-setup-github-actions.sh + +# xmllint needed for melting pot +sudo apt-get install libxml2-utils diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 368b50f2..c2b2366a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,9 +22,19 @@ jobs: java-version: '8' distribution: 'zulu' cache: 'maven' + - name: Set up CI environment run: .github/setup.sh + + - name: Restore the cache + id: restore-cache + uses: actions/cache@v3 + with: + path: ~/.cache/scijava/melting-pot + key: ${{ runner.os }}-cache + - name: Execute the build + id: execute-build run: .github/build.sh env: GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }} @@ -33,3 +43,19 @@ jobs: MAVEN_PASS: ${{ secrets.MAVEN_PASS }} OSSRH_PASS: ${{ secrets.OSSRH_PASS }} SIGNING_ASC: ${{ secrets.SIGNING_ASC }} + + - name: Delete cache + if: env.update-cache == 'true' + id: delete-cache + run: | + gh api --method DELETE -H "Accept: application/vnd.github+json" /repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-cache + env: + GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} + + - name: Update cache post-delete + if: env.update-cache == 'true' + id: update-cache + uses: actions/cache@v3 + with: + path: ~/.cache/scijava/melting-pot + key: ${{ runner.os }}-cache From 6535f566e1cf28fa344396c9d9e18079cc3b511d Mon Sep 17 00:00:00 2001 From: hinerm Date: Mon, 26 Sep 2022 11:04:02 -0500 Subject: [PATCH 427/996] build.sh: fail build with subroutines --- .github/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/build.sh b/.github/build.sh index 07810b21..1191d83b 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh sh ci-build.sh From ee61f7b46ea1c578c1c2c19f949d32a953ba6a33 Mon Sep 17 00:00:00 2001 From: hinerm Date: Mon, 26 Sep 2022 11:04:06 -0500 Subject: [PATCH 428/996] build.sh: run melting-pot script directly --- .github/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/build.sh b/.github/build.sh index 1191d83b..f5c3029a 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -13,7 +13,7 @@ if [ -f "~/.cache/scijava/melting-pot" ]; then fi # run melting-pot -sh tests/run.sh +tests/run.sh # Record the last time of cache modification after running melting-pot if [ -f "~/.cache/scijava/melting-pot" ]; then From 96789a38d6533a3dfbbc99d4081dac71e545d934 Mon Sep 17 00:00:00 2001 From: hinerm Date: Mon, 26 Sep 2022 11:05:43 -0500 Subject: [PATCH 429/996] GitHub CI: build with javafx Required for some melting pot jobs --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2b2366a..f86086b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,7 @@ jobs: uses: actions/setup-java@v3 with: java-version: '8' + java-package: 'jdk+fx' distribution: 'zulu' cache: 'maven' From b463aa355c7d537e59bcdb8f73387df8f89da20e Mon Sep 17 00:00:00 2001 From: hinerm Date: Mon, 26 Sep 2022 11:49:05 -0500 Subject: [PATCH 430/996] build.sh: consolidate cache modification checks --- .github/build.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index f5c3029a..34eab8b6 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -3,13 +3,19 @@ set -e curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh sh ci-build.sh +# Helper method to get the last cache modified date as seconds since epoch +last_cache_modified () { + cache_modified=$(find ~/.cache/scijava/melting-pot -printf '%T@\n' | sort -r | head -n1) + cache_modified=${cache_modified%.*} + echo "$cache_modified" +} + # Record the last time of cache modification before running melting-pot cache_modified_pre=0 cache_modified_post=0 if [ -f "~/.cache/scijava/melting-pot" ]; then - cache_modified_pre=$(find ~/.cache/scijava/melting-pot -printf '%T@\n' | sort -r | head -n 1) - cache_modified_pre=${cache_modified_pre%.*} + cache_modified_pre=$(last_cache_modified) fi # run melting-pot @@ -17,8 +23,7 @@ tests/run.sh # Record the last time of cache modification after running melting-pot if [ -f "~/.cache/scijava/melting-pot" ]; then - cache_modified_post=$(find ~/.cache/scijava/melting-pot -printf '%T@\n' | sort -r | head -n 1) - cache_modified_post=${cache_modified_post%.*} + cache_modified_post=$(last_cache_modified) fi # Determine if cache needs to be re-generated From 02f77140bfb32182cd6ca4d823e0b9624adb8a05 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 26 Sep 2022 12:40:27 -0500 Subject: [PATCH 431/996] CI: do the post-build cache TLC even if melt fails --- .github/build.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index 34eab8b6..2c99e987 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -1,7 +1,6 @@ #!/bin/sh -set -e -curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh -sh ci-build.sh +curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh && +sh ci-build.sh || { echo "Maven build failed. Skipping melting pot tests."; exit 1; } # Helper method to get the last cache modified date as seconds since epoch last_cache_modified () { @@ -20,6 +19,7 @@ fi # run melting-pot tests/run.sh +meltResult=$? # Record the last time of cache modification after running melting-pot if [ -f "~/.cache/scijava/melting-pot" ]; then @@ -32,3 +32,5 @@ if [ "$cache_modified_post" -gt "$cache_modified_pre" ]; then else echo "update-cache=false" >> $GITHUB_ENV fi + +exit $meltResult From fa2d041928eea87668be48e7dc07436671f3bca4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 26 Sep 2022 14:04:40 -0500 Subject: [PATCH 432/996] mega-melt: make vim % matching happy --- tests/run.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index 22160d14..6102f733 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -146,7 +146,8 @@ rm "$buildScriptTemp" || die 'Error adjusting melting pot build script!' # HACK: Adjust component POMs to satisfy Maven HTTPS strictness. -find "$meltingPotDir" -name pom.xml | while read pom +find "$meltingPotDir" -name pom.xml | + while read pom do mv "$pom" "$pom.original" && sed -E -e 's_(https?://maven.imagej.net|http://maven.scijava.org)_https://maven.scijava.org_g' \ From 72a68169ad4b289d405201ec9294ba3d0af21fd0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 26 Sep 2022 14:05:02 -0500 Subject: [PATCH 433/996] mega-melt: dump logs for failing builds and tests --- tests/run.sh | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 6102f733..a3dcd2bb 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -193,8 +193,47 @@ do done if [ "$doMelt" ] then - echo && - cd "$meltingPotDir" && sh melt.sh || die 'Melting pot failed!' + echo + cd "$meltingPotDir" + sh melt.sh + meltResult=$? + + # Dump logs for failing builds and/or tests. + for d in */* + do + test -d "$d" || continue + + # Check for failing build log. + buildLog="$d/build.log" + if [ -f "$buildLog" ] + then + if grep -qF 'BUILD FAILURE' "$buildLog" + then + echo + echo "[$buildLog]" + cat "$buildLog" + fi + fi + + # Check for failing test logs. + testLogsDir="$dir/target/surefire-reports" + if [ -d "$testLogsDir" ] + then + find "$testLogsDir" -name '*.txt' | + while read report + do + if grep -qF 'FAILURE!' "$report" + then + echo + echo "[$report]" + cat "$report" + fi + done + fi + done + + # Terminate the script with same exit code if the melt failed. + test "$meltResult" -eq 0 || exit "$meltResult" else echo && echo 'Melting the pot... SKIPPED' From b29019c90aa8b6d7adbdfe2ee97c389118e9576a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 26 Sep 2022 14:42:08 -0500 Subject: [PATCH 434/996] mega-melt: install needed native packages Some components require certain native libraries to be present in order to function. We would prefer to test these components, so let's install the libraries they crave. This also means we can test n5-blosc now. --- .github/setup.sh | 8 ++++++-- tests/run.sh | 4 ---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/setup.sh b/.github/setup.sh index a38f3d77..1350dd5d 100755 --- a/.github/setup.sh +++ b/.github/setup.sh @@ -2,5 +2,9 @@ curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-setup-github-actions.sh sh ci-setup-github-actions.sh -# xmllint needed for melting pot -sudo apt-get install libxml2-utils +# Install needed packages. +pkgs="libxml2-utils" # needed for melting pot +pkgs="$pkgs libxcb-shape0" # org.janelia:H5J_Loader_Plugin (fiji/H5J_Loader_Plugin@d026a1bb) +pkgs="$pkgs libgtk2.0-0" # net.imagej:imagej-opencv (imagej/imagej-opencv@21113e08) +pkgs="$pkgs libblosc1" # org.janelia.saalfeldlab:n5-blosc +sudo apt-get -y install $(echo "$pkgs") diff --git a/tests/run.sh b/tests/run.sh index a3dcd2bb..0d0e8a13 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -172,10 +172,6 @@ chmod +x "$meltScript" || # Request ID: null; S3 Extended Request ID: null; Proxy: null) echo "org.janelia.saalfeldlab/n5-aws-s3" > "$skipTestsFile" && -# java.lang.UnsatisfiedLinkError: Unable to load library 'blosc' -echo "org.janelia.saalfeldlab/n5-blosc" >> "$skipTestsFile" && -echo "org.janelia.saalfeldlab/n5-zarr" >> "$skipTestsFile" && - # Error while checking the CLIJ2 installation: null echo "sc.fiji/labkit-pixel-classification" >> "$skipTestsFile" || die "Failed to generate $skipTestsFile" From b42bc0592c63b2b8f68ffcc3af5c57b50d7f0b95 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Sep 2022 12:25:32 -0500 Subject: [PATCH 435/996] Update imagej-common: 0.35.0 -> 1.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8c5f5f03..6081a46b 100644 --- a/pom.xml +++ b/pom.xml @@ -483,7 +483,7 @@ ${ij1-patcher.version} - 0.35.0 + 1.0.0 ${imagej-common.version} From a3626e23a645435bc66c12a005d6a33b3a523465 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Sep 2022 15:43:13 -0500 Subject: [PATCH 436/996] Update scijava-table: 0.7.0 -> 1.0.0 And stop managing scijava-plugins-io-table, which merged with it. --- pom.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 6081a46b..16fc838c 100644 --- a/pom.xml +++ b/pom.xml @@ -374,10 +374,6 @@ 0.2.3 ${scijava-plugins-commands.version} - - 0.4.0 - ${scijava-plugins-io-table.version} - 0.3.1 ${scijava-plugins-platforms.version} @@ -395,7 +391,7 @@ ${scijava-search.version} - 0.7.0 + 1.0.0 ${scijava-table.version} @@ -2098,13 +2094,6 @@ ${org.scijava.scijava-plugins-commands.version} - - - org.scijava - scijava-plugins-io-table - ${org.scijava.scijava-plugins-io-table.version} - - org.scijava From 162c71183bfc494ffb770fdfe4b74c05e0c4482c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 29 Sep 2022 09:23:27 -0500 Subject: [PATCH 437/996] mega-melt: skip imagej-legacy and n5-zarr tests The current version of imagej-legacy fails the melt with errors like: Error: testCanConvert2(net.imagej.legacy.convert.StringToImagePlusConverterTest) Time elapsed: 3.731 s <<< ERROR! java.awt.HeadlessException: No X11 DISPLAY variable was set, but this program performed an operation which requires it. at net.imagej.legacy.convert.StringToImagePlusConverterTest.setUp(StringToImagePlusConverterTest.java:75) Once imagej/imagej-legacy#285 is fixed, we can reenable it. And n5-zarr has a failing test due to changes in n5 as of version 2.5.0. When saalfeldlab/n5-zarr#11 is merged and released, we can reenable it. --- tests/run.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/run.sh b/tests/run.sh index 0d0e8a13..17b744aa 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -167,6 +167,12 @@ grep -qxF "$f" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ chmod +x "$meltScript" || die "Failed to adjust $meltScript" +# TEMP: Until imagej/imagej-legacy#285 is fixed. +echo "net.imagej/imagej-legacy" > "$skipTestsFile" && + +# TEMP: Until saalfeldlab/n5-zarr#11 is merged and released. +echo "org.janelia.saalfeldlab/n5-zarr" > "$skipTestsFile" && + # com.amazonaws.services.s3.model.AmazonS3Exception: The specified bucket does # not exist (Service: Amazon S3; Status Code: 404; Error Code: NoSuchBucket; # Request ID: null; S3 Extended Request ID: null; Proxy: null) From 6acbc47a85cd3d2c9ddc2dcdca72331cfc35a718 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 29 Sep 2022 12:58:32 -0500 Subject: [PATCH 438/996] mega-melt: fix bug in skipTests.txt generation We need to append each line to the existing file. Because the melting-pot directory is always newly created, we can just always use >> instead of >, to avoid future bugs resulting from copy-paste, as my mistake today was. --- tests/run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 17b744aa..2807f264 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -168,15 +168,15 @@ chmod +x "$meltScript" || die "Failed to adjust $meltScript" # TEMP: Until imagej/imagej-legacy#285 is fixed. -echo "net.imagej/imagej-legacy" > "$skipTestsFile" && +echo "net.imagej/imagej-legacy" >> "$skipTestsFile" && # TEMP: Until saalfeldlab/n5-zarr#11 is merged and released. -echo "org.janelia.saalfeldlab/n5-zarr" > "$skipTestsFile" && +echo "org.janelia.saalfeldlab/n5-zarr" >> "$skipTestsFile" && # com.amazonaws.services.s3.model.AmazonS3Exception: The specified bucket does # not exist (Service: Amazon S3; Status Code: 404; Error Code: NoSuchBucket; # Request ID: null; S3 Extended Request ID: null; Proxy: null) -echo "org.janelia.saalfeldlab/n5-aws-s3" > "$skipTestsFile" && +echo "org.janelia.saalfeldlab/n5-aws-s3" >> "$skipTestsFile" && # Error while checking the CLIJ2 installation: null echo "sc.fiji/labkit-pixel-classification" >> "$skipTestsFile" || From 9ec5bc2380334e1d9ce9bb479b0141e2fecd8363 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 1 Oct 2022 12:02:38 -0500 Subject: [PATCH 439/996] Manage TrackMate extensions --- pom.xml | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 112 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 16fc838c..929fafd5 100644 --- a/pom.xml +++ b/pom.xml @@ -904,9 +904,6 @@ ${TopoJ.version} ${TopoJ_.version} - 7.7.2 - ${TrackMate.version} - 3.3.3 ${Trainable_Segmentation.version} @@ -1022,6 +1019,56 @@ 2.2.7 ${spim_data.version} + + + + 7.7.2 + ${TrackMate.version} + + + 0.0.7 + ${TrackMate-Cellpose.version} + + + 3.1.2 + ${TrackMate-CSVImporter.version} + + + + + + 1.2.4 + ${TrackMate-ExTrack.version} + + + 1.2.2 + ${TrackMate-Ilastik.version} + + + 1.1.2 + ${TrackMate-MorphoLibJ.version} + + + 3.0.0 + ${TrackMate-Oneat.version} + + + 2.0.0 + ${TrackMate-Skeleton.version} + + + + + + 1.1.1 + ${TrackMate-Weka.version} + @@ -2954,11 +3001,6 @@ TopoJ_ ${sc.fiji.TopoJ_.version} - - sc.fiji - TrackMate - ${sc.fiji.TrackMate.version} - sc.fiji Trainable_Segmentation @@ -3135,6 +3177,68 @@ ${sc.fiji.spim_data.version} + + + + sc.fiji + TrackMate + ${sc.fiji.TrackMate.version} + + + sc.fiji + TrackMate-Cellpose + ${sc.fiji.TrackMate-Cellpose.version} + + + sc.fiji + TrackMate-CSVImporter + ${sc.fiji.TrackMate-CSVImporter.version} + + + + sc.fiji + TrackMate-ExTrack + ${sc.fiji.TrackMate-ExTrack.version} + + + sc.fiji + TrackMate-Ilastik + ${sc.fiji.TrackMate-Ilastik.version} + + + sc.fiji + TrackMate-MorphoLibJ + ${sc.fiji.TrackMate-MorphoLibJ.version} + + + sc.fiji + TrackMate-Oneat + ${sc.fiji.TrackMate-Oneat.version} + + + sc.fiji + TrackMate-Skeleton + ${sc.fiji.TrackMate-Skeleton.version} + + + + sc.fiji + TrackMate-Weka + ${sc.fiji.TrackMate-Weka.version} + + From efbfc285fb7a15a7a9b312afd42cd6702e962ab4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 2 Oct 2022 11:56:35 -0500 Subject: [PATCH 440/996] Manage TrackMate-StarDist at version 1.1.4 --- pom.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 929fafd5..036a0c15 100644 --- a/pom.xml +++ b/pom.xml @@ -1060,10 +1060,8 @@ ${TrackMate-Skeleton.version} - 1.1.1 @@ -3226,13 +3224,11 @@ TrackMate-Skeleton ${sc.fiji.TrackMate-Skeleton.version} - sc.fiji TrackMate-Weka From dddbe9c2dffadc87a21055879e3b6e9a0e65d0f4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 3 Oct 2022 10:54:54 -0500 Subject: [PATCH 441/996] mega-melt: add link to relevant n5-aws-s3 issue --- tests/run.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 2807f264..3cda6732 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -173,9 +173,7 @@ echo "net.imagej/imagej-legacy" >> "$skipTestsFile" && # TEMP: Until saalfeldlab/n5-zarr#11 is merged and released. echo "org.janelia.saalfeldlab/n5-zarr" >> "$skipTestsFile" && -# com.amazonaws.services.s3.model.AmazonS3Exception: The specified bucket does -# not exist (Service: Amazon S3; Status Code: 404; Error Code: NoSuchBucket; -# Request ID: null; S3 Extended Request ID: null; Proxy: null) +# TEMP: Until saalfeldlab/n5-aws-s3#13 is fixed. echo "org.janelia.saalfeldlab/n5-aws-s3" >> "$skipTestsFile" && # Error while checking the CLIJ2 installation: null From 039cd0ab95de132271d69d452b4dc0550681c407 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 3 Oct 2022 12:54:03 -0500 Subject: [PATCH 442/996] Manage the version of commons-csv And add an exclusion to omero-model to avoid class clashes. --- pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pom.xml b/pom.xml index 036a0c15..c9c72c71 100644 --- a/pom.xml +++ b/pom.xml @@ -1471,6 +1471,10 @@ 1.21 ${commons-compress.version} + + 1.9.0 + ${commons-csv.version} + 2.7 ${commons-io.version} @@ -3582,6 +3586,11 @@ javax.transaction jta + + + org.apache.solr + solr-commons-csv + @@ -4218,6 +4227,13 @@ ${org.apache.commons.commons-compress.version} + + + org.apache.commons + commons-csv + ${org.apache.commons.commons-csv.version} + + commons-io From 4e861259d47868e54e89f1d687e68bf988754984 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 3 Oct 2022 13:19:45 -0500 Subject: [PATCH 443/996] Update TrackMate: 7.7.2 -> 7.9.1 This update is needed for some TrackMate extensions to build correctly. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c9c72c71..b94aa32a 100644 --- a/pom.xml +++ b/pom.xml @@ -1022,7 +1022,7 @@ - 7.7.2 + 7.9.1 ${TrackMate.version} From c064c41116d3ac161d4f5325f50cdfc871325d58 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 3 Oct 2022 14:26:39 -0500 Subject: [PATCH 444/996] Update TrackMate-Ilastik: 1.2.2 -> 1.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b94aa32a..f6c1b644 100644 --- a/pom.xml +++ b/pom.xml @@ -1044,7 +1044,7 @@ ${TrackMate-ExTrack.version} - 1.2.2 + 1.3.0 ${TrackMate-Ilastik.version} From f3305137ccd3c819d0043f8273229af988dc5be1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 3 Oct 2022 14:41:18 -0500 Subject: [PATCH 445/996] Update TrackMate components * TrackMate-Cellpose: 0.0.7 -> 0.1.0 * TrackMate-MorphoLibJ: 1.1.2 -> 1.2.0 * TrackMate-StarDist: 1.1.4 -> 1.2.0 * TrackMate-Weka: 1.1.1 -> 1.2.0 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f6c1b644..c5536b81 100644 --- a/pom.xml +++ b/pom.xml @@ -1026,7 +1026,7 @@ ${TrackMate.version} - 0.0.7 + 0.1.0 ${TrackMate-Cellpose.version} @@ -1048,7 +1048,7 @@ ${TrackMate-Ilastik.version} - 1.1.2 + 1.2.0 ${TrackMate-MorphoLibJ.version} @@ -1060,11 +1060,11 @@ ${TrackMate-Skeleton.version} - 1.1.4 + 1.2.0 ${TrackMate-StarDist.version} - 1.1.1 + 1.2.0 ${TrackMate-Weka.version} From 003657c11df7af11b85f8178af10411922da1de3 Mon Sep 17 00:00:00 2001 From: Stephan Saalfeld Date: Mon, 3 Oct 2022 12:05:19 -0400 Subject: [PATCH 446/996] bump to mpicbg-1.5.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c5536b81..259ec8e0 100644 --- a/pom.xml +++ b/pom.xml @@ -984,7 +984,7 @@ ${bigwarp_fiji.version} - 1.4.2 + 1.5.0 ${mpicbg.version} ${mpicbg.version} ${mpicbg_.version} From 951d4ef4afe4175066afcbdd64244d5ca0d72d11 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 5 Oct 2022 15:27:41 -0500 Subject: [PATCH 447/996] Add more info about logback-classic in ome-common --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 259ec8e0..3fd862b5 100644 --- a/pom.xml +++ b/pom.xml @@ -3425,6 +3425,13 @@ libraries or frameworks should not declare a dependency on any SLF4J binding but only depend on slf4j-api." See: https://www.slf4j.org/manual.html#libraries + + In any case: the ome-common usage of logback-classic is limited to + the class loci.common.LogbackTools, accessed only via reflection + from loci.common.DebugTools, with the intent that this dependency + may or may not actually be present at runtime. So this dependency + really should be marked optional in the ome-common POM, but since + it is not marked so, we exclude it here in pom-scijava instead. --> ch.qos.logback logback-classic From a20be31d49adae8617ce2d9baf68046c379454a8 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 5 Oct 2022 15:28:03 -0500 Subject: [PATCH 448/996] Exclude logback-classic from bio-formats_plugins It is really an optional dependency; the library works without it. --- pom.xml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pom.xml b/pom.xml index 3fd862b5..3107d1e8 100644 --- a/pom.xml +++ b/pom.xml @@ -3488,6 +3488,31 @@ ome bio-formats_plugins ${ome.bio-formats_plugins.version} + + + + ch.qos.logback + logback-classic + + ome From ae7562ec64f21179583099d4141e95492725d81b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 5 Oct 2022 15:28:25 -0500 Subject: [PATCH 449/996] Update imagej-matlab: 0.7.4 -> 0.7.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3107d1e8..4c4404d6 100644 --- a/pom.xml +++ b/pom.xml @@ -495,7 +495,7 @@ ${imagej-legacy.version} - 0.7.4 + 0.7.5 ${imagej-matlab.version} From 2e72287b19deef9f1c15222e170a8587773ee673 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 5 Oct 2022 15:51:54 -0500 Subject: [PATCH 450/996] Manage the version of scifio-labeling --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 4c4404d6..fd20f40f 100644 --- a/pom.xml +++ b/pom.xml @@ -638,6 +638,10 @@ 1.1.1 ${scifio-jai-imageio.version} + + 0.3.1 + ${scifio-labeling.version} + 0.9.0 ${scifio-lifesci.version} @@ -2603,6 +2607,13 @@ ${io.scif.scifio-jai-imageio.version} + + + io.scif + scifio-labeling + ${io.scif.scifio-labeling.version} + + io.scif From a3e490c97ce056c426ff55ea371bb65a37a4ad77 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 11 Oct 2022 16:44:43 -0500 Subject: [PATCH 451/996] README: fix path to GitHub Actions badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7eccbd13..4a967cd0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![](https://img.shields.io/maven-central/v/org.scijava/pom-scijava.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.scijava%22%20AND%20a%3A%22pom-scijava%22) -[![](https://github.com/scijava/pom-scijava/actions/workflows/build-main.yml/badge.svg)](https://github.com/scijava/pom-scijava/actions/workflows/build-main.yml) +[![](https://github.com/scijava/pom-scijava/actions/workflows/build.yml/badge.svg)](https://github.com/scijava/pom-scijava/actions/workflows/build.yml) This POM provides a parent from which SciJava-based projects can declare their build configurations. It ensures that projects all use a compatible build environment, as well as versions of dependencies and plugins. Projects extending this POM inherit the unified SciJava [Bill of Materials](https://imagej.net/develop/architecture#bill-of-materials): component versions which have been tested to work together. From a7657c5a31644dfcbaaff3aa1a03ed26e87bd4d4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 11 Oct 2022 16:43:11 -0500 Subject: [PATCH 452/996] Update ij1-patcher: 1.2.2 -> 1.2.3 This fixes a critical bug in headless support, where calling ImagePlus's show() function before running a macro would throw HeadlessException. With this fix, we can reenable the imagej-legacy automated tests. --- pom.xml | 6 +++--- tests/run.sh | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index fd20f40f..13c9efce 100644 --- a/pom.xml +++ b/pom.xml @@ -469,13 +469,13 @@ ${imagej2.version} ${imagej.version} - + 1.53t ${imagej1.version} ${ij.version} - - 1.2.2 + + 1.2.3 ${ij1-patcher.version} diff --git a/tests/run.sh b/tests/run.sh index 3cda6732..39f2c45a 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -167,9 +167,6 @@ grep -qxF "$f" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ chmod +x "$meltScript" || die "Failed to adjust $meltScript" -# TEMP: Until imagej/imagej-legacy#285 is fixed. -echo "net.imagej/imagej-legacy" >> "$skipTestsFile" && - # TEMP: Until saalfeldlab/n5-zarr#11 is merged and released. echo "org.janelia.saalfeldlab/n5-zarr" >> "$skipTestsFile" && From a3eb836be1aa6760fe6ae9a06dabe9bbb0807816 Mon Sep 17 00:00:00 2001 From: David Gault Date: Thu, 13 Oct 2022 15:37:29 +0100 Subject: [PATCH 453/996] Bump Bio-Formats version to 6.11.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 13c9efce..0bced4a1 100644 --- a/pom.xml +++ b/pom.xml @@ -1192,7 +1192,7 @@ ${jxrlib-all.version} - 6.10.1 + 6.11.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From 48cc4f428fa70607186e0aa72c670389b9aecad5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 17 Oct 2022 13:12:43 -0500 Subject: [PATCH 454/996] Fix flatlaf.version property cascade Unless there is a name clash, the long name delegates to the short one. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0bced4a1..8f462bc1 100644 --- a/pom.xml +++ b/pom.xml @@ -1558,7 +1558,7 @@ 2.4 - 2.4 + ${flatlaf.version} 0.120.0-alpha From 1b1a78cd7c6f3b058ff43e1b94e0901c9f37d3a1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 17 Oct 2022 13:37:27 -0500 Subject: [PATCH 455/996] Introduce long properties for com.zeroc artifacts --- pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8f462bc1..356e1ac8 100644 --- a/pom.xml +++ b/pom.xml @@ -1169,6 +1169,8 @@ 3.6.5 ${ice.version} + ${glacier2.version} + ${ice.version} 6.0.13 @@ -3387,12 +3389,12 @@ com.zeroc glacier2 - ${glacier2.version} + ${com.zeroc.glacier2.version} com.zeroc ice - ${ice.version} + ${com.zeroc.ice.version} From a3eb9e2ed5f7e8656fdf656a285d5392ab100cfe Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 19 Oct 2022 16:49:49 -0500 Subject: [PATCH 456/996] Update component versions * scijava-common: 2.89.2 -> 2.90.0 * scijava-table: 1.0.0 -> 1.0.1 * scijava-ui-swing: 0.17.1 -> 0.17.2 * imagej1: 1.53t -> 1.53u * imglib2-algorithm: 0.12.1 -> 0.13.0 * TrackMate: 7.9.1 -> 7.9.2 * TrackMate-Weka: 1.2.0 -> 1.3.0 * n5-imglib2: 4.3.0 -> 4.4.0 * MaMuT: 7.0.6 -> 7.1.0 * MorphoLibJ: 1.4.2.1 -> 1.5.0 * SNT: 4.1.3 -> 4.1.9 * clij2_: 2.5.1.4 -> 2.5.3.1 * clij2-assistant_: 2.5.1.1 -> 2.5.1.4 * clijx_: 0.32.1.1 -> 0.32.2.0 --- pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 356e1ac8..465e45c4 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.89.2 + 2.90.0 ${scijava-common.version} @@ -391,7 +391,7 @@ ${scijava-search.version} - 1.0.0 + 1.0.1 ${scijava-table.version} @@ -399,7 +399,7 @@ ${scijava-ui-awt.version} - 0.17.1 + 0.17.2 ${scijava-ui-swing.version} @@ -470,7 +470,7 @@ ${imagej.version} - 1.53t + 1.53u ${imagej1.version} ${ij.version} @@ -581,7 +581,7 @@ ${imglib2.version} - 0.12.1 + 0.13.0 ${imglib2-algorithm.version} @@ -1026,7 +1026,7 @@ - 7.9.1 + 7.9.2 ${TrackMate.version} @@ -1068,7 +1068,7 @@ ${TrackMate-StarDist.version} - 1.2.0 + 1.3.0 ${TrackMate-Weka.version} @@ -1125,7 +1125,7 @@ ${n5-ij.version} - 4.3.0 + 4.4.0 ${n5-imglib2.version} @@ -1139,16 +1139,16 @@ - 7.0.6 + 7.1.0 ${MaMuT.version} - 1.4.2.1 + 1.5.0 ${MorphoLibJ.version} ${MorphoLibJ_.version} - 4.1.3 + 4.1.9 ${SNT.version} @@ -1265,9 +1265,9 @@ 1.8.1.1 2.3.0.4 2.5.0.1 - 2.5.1.4 - 2.5.1.1 - 0.32.1.1 + 2.5.3.1 + 2.5.1.4 + 0.32.2.0 0.32.1.1 ${clij_.version} ${clij-core.version} From 0f1b010dc429eab51493fc4e089b1a614fdcad61 Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Sat, 22 Oct 2022 08:01:07 -0400 Subject: [PATCH 457/996] Update flatlaf This fixes an issue in which flatlaf would degrade AWT dialogs on MacOS. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 465e45c4..4663d19d 100644 --- a/pom.xml +++ b/pom.xml @@ -1559,7 +1559,7 @@ ${ejml.version} - 2.4 + 2.6 ${flatlaf.version} From 2421c5fad3fe244789a065c1ed58fcfb85df23d8 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 25 Oct 2022 15:43:40 -0500 Subject: [PATCH 458/996] Update parent to pom-scijava-base 15.1.0 This adds management of the exists-maven-plugin. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4663d19d..7d433bea 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 15.0.3 + 15.1.0 From 977aa696dea53b8b62fb2c7692585a23b9587686 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 25 Oct 2022 15:54:44 -0500 Subject: [PATCH 459/996] Update KymographBuilder: 2.1.1 -> 3.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d433bea..b6deae84 100644 --- a/pom.xml +++ b/pom.xml @@ -800,7 +800,7 @@ 2.0.1 ${Kuwahara_Filter.version} - 2.1.1 + 3.0.0 ${KymographBuilder.version} 4.1.2 From 2753f7976972e25c859efc3e20f4077a68af4060 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 26 Oct 2022 13:54:09 -0500 Subject: [PATCH 460/996] mega-melt: skip TWS tests temporarily --- tests/run.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/run.sh b/tests/run.sh index 39f2c45a..d262e8bf 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -173,6 +173,9 @@ echo "org.janelia.saalfeldlab/n5-zarr" >> "$skipTestsFile" && # TEMP: Until saalfeldlab/n5-aws-s3#13 is fixed. echo "org.janelia.saalfeldlab/n5-aws-s3" >> "$skipTestsFile" && +# TEMP: Until fiji/Trainable_Segmentation#75 is fixed. +echo "sc.fiji/Trainable_Segmentation" >> "$skipTestsFile" && + # Error while checking the CLIJ2 installation: null echo "sc.fiji/labkit-pixel-classification" >> "$skipTestsFile" || die "Failed to generate $skipTestsFile" From 762038345a8d02c252eda96d233ab4e62e0ff665 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 26 Oct 2022 13:55:13 -0500 Subject: [PATCH 461/996] Update pom-scijava-base parent to 15.2.0 This bumps the Kotlin version from 1.4.21 to 1.7.20. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b6deae84..7302f970 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 15.1.0 + 15.2.0 From 772f2a2f7459bf8f2b71acdb661e16f10c5ee416 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 27 Oct 2022 09:16:35 -0500 Subject: [PATCH 462/996] mega-melt: find artifacts at maven.scijava.org too This helps the melting pot to download the existing release binary for testing binary compatibility, in the case where the component in question does not depend on maven.scijava.org for its dependencies but *was* deployed to maven.scijava.org for its release. --- tests/run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/run.sh b/tests/run.sh index d262e8bf..d86d4d82 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -84,6 +84,7 @@ fi || # Build the melting pot structure. chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ + -r scijava.public::::https://maven.scijava.org/content/groups/public \ -o "$meltingPotDir" \ -i 'ca.mcgill:*' \ -i 'io.scif:*' \ From 9fa3a9384721988a108f633c6fe78b90d2746de8 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 27 Oct 2022 12:45:06 -0500 Subject: [PATCH 463/996] mega-melt: unify the value of kotlin.version This one doesn't get set by the melting pot by default. But we need to set it for the scripting-kotlin build to pass. --- tests/run.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/run.sh b/tests/run.sh index d86d4d82..0c20a5c3 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -142,6 +142,14 @@ sed -E 's; -Dsc.fiji.(3D_Objects_Counter|3D_Viewer)\.version=([^ ]*);& -DImageJ_ mv -f "$buildScript" "$buildScriptTemp" && sed -E 's; -Dij\.version=([^ ]*);& -Dimagej1.version=\1;' "$buildScriptTemp" > "$buildScript" && +# HACK: Add explicit kotlin.version to match our pom-scijava-base. +# Otherwise, components built on older pom-scijava-base will have +# mismatched kotlin component versions. +kotlinVersion=$(mvn -B -U -q -Denforcer.skip=true -Dexec.executable=echo \ + -Dexec.args='${kotlin.version}' --non-recursive validate exec:exec 2>&1) && +mv -f "$buildScript" "$buildScriptTemp" && +sed -E "s;mvn -Denforcer.skip;& -Dkotlin.version=$kotlinVersion;" "$buildScriptTemp" > "$buildScript" && + chmod +x "$buildScript" && rm "$buildScriptTemp" || die 'Error adjusting melting pot build script!' From 965750da89571c8a74609b42b3fbf3498f7272ab Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Thu, 27 Oct 2022 21:43:36 -0400 Subject: [PATCH 464/996] Update rsyntaxtextarea components to v3.3.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7302f970..29b9ff4c 100644 --- a/pom.xml +++ b/pom.xml @@ -1969,9 +1969,9 @@ ${reload4j.version} - 3.1.6 - 3.1.5 - 3.1.4 + 3.3.0 + 3.3.0 + 3.3.0 ${rsyntaxtextarea.version} ${autocomplete.version} ${languagesupport.version} From 39e5e269c54337ba570af94dd567dfc8bb763b2f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 28 Oct 2022 17:13:18 -0500 Subject: [PATCH 465/996] Update imagej-opencv: 0.1.3 This fixes its dependencies to work properly as the versions of opencv and javacpp roll forward over time. It also makes the footprint smaller. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7302f970..a8ecd3e9 100644 --- a/pom.xml +++ b/pom.xml @@ -519,7 +519,7 @@ ${imagej-omero-legacy.version} - 0.1.2 + 0.1.3 ${imagej-opencv.version} From 4b9865bc6e4f7644053d875b451be3047790d777 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 28 Oct 2022 17:27:00 -0500 Subject: [PATCH 466/996] Update component versions * scijava-config: 2.0.2 -> 2.0.3 * scijava-log-slf4j: 1.0.5 -> 1.0.6 * H5J_Loader_Plugin: 1.1.4 -> 1.1.5 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a8ecd3e9..40fb994f 100644 --- a/pom.xml +++ b/pom.xml @@ -339,7 +339,7 @@ ${scijava-common.version} - 2.0.2 + 2.0.3 ${scijava-config.version} @@ -359,7 +359,7 @@ ${scijava-listeners.version} - 1.0.5 + 1.0.6 ${scijava-log-slf4j.version} @@ -766,7 +766,7 @@ 2.3.5 ${Gray_Morphology.version} - 1.1.4 + 1.1.5 ${H5J_Loader_Plugin.version} 1.1.1 From c62c9b3358d76d2884de3f8e3a60e4de6c718350 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 19 Oct 2022 16:49:49 -0500 Subject: [PATCH 467/996] Update dependency versions * antlr: 3.5.2 -> 3.5.3 * aws-java-sdk-s3: 1.11.796 -> 1.12.321 * maven-core: 3.8.2 -> 3.8.6 * poi: 5.2.0 -> 5.2.3 * httpcore: 4.4.14 -> 4.4.15 * batik: 1.14 -> 1.15 * xmlgraphics-commons: 2.6 -> 2.7 * cdi-api: 1.2 -> 2.0.SP1 * commons-codec: 1.14 -> 1.15 * commons-io: 2.7 -> 2.11.0 * commons-text: 1.9 -> 1.10.0 * eclipse-collections: 11.0.0 -> 11.1.0 * google-cloud-nio: 0.120.0-alpha -> 0.124.17 * google-cloud-storage: 1.108.0 -> 2.13.0 * google-http-client: 1.40.0 -> 1.42.2 * gson: 2.9.0 -> 2.9.1 * itextpdf: 5.5.13.1 -> 5.5.13.3 * jackrabbit-webdav: 2.21.7 -> 2.21.13 * javacpp: 1.5.2 -> 1.5.7 * ffmpeg: 4.2.1-1.5.2 -> 5.0-1.5.7 * hdf5: 1.10.5-1.5.2 -> 1.12.1-1.5.7 * leptonica: 1.78.0-1.5.2 -> 1.82.0-1.5.7 * openblas: 0.3.7-1.5.2 -> 0.3.19-1.5.7 * opencv: 4.1.2-1.5.2 -> 4.5.5-1.5.7 * tesseract: 4.1.0-1.5.2 -> 5.0.1-1.5.7 * javassist: 3.28.0-GA -> 3.29.2-GA * jcodings: 1.0.55 -> 1.0.57 * jdom2: 2.0.6 -> 2.0.6.1 * jetty: 9.4.29.v20200521 -> 9.4.49.v20220914 * jfreesvg: 3.4.1 -> 3.4.3 * jgraphx: 4.1.0 -> 4.2.2 * jmh: 1.33 -> 1.35 * joda-time: 2.10.6 -> 2.12.0 * joml: 1.10.2 -> 1.10.5 * junit-jupiter: 5.8.1 -> 5.9.1 * kryo: 4.0.2 -> 5.3.0 * minlog: 1.3.0 -> 1.3.1 * logback: 1.2.3 -> 1.2.9 * miglayout: 5.2 -> 5.3 * opencsv: 5.2 -> 5.7.0 * picocli: 4.3.2 -> 4.6.3 * postgresql: 42.2.24 -> 42.5.0 * reload4j: 1.2.18.3 -> 1.2.22 * snakeyaml: 1.29 -> 1.33 * snakeyaml-engine: 2.3 -> 2.5 * weka: 3.9.5 -> 3.9.6 --- pom.xml | 107 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 60 insertions(+), 47 deletions(-) diff --git a/pom.xml b/pom.xml index 40fb994f..3a2c13cb 100644 --- a/pom.xml +++ b/pom.xml @@ -1281,7 +1281,7 @@ - 3.5.2 + 3.5.3 ${antlr.version} 2.7.7 ${antlr.version} @@ -1292,7 +1292,7 @@ ${args4j.version} - 1.11.796 + 1.12.321 ${aws-java-sdk-s3.version} @@ -1354,7 +1354,7 @@ 0.13.1 3.2.0 - 3.8.2 + 3.8.6 3.6.1 2.6.0 2.6.0 @@ -1366,7 +1366,7 @@ ${sisu-inject-plexus.version} - 5.2.0 + 5.2.3 ${poi.version} ${poi.version} ${poi.version} @@ -1386,12 +1386,12 @@ 4.5.13 - 4.4.14 + 4.4.15 ${httpclient.version} ${httpcore.version} - 1.14 + 1.15 ${batik.version} ${batik.version} ${batik.version} @@ -1419,7 +1419,7 @@ ${batik.version} ${batik.version} ${batik.version} - 2.6 + 2.7 ${batik-anim.version} ${batik-awt-util.version} ${batik-bridge.version} @@ -1458,7 +1458,7 @@ ${bridj.version} - 1.2 + 2.0.SP1 ${cdi-api.version} @@ -1466,7 +1466,7 @@ ${commons-beanutils.version} - 1.14 + 1.15 ${commons-codec.version} @@ -1482,7 +1482,7 @@ ${commons-csv.version} - 2.7 + 2.11.0 ${commons-io.version} @@ -1504,7 +1504,7 @@ ${commons-pool2.version} - 1.9 + 1.10.0 ${commons-text.version} @@ -1512,7 +1512,7 @@ ${cglib.version} - 11.0.0 + 11.1.0 ${eclipse-collections.version} ${eclipse-collections.version} ${eclipse-collections.version} @@ -1563,15 +1563,15 @@ ${flatlaf.version} - 0.120.0-alpha + 0.124.17 0.117.2-alpha - 1.108.0 + 2.13.0 ${google-cloud-nio.version} ${google-cloud-resourcemanager.version} ${google-cloud-storage.version} - 1.40.0 + 1.42.2 ${google-http-client.version} ${google-http-client.version} ${google-http-client.version} @@ -1581,7 +1581,7 @@ ${google-http-client-xml.version} - 2.9.0 + 2.9.1 ${gson.version} @@ -1593,11 +1593,11 @@ ${hsqldb.version} - 5.5.13.1 + 5.5.13.3 ${itextpdf.version} - 2.21.7 + 2.21.13 ${jackrabbit-webdav.version} @@ -1635,23 +1635,23 @@ - 1.5.2 + 1.5.7 ${org.bytedeco.javacpp.version} ${javacpp.version} ${javacv.version} 2.3.1-${org.bytedeco.javacpp.version} - 4.2.1-${org.bytedeco.javacpp.version} + 5.0-${org.bytedeco.javacpp.version} 1.07-${org.bytedeco.javacpp.version} - 1.10.5-${org.bytedeco.javacpp.version} - 1.78.0-${org.bytedeco.javacpp.version} + 1.12.1-${org.bytedeco.javacpp.version} + 1.82.0-${org.bytedeco.javacpp.version} 2.2.6-${org.bytedeco.javacpp.version} 0.5.7-${org.bytedeco.javacpp.version} 0.2.0-${org.bytedeco.javacpp.version} 1.12.4-${org.bytedeco.javacpp.version} - 0.3.7-${org.bytedeco.javacpp.version} - 4.1.2-${org.bytedeco.javacpp.version} - 4.1.0-${org.bytedeco.javacpp.version} + 0.3.19-${org.bytedeco.javacpp.version} + 4.5.5-${org.bytedeco.javacpp.version} + 5.0.1-${org.bytedeco.javacpp.version} ${artoolkitplus.version} ${ffmpeg.version} ${flandmark.version} @@ -1679,15 +1679,15 @@ ${scijava.natives.classifier.javacpp} - 3.28.0-GA + 3.29.2-GA ${javassist.version} - 1.0.55 + 1.0.57 ${jcodings.version} - 2.0.6 + 2.0.6.1 ${jdom2.version} @@ -1695,7 +1695,7 @@ ${jep.version} - 9.4.29.v20200521 + 9.4.49.v20220914 ${jetty.version} - 3.4.1 + 3.4.3 ${jfreesvg.version} @@ -1784,7 +1784,7 @@ ${jgrapht-opt.version} - 4.1.0 + 4.2.2 ${jgraphx.version} @@ -1792,7 +1792,7 @@ ${jhdf5.version} - 1.33 + 1.35 ${jmh.version} ${jmh.version} ${jmh-core.version} @@ -1807,7 +1807,7 @@ ${jna.version} - 2.10.6 + 2.12.0 ${joda-time.version} @@ -1837,7 +1837,7 @@ ${scijava.natives.classifier.jogamp} - 1.10.2 + 1.10.5 ${joml.version} @@ -1854,7 +1854,7 @@ ${junit.version} - 5.8.1 + 5.9.1 ${junit-jupiter.version} ${junit-jupiter.version} ${junit-jupiter.version} @@ -1904,9 +1904,9 @@ ${kotlin-stdlib-jdk8.version} - 4.0.2 + 5.3.0 ${kryo.version} - 1.3.0 + 1.3.1 ${minlog.version} @@ -1916,7 +1916,7 @@ ${labkit-pixel-classification.version} - 1.2.3 + 1.2.9 ${logback.version} ${logback.version} ${logback-classic.version} @@ -1931,7 +1931,7 @@ ${mapdb.version} - 5.2 + 5.3 ${miglayout.version} ${miglayout.version} ${miglayout.version} @@ -1953,19 +1953,19 @@ ${ojalgo.version} - 5.2 + 5.7.0 ${opencsv.version} - 4.3.2 + 4.6.3 ${picocli.version} - 42.2.24 + 42.5.0 ${postgresql.version} - 1.2.18.3 + 1.2.22 ${reload4j.version} @@ -1994,11 +1994,11 @@ ${jcl-over-slf4j.version} - 1.29 + 1.33 ${snakeyaml.version} - 2.3 + 2.5 ${snakeyaml-engine.version} @@ -2031,7 +2031,7 @@ ${trove4j.version} - 3.9.5 + 3.9.6 ${weka.version} ${weka-dev.version} @@ -3570,7 +3570,10 @@ ${org.openmicroscopy.omero-blitz.version} - + com.sun.activation javax.activation @@ -5175,6 +5178,16 @@ ch.qos.logback logback-classic ${ch.qos.logback.logback-classic.version} + + + + javax.activation + activation + + ch.qos.logback From 61170ef245603e80f1e19c99c0bcb2d04b6fc8d1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 28 Oct 2022 21:03:41 -0500 Subject: [PATCH 468/996] Update parent to pom-scijava-base 16.0.0 This updates many Maven plugins to their latest versions. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a2c13cb..e61f329f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 15.2.0 + 16.0.0 From b0cba97636ae7612d6b23554e8869c3f3486d5ad Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 28 Oct 2022 21:04:36 -0500 Subject: [PATCH 469/996] mega-melt: always build in headless mode Some of the components being tested momentarily pop GUI components while testing, which is annoying. Let's just set headless mode always. --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index 0c20a5c3..ac199485 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -169,7 +169,7 @@ done mv "$meltScript" "$meltScript.original" && sed 's_\s*"$dir/build.sh"_\ # HACK: If project is on the skipTests list, then skip the tests.\ -buildFlags=\ +buildFlags=-Djava.awt.headless=true\ grep -qxF "$f" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ \ & $buildFlags_' "$meltScript.original" > "$meltScript" && From 078c4c1ea1be6c5601fd2fb324ba5ae4315a99f3 Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Wed, 2 Nov 2022 09:37:56 -0400 Subject: [PATCH 470/996] Bump script editor to v0.7.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 29b9ff4c..80a464db 100644 --- a/pom.xml +++ b/pom.xml @@ -403,7 +403,7 @@ ${scijava-ui-swing.version} - 0.7.8 + 0.7.9 ${script-editor.version} From 92b37bb71f19a2f9ade3eaeccb76c1d48b07ecc4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 3 Nov 2022 23:07:50 -0500 Subject: [PATCH 471/996] Update scijava-table: 1.0.1 -> 1.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e61f329f..bf025bcf 100644 --- a/pom.xml +++ b/pom.xml @@ -391,7 +391,7 @@ ${scijava-search.version} - 1.0.1 + 1.0.2 ${scijava-table.version} From 8e1e9330769de00e27a406b052eb836c5ebc1b7e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 15 Nov 2022 10:31:34 -0600 Subject: [PATCH 472/996] Manage the version of io.humble:humble-video-all --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index bf025bcf..38e72b41 100644 --- a/pom.xml +++ b/pom.xml @@ -1588,6 +1588,11 @@ 27.1-jre ${guava.version} + + 0.3.0 + ${humble-video.version} + ${humble-video-all.version} + 1.8.0.10 ${hsqldb.version} @@ -4502,6 +4507,13 @@ ${com.google.guava.guava.version} + + + io.humble + humble-video-all + ${io.humble.humble-video-all.version} + + hsqldb From 5f434b60f78b19b51c3d33448f5af5fb304f02f1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 17 Nov 2022 12:22:30 -0600 Subject: [PATCH 473/996] Update imglib2-roi: 0.12.1 -> 0.13.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 38e72b41..28b6ee43 100644 --- a/pom.xml +++ b/pom.xml @@ -609,7 +609,7 @@ ${imglib2-realtransform.version} - 0.12.1 + 0.13.0 ${imglib2-roi.version} From 95fa032c200074a60928662460bdf5109ff5868c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 21 Nov 2022 13:40:36 -0600 Subject: [PATCH 474/996] Update ij: 1.53u -> 1.53v --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28b6ee43..a55ab810 100644 --- a/pom.xml +++ b/pom.xml @@ -470,7 +470,7 @@ ${imagej.version} - 1.53u + 1.53v ${imagej1.version} ${ij.version} From c219101fb3da6c657f0acf0104c6e25feaa6f407 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 21 Nov 2022 18:53:56 -0600 Subject: [PATCH 475/996] Update imagej-common: 1.0.0 -> 2.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a55ab810..463e2ae5 100644 --- a/pom.xml +++ b/pom.xml @@ -479,7 +479,7 @@ ${ij1-patcher.version} - 1.0.0 + 2.0.0 ${imagej-common.version} From 81ba43f69b3d461710758598d18f14bf5d71ae66 Mon Sep 17 00:00:00 2001 From: David Gault Date: Thu, 1 Dec 2022 14:53:14 +0000 Subject: [PATCH 476/996] Bump Bio-Formats version to 6.11.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 463e2ae5..a60e7d7c 100644 --- a/pom.xml +++ b/pom.xml @@ -1194,7 +1194,7 @@ ${jxrlib-all.version} - 6.11.0 + 6.11.1 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From 1720b9fe9548808e60f1da2017951d9e9decb599 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 7 Dec 2022 11:08:52 -0600 Subject: [PATCH 477/996] Sort all Fiji-adjacent components correctly Some of them had been placed into "Other SciJava" or "Third party" when the "Fiji-adjacent projects" section is more appropriate. This commit also sorts all of these components by groupId. --- pom.xml | 260 +++++++++++++++++++++++++++----------------------------- 1 file changed, 125 insertions(+), 135 deletions(-) diff --git a/pom.xml b/pom.xml index ca679c28..c1a8286a 100644 --- a/pom.xml +++ b/pom.xml @@ -1138,20 +1138,38 @@ - - 7.1.0 - ${MaMuT.version} - - + 1.5.0 ${MorphoLibJ.version} ${MorphoLibJ_.version} - - 4.1.9 - ${SNT.version} + + 1.9.0.1 + 1.8.1.1 + 2.3.0.4 + 2.5.0.1 + 2.5.3.1 + 2.5.1.4 + 0.32.2.0 + 0.32.1.1 + ${clij_.version} + ${clij-core.version} + ${clij-coremem.version} + ${clij-clearcl.version} + ${clij2_.version} + ${clij2-assistant_.version} + ${clijx_.version} + ${clijx-weka_.version} + + + 0.8.3 + 0.11.5 + 0.2.0 + ${BigStitcher.version} + ${multiview-reconstruction.version} + ${multiview-simulation.version} - + 7.0.14 ${bonej.version} ${bonej.version} @@ -1164,6 +1182,20 @@ ${bonej-legacy-util_.version} ${bonej-utilities.version} + + 4.1.9 + ${SNT.version} + + + 7.1.0 + ${MaMuT.version} + + + 0.1.15 + 0.3.8 + ${labkit-pixel-classification.version} + ${labkit-ui.version} + @@ -1240,18 +1272,6 @@ - - 0.8.3 - ${BigStitcher.version} - - - 0.11.5 - ${multiview-reconstruction.version} - - - 0.2.0 - ${multiview-simulation.version} - 0.4.8 ${coremem.version} @@ -1260,24 +1280,6 @@ 2.2.10 ${cleargl.version} - - 1.9.0.1 - 1.8.1.1 - 2.3.0.4 - 2.5.0.1 - 2.5.3.1 - 2.5.1.4 - 0.32.2.0 - 0.32.1.1 - ${clij_.version} - ${clij-core.version} - ${clij-coremem.version} - ${clij-clearcl.version} - ${clij2_.version} - ${clij2-assistant_.version} - ${clijx_.version} - ${clijx-weka_.version} - @@ -1914,12 +1916,6 @@ 1.3.1 ${minlog.version} - - 0.3.8 - ${labkit-ui.version} - 0.1.15 - ${labkit-pixel-classification.version} - 1.2.9 ${logback.version} @@ -3340,28 +3336,73 @@ - - - sc.fiji - MaMuT - ${sc.fiji.MaMuT.version} - - - + fr.inra.ijpb MorphoLibJ_ ${fr.inra.ijpb.MorphoLibJ_.version} - + - org.morphonets - SNT - ${org.morphonets.SNT.version} + net.haesleinhuepf + clij_ + ${net.haesleinhuepf.clij_.version} + + + net.haesleinhuepf + clij-core + ${net.haesleinhuepf.clij-core.version} + + + net.haesleinhuepf + clij-coremem + ${net.haesleinhuepf.clij-coremem.version} + + + net.haesleinhuepf + clij-clearcl + ${net.haesleinhuepf.clij-clearcl.version} + + + net.haesleinhuepf + clij2_ + ${net.haesleinhuepf.clij2_.version} + + + net.haesleinhuepf + clij2-assistant_ + ${net.haesleinhuepf.clij2-assistant_.version} + + + net.haesleinhuepf + clijx_ + ${net.haesleinhuepf.clijx_.version} + + + net.haesleinhuepf + clijx-weka_ + ${net.haesleinhuepf.clijx-weka_.version} + + + + + net.preibisch + BigStitcher + ${net.preibisch.BigStitcher.version} + + + net.preibisch + multiview-reconstruction + ${net.preibisch.multiview-reconstruction.version} + + + net.preibisch + multiview-simulation + ${net.preibisch.multiview-simulation.version} - + org.bonej bonej-plugins @@ -3388,6 +3429,32 @@ ${org.bonej.bonej-utilities.version} + + + org.morphonets + SNT + ${org.morphonets.SNT.version} + + + + + sc.fiji + MaMuT + ${sc.fiji.MaMuT.version} + + + + + sc.fiji + labkit-pixel-classification + ${sc.fiji.labkit-pixel-classification.version} + + + sc.fiji + labkit-ui + ${sc.fiji.labkit-ui.version} + + @@ -3700,29 +3767,6 @@ - - - - - net.preibisch - BigStitcher - ${net.preibisch.BigStitcher.version} - - - - - net.preibisch - multiview-reconstruction - ${net.preibisch.multiview-reconstruction.version} - - - - - net.preibisch - multiview-simulation - ${net.preibisch.multiview-simulation.version} - - @@ -3746,48 +3790,6 @@ ${net.clearvolume.cleargl.version} - - - net.haesleinhuepf - clij_ - ${net.haesleinhuepf.clij_.version} - - - net.haesleinhuepf - clij-core - ${net.haesleinhuepf.clij-core.version} - - - net.haesleinhuepf - clij-coremem - ${net.haesleinhuepf.clij-coremem.version} - - - net.haesleinhuepf - clij-clearcl - ${net.haesleinhuepf.clij-clearcl.version} - - - net.haesleinhuepf - clij2_ - ${net.haesleinhuepf.clij2_.version} - - - net.haesleinhuepf - clij2-assistant_ - ${net.haesleinhuepf.clij2-assistant_.version} - - - net.haesleinhuepf - clijx_ - ${net.haesleinhuepf.clijx_.version} - - - net.haesleinhuepf - clijx-weka_ - ${net.haesleinhuepf.clijx-weka_.version} - - @@ -5173,18 +5175,6 @@ ${com.esotericsoftware.minlog.version} - - - sc.fiji - labkit-ui - ${sc.fiji.labkit-ui.version} - - - sc.fiji - labkit-pixel-classification - ${sc.fiji.labkit-pixel-classification.version} - - ch.qos.logback From fa3c4bd0bc9ec556daf1f94a71e88fb25b3c043a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 7 Dec 2022 16:27:43 -0600 Subject: [PATCH 478/996] Update imagej-legacy: 0.39.2 -> 0.39.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1a8286a..6fb562bc 100644 --- a/pom.xml +++ b/pom.xml @@ -491,7 +491,7 @@ ${imagej-launcher.version} - 0.39.2 + 0.39.3 ${imagej-legacy.version} From 42869957e305fc60a721e29a4618f7d6d5ba7399 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 7 Dec 2022 16:42:33 -0600 Subject: [PATCH 479/996] Update imagej-common: 2.0.0 -> 2.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6fb562bc..e9647033 100644 --- a/pom.xml +++ b/pom.xml @@ -479,7 +479,7 @@ ${ij1-patcher.version} - 2.0.0 + 2.0.2 ${imagej-common.version} From 58f74d4c773c5cd8e78ca7eaaca850130c970df8 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 15 Dec 2022 09:29:22 -0600 Subject: [PATCH 480/996] Update imagej-ops: 0.49.0 -> 0.49.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e9647033..72c81fd9 100644 --- a/pom.xml +++ b/pom.xml @@ -523,7 +523,7 @@ ${imagej-opencv.version} - 0.49.0 + 0.49.1 ${imagej-ops.version} From 164c60d8a9938d318e319c1c89821816fc4aa88b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 15 Dec 2022 09:32:28 -0600 Subject: [PATCH 481/996] CI: call apt-get update before install Hoping to avoid errors like: Ign:8 http://azure.archive.ubuntu.com/ubuntu jammy-updates/main amd64 libxml2-utils amd64 2.9.13+dfsg-1ubuntu0.1 Err:8 http://azure.archive.ubuntu.com/ubuntu jammy-updates/main amd64 libxml2-utils amd64 2.9.13+dfsg-1ubuntu0.1 404 Not Found [IP: 52.252.75.106 80] Fetched 2359 kB in 0s (10.1 MB/s) E: Failed to fetch http://azure.archive.ubuntu.com/ubuntu/pool/main/libx/libxml2/libxml2-utils_2.9.13%2bdfsg-1ubuntu0.1_amd64.deb 404 Not Found [IP: 52.252.75.106 80] E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing? Error: Process completed with exit code 100. --- .github/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/setup.sh b/.github/setup.sh index 1350dd5d..4ca47041 100755 --- a/.github/setup.sh +++ b/.github/setup.sh @@ -7,4 +7,5 @@ pkgs="libxml2-utils" # needed for melting pot pkgs="$pkgs libxcb-shape0" # org.janelia:H5J_Loader_Plugin (fiji/H5J_Loader_Plugin@d026a1bb) pkgs="$pkgs libgtk2.0-0" # net.imagej:imagej-opencv (imagej/imagej-opencv@21113e08) pkgs="$pkgs libblosc1" # org.janelia.saalfeldlab:n5-blosc +sudo apt-get update sudo apt-get -y install $(echo "$pkgs") From 56a065b07442cc87d2336f13a80c4d59d93d483b Mon Sep 17 00:00:00 2001 From: Jan Eglinger Date: Tue, 3 Jan 2023 22:58:25 +0100 Subject: [PATCH 482/996] Manage version of org.json:json --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 72c81fd9..d34c336e 100644 --- a/pom.xml +++ b/pom.xml @@ -1856,6 +1856,10 @@ 0.1.55 ${jsch.version} + + 20220924 + ${json.version} + 4.13.2 ${junit.version} @@ -5087,6 +5091,13 @@ ${com.jcraft.jsch.version} + + + org.json + json + ${org.json.json.version} + + org.python From 6f8766be07b75ca3ddb6451ba6b476df3cddf102 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 31 Jan 2023 13:01:00 -0600 Subject: [PATCH 483/996] Update net.imagej:ij to 1.54b --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d34c336e..be25437b 100644 --- a/pom.xml +++ b/pom.xml @@ -470,7 +470,7 @@ ${imagej.version} - 1.53v + 1.54b ${imagej1.version} ${ij.version} From 014bcad68288df96a0dd6fc3c99b8b77faeb4189 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 1 Feb 2023 11:03:24 -0600 Subject: [PATCH 484/996] Update scijava-search to 2.0.0 Closes #227. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index be25437b..6caf1777 100644 --- a/pom.xml +++ b/pom.xml @@ -387,7 +387,7 @@ ${scijava-plugins-text-plain.version} - 1.0.0 + 2.0.0 ${scijava-search.version} From cb2c285078c5056625550f6152dbb0665097125f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 1 Feb 2023 16:36:15 -0600 Subject: [PATCH 485/996] Update parent to pom-scijava-base 17.0.0 This updates maven-release-plugin to 3.0.0-M7. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6caf1777..b8597c29 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 16.0.0 + 17.0.0 From 89a215fb3daeca6785260fedeab2bfb0296ee2a7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 16 Feb 2023 16:46:41 -0600 Subject: [PATCH 486/996] Update sc.fiji:IO_: 4.2.0 -> 4.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8597c29..14b76c3b 100644 --- a/pom.xml +++ b/pom.xml @@ -778,7 +778,7 @@ 2.0.1 ${IJ_Robot.version} - 4.2.0 + 4.2.1 ${IO.version} ${IO_.version} From 0302bd57c9f7482310ca0a0823b53dd5c69bdda5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 20 Feb 2023 18:26:46 -0600 Subject: [PATCH 487/996] Manage version of org.scijava:scripting-python --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 14b76c3b..875cbdf5 100644 --- a/pom.xml +++ b/pom.xml @@ -446,6 +446,10 @@ 0.5.3 ${scripting-matlab.version} + + 0.3.0 + ${scripting-python.version} + 0.2.3 ${scripting-renjin.version} @@ -2280,6 +2284,13 @@ ${org.scijava.scripting-matlab.version} + + + org.scijava + scripting-python + ${org.scijava.scripting-python.version} + + org.scijava From 7145853949be96b4fc56e0da2d5fc5f5a62b6b49 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 2 Feb 2023 15:12:40 -0600 Subject: [PATCH 488/996] Update component versions * scijava-common: 2.90.0 -> 2.90.2 * ij1-patcher: 1.2.3 -> 1.2.5 * imagej-plugins-uploader-webdav: 0.3.2 -> 0.3.3 * imglib2-unsafe: 0.4.1 -> 1.0.0 * scijava-plugins-text-plain: 0.1.3 -> 0.1.4 * 3D_Viewer: 4.0.4 -> 4.0.5 * CorrectBleach: 2.0.3 -> 2.1.0 --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 875cbdf5..2a5a5857 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.90.0 + 2.90.2 ${scijava-common.version} @@ -383,7 +383,7 @@ ${scijava-plugins-text-markdown.version} - 0.1.3 + 0.1.4 ${scijava-plugins-text-plain.version} @@ -479,7 +479,7 @@ ${ij.version} - 1.2.3 + 1.2.5 ${ij1-patcher.version} @@ -547,7 +547,7 @@ ${imagej-plugins-uploader-ssh.version} - 0.3.2 + 0.3.3 ${imagej-plugins-uploader-webdav.version} @@ -617,7 +617,7 @@ ${imglib2-roi.version} - 0.4.1 + 1.0.0 ${imglib2-unsafe.version} @@ -668,7 +668,7 @@ <_3D_Objects_Counter.version>2.0.1 ${_3D_Objects_Counter.version} - <_3D_Viewer.version>4.0.4 + <_3D_Viewer.version>4.0.5 ${_3D_Viewer.version} 3.4.2 @@ -721,7 +721,7 @@ 3.0.3 ${Colour_Deconvolution.version} - 2.0.3 + 2.1.0 ${CorrectBleach.version} ${CorrectBleach_.version} From ea0d99ec6bcdbb5b32ef0016408cec41e67816b9 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 21 Feb 2023 13:42:45 -0600 Subject: [PATCH 489/996] Manage more third party components All of these are already in use by the various dependency stacks of managed projects. By managing them here, we can help unify their versions across the runtime environment, and in particular reduce dependency skew when testing components of the bill of materials. The following new components are now managed: * com.amazonaws:aws-java-sdk-core * com.esotericsoftware:reflectasm * com.github.jnr:jffi * com.github.jnr:jnr-constants * com.github.jnr:jnr-ffi * com.github.jnr:jnr-posix * com.google.api-client:google-api-client * com.google.api-client:google-api-client-android * com.google.api-client:google-api-client-appengine * com.google.api-client:google-api-client-gson * com.google.api-client:google-api-client-jackson2 * com.google.api-client:google-api-client-protobuf * com.google.api-client:google-api-client-servlet * com.google.api-client:google-api-client-xml * com.google.api.grpc:proto-google-common-protos * com.google.api.grpc:proto-google-iam-v1 * com.google.api:api-common * com.google.api:gax * com.google.api:gax-httpjson * com.google.auth:google-auth-library-appengine * com.google.auth:google-auth-library-credentials * com.google.auth:google-auth-library-oauth2-http * com.google.auto.value:auto-value * com.google.auto.value:auto-value-annotations * com.google.cloud:google-cloud-core * com.google.cloud:google-cloud-core-http * com.google.errorprone:error_prone_annotations * com.google.http-client:google-http-client-apache-v2 * com.google.http-client:google-http-client-gson * com.google.j2objc:j2objc-annotations * com.google.protobuf:protobuf-java * com.google.protobuf:protobuf-java-util * com.google.protobuf:protobuf-kotlin * com.squareup.okhttp3:okhttp * com.squareup.okio:okio * commons-cli:commons-cli * io.grpc:grpc-context * jline:jline * net.java.dev.jna:jna-platform * org.antlr:ST4 * org.antlr:antlr4 (commented out) * org.antlr:antlr4-runtime (commented out) * org.apache.ant:ant * org.apache.ant:ant-launcher * org.apache.commons:commons-collections4 * org.apache.httpcomponents:httpmime * org.checkerframework:checker-qual * org.codehaus.plexus:plexus-component-annotations * org.codehaus.plexus:plexus-utils * org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm * org.jheaps:jheaps * org.jline:jline * org.jruby.joni:joni * org.objenesis:objenesis * org.ow2.asm:asm * org.ow2.asm:asm-analysis * org.ow2.asm:asm-commons * org.ow2.asm:asm-tree * org.ow2.asm:asm-util * org.smurn:jply * org.springframework:spring-beans * org.springframework:spring-core * org.threeten:threetenbp This commit also cleans up the ordering of some component to be more consistent, updates the URLs of some components to their latest, and and fixes the inheritance of org.jogamp version property values. --- pom.xml | 683 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 621 insertions(+), 62 deletions(-) diff --git a/pom.xml b/pom.xml index 2a5a5857..18db64ba 100644 --- a/pom.xml +++ b/pom.xml @@ -1286,20 +1286,27 @@ - - 3.5.3 + + 1.12.410 + ${aws.version} + ${aws.version} + ${aws-java-sdk-core.version} + ${aws-java-sdk-s3.version} + + + 4.3.4 + 2.7.7 + 3.5.3 + 4.11.1 + ${antlr3.version} ${antlr.version} - 2.7.7 + ${antlr4.version} + ${antlr2.version} + ${ST4.version} ${antlr.version} ${antlr-runtime.version} - - - 2.33 - ${args4j.version} - - - 1.12.321 - ${aws-java-sdk-s3.version} + ${antlr4.version} + ${antlr4-runtime.version} 3.0.4 @@ -1357,17 +1364,27 @@ ${groovy-xml.version} ${groovy-yaml.version} + + 1.10.13 + ${ant.version} + ${ant.version} + ${ant-launcher.version} + 0.13.1 3.2.0 3.8.6 3.6.1 + 2.1.1 + 3.5.0 2.6.0 2.6.0 ${maven-artifact-transfer.version} ${maven-common-artifact-filters.version} ${maven-core.version} ${maven-plugin-tools-api.version} + ${plexus-component-annotations.version} + ${plexus-utils.version} ${sisu-inject-bean.version} ${sisu-inject-plexus.version} @@ -1391,10 +1408,28 @@ ${spark-core_2.11.version} - 4.5.13 - 4.4.15 + 4.5.14 + 4.4.16 + 4.5.14 ${httpclient.version} ${httpcore.version} + ${httpmime.version} + + + 2.33 + ${args4j.version} + + + 5.2 + ${asm.version} + ${asm.version} + ${asm.version} + ${asm.version} + ${asm.version} + ${asm-analysis.version} + ${asm-commons.version} + ${asm-tree.version} + ${asm-util.version} 1.15 @@ -1463,21 +1498,31 @@ 0.7.0 ${bridj.version} - + 2.0.SP1 ${cdi-api.version} + + 3.31.0 + ${checker-qual.version} + 1.9.4 ${commons-beanutils.version} + + 1.5.0 + ${commons-cli.version} + 1.15 ${commons-codec.version} 3.2.2 + 4.4 ${commons-collections.version} + ${commons-collections4.version} 1.21 @@ -1564,28 +1609,95 @@ 0.25 ${ejml.version} - + + 2.18.0 + + ${error_prone.version} + ${error_prone_annotations.version} + + 2.6 ${flatlaf.version} + + 2.2.0 + ${google-api-client.version} + ${google-api-client.version} + ${google-api-client.version} + ${google-api-client.version} + ${google-api-client.version} + ${google-api-client.version} + ${google-api-client.version} + ${google-api-client.version} + ${google-api-client-android.version} + ${google-api-client-appengine.version} + ${google-api-client-gson.version} + ${google-api-client-jackson2.version} + ${google-api-client-protobuf.version} + ${google-api-client-servlet.version} + ${google-api-client-xml.version} + + + 2.6.0 + 2.23.0 + 0.108.0 + 2.14.0 + 1.9.0 + ${api-common.version} + ${gax.version} + ${gax-httpjson.version} + ${proto-google-common-protos.version} + ${proto-google-iam-v1.version} + + + 1.15.0 + ${google-auth-library.version} + ${google-auth-library.version} + ${google-auth-library.version} + ${google-auth-library-appengine.version} + ${google-auth-library-credentials.version} + ${google-auth-library-oauth2-http.version} + + + 1.10.1 + ${auto-value.version} + ${auto-value.version} + ${auto-value-annotations.version} + + 2.10.0 + ${google-cloud-core.version} 0.124.17 0.117.2-alpha 2.13.0 + ${google-cloud-core.version} + ${google-cloud-core-http.version} ${google-cloud-nio.version} ${google-cloud-resourcemanager.version} ${google-cloud-storage.version} - - 1.42.2 + + 1.42.3 + ${google-http-client.version} ${google-http-client.version} + ${google-http-client.version} ${google-http-client.version} ${google-http-client.version} ${google-http-client.version} + ${google-http-client-apache-v2.version} ${google-http-client-appengine.version} + ${google-http-client-gson.version} ${google-http-client-jackson2.version} ${google-http-client-xml.version} + + 1.52.1 + ${grpc.version} + ${grpc-context.version} + 2.9.1 ${gson.version} @@ -1599,7 +1711,7 @@ ${humble-video.version} ${humble-video-all.version} - + 1.8.0.10 ${hsqldb.version} @@ -1607,6 +1719,10 @@ 5.5.13.3 ${itextpdf.version} + + 1.3 + ${j2objc-annotations.version} + 2.21.13 ${jackrabbit-webdav.version} @@ -1771,11 +1887,11 @@ ${jetty-webapp.version} ${jetty-xml.version} - + 1.5.3 ${jfreechart.version} - + 3.4.3 ${jfreesvg.version} @@ -1802,6 +1918,17 @@ 19.04.1 ${jhdf5.version} + + 0.14 + ${jheaps.version} + + + 2.14.6 + 3.22.0 + ${jline2.version} + ${jline.version} + ${jline3.version} + 1.35 ${jmh.version} @@ -1813,9 +1940,21 @@ 1.49 ${jmockit.version} - + 5.12.1 + ${jna.version} ${jna.version} + ${jna-platform.version} + + + 1.3.10 + 0.9.17 + 2.2.13 + 3.1.16 + ${jffi.version} + ${jnr-constants.version} + ${jnr-ffi.version} + ${jnr-posix.version} 2.12.0 @@ -1832,15 +1971,16 @@ ${jogamp.version} ${jogamp.version} ${jogamp.version} - + + ${jogamp.version} ${jogamp.version} - ${jogamp.version} - ${jogamp.version} - ${jogamp.version} + ${gluegen.version} + ${gluegen-rt.version} + ${joal.version} ${jogamp.version} - ${jogamp.version} - ${jogamp.version} + ${jogl-all.version} + ${jogl-all-noawt.version} ${scijava.natives.classifier.jogamp} ${scijava.natives.classifier.jogamp} @@ -1851,11 +1991,19 @@ 1.10.5 ${joml.version} + + 2.1.48 + ${joni.version} + 2.80b11 ${jpedal.version} ${jpedalSTD.version} + + 0.2.1 + ${jply.version} + 0.1.55 ${jsch.version} @@ -1905,6 +2053,7 @@ ${kotlin.version} ${kotlin.version} ${kotlin.version} + 1.6.4 ${kotlin-compiler-embeddable.version} ${kotlin-daemon-embeddable.version} ${kotlin-reflect.version} @@ -1917,12 +2066,15 @@ ${kotlin-stdlib.version} ${kotlin-stdlib-common.version} ${kotlin-stdlib-jdk8.version} + ${kotlinx-coroutines-core-jvm.version} 5.3.0 - ${kryo.version} 1.3.1 + 1.11.9 + ${kryo.version} ${minlog.version} + ${reflectasm.version} 1.2.9 @@ -1935,11 +2087,11 @@ 1.8.0 ${lz4-java.version} - + 3.0.8 ${mapdb.version} - + 5.3 ${miglayout.version} ${miglayout.version} @@ -1957,11 +2109,21 @@ ${mockito.version} ${mockito-core.version} + + 3.3 + ${objenesis.version} + + + 4.9.3 + 3.3.0 + ${okhttp.version} + ${okio.version} + 45.1.1 ${ojalgo.version} - + 5.7.0 ${opencsv.version} @@ -1973,6 +2135,19 @@ 42.5.0 ${postgresql.version} + + 3.21.9 + + ${protobuf.version} + ${protobuf.version} + ${protobuf.version} + ${protobuf-java.version} + ${protobuf-java-util.version} + ${protobuf-kotlin.version} + 1.2.22 ${reload4j.version} @@ -2012,12 +2187,18 @@ - 3.2.9.RELEASE + 3.2.9.RELEASE + ${spring.version} + ${spring.version} + ${spring.version} ${spring-aop.version} + ${spring-beans.version} + ${spring-core.version} 1.12.0 @@ -2035,6 +2216,10 @@ ${therapi.version} + + 1.6.5 + ${threetenbp.version} + 3.0.3 ${trove4j.version} @@ -3807,12 +3992,29 @@ + + + com.amazonaws + aws-java-sdk-core + ${com.amazonaws.aws-java-sdk-core.version} + + + com.amazonaws + aws-java-sdk-s3 + ${com.amazonaws.aws-java-sdk-s3.version} + + antlr antlr ${antlr.antlr.version} + + org.antlr + ST4 + ${org.antlr.ST4.version} + org.antlr antlr @@ -3823,20 +4025,19 @@ antlr-runtime ${org.antlr.antlr-runtime.version} - - + - com.amazonaws - aws-java-sdk-s3 - ${com.amazonaws.aws-java-sdk-s3.version} + org.antlr + antlr4-runtime + ${org.antlr.antlr4-runtime.version} + --> @@ -3975,6 +4176,18 @@ ${org.codehaus.groovy.groovy-yaml.version} + + + org.apache.ant + ant + ${org.apache.ant.ant.version} + + + org.apache.ant + ant-launcher + ${org.apache.ant.ant-launcher.version} + + org.apache.maven.shared @@ -3996,6 +4209,16 @@ maven-plugin-tools-api ${org.apache.maven.plugin-tools.maven-plugin-tools-api.version} + + org.codehaus.plexus + plexus-component-annotations + ${org.codehaus.plexus.plexus-component-annotations.version} + + + org.codehaus.plexus + plexus-utils + ${org.codehaus.plexus.plexus-utils.version} + org.sonatype.sisu sisu-inject-bean @@ -4081,6 +4304,45 @@ httpcore ${org.apache.httpcomponents.httpcore.version} + + org.apache.httpcomponents + httpmime + ${org.apache.httpcomponents.httpmime.version} + + + + + args4j + args4j + ${args4j.args4j.version} + + + + + org.ow2.asm + asm + ${org.ow2.asm.asm.version} + + + org.ow2.asm + asm-analysis + ${org.ow2.asm.asm-analysis.version} + + + org.ow2.asm + asm-commons + ${org.ow2.asm.asm-commons.version} + + + org.ow2.asm + asm-tree + ${org.ow2.asm.asm-tree.version} + + + org.ow2.asm + asm-util + ${org.ow2.asm.asm-util.version} + @@ -4262,13 +4524,20 @@ ${com.nativelibs4java.bridj.version} - + javax.enterprise cdi-api ${javax.enterprise.cdi-api.version} + + + org.checkerframework + checker-qual + ${org.checkerframework.checker-qual.version} + + commons-beanutils @@ -4276,6 +4545,13 @@ ${commons-beanutils.commons-beanutils.version} + + + commons-cli + commons-cli + ${commons-cli.commons-cli.version} + + commons-codec @@ -4289,6 +4565,11 @@ commons-collections ${commons-collections.commons-collections.version} + + org.apache.commons + commons-collections4 + ${org.apache.commons.commons-collections4.version} + @@ -4464,6 +4745,13 @@ ${com.googlecode.efficient-java-matrix-library.ejml.version} + + + com.google.errorprone + error_prone_annotations + ${com.google.errorprone.error_prone_annotations.version} + + com.formdev @@ -4471,7 +4759,125 @@ ${com.formdev.flatlaf.version} + + + com.google.api-client + google-api-client + ${com.google.api-client.google-api-client.version} + + + com.google.api-client + google-api-client-android + ${com.google.api-client.google-api-client-android.version} + + + com.google.api-client + google-api-client-appengine + ${com.google.api-client.google-api-client-appengine.version} + + + com.google.api-client + google-api-client-gson + ${com.google.api-client.google-api-client-gson.version} + + + com.google.api-client + google-api-client-jackson2 + ${com.google.api-client.google-api-client-jackson2.version} + + + com.google.api-client + google-api-client-protobuf + ${com.google.api-client.google-api-client-protobuf.version} + + + com.google.api-client + google-api-client-servlet + ${com.google.api-client.google-api-client-servlet.version} + + + + javax.servlet + servlet-api + + + + + com.google.api-client + google-api-client-xml + ${com.google.api-client.google-api-client-xml.version} + + + + + com.google.api + api-common + ${com.google.api.api-common.version} + + + com.google.api + gax + ${com.google.api.gax.version} + + + com.google.api + gax-httpjson + ${com.google.api.gax-httpjson.version} + + + com.google.api.grpc + proto-google-common-protos + ${com.google.api.grpc.proto-google-common-protos.version} + + + com.google.api.grpc + proto-google-iam-v1 + ${com.google.api.grpc.proto-google-iam-v1.version} + + + + + com.google.auth + google-auth-library-appengine + ${com.google.auth.google-auth-library-appengine.version} + + + com.google.auth + google-auth-library-credentials + ${com.google.auth.google-auth-library-credentials.version} + + + com.google.auth + google-auth-library-oauth2-http + ${com.google.auth.google-auth-library-oauth2-http.version} + + + + + com.google.auto.value + auto-value + ${com.google.auto.value.auto-value.version} + + + com.google.auto.value + auto-value-annotations + ${com.google.auto.value.auto-value-annotations.version} + + + + com.google.cloud + google-cloud-core + ${com.google.cloud.google-cloud-core.version} + + + com.google.cloud + google-cloud-core-http + ${com.google.cloud.google-cloud-core-http.version} + com.google.cloud google-cloud-nio @@ -4488,17 +4894,27 @@ ${com.google.cloud.google-cloud-storage.version} - + com.google.http-client google-http-client ${com.google.http-client.google-http-client.version} + + com.google.http-client + google-http-client-apache-v2 + ${com.google.http-client.google-http-client-apache-v2.version} + com.google.http-client google-http-client-appengine ${com.google.http-client.google-http-client-appengine.version} + + com.google.http-client + google-http-client-gson + ${com.google.http-client.google-http-client-gson.version} + com.google.http-client google-http-client-jackson2 @@ -4510,6 +4926,13 @@ ${com.google.http-client.google-http-client-xml.version} + + + io.grpc + grpc-context + ${io.grpc.grpc-context.version} + + com.google.code.gson @@ -4531,7 +4954,7 @@ ${io.humble.humble-video-all.version} - + hsqldb hsqldb @@ -4545,6 +4968,13 @@ ${com.itextpdf.itextpdf.version} + + + com.google.j2objc + j2objc-annotations + ${com.google.j2objc.j2objc-annotations.version} + + org.apache.jackrabbit @@ -4603,7 +5033,7 @@ ${javax.media.jai-core.version} - + gov.nist.math jama @@ -4774,7 +5204,7 @@ ${scijava.natives.classifier.tesseract} - + org.javassist javassist @@ -4802,7 +5232,7 @@ ${org.scijava.jep.version} - + org.eclipse.jetty jetty-annotations @@ -4929,14 +5359,14 @@ ${org.eclipse.jetty.jetty-xml.version} - + org.jfree jfreechart ${org.jfree.jfreechart.version} - + org.jfree jfreesvg @@ -4996,14 +5426,66 @@ ${cisd.jhdf5.version} - + + + org.jheaps + jheaps + ${org.jheaps.jheaps.version} + + + + + jline + jline + ${jline.jline.version} + + + org.jline + jline + ${org.jline.jline.version} + + + net.java.dev.jna jna ${net.java.dev.jna.jna.version} + + net.java.dev.jna + jna-platform + ${net.java.dev.jna.jna-platform.version} + + + + + com.github.jnr + jffi + ${com.github.jnr.jffi.version} + + + com.github.jnr + jffi + ${com.github.jnr.jffi.version} + native + + + com.github.jnr + jnr-constants + ${com.github.jnr.jnr-constants.version} + + + com.github.jnr + jnr-ffi + ${com.github.jnr.jnr-ffi.version} + + + com.github.jnr + jnr-posix + ${com.github.jnr.jnr-posix.version} + - + joda-time joda-time @@ -5081,13 +5563,20 @@ ${scijava.natives.classifier.jogl} - + org.joml joml ${org.joml.joml.version} + + + org.jruby.joni + joni + ${org.jruby.joni.joni.version} + + org.jpedal @@ -5095,6 +5584,13 @@ ${org.jpedal.jpedalSTD.version} + + + org.smurn + jply + ${org.smurn.jply.version} + + com.jcraft @@ -5184,6 +5680,11 @@ kotlin-stdlib-jdk8 ${org.jetbrains.kotlin.kotlin-stdlib-jdk8.version} + + org.jetbrains.kotlinx + kotlinx-coroutines-core-jvm + ${org.jetbrains.kotlinx.kotlinx-coroutines-core-jvm.version} + @@ -5196,8 +5697,13 @@ minlog ${com.esotericsoftware.minlog.version} + + com.esotericsoftware + reflectasm + ${com.esotericsoftware.reflectasm.version} + - + ch.qos.logback logback-classic @@ -5226,7 +5732,7 @@ ${org.lz4.lz4-java.version} - + org.mapdb mapdb @@ -5243,7 +5749,7 @@ - + com.miglayout miglayout-core @@ -5267,6 +5773,25 @@ ${edu.mines.mines-jtk.version} + + + org.objenesis + objenesis + ${org.objenesis.objenesis.version} + + + + + com.squareup.okhttp3 + okhttp + ${com.squareup.okhttp3.okhttp.version} + + + com.squareup.okio + okio + ${com.squareup.okio.okio.version} + + org.ojalgo @@ -5274,14 +5799,14 @@ ${org.ojalgo.ojalgo.version} - + com.opencsv opencsv ${com.opencsv.opencsv.version} - + info.picocli picocli @@ -5295,6 +5820,23 @@ ${org.postgresql.postgresql.version} + + + com.google.protobuf + protobuf-java + ${com.google.protobuf.protobuf-java.version} + + + com.google.protobuf + protobuf-java-util + ${com.google.protobuf.protobuf-java-util.version} + + + com.google.protobuf + protobuf-kotlin + ${com.google.protobuf.protobuf-kotlin.version} + + ch.qos.reload4j @@ -5376,6 +5918,16 @@ spring-aop ${org.springframework.spring-aop.version} + + org.springframework + spring-beans + ${org.springframework.spring-beans.version} + + + org.springframework + spring-core + ${org.springframework.spring-core.version} + @@ -5411,6 +5963,13 @@ ${com.github.therapi.therapi-runtime-javadoc.version} + + + org.threeten + threetenbp + ${org.threeten.threetenbp.version} + + net.sf.trove4j @@ -5418,7 +5977,7 @@ ${net.sf.trove4j.trove4j.version} - + nz.ac.waikato.cms.weka weka-dev @@ -5579,7 +6138,7 @@ test - + org.mockito mockito-core @@ -5587,7 +6146,7 @@ test - + org.openjdk.jmh jmh-core From 92ccbc3f1b763d459d3acb667dabb4632a0b6d4b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 22 Feb 2023 13:13:06 -0600 Subject: [PATCH 490/996] mega-melt: fix typo in antlr artifactId --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index ac199485..2587411a 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -44,7 +44,7 @@ meltScript="$meltingPotDir/melt.sh" # HACK: List of artifacts with known-duplicate short version properties. shortVersionClashes=\ 'net.sourceforge.findbugs.annotations'\ -'|antr.antlr'\ +'|antlr.antlr'\ '|org.jogamp.jocl.jocl'\ '|net.sf.opencsv.opencsv'\ '|org.jetbrains.intellij.deps.trove4j' From b9df6ff5c4b23426b9bb346f5e02958db4cbe05e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 22 Feb 2023 15:12:37 -0600 Subject: [PATCH 491/996] mega-melt: always extend this pom-scijava version Every component is being tested at its release version being managed. The component itself typically extends pom-scijava, but an older version than the one being tested now. Unfortunately, that can create problems with pinning all needed dependency versions at the currently managed versions: when a transitive dependency is *currently* managed by the pom-scijava being tested, but *wasn't* managed by the older version of pom-scijava that the component being tested extends, then setting the version property associated with that transitive dependency will have no effect, resulting in version skew between what gets tested versus what the BOM indicates for that dependency. Hacking every component POM to extend the version of pom-scijava currently being tested avoids this problem by ensuring that the entire current BOM is inherited by the component, even dependencies that were not originally managed at the component's time of release. Theoretically, there could be problems with this hack -- e.g. the newer pom-scijava parent might no longer support some trick or other that the component was making use of, such as if infrastructural property names or values changed -- but in practice it appears to work extremely well, and we can always cut new releases of any components that run up against rough edges caused by changing pom-scijava/pom-scijava-base build infrastructure over time. --- tests/run.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index 2587411a..4d802523 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -51,7 +51,8 @@ shortVersionClashes=\ rm -rf "$megaMeltDir" && mkdir -p "$megaMeltDir" || die "Creation of $megaMeltDir failed!" cp "$pom" "$pomParent" && -mvn -B -f "$pomParent" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" || +mvn -B -f "$pomParent" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" && + mvn -B -f "$pomParent" install >> "$versionSwapLog" || die "pom-scijava version update failed:\n$(cat "$versionSwapLog")" python "$generateMegaMeltScript" "$megaMeltDir" || die 'Generation failed!' sectionEnd # Generating mega-melt project @@ -164,6 +165,14 @@ do die "Failed to adjust $pom" done +# HACK: Make component POMs extend the same version of pom-scijava +# being tested. This reduces dependency skew for transitively inherited +# components that were not managed at the time of that component release. +find "$meltingPotDir" -name pom.xml | while read pom +do + perl -0777 -i -pe 's/(\s*org.scijava<\/groupId>\s*pom-scijava<\/artifactId>\s*)[^\n]*/${1}999-mega-melt<\/version>/igs' "$pom" +done + # HACK: Skip tests for projects with known problems. mv "$meltScript" "$meltScript.original" && From 009ef8b1eb9c9c73de04eb97ade0421a0c3665ac Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 22 Feb 2023 15:45:18 -0600 Subject: [PATCH 492/996] Explicitly manage all platforms for JogAmp Not just the current platform. To avoid version skew across JogAmp JARs in the event that non-matching platform JARs get brought in as dependencies. --- pom.xml | 329 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 324 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 18db64ba..c407c369 100644 --- a/pom.xml +++ b/pom.xml @@ -5536,31 +5536,350 @@ org.jogamp.gluegen gluegen-rt ${org.jogamp.gluegen.gluegen-rt.version} - ${scijava.natives.classifier.gluegen} + natives-android-aarch64 + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + natives-android-armv6 + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + natives-android-x86 + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + natives-ios-amd64 + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + natives-ios-arm64 + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + natives-linux-aarch64 + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + natives-linux-amd64 + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + natives-linux-armv6hf + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + natives-linux-i586 + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + natives-windows-amd64 + + + org.jogamp.gluegen + gluegen-rt + ${org.jogamp.gluegen.gluegen-rt.version} + natives-windows-i586 + + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + natives-android-aarch64 + + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + natives-android-armv6 org.jogamp.joal joal ${org.jogamp.joal.joal.version} - ${scijava.natives.classifier.joal} + natives-android-x86 + + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + natives-ios-amd64 + + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + natives-ios-arm64 + + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + natives-linux-aarch64 + + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + natives-linux-amd64 + + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + natives-linux-armv6hf + + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + natives-linux-i586 + + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + natives-macosx-universal + + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + natives-windows-amd64 + + + org.jogamp.joal + joal + ${org.jogamp.joal.joal.version} + natives-windows-i586 + + + org.jogamp.jocl + jocl + ${org.jogamp.jocl.jocl.version} + natives-android-aarch64 org.jogamp.jocl jocl ${org.jogamp.jocl.jocl.version} - ${scijava.natives.classifier.jocl} + natives-android-armv6 + + + org.jogamp.jocl + jocl + ${org.jogamp.jocl.jocl.version} + natives-android-x86 + + + + org.jogamp.jocl + jocl + ${org.jogamp.jocl.jocl.version} + natives-linux-aarch64 + + + org.jogamp.jocl + jocl + ${org.jogamp.jocl.jocl.version} + natives-linux-amd64 + + + org.jogamp.jocl + jocl + ${org.jogamp.jocl.jocl.version} + natives-linux-armv6hf + + + org.jogamp.jocl + jocl + ${org.jogamp.jocl.jocl.version} + natives-linux-i586 + + + org.jogamp.jocl + jocl + ${org.jogamp.jocl.jocl.version} + natives-macosx-universal + + + org.jogamp.jocl + jocl + ${org.jogamp.jocl.jocl.version} + natives-windows-amd64 + + + org.jogamp.jocl + jocl + ${org.jogamp.jocl.jocl.version} + natives-windows-i586 + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + natives-android-aarch64 + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + natives-android-armv6 + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + natives-android-x86 + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + natives-ios-amd64 + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + natives-ios-arm64 + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + natives-linux-amd64 + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + natives-linux-i586 org.jogamp.jogl jogl-all ${org.jogamp.jogl.jogl-all.version} - ${scijava.natives.classifier.jogl} + natives-macosx-universal + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + natives-windows-amd64 + + + org.jogamp.jogl + jogl-all + ${org.jogamp.jogl.jogl-all.version} + natives-windows-i586 + + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + natives-android-aarch64 + + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + natives-android-armv6 + + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + natives-android-x86 + + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + natives-ios-amd64 + + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + natives-ios-arm64 + + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + natives-linux-amd64 + + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + natives-linux-i586 + + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + natives-macosx-universal + + + org.jogamp.jogl + jogl-all-noawt + ${org.jogamp.jogl.jogl-all-noawt.version} + natives-windows-amd64 org.jogamp.jogl jogl-all-noawt ${org.jogamp.jogl.jogl-all-noawt.version} - ${scijava.natives.classifier.jogl} + natives-windows-i586 From f72749568d8d7d9f1f3fb3f6bd47a7f3cf9b76c0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 22 Feb 2023 21:58:25 -0600 Subject: [PATCH 493/996] Manage jzy3d artifacts And fix some places where JogAmp natives were leaking in. --- pom.xml | 229 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) diff --git a/pom.xml b/pom.xml index c407c369..3d24e45e 100644 --- a/pom.xml +++ b/pom.xml @@ -2039,6 +2039,27 @@ 1.1.3 ${jzlib.version} + + 2.2.0 + ${jzy3d.version} + ${jzy3d.version} + ${jzy3d.version} + ${jzy3d.version} + ${jzy3d.version} + ${jzy3d.version} + ${jzy3d.version} + ${jzy3d.version} + ${jzy3d.version} + ${jzy3d-core-awt.version} + ${jzy3d-core.version} + ${jzy3d-emul-gl-awt.version} + ${jzy3d-jGL-awt.version} + ${jzy3d-jdt-core.version} + ${jzy3d-native-jogl-awt.version} + ${jzy3d-native-jogl-core.version} + ${jzy3d-native-jogl-swing.version} + ${jzy3d-tester.version} + ${kotlin.version} @@ -3634,6 +3655,22 @@ org.morphonets SNT ${org.morphonets.SNT.version} + + + + org.jzy3d + jzy3d-emul-gl + + + + org.jzy3d + jGL + + @@ -3988,6 +4025,18 @@ net.clearvolume cleargl ${net.clearvolume.cleargl.version} + + + + org.jogamp.gluegen + gluegen-rt-main + + + + org.jogamp.jogl + jogl-all-main + + @@ -5938,6 +5987,186 @@ ${com.jcraft.jzlib.version} + + + org.jzy3d + jzy3d-core + ${org.jzy3d.jzy3d-core.version} + + + org.jzy3d + jzy3d-core-awt + ${org.jzy3d.jzy3d-core-awt.version} + + + org.jzy3d + jzy3d-emul-gl-awt + ${org.jzy3d.jzy3d-emul-gl-awt.version} + + + org.jzy3d + jzy3d-jGL-awt + ${org.jzy3d.jzy3d-jGL-awt.version} + + + org.jzy3d + jzy3d-jdt-core + ${org.jzy3d.jzy3d-jdt-core.version} + + + org.jzy3d + jzy3d-native-jogl-awt + ${org.jzy3d.jzy3d-native-jogl-awt.version} + + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-linux-aarch64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-armv6hf + + + org.jogamp.gluegen + gluegen-rt-natives-linux-i586 + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-windows-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-windows-i586 + + + org.jogamp.jogl + jogl-all-natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all-natives-linux-amd64 + + + org.jogamp.jogl + jogl-all-natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all-natives-linux-i586 + + + org.jogamp.jogl + jogl-all-natives-macosx-universal + + + org.jogamp.jogl + jogl-all-natives-windows-amd64 + + + org.jogamp.jogl + jogl-all-natives-windows-i586 + + + + + org.jzy3d + jzy3d-native-jogl-core + ${org.jzy3d.jzy3d-native-jogl-core.version} + + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-linux-aarch64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-armv6hf + + + org.jogamp.gluegen + gluegen-rt-natives-linux-i586 + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-windows-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-windows-i586 + + + org.jogamp.jogl + jogl-all-natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all-natives-linux-amd64 + + + org.jogamp.jogl + jogl-all-natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all-natives-linux-i586 + + + org.jogamp.jogl + jogl-all-natives-macosx-universal + + + org.jogamp.jogl + jogl-all-natives-windows-amd64 + + + org.jogamp.jogl + jogl-all-natives-windows-i586 + + + + + org.jzy3d + jzy3d-native-jogl-swing + ${org.jzy3d.jzy3d-native-jogl-swing.version} + + + + com.miglayout + miglayout + + + + + org.jzy3d + jzy3d-tester + ${org.jzy3d.jzy3d-tester.version} + + org.jetbrains.kotlin From 612d673ff9b066f790f173de07ffef47f81c296a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 23 Feb 2023 00:07:58 -0600 Subject: [PATCH 494/996] Temporarily disable the mega melt It will be reenabled after the pom-scijava 34.0.0 release. --- .github/build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/build.sh b/.github/build.sh index 2c99e987..eafec776 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -2,6 +2,8 @@ curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh && sh ci-build.sh || { echo "Maven build failed. Skipping melting pot tests."; exit 1; } +exit 0 # TEMP: Disable melting pot until issues are fixed. + # Helper method to get the last cache modified date as seconds since epoch last_cache_modified () { cache_modified=$(find ~/.cache/scijava/melting-pot -printf '%T@\n' | sort -r | head -n1) From 49aee747962ffba04b758413a87da33b5ff46482 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 23 Feb 2023 14:44:01 -0600 Subject: [PATCH 495/996] Update JogAmp: 2.4.0-rc-20210111 -> 2.4.0 Downloaded from: https://jogamp.org/deployment/archive/rc/v2.4.0/jar/ Deployed with the following script: --snip-- set -e set -x mvn deploy:deploy-file \ -Dfile=gluegen.jar \ -DpomFile=gluegen-2.4.0.pom \ -DrepositoryId=scijava.releases \ -Durl=https://maven.scijava.org/content/repositories/thirdparty \ -DgeneratePom=false \ -DgroupId=org.jogamp.gluegen \ -DartifactId=gluegen \ -Dversion=2.4.0 \ -Dclassifiers=tests \ -Dfiles=gluegen-test-util.jar \ -Dtypes=jar mvn deploy:deploy-file \ -Dfile=gluegen-rt.jar \ -DpomFile=gluegen-rt-2.4.0.pom \ -DrepositoryId=scijava.releases \ -Durl=https://maven.scijava.org/content/repositories/thirdparty \ -DgeneratePom=false \ -DgroupId=org.jogamp.gluegen \ -DartifactId=gluegen-rt \ -Dversion=2.4.0 \ -Dclassifiers=natives-android-aarch64,natives-linux-aarch64,natives-linux-amd64,natives-linux-armv6hf,natives-macosx-universal,natives-windows-amd64 \ -Dfiles=gluegen-rt-natives-android-aarch64.jar,gluegen-rt-natives-linux-aarch64.jar,gluegen-rt-natives-linux-amd64.jar,gluegen-rt-natives-linux-armv6hf.jar,gluegen-rt-natives-macosx-universal.jar,gluegen-rt-natives-windows-amd64.jar \ -Dtypes=jar,jar,jar,jar,jar,jar mvn deploy:deploy-file \ -Dfile=gluegen-rt-android.jar \ -DpomFile=gluegen-rt-android-2.4.0.pom \ -DrepositoryId=scijava.releases \ -Durl=https://maven.scijava.org/content/repositories/thirdparty \ -DgeneratePom=false \ -DgroupId=org.jogamp.gluegen \ -DartifactId=gluegen-rt-android \ -Dversion=2.4.0 \ -Dclassifiers=natives-android-aarch64,natives-linux-aarch64,natives-linux-amd64,natives-linux-armv6hf,natives-macosx-universal,natives-windows-amd64 \ -Dfiles=gluegen-rt-android-natives-android-aarch64.jar,gluegen-rt-android-natives-linux-aarch64.jar,gluegen-rt-android-natives-linux-amd64.jar,gluegen-rt-android-natives-linux-armv6hf.jar,gluegen-rt-android-natives-macosx-universal.jar,gluegen-rt-android-natives-windows-amd64.jar \ -Dtypes=jar,jar,jar,jar,jar,jar mvn deploy:deploy-file \ -Dfile=joal-android.jar \ -DpomFile=joal-android-2.4.0.pom \ -DrepositoryId=scijava.releases \ -Durl=https://maven.scijava.org/content/repositories/thirdparty \ -DgeneratePom=false \ -DgroupId=org.jogamp.joal \ -DartifactId=joal-android \ -Dversion=2.4.0 \ -Dclassifiers=tests,natives-android-aarch64,natives-linux-aarch64,natives-linux-amd64,natives-linux-armv6hf,natives-macosx-universal,natives-windows-amd64 \ -Dfiles=joal-test-android.jar,joal-android-natives-android-aarch64.jar,joal-android-natives-linux-aarch64.jar,joal-android-natives-linux-amd64.jar,joal-android-natives-linux-armv6hf.jar,joal-android-natives-macosx-universal.jar,joal-android-natives-windows-amd64.jar \ -Dtypes=jar,jar,jar,jar,jar,jar,jar mvn deploy:deploy-file \ -Dfile=joal.jar \ -DpomFile=joal-2.4.0.pom \ -DrepositoryId=scijava.releases \ -Durl=https://maven.scijava.org/content/repositories/thirdparty \ -DgeneratePom=false \ -DgroupId=org.jogamp.joal \ -DartifactId=joal \ -Dversion=2.4.0 \ -Dclassifiers=tests,natives-android-aarch64,natives-linux-aarch64,natives-linux-amd64,natives-linux-armv6hf,natives-macosx-universal,natives-windows-amd64 \ -Dfiles=joal-test.jar,joal-natives-android-aarch64.jar,joal-natives-linux-aarch64.jar,joal-natives-linux-amd64.jar,joal-natives-linux-armv6hf.jar,joal-natives-macosx-universal.jar,joal-natives-windows-amd64.jar \ -Dtypes=jar,jar,jar,jar,jar,jar,jar mvn deploy:deploy-file \ -Dfile=jocl-android.jar \ -DpomFile=jocl-android-2.4.0.pom \ -DrepositoryId=scijava.releases \ -Durl=https://maven.scijava.org/content/repositories/thirdparty \ -DgeneratePom=false \ -DgroupId=org.jogamp.jocl \ -DartifactId=jocl-android \ -Dversion=2.4.0 \ -Dclassifiers=tests,natives-android-aarch64,natives-linux-aarch64,natives-linux-amd64,natives-linux-armv6hf,natives-macosx-universal,natives-windows-amd64 \ -Dfiles=jocl-test-android.jar,jocl-android-natives-android-aarch64.jar,jocl-android-natives-linux-aarch64.jar,jocl-android-natives-linux-amd64.jar,jocl-android-natives-linux-armv6hf.jar,jocl-android-natives-macosx-universal.jar,jocl-android-natives-windows-amd64.jar \ -Dtypes=jar,jar,jar,jar,jar,jar,jar mvn deploy:deploy-file \ -Dfile=jocl.jar \ -DpomFile=jocl-2.4.0.pom \ -DrepositoryId=scijava.releases \ -Durl=https://maven.scijava.org/content/repositories/thirdparty \ -DgeneratePom=false \ -DgroupId=org.jogamp.jocl \ -DartifactId=jocl \ -Dversion=2.4.0 \ -Dclassifiers=tests,natives-android-aarch64,natives-linux-aarch64,natives-linux-amd64,natives-linux-armv6hf,natives-macosx-universal,natives-windows-amd64 \ -Dfiles=jocl-test.jar,jocl-natives-android-aarch64.jar,jocl-natives-linux-aarch64.jar,jocl-natives-linux-amd64.jar,jocl-natives-linux-armv6hf.jar,jocl-natives-macosx-universal.jar,jocl-natives-windows-amd64.jar \ -Dtypes=jar,jar,jar,jar,jar,jar,jar mvn deploy:deploy-file \ -Dfile=jogl-all-android.jar \ -DpomFile=jogl-all-android-2.4.0.pom \ -DrepositoryId=scijava.releases \ -Durl=https://maven.scijava.org/content/repositories/thirdparty \ -DgeneratePom=false \ -DgroupId=org.jogamp.jogl \ -DartifactId=jogl-all-android \ -Dversion=2.4.0 \ -Dclassifiers=tests,natives-android-aarch64,natives-linux-aarch64,natives-linux-amd64,natives-linux-armv6hf,natives-macosx-universal,natives-windows-amd64 \ -Dfiles=jogl-test-android.jar,jogl-all-android-natives-android-aarch64.jar,jogl-all-android-natives-linux-aarch64.jar,jogl-all-android-natives-linux-amd64.jar,jogl-all-android-natives-linux-armv6hf.jar,jogl-all-android-natives-macosx-universal.jar,jogl-all-android-natives-windows-amd64.jar \ -Dtypes=jar,jar,jar,jar,jar,jar,jar mvn deploy:deploy-file \ -Dfile=jogl-all-mobile.jar \ -DpomFile=jogl-all-mobile-2.4.0.pom \ -DrepositoryId=scijava.releases \ -Durl=https://maven.scijava.org/content/repositories/thirdparty \ -DgeneratePom=false \ -DgroupId=org.jogamp.jogl \ -DartifactId=jogl-all-mobile \ -Dversion=2.4.0 \ -Dclassifiers=natives-android-aarch64,natives-linux-aarch64,natives-linux-amd64,natives-linux-armv6hf,natives-macosx-universal,natives-windows-amd64 \ -Dfiles=jogl-all-mobile-natives-android-aarch64.jar,jogl-all-mobile-natives-linux-aarch64.jar,jogl-all-mobile-natives-linux-amd64.jar,jogl-all-mobile-natives-linux-armv6hf.jar,jogl-all-mobile-natives-macosx-universal.jar,jogl-all-mobile-natives-windows-amd64.jar \ -Dtypes=jar,jar,jar,jar,jar,jar mvn deploy:deploy-file \ -Dfile=jogl-all.jar \ -DpomFile=jogl-all-2.4.0.pom \ -DrepositoryId=scijava.releases \ -Durl=https://maven.scijava.org/content/repositories/thirdparty \ -DgeneratePom=false \ -DgroupId=org.jogamp.jogl \ -DartifactId=jogl-all \ -Dversion=2.4.0 \ -Dclassifiers=tests,natives-android-aarch64,natives-linux-aarch64,natives-linux-amd64,natives-linux-armv6hf,natives-macosx-universal,natives-windows-amd64 \ -Dfiles=jogl-test.jar,jogl-all-natives-android-aarch64.jar,jogl-all-natives-linux-aarch64.jar,jogl-all-natives-linux-amd64.jar,jogl-all-natives-linux-armv6hf.jar,jogl-all-natives-macosx-universal.jar,jogl-all-natives-windows-amd64.jar \ -Dtypes=jar,jar,jar,jar,jar,jar,jar mvn deploy:deploy-file \ -Dfile=jogl-all-noawt.jar \ -DpomFile=jogl-all-noawt-2.4.0.pom \ -DrepositoryId=scijava.releases \ -Durl=https://maven.scijava.org/content/repositories/thirdparty \ -DgeneratePom=false \ -DgroupId=org.jogamp.jogl \ -DartifactId=jogl-all-noawt \ -Dversion=2.4.0 \ -Dclassifiers=natives-android-aarch64,natives-linux-aarch64,natives-linux-amd64,natives-linux-armv6hf,natives-macosx-universal,natives-windows-amd64 \ -Dfiles=jogl-all-noawt-natives-android-aarch64.jar,jogl-all-noawt-natives-linux-aarch64.jar,jogl-all-noawt-natives-linux-amd64.jar,jogl-all-noawt-natives-linux-armv6hf.jar,jogl-all-noawt-natives-macosx-universal.jar,jogl-all-noawt-natives-windows-amd64.jar \ -Dtypes=jar,jar,jar,jar,jar,jar --snap-- --- pom.xml | 171 +------------------------------------------------------- 1 file changed, 1 insertion(+), 170 deletions(-) diff --git a/pom.xml b/pom.xml index 3d24e45e..f7f058bf 100644 --- a/pom.xml +++ b/pom.xml @@ -1966,7 +1966,7 @@ - 2.4.0-rc-20210111 + 2.4.0 ${jogamp.version} ${jogamp.version} @@ -5587,30 +5587,6 @@ ${org.jogamp.gluegen.gluegen-rt.version} natives-android-aarch64 - - org.jogamp.gluegen - gluegen-rt - ${org.jogamp.gluegen.gluegen-rt.version} - natives-android-armv6 - - - org.jogamp.gluegen - gluegen-rt - ${org.jogamp.gluegen.gluegen-rt.version} - natives-android-x86 - - - org.jogamp.gluegen - gluegen-rt - ${org.jogamp.gluegen.gluegen-rt.version} - natives-ios-amd64 - - - org.jogamp.gluegen - gluegen-rt - ${org.jogamp.gluegen.gluegen-rt.version} - natives-ios-arm64 - org.jogamp.gluegen gluegen-rt @@ -5629,12 +5605,6 @@ ${org.jogamp.gluegen.gluegen-rt.version} natives-linux-armv6hf - - org.jogamp.gluegen - gluegen-rt - ${org.jogamp.gluegen.gluegen-rt.version} - natives-linux-i586 - org.jogamp.gluegen gluegen-rt @@ -5647,42 +5617,12 @@ ${org.jogamp.gluegen.gluegen-rt.version} natives-windows-amd64 - - org.jogamp.gluegen - gluegen-rt - ${org.jogamp.gluegen.gluegen-rt.version} - natives-windows-i586 - org.jogamp.joal joal ${org.jogamp.joal.joal.version} natives-android-aarch64 - - org.jogamp.joal - joal - ${org.jogamp.joal.joal.version} - natives-android-armv6 - - - org.jogamp.joal - joal - ${org.jogamp.joal.joal.version} - natives-android-x86 - - - org.jogamp.joal - joal - ${org.jogamp.joal.joal.version} - natives-ios-amd64 - - - org.jogamp.joal - joal - ${org.jogamp.joal.joal.version} - natives-ios-arm64 - org.jogamp.joal joal @@ -5701,12 +5641,6 @@ ${org.jogamp.joal.joal.version} natives-linux-armv6hf - - org.jogamp.joal - joal - ${org.jogamp.joal.joal.version} - natives-linux-i586 - org.jogamp.joal joal @@ -5719,31 +5653,12 @@ ${org.jogamp.joal.joal.version} natives-windows-amd64 - - org.jogamp.joal - joal - ${org.jogamp.joal.joal.version} - natives-windows-i586 - org.jogamp.jocl jocl ${org.jogamp.jocl.jocl.version} natives-android-aarch64 - - org.jogamp.jocl - jocl - ${org.jogamp.jocl.jocl.version} - natives-android-armv6 - - - org.jogamp.jocl - jocl - ${org.jogamp.jocl.jocl.version} - natives-android-x86 - - org.jogamp.jocl jocl @@ -5762,12 +5677,6 @@ ${org.jogamp.jocl.jocl.version} natives-linux-armv6hf - - org.jogamp.jocl - jocl - ${org.jogamp.jocl.jocl.version} - natives-linux-i586 - org.jogamp.jocl jocl @@ -5780,42 +5689,12 @@ ${org.jogamp.jocl.jocl.version} natives-windows-amd64 - - org.jogamp.jocl - jocl - ${org.jogamp.jocl.jocl.version} - natives-windows-i586 - org.jogamp.jogl jogl-all ${org.jogamp.jogl.jogl-all.version} natives-android-aarch64 - - org.jogamp.jogl - jogl-all - ${org.jogamp.jogl.jogl-all.version} - natives-android-armv6 - - - org.jogamp.jogl - jogl-all - ${org.jogamp.jogl.jogl-all.version} - natives-android-x86 - - - org.jogamp.jogl - jogl-all - ${org.jogamp.jogl.jogl-all.version} - natives-ios-amd64 - - - org.jogamp.jogl - jogl-all - ${org.jogamp.jogl.jogl-all.version} - natives-ios-arm64 - org.jogamp.jogl jogl-all @@ -5834,12 +5713,6 @@ ${org.jogamp.jogl.jogl-all.version} natives-linux-armv6hf - - org.jogamp.jogl - jogl-all - ${org.jogamp.jogl.jogl-all.version} - natives-linux-i586 - org.jogamp.jogl jogl-all @@ -5852,42 +5725,12 @@ ${org.jogamp.jogl.jogl-all.version} natives-windows-amd64 - - org.jogamp.jogl - jogl-all - ${org.jogamp.jogl.jogl-all.version} - natives-windows-i586 - org.jogamp.jogl jogl-all-noawt ${org.jogamp.jogl.jogl-all-noawt.version} natives-android-aarch64 - - org.jogamp.jogl - jogl-all-noawt - ${org.jogamp.jogl.jogl-all-noawt.version} - natives-android-armv6 - - - org.jogamp.jogl - jogl-all-noawt - ${org.jogamp.jogl.jogl-all-noawt.version} - natives-android-x86 - - - org.jogamp.jogl - jogl-all-noawt - ${org.jogamp.jogl.jogl-all-noawt.version} - natives-ios-amd64 - - - org.jogamp.jogl - jogl-all-noawt - ${org.jogamp.jogl.jogl-all-noawt.version} - natives-ios-arm64 - org.jogamp.jogl jogl-all-noawt @@ -5906,12 +5749,6 @@ ${org.jogamp.jogl.jogl-all-noawt.version} natives-linux-armv6hf - - org.jogamp.jogl - jogl-all-noawt - ${org.jogamp.jogl.jogl-all-noawt.version} - natives-linux-i586 - org.jogamp.jogl jogl-all-noawt @@ -5924,12 +5761,6 @@ ${org.jogamp.jogl.jogl-all-noawt.version} natives-windows-amd64 - - org.jogamp.jogl - jogl-all-noawt - ${org.jogamp.jogl.jogl-all-noawt.version} - natives-windows-i586 - From b266eb2f0c3d1c9803945f53f0e7568e1a6abade Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 2 Mar 2023 14:33:36 -0600 Subject: [PATCH 496/996] Update component versions * scijava-common: 2.90.2 -> 2.91.0 * imagej-common: 2.0.2 -> 2.0.3 * imagej-ops: 0.49.1 -> 1.0.0 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f7f058bf..9a84a282 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.90.2 + 2.91.0 ${scijava-common.version} @@ -483,7 +483,7 @@ ${ij1-patcher.version} - 2.0.2 + 2.0.3 ${imagej-common.version} @@ -527,7 +527,7 @@ ${imagej-opencv.version} - 0.49.1 + 1.0.0 ${imagej-ops.version} From c0188afeb737557d26131fd309049ef3f323614b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 2 Mar 2023 14:54:05 -0600 Subject: [PATCH 497/996] Update components to last Java-8-based versions * jetty: 9.4.49.v20220914 -> 9.4.50.v20221201 * logback: 1.2.9 -> 1.3.5 And add comments noting which components are known to have moved beyond Java 8. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9a84a282..b5f20b03 100644 --- a/pom.xml +++ b/pom.xml @@ -1420,7 +1420,7 @@ ${args4j.version} - 5.2 + 5.2 ${asm.version} ${asm.version} ${asm.version} @@ -1822,7 +1822,7 @@ ${jep.version} - 9.4.49.v20220914 + 9.4.50.v20221201 ${jetty.version} - 1.2.9 + 1.3.5 ${logback.version} ${logback.version} ${logback-classic.version} From b271e29d8562c2ce75971e43432ce108dcac6bc3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 2 Mar 2023 15:08:58 -0600 Subject: [PATCH 498/996] Remove dependency management for jetty-jaas It brings in a dependency on a conflicting fork of antlr. I'm guessing this was introduced in jetty 9.4.50.v20221201, since the mega-melt test did not flag any issue with jetty-jaas 9.4.49.v20220914. --- pom.xml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index b5f20b03..c38ce77e 100644 --- a/pom.xml +++ b/pom.xml @@ -1834,7 +1834,12 @@ ${jetty.version} ${jetty.version} ${jetty.version} - ${jetty.version} + ${jetty.version} ${jetty.version} ${jetty.version} @@ -1868,7 +1873,6 @@ ${jetty-http.version} ${jetty-http-spi.version} ${jetty-io.version} - ${jetty-jaas.version} ${jetty-jaspi.version} ${jetty-jmx.version} ${jetty-jndi.version} @@ -5317,11 +5321,6 @@ jetty-io ${org.eclipse.jetty.jetty-io.version} - - org.eclipse.jetty - jetty-jaas - ${org.eclipse.jetty.jetty-jaas.version} - org.eclipse.jetty jetty-jaspi From acf5c0317b0768cda6a3071d245e14fb81465e12 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 2 Mar 2023 15:23:29 -0600 Subject: [PATCH 499/996] Update protobuf: 3.21.9 -> 3.22.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c38ce77e..e7b90768 100644 --- a/pom.xml +++ b/pom.xml @@ -2161,7 +2161,7 @@ ${postgresql.version} - 3.21.9 + 3.22.0 - 1.3.5 + + 1.2.11 ${logback.version} ${logback.version} ${logback-classic.version} From d14784d4b01dc0c3a6c7f76c43cbabb49a8ddc6d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 3 Mar 2023 08:18:20 -0600 Subject: [PATCH 501/996] Update asm: 5.2 -> 9.4 Due to a bug in the class-versions.sh detection script, I was wrong about 7.x and 9.x requiring Java 9+. That bug is now fixed (scijava/scijava-scripts@22a568f2), and asm 9.4 is working great across all SciJava components, whereas using 5.x broke scripting-jython, which was expecting version 7.1 or later. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 38ea29d7..233660d4 100644 --- a/pom.xml +++ b/pom.xml @@ -1420,7 +1420,7 @@ ${args4j.version} - 5.2 + 9.4 ${asm.version} ${asm.version} ${asm.version} From 52530223f091120a4a0efacf661ca912bc944939 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 3 Mar 2023 08:36:38 -0600 Subject: [PATCH 502/996] Update components preemptively * imagej2: 2.9.0 -> 2.10.0 * imglib2-imglyb: 1.0.1 -> 1.1.0 * fiji: 2.9.0 -> 2.10.0 These components will be released built on pom-scijava 34.0.0. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 233660d4..61578aa1 100644 --- a/pom.xml +++ b/pom.xml @@ -469,7 +469,7 @@ - 2.9.0 + 2.10.0 ${imagej2.version} ${imagej.version} @@ -605,7 +605,7 @@ ${imglib2-ij.version} - 1.0.1 + 1.1.0 ${imglib2-imglyb.version} @@ -657,7 +657,7 @@ - 2.9.0 + 2.10.0 ${fiji.version} From 0536116200b780cbac97955cb738ec2616683f48 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 3 Mar 2023 08:38:33 -0600 Subject: [PATCH 503/996] Update parent to pom-scijava-base 17.1.0 This updates scijava-coding-style from 2.0.0 to 2.1.0. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 61578aa1..91e172d1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 17.0.0 + 17.1.0 From 7d1a41124b6b05a6065a162ab4ed18e50a33a9e4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 3 Mar 2023 08:40:26 -0600 Subject: [PATCH 504/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91e172d1..4d07c651 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 34.0.0-SNAPSHOT + 34.0.1-SNAPSHOT pom SciJava Parent POM From ff6d6c8382e394239552535a9719271f6c258fe4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 6 Mar 2023 13:27:27 -0600 Subject: [PATCH 505/996] mega-melt: skip SNT until its next release --- tests/generate-mega-melt.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index 929091ac..a075e0de 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -21,6 +21,9 @@ def child(node, tag): # Artifacts to exclude from the mega melt. ignoredArtifacts = [ + # TEMP: The SNT project needs a new release with cleaned + # up dependencies before it can be reenabled in the melt. + 'SNT', # TEMP: The original ImageJ requires Java 9+ to compile, # because it has a module-info.java, so skip it until the # component collection is updated from Java 8 to Java 11. From 0cfe4ccda16947cb4e4d0fa55afc048190c4ce01 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 6 Mar 2023 13:27:44 -0600 Subject: [PATCH 506/996] Update components * Trainable_Segmentation: 3.3.3 -> 3.3.4 * n5-zarr: 0.0.7 -> 0.0.8 And reenable their tests in the mega melt. --- pom.xml | 4 ++-- tests/run.sh | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 4d07c651..6a390f1a 100644 --- a/pom.xml +++ b/pom.xml @@ -912,7 +912,7 @@ ${TopoJ.version} ${TopoJ_.version} - 3.3.3 + 3.3.4 ${Trainable_Segmentation.version} 2.0.4 @@ -1137,7 +1137,7 @@ ${n5-viewer_fiji.version} - 0.0.7 + 0.0.8 ${n5-zarr.version} diff --git a/tests/run.sh b/tests/run.sh index 4d802523..f8cee8a1 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -185,15 +185,9 @@ grep -qxF "$f" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ chmod +x "$meltScript" || die "Failed to adjust $meltScript" -# TEMP: Until saalfeldlab/n5-zarr#11 is merged and released. -echo "org.janelia.saalfeldlab/n5-zarr" >> "$skipTestsFile" && - # TEMP: Until saalfeldlab/n5-aws-s3#13 is fixed. echo "org.janelia.saalfeldlab/n5-aws-s3" >> "$skipTestsFile" && -# TEMP: Until fiji/Trainable_Segmentation#75 is fixed. -echo "sc.fiji/Trainable_Segmentation" >> "$skipTestsFile" && - # Error while checking the CLIJ2 installation: null echo "sc.fiji/labkit-pixel-classification" >> "$skipTestsFile" || die "Failed to generate $skipTestsFile" From f592844b4f92187998bdd89991ed48fe51a575c2 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 6 Mar 2023 13:32:35 -0600 Subject: [PATCH 507/996] Reenable the mega melt --- .github/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index eafec776..2c99e987 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -2,8 +2,6 @@ curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh && sh ci-build.sh || { echo "Maven build failed. Skipping melting pot tests."; exit 1; } -exit 0 # TEMP: Disable melting pot until issues are fixed. - # Helper method to get the last cache modified date as seconds since epoch last_cache_modified () { cache_modified=$(find ~/.cache/scijava/melting-pot -printf '%T@\n' | sort -r | head -n1) From fd7aaf20743288aa31c1e4c0bbb6a2bb9aa1b036 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 6 Mar 2023 13:50:08 -0600 Subject: [PATCH 508/996] Update SciJava component versions * imagej-updater: 0.11.0 -> 1.0.0 * Auto_Threshold: 1.17.2 -> 1.18.0 * n5-ij: 3.2.2 -> 3.2.3 * n5-viewer_fiji: 5.1.0 -> 5.3.0 * MorphoLibJ: 1.5.0 -> 1.6.0.1 * BigStitcher: 0.8.3 -> 1.1.3 * multiview-reconstruction: 0.11.5 -> 1.2.8 * SNT: 4.1.9 -> 4.1.14 * MaMuT: 7.1.0 -> 7.1.1 * labkit-ui: 0.3.8 -> 0.3.10 --- pom.xml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 6a390f1a..b3e41817 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 34.0.1-SNAPSHOT + 34.1.0-SNAPSHOT pom SciJava Parent POM @@ -571,7 +571,7 @@ ${imagej-ui-swing.version} - 0.11.0 + 1.0.0 ${imagej-updater.version} @@ -688,7 +688,7 @@ 1.11.0 ${Auto_Local_Threshold.version} - 1.17.2 + 1.18.0 ${Auto_Threshold.version} 3.0.1 @@ -1125,7 +1125,7 @@ ${n5-hdf5.version} - 3.2.2 + 3.2.3 ${n5-ij.version} @@ -1133,7 +1133,7 @@ ${n5-imglib2.version} - 5.1.0 + 5.3.0 ${n5-viewer_fiji.version} @@ -1143,7 +1143,7 @@ - 1.5.0 + 1.6.0.1 ${MorphoLibJ.version} ${MorphoLibJ_.version} @@ -1166,8 +1166,8 @@ ${clijx-weka_.version} - 0.8.3 - 0.11.5 + 1.1.3 + 1.2.8 0.2.0 ${BigStitcher.version} ${multiview-reconstruction.version} @@ -1187,16 +1187,16 @@ ${bonej-utilities.version} - 4.1.9 + 4.1.14 ${SNT.version} - 7.1.0 + 7.1.1 ${MaMuT.version} 0.1.15 - 0.3.8 + 0.3.10 ${labkit-pixel-classification.version} ${labkit-ui.version} From 161b9bcb72a247bcc0f6ff2b87ee3ae7f6454984 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 6 Mar 2023 13:52:36 -0600 Subject: [PATCH 509/996] Update OME component versions * ome-common: 6.0.13 -> 6.0.14 * metakit: 5.3.4 -> 5.3.5 * ome-xml: 6.3.1 -> 6.3.2 * bio-formats: 6.11.1 -> 6.12.0 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b3e41817..2ead2e8e 100644 --- a/pom.xml +++ b/pom.xml @@ -1209,11 +1209,11 @@ ${ice.version} - 6.0.13 + 6.0.14 ${ome-common.version} - 5.3.4 + 5.3.5 ${metakit.version} @@ -1221,7 +1221,7 @@ ${ome-poi.version} - 6.3.1 + 6.3.2 ${ome-xml.version} @@ -1230,7 +1230,7 @@ ${jxrlib-all.version} - 6.11.1 + 6.12.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From b58814e26213169162b512e33be6312bd9dc1b62 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 6 Mar 2023 14:02:45 -0600 Subject: [PATCH 510/996] Update JavaCPP version: 1.5.7 -> 1.5.8 * ffmpeg: 5.0-1.5.7 -> 5.1.2-1.5.8 * flandmark: 1.07-1.5.7 -> 1.07-1.5.8 * hdf5: 1.12.1-1.5.7 -> 1.12.2-1.5.8 * leptonica: 1.82.0-1.5.7 -> 1.82.0-1.5.8 * libdc1394: 2.2.6-1.5.7 -> 2.2.6-1.5.8 * libfreenect: 0.5.7-1.5.7 -> 0.5.7-1.5.8 * libfreenect2: 0.2.0-1.5.7 -> 0.2.0-1.5.8 * librealsense: 1.12.4-1.5.7 -> 1.12.4-1.5.8 * openblas: 0.3.19-1.5.7 -> 0.3.21-1.5.8 * opencv: 4.5.5-1.5.7 -> 4.6.0-1.5.8 * tesseract: 5.0.1-1.5.7 -> 5.2.0-1.5.8 --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2ead2e8e..2f74ee05 100644 --- a/pom.xml +++ b/pom.xml @@ -1762,23 +1762,23 @@ - 1.5.7 + 1.5.8 ${org.bytedeco.javacpp.version} ${javacpp.version} ${javacv.version} 2.3.1-${org.bytedeco.javacpp.version} - 5.0-${org.bytedeco.javacpp.version} + 5.1.2-${org.bytedeco.javacpp.version} 1.07-${org.bytedeco.javacpp.version} - 1.12.1-${org.bytedeco.javacpp.version} + 1.12.2-${org.bytedeco.javacpp.version} 1.82.0-${org.bytedeco.javacpp.version} 2.2.6-${org.bytedeco.javacpp.version} 0.5.7-${org.bytedeco.javacpp.version} 0.2.0-${org.bytedeco.javacpp.version} 1.12.4-${org.bytedeco.javacpp.version} - 0.3.19-${org.bytedeco.javacpp.version} - 4.5.5-${org.bytedeco.javacpp.version} - 5.0.1-${org.bytedeco.javacpp.version} + 0.3.21-${org.bytedeco.javacpp.version} + 4.6.0-${org.bytedeco.javacpp.version} + 5.2.0-${org.bytedeco.javacpp.version} ${artoolkitplus.version} ${ffmpeg.version} ${flandmark.version} From bd8e82b2f8f6dac833dc8a634e013accaaef8312 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 6 Mar 2023 13:54:57 -0600 Subject: [PATCH 511/996] Update dependency versions * aws: 1.12.410 -> 1.12.420 * plexus-utils: 3.5.0 -> 3.5.1 * batik: 1.15 -> 1.16 * xmlgraphics-commons: 2.7 -> 2.8 * checker-qual: 3.31.0 -> 3.32.0 * commons-compress: 1.21 -> 1.22 * commons-csv: 1.9.0 -> 1.10.0 * api-common: 2.6.0 -> 2.6.2 * gax: 2.23.0 -> 2.23.2 * gax-httpjson: 0.108.0 -> 0.108.2 * proto-google-common-protos: 2.14.0 -> 2.14.2 * proto-google-iam-v1: 1.9.0 -> 1.9.2 * google-auth-library: 1.15.0 -> 1.16.0 * google-cloud-core: 2.10.0 -> 2.12.0 * google-cloud-nio: 0.124.17 -> 0.126.6 * google-cloud-storage: 2.13.0 -> 2.19.0 * google-http-client: 1.42.3 -> 1.43.0 * grpc: 1.52.1 -> 1.53.0 * gson: 2.9.1 -> 2.10.1 * guava: 27.1-jre -> 31.1-jre * j2objc-annotations: 1.3 -> 2.8 * jackson: 2.13.4 -> 2.14.2 * jcodings: 1.0.57 -> 1.0.58 * jfreechart: 1.5.3 -> 1.5.4 * jmh: 1.35 -> 1.36 * jna: 5.12.1 -> 5.13.0 * jnr-constants: 0.9.17 -> 0.10.4 * joda-time: 2.12.0 -> 2.12.2 * json: 20220924 -> 20230227 * kryo: 5.3.0 -> 5.4.0 * mapdb: 3.0.8 -> 3.0.9 * opencsv: 5.7.0 -> 5.7.1 * picocli: 4.6.3 -> 4.7.1 * postgresql: 42.5.0 -> 42.5.4 * reload4j: 1.2.22 -> 1.2.24 * rsyntaxtextarea: 3.3.0 -> 3.3.2 * autocomplete: 3.3.0 -> 3.3.1 * slf4j: 1.7.32 -> 1.7.36 * snakeyaml-engine: 2.5 -> 2.6 --- pom.xml | 79 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/pom.xml b/pom.xml index 2f74ee05..09899ad8 100644 --- a/pom.xml +++ b/pom.xml @@ -1287,7 +1287,7 @@ - 1.12.410 + 1.12.420 ${aws.version} ${aws.version} ${aws-java-sdk-core.version} @@ -1376,7 +1376,7 @@ 3.8.6 3.6.1 2.1.1 - 3.5.0 + 3.5.1 2.6.0 2.6.0 ${maven-artifact-transfer.version} @@ -1432,7 +1432,7 @@ ${asm-util.version} - 1.15 + 1.16 ${batik.version} ${batik.version} ${batik.version} @@ -1460,7 +1460,7 @@ ${batik.version} ${batik.version} ${batik.version} - 2.7 + 2.8 ${batik-anim.version} ${batik-awt-util.version} ${batik-bridge.version} @@ -1503,7 +1503,7 @@ ${cdi-api.version} - 3.31.0 + 3.32.0 ${checker-qual.version} @@ -1525,11 +1525,11 @@ ${commons-collections4.version} - 1.21 + 1.22 ${commons-compress.version} - 1.9.0 + 1.10.0 ${commons-csv.version} @@ -1641,11 +1641,11 @@ ${google-api-client-xml.version} - 2.6.0 - 2.23.0 - 0.108.0 - 2.14.0 - 1.9.0 + 2.6.2 + 2.23.2 + 0.108.2 + 2.14.2 + 1.9.2 ${api-common.version} ${gax.version} ${gax-httpjson.version} @@ -1653,7 +1653,7 @@ ${proto-google-iam-v1.version} - 1.15.0 + 1.16.0 ${google-auth-library.version} ${google-auth-library.version} ${google-auth-library.version} @@ -1668,11 +1668,11 @@ ${auto-value-annotations.version} - 2.10.0 + 2.12.0 ${google-cloud-core.version} - 0.124.17 + 0.126.6 0.117.2-alpha - 2.13.0 + 2.19.0 ${google-cloud-core.version} ${google-cloud-core-http.version} ${google-cloud-nio.version} @@ -1680,7 +1680,7 @@ ${google-cloud-storage.version} - 1.42.3 + 1.43.0 ${google-http-client.version} ${google-http-client.version} ${google-http-client.version} @@ -1694,16 +1694,16 @@ ${google-http-client-xml.version} - 1.52.1 + 1.53.0 ${grpc.version} ${grpc-context.version} - 2.9.1 + 2.10.1 ${gson.version} - 27.1-jre + 31.1-jre ${guava.version} @@ -1720,7 +1720,7 @@ ${itextpdf.version} - 1.3 + 2.8 ${j2objc-annotations.version} @@ -1728,7 +1728,7 @@ ${jackrabbit-webdav.version} - 2.13.4 + 2.14.2 ${jackson.version} ${jackson.version} ${jackson.version} @@ -1810,7 +1810,7 @@ ${javassist.version} - 1.0.57 + 1.0.58 ${jcodings.version} @@ -1892,7 +1892,7 @@ ${jetty-xml.version} - 1.5.3 + 1.5.4 ${jfreechart.version} @@ -1934,7 +1934,7 @@ ${jline3.version} - 1.35 + 1.36 ${jmh.version} ${jmh.version} ${jmh-core.version} @@ -1945,14 +1945,14 @@ ${jmockit.version} - 5.12.1 + 5.13.0 ${jna.version} ${jna.version} ${jna-platform.version} 1.3.10 - 0.9.17 + 0.10.4 2.2.13 3.1.16 ${jffi.version} @@ -1961,7 +1961,7 @@ ${jnr-posix.version} - 2.12.0 + 2.12.2 ${joda-time.version} @@ -2013,7 +2013,7 @@ ${jsch.version} - 20220924 + 20230227 ${json.version} @@ -2035,6 +2035,7 @@ ${junit-vintage-engine.version} + 2.7.2 ${jython.version} ${jython-slim.version} @@ -2094,7 +2095,7 @@ ${kotlinx-coroutines-core-jvm.version} - 5.3.0 + 5.4.0 1.3.1 1.11.9 ${kryo.version} @@ -2117,7 +2118,7 @@ ${lz4-java.version} - 3.0.8 + 3.0.9 ${mapdb.version} @@ -2153,15 +2154,15 @@ ${ojalgo.version} - 5.7.0 + 5.7.1 ${opencsv.version} - 4.6.3 + 4.7.1 ${picocli.version} - 42.5.0 + 42.5.4 ${postgresql.version} @@ -2178,19 +2179,19 @@ ${protobuf-kotlin.version} - 1.2.22 + 1.2.24 ${reload4j.version} - 3.3.0 - 3.3.0 + 3.3.2 + 3.3.1 3.3.0 ${rsyntaxtextarea.version} ${autocomplete.version} ${languagesupport.version} - 1.7.32 + 1.7.36 ${slf4j.version} ${slf4j.version} ${slf4j.version} @@ -2211,7 +2212,7 @@ ${snakeyaml.version} - 2.5 + 2.6 ${snakeyaml-engine.version} From 980ff6cb4b04156013ec1e9ab2ec084d46a7f036 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 6 Mar 2023 15:49:45 -0600 Subject: [PATCH 512/996] Update TrackMate component versions These needed to be updated simultaneously, due to breaking changes in TrackMate 7.10. * TrackMate: 7.9.2 -> 7.10.2 * TrackMate-Cellpose: 0.1.0 -> 0.1.2 * TrackMate-CSVImporter: 3.1.2 -> 3.1.4 * TrackMate-ExTrack: 1.2.4 -> 1.2.5 * TrackMate-Ilastik: 1.3.0 -> 1.3.1 * TrackMate-MorphoLibJ: 1.2.0 -> 1.2.1 * TrackMate-Oneat: 3.0.0 -> 3.2.0 * TrackMate-Skeleton: 2.0.0 -> 2.0.1 * TrackMate-StarDist: 1.2.0 -> 1.2.1 * TrackMate-Weka: 1.3.0 -> 1.3.1 --- pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 09899ad8..927918b4 100644 --- a/pom.xml +++ b/pom.xml @@ -1030,15 +1030,15 @@ - 7.9.2 + 7.10.2 ${TrackMate.version} - 0.1.0 + 0.1.2 ${TrackMate-Cellpose.version} - 3.1.2 + 3.1.4 ${TrackMate-CSVImporter.version} @@ -1048,31 +1048,31 @@ --> - 1.2.4 + 1.2.5 ${TrackMate-ExTrack.version} - 1.3.0 + 1.3.1 ${TrackMate-Ilastik.version} - 1.2.0 + 1.2.1 ${TrackMate-MorphoLibJ.version} - 3.0.0 + 3.2.0 ${TrackMate-Oneat.version} - 2.0.0 + 2.0.1 ${TrackMate-Skeleton.version} - 1.2.0 + 1.2.1 ${TrackMate-StarDist.version} - 1.3.0 + 1.3.1 ${TrackMate-Weka.version} From b97beee40ff7638dc3a3ebe4f4785917309620ff Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 6 Mar 2023 16:13:59 -0600 Subject: [PATCH 513/996] Skip flaky imagej-ops CachedOpEnvironmentTest --- tests/run.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/run.sh b/tests/run.sh index f8cee8a1..062abf10 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -185,6 +185,11 @@ grep -qxF "$f" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ chmod +x "$meltScript" || die "Failed to adjust $meltScript" +# HACK: Remove flaky test from imagej-ops builds. +# This test fails intermittently. Of course, it should be somehow +# fixed in imagej-ops. But for now, let's not let it ruin the melt. +rm -f "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/cached/CachedOpEnvironmentTest.java" + # TEMP: Until saalfeldlab/n5-aws-s3#13 is fixed. echo "org.janelia.saalfeldlab/n5-aws-s3" >> "$skipTestsFile" && From 023bd80dca75522e0e1e84a7eb0a583bda8835e6 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 6 Mar 2023 19:23:08 -0600 Subject: [PATCH 514/996] Update FilamentDetector: 2.0.0 -> 2.0.1 This release updates the code to work with TrackMate 7.10. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 927918b4..b8ce1dcf 100644 --- a/pom.xml +++ b/pom.xml @@ -757,7 +757,7 @@ 3.1.2 ${Fiji_Plugins.version} - 2.0.0 + 2.0.1 ${FilamentDetector.version} 2.0.1 From 462096a35d8005ac292dffa95767f6e1b81b3224 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 08:47:02 -0600 Subject: [PATCH 515/996] CI: defer build failure until after cache update We want the cache to update even when some components of the mega melt fail to build successfully. That way, the ones that *were* successful will not need to build again next time. --- .github/build.sh | 3 ++- .github/exit.sh | 8 ++++++++ .github/workflows/build.yml | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100755 .github/exit.sh diff --git a/.github/build.sh b/.github/build.sh index 2c99e987..0aa1753a 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -33,4 +33,5 @@ else echo "update-cache=false" >> $GITHUB_ENV fi -exit $meltResult +# NB: This script exits 0, but saves the exit code for a later build step. +echo $meltResult > exit-code diff --git a/.github/exit.sh b/.github/exit.sh new file mode 100755 index 00000000..b5ab4d19 --- /dev/null +++ b/.github/exit.sh @@ -0,0 +1,8 @@ +#!/bin/sh +test -f exit-code || { + echo "[ERROR] No build exit code was saved!" + exit 255 +} +exitCode=$(cat exit-code) +rm -f exit-code +exit $exitCode diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f86086b4..2c4af459 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,3 +60,7 @@ jobs: with: path: ~/.cache/scijava/melting-pot key: ${{ runner.os }}-cache + + - name: Return the exit code + id: exit-build + run: .github/exit.sh From 747186bb7957b12d67e0ece7c0545cb1b39fa765 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 10:34:43 -0600 Subject: [PATCH 516/996] Update ImageJ: 1.54b -> 1.54c --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8ce1dcf..b325678c 100644 --- a/pom.xml +++ b/pom.xml @@ -474,7 +474,7 @@ ${imagej.version} - 1.54b + 1.54c ${imagej1.version} ${ij.version} From 2f88bff1d306d6ac5549a3e981f26c32460217c4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 12:09:59 -0600 Subject: [PATCH 517/996] mega-melt: build only org.scijava components The mega-melt takes so long to run, and it's hanging at various points. Let's try it in smaller chunks, and see if we can get the cache updated. If this works, the next commits will roll through more of the groupIds. --- tests/run.sh | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 062abf10..c0b18cec 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -87,20 +87,7 @@ chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ -r scijava.public::::https://maven.scijava.org/content/groups/public \ -o "$meltingPotDir" \ - -i 'ca.mcgill:*' \ - -i 'io.scif:*' \ - -i 'jitk:*' \ - -i 'mpicbg:*' \ - -i 'net.imagej:*' \ - -i 'net.imglib2:*' \ - -i 'net.preibisch:*' \ - -i 'org.bonej:*' \ - -i 'org.janelia.saalfeldlab:*' \ - -i 'org.janelia:*' \ - -i 'org.morphonets:*' \ -i 'org.scijava:*' \ - -i 'sc.fiji:*' \ - -e 'net.imagej:ij' \ -e 'org.scijava:j3dcore' \ -e 'org.scijava:j3dutils' \ -e 'org.scijava:jep' \ From 69dbf3a3013e720a913b3cce0063bf1c469f2904 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 13:06:18 -0600 Subject: [PATCH 518/996] mega-melt: also build net.imagej components --- tests/run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/run.sh b/tests/run.sh index c0b18cec..27f0e05b 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -87,7 +87,9 @@ chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ -r scijava.public::::https://maven.scijava.org/content/groups/public \ -o "$meltingPotDir" \ + -i 'net.imagej:*' \ -i 'org.scijava:*' \ + -e 'net.imagej:ij' \ -e 'org.scijava:j3dcore' \ -e 'org.scijava:j3dutils' \ -e 'org.scijava:jep' \ From 80a8881a2672325743a55945c03911c24b37b4c1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 13:21:45 -0600 Subject: [PATCH 519/996] Update scijava-search: 2.0.0 -> 2.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b325678c..65424630 100644 --- a/pom.xml +++ b/pom.xml @@ -387,7 +387,7 @@ ${scijava-plugins-text-plain.version} - 2.0.0 + 2.0.1 ${scijava-search.version} From 4692ed2a6c4a6c01d9a9235f7f4acb1004bd951e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 13:42:34 -0600 Subject: [PATCH 520/996] CI: use new granular cache restore/save actions See https://github.com/actions/cache/issues/92#issuecomment-1362456629 --- .github/workflows/build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c4af459..9fe3c401 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,9 +27,9 @@ jobs: - name: Set up CI environment run: .github/setup.sh - - name: Restore the cache + - name: Restore the melting-pot cache id: restore-cache - uses: actions/cache@v3 + uses: actions/cache/restore@v3 with: path: ~/.cache/scijava/melting-pot key: ${{ runner.os }}-cache @@ -45,7 +45,7 @@ jobs: OSSRH_PASS: ${{ secrets.OSSRH_PASS }} SIGNING_ASC: ${{ secrets.SIGNING_ASC }} - - name: Delete cache + - name: Delete the melting-pot cache if: env.update-cache == 'true' id: delete-cache run: | @@ -53,10 +53,10 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} - - name: Update cache post-delete + - name: Save the melting-pot cache if: env.update-cache == 'true' - id: update-cache - uses: actions/cache@v3 + id: save-cache + uses: actions/cache/save@v3 with: path: ~/.cache/scijava/melting-pot key: ${{ runner.os }}-cache From 2234669f65cf144f9482637da4a80d97167db184 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 13:55:44 -0600 Subject: [PATCH 521/996] Update image-legacy: 0.39.3 -> 0.39.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65424630..a4a83815 100644 --- a/pom.xml +++ b/pom.xml @@ -495,7 +495,7 @@ ${imagej-launcher.version} - 0.39.3 + 0.39.4 ${imagej-legacy.version} From db8e6fbe7d80a0a963fccca4db3f4390aed895c0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 15:03:57 -0600 Subject: [PATCH 522/996] CI: try using a valid env var name They aren't allowed to have dashes. Maybe that's why GitHub Actions is skipping these two build steps? --- .github/build.sh | 4 ++-- .github/workflows/build.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index 0aa1753a..1d9f8887 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -28,9 +28,9 @@ fi # Determine if cache needs to be re-generated if [ "$cache_modified_post" -gt "$cache_modified_pre" ]; then - echo "update-cache=true" >> $GITHUB_ENV + echo "cacheChanged=true" >> $GITHUB_ENV else - echo "update-cache=false" >> $GITHUB_ENV + echo "cacheChanged=false" >> $GITHUB_ENV fi # NB: This script exits 0, but saves the exit code for a later build step. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fe3c401..c5a1d5b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,7 +46,7 @@ jobs: SIGNING_ASC: ${{ secrets.SIGNING_ASC }} - name: Delete the melting-pot cache - if: env.update-cache == 'true' + if: env.cacheChanged == 'true' id: delete-cache run: | gh api --method DELETE -H "Accept: application/vnd.github+json" /repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-cache @@ -54,7 +54,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} - name: Save the melting-pot cache - if: env.update-cache == 'true' + if: env.cacheChanged == 'true' id: save-cache uses: actions/cache/save@v3 with: From 74a74b4587fc2ab95171530109ebbf94d8e73535 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 15:17:31 -0600 Subject: [PATCH 523/996] Update image-legacy: 0.39.4 -> 0.39.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4a83815..ea3874ad 100644 --- a/pom.xml +++ b/pom.xml @@ -495,7 +495,7 @@ ${imagej-launcher.version} - 0.39.4 + 0.39.5 ${imagej-legacy.version} From fbb4c3051c3654200a011b257300858b54bc1f77 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 15:52:12 -0600 Subject: [PATCH 524/996] CI: fix cache modification detection The -f flag tests for normal files, not directories. The ~ symbol must be unquoted, to be expanded by the shell. Furthermore, it is a bashism, and the build.sh script purports to be POSIX-compliant with /bin/sh shebang. So we use $HOME instead. --- .github/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index 1d9f8887..3b9ac89f 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -13,7 +13,7 @@ last_cache_modified () { cache_modified_pre=0 cache_modified_post=0 -if [ -f "~/.cache/scijava/melting-pot" ]; then +if [ -d "$HOME/.cache/scijava/melting-pot" ]; then cache_modified_pre=$(last_cache_modified) fi @@ -22,7 +22,7 @@ tests/run.sh meltResult=$? # Record the last time of cache modification after running melting-pot -if [ -f "~/.cache/scijava/melting-pot" ]; then +if [ -d "$HOME/.cache/scijava/melting-pot" ]; then cache_modified_post=$(last_cache_modified) fi From 35fd73957ce5ae419d99c022d12240aa1b062ed0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 17:21:42 -0600 Subject: [PATCH 525/996] CI: do not fail if non-existent cache --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5a1d5b4..c7013a1d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: if: env.cacheChanged == 'true' id: delete-cache run: | - gh api --method DELETE -H "Accept: application/vnd.github+json" /repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-cache + gh api --method DELETE -H "Accept: application/vnd.github+json" /repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-cache || true env: GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} From e081f7b35f521bf8b565c618999cd53a5210f53b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 17:33:15 -0600 Subject: [PATCH 526/996] mega-melt: build only org.scijava components again Correctness of caching still needs confirmation. Let's do it more quickly, over a smaller subset of components. --- tests/run.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 27f0e05b..c0b18cec 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -87,9 +87,7 @@ chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ -r scijava.public::::https://maven.scijava.org/content/groups/public \ -o "$meltingPotDir" \ - -i 'net.imagej:*' \ -i 'org.scijava:*' \ - -e 'net.imagej:ij' \ -e 'org.scijava:j3dcore' \ -e 'org.scijava:j3dutils' \ -e 'org.scijava:jep' \ From fbaac12e00b9e6f84a88f3c9af698948832f9651 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 18:00:20 -0600 Subject: [PATCH 527/996] CI: melt the net.imagej components, once again Finally, the cache was saved. Let's see if it restores correctly. --- tests/run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/run.sh b/tests/run.sh index c0b18cec..27f0e05b 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -87,7 +87,9 @@ chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ -r scijava.public::::https://maven.scijava.org/content/groups/public \ -o "$meltingPotDir" \ + -i 'net.imagej:*' \ -i 'org.scijava:*' \ + -e 'net.imagej:ij' \ -e 'org.scijava:j3dcore' \ -e 'org.scijava:j3dutils' \ -e 'org.scijava:jep' \ From eb6d2368b61675e05aa5fb4c0072d45c6c3e3eb5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 18:27:53 -0600 Subject: [PATCH 528/996] mega-melt: reenable remaining components The CI cache is working now, so let's melt everything! --- tests/run.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/run.sh b/tests/run.sh index 27f0e05b..062abf10 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -87,8 +87,19 @@ chmod +x "$meltingPotScript" && "$meltingPotScript" "$megaMeltDir" \ -r scijava.public::::https://maven.scijava.org/content/groups/public \ -o "$meltingPotDir" \ + -i 'ca.mcgill:*' \ + -i 'io.scif:*' \ + -i 'jitk:*' \ + -i 'mpicbg:*' \ -i 'net.imagej:*' \ + -i 'net.imglib2:*' \ + -i 'net.preibisch:*' \ + -i 'org.bonej:*' \ + -i 'org.janelia.saalfeldlab:*' \ + -i 'org.janelia:*' \ + -i 'org.morphonets:*' \ -i 'org.scijava:*' \ + -i 'sc.fiji:*' \ -e 'net.imagej:ij' \ -e 'org.scijava:j3dcore' \ -e 'org.scijava:j3dutils' \ From 28ba538106aaeee824cef20cb5f49e133776a127 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 19:31:40 -0600 Subject: [PATCH 529/996] Update component versions * scifio: 0.43.3 -> 0.43.4 * aws: 1.12.420 -> 1.12.421 * maven-common-artifact-filters: 3.2.0 -> 3.3.2 * maven-core: 3.8.6 -> 3.9.0 * maven-plugin-tools-api: 3.6.1 -> 3.8.1 * google-cloud-nio: 0.126.6 -> 0.126.7 * google-cloud-resourcemanager: 0.117.2-alpha -> 1.14.0 * google-cloud-storage: 2.19.0 -> 2.20.0 * jackrabbit-webdav: 2.21.13 -> 2.21.15 * junit-jupiter: 5.9.1 -> 5.9.2 * okhttp: 4.9.3 -> 4.10.0 * tensorflow: 1.12.0 -> 1.15.0 --- pom.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index ea3874ad..e521a131 100644 --- a/pom.xml +++ b/pom.xml @@ -623,7 +623,7 @@ - 0.43.3 + 0.43.4 ${scifio.version} @@ -1287,7 +1287,7 @@ - 1.12.420 + 1.12.421 ${aws.version} ${aws.version} ${aws-java-sdk-core.version} @@ -1372,9 +1372,9 @@ 0.13.1 - 3.2.0 - 3.8.6 - 3.6.1 + 3.3.2 + 3.9.0 + 3.8.1 2.1.1 3.5.1 2.6.0 @@ -1670,9 +1670,9 @@ 2.12.0 ${google-cloud-core.version} - 0.126.6 - 0.117.2-alpha - 2.19.0 + 0.126.7 + 1.14.0 + 2.20.0 ${google-cloud-core.version} ${google-cloud-core-http.version} ${google-cloud-nio.version} @@ -1724,7 +1724,7 @@ ${j2objc-annotations.version} - 2.21.13 + 2.21.15 ${jackrabbit-webdav.version} @@ -2021,7 +2021,7 @@ ${junit.version} - 5.9.1 + 5.9.2 ${junit-jupiter.version} ${junit-jupiter.version} ${junit-jupiter.version} @@ -2144,7 +2144,7 @@ ${objenesis.version} - 4.9.3 + 4.10.0 3.3.0 ${okhttp.version} ${okio.version} @@ -2231,7 +2231,7 @@ ${spring-core.version} - 1.12.0 + 1.15.0 ${tensorflow.version} ${tensorflow.version} ${tensorflow.version} From 35c119a1b5abc759fe527e19ec9c1d7c011a02d3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 7 Mar 2023 22:26:35 -0600 Subject: [PATCH 530/996] Revert tensorflow: 1.15.0 -> 1.12.0 The upgrade broke a test in ImageJ-TensorFlow: Error: runLabelImageCommand(net.imagej.tensorflow.demo.LabelImageTest) Time elapsed: 12.624 s <<< ERROR! java.util.concurrent.ExecutionException: java.lang.RuntimeException: Module threw error at net.imagej.tensorflow.demo.LabelImageTest.runLabelImageCommand(LabelImageTest.java:50) Caused by: java.lang.RuntimeException: Module threw error Caused by: java.lang.IncompatibleClassChangeError: Found interface org.tensorflow.OperationBuilder, but class was expected The upgrade is not urgent, so for now we revert to the working version. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e521a131..feae560d 100644 --- a/pom.xml +++ b/pom.xml @@ -2231,7 +2231,7 @@ ${spring-core.version} - 1.15.0 + 1.12.0 ${tensorflow.version} ${tensorflow.version} ${tensorflow.version} From 97f3a0b8018ba76ec9e1896a2a0b171f259597fe Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 8 Mar 2023 20:36:08 -0600 Subject: [PATCH 531/996] Add script to scan for dependency+plugin updates Migrated and updated from the status.scijava.org repository. --- rules.xml | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++ settings.xml | 10 +++ whatsnew.sh | 5 ++ 3 files changed, 183 insertions(+) create mode 100644 rules.xml create mode 100644 settings.xml create mode 100755 whatsnew.sh diff --git a/rules.xml b/rules.xml new file mode 100644 index 00000000..2fa9bee8 --- /dev/null +++ b/rules.xml @@ -0,0 +1,168 @@ + + + + + 20030911 + 3.0b5 + 3.0ea8 + + + + + .*-(alpha|beta|rc)-?[0-9]+ + + 1\.[34].* + + + + + .*-(alpha|beta|rc)-?[0-9]+ + + + + + .*-android + + + + + .*-(alpha|beta|rc)-?[0-9]+ + + + + + .*-kohsuke-?[0-9]+ + + + + + .*-(alpha|beta|rc)[-\.]?[0-9]+ + + + + + [0-9]{8}.* + + + + + 20040117.000000 + .*-pre[0-9]+ + + + + + [0-9]{8}.* + + + + + [0-9]{8}.* + + + + + [0-9]{8}.* + + + + + [0-9]{8}.* + + + + + .*-does-not-exist + + + + + .*[\.-](Alpha|Beta|CR|EDR|PFD|PRD)([0-9]+(\.[0-9]+)*[a-z]?)? + + + + + .*\.M[0-9]+ + + + + + .*-(alpha|beta|rc)-?[0-9]+ + + + + + [0-9]{8} + + + + + .*-m[0-9]+ + + + + + .*-m[0-9]+-.* + + + + + .*-(alpha|beta|rc)-?[0-9]+ + + + + + .*\.M[0-9]+ + + + + + + 11\..* + + + + + + 11\..* + + + + + .*-(Beta|RC)[0-9]* + + + + + .*-m[0-9]+ + + + + + .*[-\.](alpha|beta|rc)-?[0-9]+ + .*\.RC[0-9]+ + + + + + + .* + + + + + .*-(alpha|beta|rc)-?[0-9]+ + + + + + .*-(alpha|beta|rc)-?[0-9]+ + + + + diff --git a/settings.xml b/settings.xml new file mode 100644 index 00000000..9a578714 --- /dev/null +++ b/settings.xml @@ -0,0 +1,10 @@ + + + + scijava-mirror + SciJava public repositories + https://maven.scijava.org/service/local/repo_groups/public/content + * + + + diff --git a/whatsnew.sh b/whatsnew.sh new file mode 100755 index 00000000..0c35a1f8 --- /dev/null +++ b/whatsnew.sh @@ -0,0 +1,5 @@ +#!/bin/sh +dir=$(cd "${0%/*}" && pwd) +mvn -B -U -Dverbose=true -s settings.xml \ + -Dmaven.version.rules="file://$dir/rules.xml" \ + versions:display-dependency-updates From 99c0f561a520074f26795e1d96824686689c4470 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 9 Mar 2023 10:02:11 -0600 Subject: [PATCH 532/996] Update versions-maven-plugin rules schema location --- rules.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules.xml b/rules.xml index 2fa9bee8..a213c111 100644 --- a/rules.xml +++ b/rules.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 https://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd"> From b2d1d8eca6f490cb81ceed7fd7ec1c95460d293f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 9 Mar 2023 11:07:39 -0600 Subject: [PATCH 533/996] Update aws: 1.12.421 -> 1.12.423 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index feae560d..48b5edbe 100644 --- a/pom.xml +++ b/pom.xml @@ -1287,7 +1287,7 @@ - 1.12.421 + 1.12.423 ${aws.version} ${aws.version} ${aws-java-sdk-core.version} From 958a4eb3a656616ef43c97c9198aac8dff80f06a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 9 Mar 2023 11:47:25 -0600 Subject: [PATCH 534/996] Update jetty: 9.4.50.v20221201 -> 9.4.51.v20230217 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 48b5edbe..2d578044 100644 --- a/pom.xml +++ b/pom.xml @@ -1822,7 +1822,7 @@ ${jep.version} - 9.4.50.v20221201 + 9.4.51.v20230217 ${jetty.version} + ^(?!5\.).* + + .*-(alpha|beta|rc)[-\.]?[0-9]+ @@ -117,16 +126,15 @@ .*\.M[0-9]+ - + - - 11\..* - - - - - - 11\..* + + ^(?!9\.).* + .*[-\.](alpha|beta|rc)-?[0-9]+ + .*\.RC[0-9]+ @@ -134,24 +142,27 @@ .*-(Beta|RC)[0-9]* - + + - .*-m[0-9]+ + ^(?!1\.4\.).* - + - .*[-\.](alpha|beta|rc)-?[0-9]+ - .*\.RC[0-9]+ + + ^(?!4\.).* - - + - .* + .*-m[0-9]+ From 8c53ed6be2628a75c8754083210b5f623e590fcd Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 9 Mar 2023 14:40:12 -0600 Subject: [PATCH 536/996] Update component versions * parsington: 3.0.0 -> 3.1.0 * scijava-plugins-commands: 0.2.3 -> 0.2.4 * scijava-ui-swing: 0.17.2 -> 1.0.0 * script-editor: 0.7.9 -> 1.0.0 * script-editor-jython: 0.1.3 -> 1.0.0 * scripting-javascript: 0.5.0 -> 1.0.0 * scripting-jython: 1.0.0 -> 1.0.1 * imagej-tensorflow: 1.1.6 -> 1.1.7 * imagej-ui-swing: 0.23.3 -> 1.0.0 * scifio: 0.43.4 -> 0.44.0 * CPU_Meter: 2.0.1 -> 2.0.2 * View5D: 2.4.0 -> 2.5.0 * google-cloud-nio: 0.126.7 -> 0.126.8 * google-cloud-storage: 2.20.0 -> 2.20.1 * jline3: 3.22.0 -> 3.23.0 --- pom.xml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 2d578044..ee4a0133 100644 --- a/pom.xml +++ b/pom.xml @@ -327,7 +327,7 @@ ${native-lib-loader.version} - 3.0.0 + 3.1.0 ${parsington.version} @@ -371,7 +371,7 @@ ${scijava-plot.version} - 0.2.3 + 0.2.4 ${scijava-plugins-commands.version} @@ -399,15 +399,15 @@ ${scijava-ui-awt.version} - 0.17.2 + 1.0.0 ${scijava-ui-swing.version} - 0.7.9 + 1.0.0 ${script-editor.version} - 0.1.3 + 1.0.0 ${script-editor-jython.version} @@ -427,7 +427,7 @@ ${scripting-java.version} - 0.5.0 + 1.0.0 ${scripting-javascript.version} @@ -435,7 +435,7 @@ ${scripting-jruby.version} - 1.0.0 + 1.0.1 ${scripting-jython.version} @@ -559,7 +559,7 @@ ${imagej-server.version} - 1.1.6 + 1.1.7 ${imagej-tensorflow.version} @@ -567,7 +567,7 @@ ${imagej-ui-awt.version} - 0.23.3 + 1.0.0 ${imagej-ui-swing.version} @@ -623,7 +623,7 @@ - 0.43.4 + 0.44.0 ${scifio.version} @@ -700,7 +700,7 @@ 2.1.1 ${Bug_Submitter.version} - 2.0.1 + 2.0.2 ${CPU_Meter.version} 2.0.1 @@ -934,7 +934,7 @@ 2.0.1 ${Video_Editing.version} - 2.4.0 + 2.5.0 ${View5D.version} ${View5D_.version} @@ -1670,9 +1670,9 @@ 2.12.0 ${google-cloud-core.version} - 0.126.7 + 0.126.8 1.14.0 - 2.20.0 + 2.20.1 ${google-cloud-core.version} ${google-cloud-core-http.version} ${google-cloud-nio.version} @@ -1928,7 +1928,7 @@ 2.14.6 - 3.22.0 + 3.23.0 ${jline2.version} ${jline.version} ${jline3.version} From 7a84ba978c71af3b7bec148a5b9b5734081ea855 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 9 Mar 2023 14:45:05 -0600 Subject: [PATCH 537/996] Manage version of com.google.re2j:re2j --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index ee4a0133..b2820c87 100644 --- a/pom.xml +++ b/pom.xml @@ -2178,6 +2178,10 @@ ${protobuf-java-util.version} ${protobuf-kotlin.version} + + 1.7 + ${re2j.version} + 1.2.24 ${reload4j.version} @@ -6220,6 +6224,13 @@ ${com.google.protobuf.protobuf-kotlin.version} + + + com.google.re2j + re2j + ${com.google.re2j.re2j.version} + + ch.qos.reload4j From f84d94ae7bb242ebc467608d2a9bf618223a99a2 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 9 Mar 2023 14:56:58 -0600 Subject: [PATCH 538/996] Manage version of com.google.api:gax-grpc --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index b2820c87..5de1bae9 100644 --- a/pom.xml +++ b/pom.xml @@ -1643,12 +1643,16 @@ 2.6.2 2.23.2 + ${gax.version} 0.108.2 2.14.2 1.9.2 ${api-common.version} ${gax.version} + ${gax-grpc.version} ${gax-httpjson.version} + + ${proto-google-common-protos.version} ${proto-google-iam-v1.version} @@ -4884,6 +4888,11 @@ gax ${com.google.api.gax.version} + + com.google.api + gax-grpc + ${com.google.api.gax-grpc.version} + com.google.api gax-httpjson From 8b85b951ea977e55e054d9d9b4b11214f189083c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 9 Mar 2023 19:17:08 -0600 Subject: [PATCH 539/996] Fix alphabetic ordering of Apache Ant --- pom.xml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pom.xml b/pom.xml index 5de1bae9..5f2a5568 100644 --- a/pom.xml +++ b/pom.xml @@ -1308,6 +1308,12 @@ ${antlr4.version} ${antlr4-runtime.version} + + 1.10.13 + ${ant.version} + ${ant.version} + ${ant-launcher.version} + 3.0.4 ${groovy.version} @@ -1364,12 +1370,6 @@ ${groovy-xml.version} ${groovy-yaml.version} - - 1.10.13 - ${ant.version} - ${ant.version} - ${ant-launcher.version} - 0.13.1 3.3.2 @@ -4105,6 +4105,18 @@ --> + + + org.apache.ant + ant + ${org.apache.ant.ant.version} + + + org.apache.ant + ant-launcher + ${org.apache.ant.ant-launcher.version} + + org.codehaus.groovy @@ -4242,18 +4254,6 @@ ${org.codehaus.groovy.groovy-yaml.version} - - - org.apache.ant - ant - ${org.apache.ant.ant.version} - - - org.apache.ant - ant-launcher - ${org.apache.ant.ant-launcher.version} - - org.apache.maven.shared From 9e77aa9b5363fa4c0d17e21bf5bdf7c302192d71 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 9 Mar 2023 19:17:17 -0600 Subject: [PATCH 540/996] Manage version of Apache Log4j 2.x Some of the other managed components depend on it, and so we must manage it also in order to have a fully consistent bill of materials. --- pom.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pom.xml b/pom.xml index 5f2a5568..98a0e786 100644 --- a/pom.xml +++ b/pom.xml @@ -1370,6 +1370,13 @@ ${groovy-xml.version} ${groovy-yaml.version} + + 2.20.0 + ${log4j.version} + ${log4j.version} + ${log4j-api.version} + ${log4j-core.version} + 0.13.1 3.3.2 @@ -4254,6 +4261,18 @@ ${org.codehaus.groovy.groovy-yaml.version} + + + org.apache.logging.log4j + log4j-api + ${org.apache.logging.log4j.log4j-api.version} + + + org.apache.logging.log4j + log4j-core + ${org.apache.logging.log4j.log4j-core.version} + + org.apache.maven.shared From 0aa85938a4cb246ade65d0e9e02585395ee9edee Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 10 Mar 2023 14:50:42 -0600 Subject: [PATCH 541/996] Update parent to pom-scijava-base 17.1.1 This updates scijava-coding-style from 2.1.0 to 2.1.1. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 98a0e786..6a54b8ec 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 17.1.0 + 17.1.1 From f32753e1f868d13b030778c301d94c307552a5e2 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 10 Mar 2023 15:31:37 -0600 Subject: [PATCH 542/996] CI: avoid using subshell for cache mod detection It's already called in a subshell due to $(last_cache_modified). Nested subshells should be fine, but in practice the CI builds are complaining with a weird error: sort: write failed: 'standard output': Broken pipe sort: write error Let's see if this change makes any difference! --- .github/build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index 3b9ac89f..bd7b601f 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -4,9 +4,7 @@ sh ci-build.sh || { echo "Maven build failed. Skipping melting pot tests."; exit # Helper method to get the last cache modified date as seconds since epoch last_cache_modified () { - cache_modified=$(find ~/.cache/scijava/melting-pot -printf '%T@\n' | sort -r | head -n1) - cache_modified=${cache_modified%.*} - echo "$cache_modified" + find ~/.cache/scijava/melting-pot -printf '%T@\n' | sort -r | head -n1 | sed 's/\..*$//' } # Record the last time of cache modification before running melting-pot From a581053886dfdba522e8324022d77431232a2764 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 10 Mar 2023 16:17:12 -0600 Subject: [PATCH 543/996] CI: get last modified timestamps differently Let's see if using stat works any better than find's '-printf %T@'. And let's print the pre and post timestamp extraction results. --- .github/build.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index bd7b601f..2cfb29b1 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -3,8 +3,11 @@ curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-b sh ci-build.sh || { echo "Maven build failed. Skipping melting pot tests."; exit 1; } # Helper method to get the last cache modified date as seconds since epoch -last_cache_modified () { - find ~/.cache/scijava/melting-pot -printf '%T@\n' | sort -r | head -n1 | sed 's/\..*$//' +last_cache_modified() { + find "$HOME/.cache/scijava/melting-pot" -type f | while read f + do + stat -f '%m' "$f" + done | sort -nr | head -n1 } # Record the last time of cache modification before running melting-pot @@ -25,9 +28,13 @@ if [ -d "$HOME/.cache/scijava/melting-pot" ]; then fi # Determine if cache needs to be re-generated +echo "cache_modified_pre=$cache_modified_pre" +echo "cache_modified_post=$cache_modified_post" if [ "$cache_modified_post" -gt "$cache_modified_pre" ]; then + echo "cacheChanged=true" echo "cacheChanged=true" >> $GITHUB_ENV else + echo "cacheChanged=false" echo "cacheChanged=false" >> $GITHUB_ENV fi From 83392301f3b3e48b9828afb0b8398cc50ba83539 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 10 Mar 2023 16:25:30 -0600 Subject: [PATCH 544/996] CI: fix stat syntax I even installed GNU stat on my macOS machine so that I would be sure to be testing with the right flavor of stat. But then I absentmindedly tested with `stat` instead of `gstat` locally, so here I am fixing it. --- .github/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/build.sh b/.github/build.sh index 2cfb29b1..df9633ae 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -6,7 +6,7 @@ sh ci-build.sh || { echo "Maven build failed. Skipping melting pot tests."; exit last_cache_modified() { find "$HOME/.cache/scijava/melting-pot" -type f | while read f do - stat -f '%m' "$f" + stat -c '%Y' "$f" done | sort -nr | head -n1 } From 8ed1e45c3cc5c9cda5c08720c376fd870dd1e252 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 10 Mar 2023 16:36:03 -0600 Subject: [PATCH 545/996] Update component versions preemptively * imagej2: 2.10.0 -> 2.11.0 * fiji: 2.10.0 -> 2.11.0 --- .github/build.sh | 2 ++ pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index df9633ae..aba53f76 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -2,6 +2,8 @@ curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh && sh ci-build.sh || { echo "Maven build failed. Skipping melting pot tests."; exit 1; } +exit 0 # TEMP: Disable mega-melt during pom-scijava release process. + # Helper method to get the last cache modified date as seconds since epoch last_cache_modified() { find "$HOME/.cache/scijava/melting-pot" -type f | while read f diff --git a/pom.xml b/pom.xml index 6a54b8ec..3b9186c5 100644 --- a/pom.xml +++ b/pom.xml @@ -469,7 +469,7 @@ - 2.10.0 + 2.11.0 ${imagej2.version} ${imagej.version} @@ -657,7 +657,7 @@ - 2.10.0 + 2.11.0 ${fiji.version} From 30a95ec9efdb85cdd7bb978e4c124316699ef5ee Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 10 Mar 2023 16:40:00 -0600 Subject: [PATCH 546/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3b9186c5..63fa292d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 34.1.0-SNAPSHOT + 34.1.1-SNAPSHOT pom SciJava Parent POM From 69269579540e1e0f9d52152c32977075f2a698fa Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 10 Mar 2023 16:54:41 -0600 Subject: [PATCH 547/996] Reenable the mega-melt --- .github/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index aba53f76..df9633ae 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -2,8 +2,6 @@ curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh && sh ci-build.sh || { echo "Maven build failed. Skipping melting pot tests."; exit 1; } -exit 0 # TEMP: Disable mega-melt during pom-scijava release process. - # Helper method to get the last cache modified date as seconds since epoch last_cache_modified() { find "$HOME/.cache/scijava/melting-pot" -type f | while read f From c712235a724a92dfd2b0262a813d894da0f2f753 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 10 Mar 2023 20:35:30 -0600 Subject: [PATCH 548/996] CI: suppress sort "Broken pipe" warnings Apparently, it's completely normal in this sort of use where it's paired with head, since head closes the stream after printing the requested number of leading lines: https://stackoverflow.com/a/46203242/1207769 --- .github/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/build.sh b/.github/build.sh index df9633ae..02f11608 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -7,7 +7,7 @@ last_cache_modified() { find "$HOME/.cache/scijava/melting-pot" -type f | while read f do stat -c '%Y' "$f" - done | sort -nr | head -n1 + done | sort -nr 2>/dev/null | head -n1 } # Record the last time of cache modification before running melting-pot From 78025f30e4c2e3497773b4373ead2db919a22118 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 11 Mar 2023 12:34:42 -0600 Subject: [PATCH 549/996] Update labkit-pixel-classification: 0.1.15 -> 0.1.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 63fa292d..3323b23b 100644 --- a/pom.xml +++ b/pom.xml @@ -1195,7 +1195,7 @@ ${MaMuT.version} - 0.1.15 + 0.1.16 0.3.10 ${labkit-pixel-classification.version} ${labkit-ui.version} From 22d4a8e2cfcc1d0cba7c36b0d88e4c6743758c55 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 11 Mar 2023 12:43:13 -0600 Subject: [PATCH 550/996] Ignore rogue 3D_Objects_Counter jitpack binaries --- rules.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rules.xml b/rules.xml index ef32e172..b5257cd8 100644 --- a/rules.xml +++ b/rules.xml @@ -175,5 +175,11 @@ .*-(alpha|beta|rc)-?[0-9]+ + + + + 3D_Objects_Counter-.* + + From ed99beb3e1a3ddb3a5916a27d335c8be2f20bd23 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 13 Mar 2023 11:49:04 -0500 Subject: [PATCH 551/996] Update Fiji_Plugins: 3.1.2 -> 3.1.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3323b23b..73c674e0 100644 --- a/pom.xml +++ b/pom.xml @@ -754,7 +754,7 @@ 2.1.1 ${Fiji_Package_Maker.version} - 3.1.2 + 3.1.3 ${Fiji_Plugins.version} 2.0.1 From a11e7d795737e60c50fe84b23d6296265087ef2a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 20 Mar 2023 15:00:47 -0500 Subject: [PATCH 552/996] Update snakeyaml: 1.33 -> 2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 73c674e0..d39f9bf3 100644 --- a/pom.xml +++ b/pom.xml @@ -2223,7 +2223,7 @@ ${jcl-over-slf4j.version} - 1.33 + 2.0 ${snakeyaml.version} From 1de596513b2bef856a5c99542f769aba8eeded5a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 20 Mar 2023 15:42:00 -0500 Subject: [PATCH 553/996] Revert "Update snakeyaml: 1.33 -> 2.0" This reverts commit a11e7d795737e60c50fe84b23d6296265087ef2a. The snakeyaml 1.33 release is new enough to avoid CVE-2022-25857 (https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-25857), which affects snakeyaml [0, 1.31). We'll stick with 1.33 for now, because 2.0 breaks API compatibility in ways that break the ui-behaviour and bigdataviewer-core projects. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d39f9bf3..73c674e0 100644 --- a/pom.xml +++ b/pom.xml @@ -2223,7 +2223,7 @@ ${jcl-over-slf4j.version} - 2.0 + 1.33 ${snakeyaml.version} From ee1499be264edcded8cbef0a9acb302f2c4e071d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 26 Mar 2023 11:54:44 -0500 Subject: [PATCH 554/996] Update Volume_Viewer: 2.01.3 -> 2.01.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 73c674e0..50e4287f 100644 --- a/pom.xml +++ b/pom.xml @@ -941,7 +941,7 @@ 2.0.3 ${Volume_Calculator.version} - 2.01.3 + 2.01.4 ${Volume_Viewer.version} 2.6.13 From 7dcc8439fdfefbe79045404c86d1a170dd7bf37d Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Tue, 28 Mar 2023 14:14:02 +0800 Subject: [PATCH 555/996] Update BoneJ: 7.0.14 -> 7.0.15 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 50e4287f..9e78336c 100644 --- a/pom.xml +++ b/pom.xml @@ -1174,7 +1174,7 @@ ${multiview-simulation.version} - 7.0.14 + 7.0.15 ${bonej.version} ${bonej.version} ${bonej.version} From f0824dec3c01c72f470e69871c5398eec436c955 Mon Sep 17 00:00:00 2001 From: hinerm Date: Wed, 12 Apr 2023 11:53:47 -0500 Subject: [PATCH 556/996] Bump scijava-common to 2.92.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 50e4287f..17967c33 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.91.0 + 2.92.0 ${scijava-common.version} From 87417ffc8e01ffc4101afa3868c40c463c445d99 Mon Sep 17 00:00:00 2001 From: hinerm Date: Wed, 12 Apr 2023 11:54:14 -0500 Subject: [PATCH 557/996] Bump scifio to 0.44.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 17967c33..1d4d1e01 100644 --- a/pom.xml +++ b/pom.xml @@ -623,7 +623,7 @@ - 0.44.0 + 0.44.1 ${scifio.version} From 1c04f3482048913b9da045011c8a1cb0e93c7112 Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Thu, 20 Apr 2023 11:28:18 -0400 Subject: [PATCH 558/996] Update FlatLaf to v3.1.1 + Jetbrains Mono This brings bug-fixes, MacOS 'native' themes, and "JetBrains Mono", the coding font used by JetBrains software. --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e311832..8fa3c507 100644 --- a/pom.xml +++ b/pom.xml @@ -1626,8 +1626,10 @@ ${error_prone_annotations.version} - 2.6 + 3.1.1 ${flatlaf.version} + 2.242 + ${flatlaf-fonts-jetbrains-mono.version} 2.2.0 From a1f3ff60bd99fca1bac4c5435033d5a8ba628b8d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 24 Apr 2023 12:56:37 -0500 Subject: [PATCH 559/996] Add missing block for flatlaf-fonts-jetbrains-mono --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 8fa3c507..e01d9b4d 100644 --- a/pom.xml +++ b/pom.xml @@ -4845,6 +4845,11 @@ flatlaf ${com.formdev.flatlaf.version} + + com.formdev + flatlaf-fonts-jetbrains-mono + ${com.formdev.flatlaf-fonts-jetbrains-mono.version} + From 132c7ac7fc6be8278ed7fb4708906761e8529aa3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 24 Apr 2023 12:56:55 -0500 Subject: [PATCH 560/996] Update component versions * scijava-ui-swing: 1.0.0 -> 1.0.1 * imagej-ui-swing: 1.0.0 -> 1.0.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e01d9b4d..be2e6204 100644 --- a/pom.xml +++ b/pom.xml @@ -399,7 +399,7 @@ ${scijava-ui-awt.version} - 1.0.0 + 1.0.1 ${scijava-ui-swing.version} @@ -567,7 +567,7 @@ ${imagej-ui-awt.version} - 1.0.0 + 1.0.1 ${imagej-ui-swing.version} From b256a816ba51c061d29dd998df8160eadbcc6113 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 2 May 2023 17:42:31 -0500 Subject: [PATCH 561/996] Run the mega melt test every Sunday at 0405 UTC Because otherwise, if no builds happen for a week, the extremely valuable cache is deleted and subsequent builds again take hours rather than minutes, until the cache is saved again. --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c7013a1d..e95435c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,6 +9,8 @@ on: pull_request: branches: - master + schedule: + - cron: "4 5 * * 0" # every Sunday at 0405, to keep cache alive jobs: build: From 0fbed3eea7d88e0363124c5dc912451998756ab6 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 2 May 2023 17:51:21 -0500 Subject: [PATCH 562/996] Update component versions * scijava-search: 2.0.1 -> 2.0.2 * imagej-legacy: 0.39.5 -> 1.1.0 * TrackMate: 7.10.2 -> 7.11.0 Closes #231. --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index be2e6204..eef3983c 100644 --- a/pom.xml +++ b/pom.xml @@ -387,7 +387,7 @@ ${scijava-plugins-text-plain.version} - 2.0.1 + 2.0.2 ${scijava-search.version} @@ -495,7 +495,7 @@ ${imagej-launcher.version} - 0.39.5 + 1.1.0 ${imagej-legacy.version} @@ -1030,7 +1030,7 @@ - 7.10.2 + 7.11.0 ${TrackMate.version} From 071fe463c1218de55348e46807c2f3bb17a2b481 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 2 May 2023 18:02:02 -0500 Subject: [PATCH 563/996] Update imglib2: 5.12.0 -> 5.13.0 Closes #229. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eef3983c..b1c8f4d2 100644 --- a/pom.xml +++ b/pom.xml @@ -581,7 +581,7 @@ - 5.12.0 + 5.13.0 ${imglib2.version} From 1f863b4a1680137a2c420090e864ae4bd9c5d9fe Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 2 May 2023 20:33:57 -0500 Subject: [PATCH 564/996] Revert "Update imglib2: 5.12.0 -> 5.13.0" This reverts commit 071fe463c1218de55348e46807c2f3bb17a2b481. Unfortunately, 5.13.0 has breaking API changes over 5.12.0. E.g.: Error: .../bigdataviewer_fiji/src/main/java/bdv/img/virtualstack/VirtualStackImageLoader.java:[242,77] type argument A is not within bounds of type-variable A when recompiling bigdataviewer_fiji 6.2.3 with imglib2 5.13.0. So we revert back to imglib2 5.12.0. The issue will be moot once #226 is resolved. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b1c8f4d2..eef3983c 100644 --- a/pom.xml +++ b/pom.xml @@ -581,7 +581,7 @@ - 5.13.0 + 5.12.0 ${imglib2.version} From c08543f310ff9b1fcbaab0b2aaed2f69d1cc4b59 Mon Sep 17 00:00:00 2001 From: David Gault Date: Wed, 3 May 2023 16:10:13 +0100 Subject: [PATCH 565/996] Bump Bio-Formats version to 6.13.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eef3983c..4e59f0e7 100644 --- a/pom.xml +++ b/pom.xml @@ -1230,7 +1230,7 @@ ${jxrlib-all.version} - 6.12.0 + 6.13.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From 3ce90927ef2fd37939e9094d05b50621390d0160 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 3 May 2023 15:13:23 -0500 Subject: [PATCH 566/996] Update component versions * scijava-common: 2.92.0 -> 2.93.0 * scijava-search: 2.0.2 -> 2.0.3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4e59f0e7..5718ac69 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.92.0 + 2.93.0 ${scijava-common.version} @@ -387,7 +387,7 @@ ${scijava-plugins-text-plain.version} - 2.0.2 + 2.0.3 ${scijava-search.version} From b993a276e61f090dc036ad45527f60f3719a4bc1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 4 May 2023 16:24:49 -0500 Subject: [PATCH 567/996] Update component versions * scripting-scala: 0.2.2 -> 0.3.0 * SNT: 4.1.14 -> 4.1.15 * ome-common: 6.0.14 -> 6.0.16 * ome-xml: 6.3.2 -> 6.3.3 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 5718ac69..f6ab5740 100644 --- a/pom.xml +++ b/pom.xml @@ -455,7 +455,7 @@ ${scripting-renjin.version} - 0.2.2 + 0.3.0 ${scripting-scala.version} @@ -1187,7 +1187,7 @@ ${bonej-utilities.version} - 4.1.14 + 4.1.15 ${SNT.version} @@ -1209,7 +1209,7 @@ ${ice.version} - 6.0.14 + 6.0.16 ${ome-common.version} @@ -1221,7 +1221,7 @@ ${ome-poi.version} - 6.3.2 + 6.3.3 ${ome-xml.version} From c75ecbbe5f112af052d6e504201c81672a2e30d4 Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Tue, 9 May 2023 10:40:30 +0800 Subject: [PATCH 568/996] BoneJ v7.0.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9e78336c..f0b3e9f1 100644 --- a/pom.xml +++ b/pom.xml @@ -1174,7 +1174,7 @@ ${multiview-simulation.version} - 7.0.15 + 7.0.16 ${bonej.version} ${bonej.version} ${bonej.version} From ec5bf9c8942439fac64408cb877f00df644fc08f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 4 May 2023 16:52:17 -0500 Subject: [PATCH 569/996] Use fine-grained JLine 3.x components The org.jline:jline component is an uber-JAR, which conflicts with the org.scala-lang:scala3-compiler_3 component's use of org.jline:jline-reader, org.jline:jline-terminal, and org.jline:jline-terminal-jna. --- pom.xml | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 77 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index da20d32b..afbb0c66 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 34.1.1-SNAPSHOT + 35.0.0-SNAPSHOT pom SciJava Parent POM @@ -1940,11 +1940,34 @@ ${jheaps.version} + 2.14.6 - 3.23.0 ${jline2.version} ${jline.version} - ${jline3.version} + + 3.23.0 + ${jline3.version} + ${jline3.version} + + + ${jline3.version} + ${jline3.version} + ${jline3.version} + ${jline3.version} + ${jline3.version} + + + ${jline3.version} + ${jline-builtins.version} + ${jline-console.version} + + ${jline-reader.version} + ${jline-remote-ssh.version} + ${jline-remote-telnet.version} + ${jline-style.version} + ${jline-terminal.version} + + ${jline-terminal-jna.version} 1.36 @@ -5533,8 +5556,57 @@ org.jline - jline - ${org.jline.jline.version} + jline-builtins + ${org.jline.jline-builtins.version} + + + org.jline + jline-console + ${org.jline.jline-console.version} + + + + org.jline + jline-reader + ${org.jline.jline-reader.version} + + + org.jline + jline-remote-ssh + ${org.jline.jline-remote-ssh.version} + + + org.jline + jline-remote-telnet + ${org.jline.jline-remote-telnet.version} + + + org.jline + jline-style + ${org.jline.jline-style.version} + + + org.jline + jline-terminal + ${org.jline.jline-terminal.version} + + + + org.jline + jline-terminal-jna + ${org.jline.jline-terminal-jna.version} From 3b351a4292ebc2785baa7982e01d1f613a064423 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 9 May 2023 10:24:03 -0500 Subject: [PATCH 570/996] whatsnew.sh: add more version update exclusions --- rules.xml | 45 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/rules.xml b/rules.xml index b5257cd8..1dae14e3 100644 --- a/rules.xml +++ b/rules.xml @@ -50,6 +50,15 @@ .*-(alpha|beta|rc)[-\.]?[0-9]+ + + + + ^(?!3\.6\.).* + + [0-9]{8}.* @@ -86,6 +95,14 @@ .*-does-not-exist + + + + ^(?!1\.8\.0\.).* + + .*[\.-](Alpha|Beta|CR|EDR|PFD|PRD)([0-9]+(\.[0-9]+)*[a-z]?)? @@ -121,6 +138,15 @@ .*-(alpha|beta|rc)-?[0-9]+ + + + + ^(?!3\.0\.4\.).* + + .*\.M[0-9]+ @@ -143,11 +169,11 @@ - + ^(?!1\.4\.).* @@ -170,6 +196,17 @@ .*-(alpha|beta|rc)-?[0-9]+ + + + + ^(?!3\.2\.9\.).* + + .*-(alpha|beta|rc)-?[0-9]+ From 67484642c3df7f20a9572eb749a6f838cc8ca227 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 9 May 2023 09:53:12 -0500 Subject: [PATCH 571/996] Update component versions * imagej1: 1.54c -> 1.54d * imglib2-label-multisets: 0.11.4 -> 0.11.5 * BigStitcher: 1.1.3 -> 1.1.5 * SNT: 4.1.15 -> 4.1.16 * aws: 1.12.423 -> 1.12.465 * maven-core: 3.9.0 -> 3.9.1 * maven-plugin-tools-api: 3.8.1 -> 3.8.2 * asm: 9.4 -> 9.5 * checker-qual: 3.32.0 -> 3.34.0 * commons-compress: 1.22 -> 1.23.0 * error_prone: 2.18.0 -> 2.19.0 * api-common: 2.6.2 -> 2.9.0 * gax: 2.23.2 -> 2.26.0 * gax-httpjson: 0.108.2 -> 0.111.0 * proto-google-common-protos: 2.14.2 -> 2.17.0 * proto-google-iam-v1: 1.9.2 -> 1.12.0 * google-auth-library: 1.16.0 -> 1.16.1 * google-cloud-core: 2.12.0 -> 2.16.0 * google-cloud-nio: 0.126.8 -> 0.126.14 * google-cloud-resourcemanager: 1.14.0 -> 1.18.0 * google-cloud-storage: 2.20.1 -> 2.22.1 * google-http-client: 1.43.0 -> 1.43.1 * grpc: 1.53.0 -> 1.55.1 * jackrabbit-webdav: 2.21.15 -> 2.21.16 * jffi: 1.3.10 -> 1.3.11 * joda-time: 2.12.2 -> 2.12.5 * jocl: 2.0.4 -> 2.0.5 * junit-jupiter: 5.9.2 -> 5.9.3 * jzy3d: 2.2.0 -> 2.2.1 * kryo: 5.4.0 -> 5.5.0 * logback: 1.2.11 -> 1.2.12 * okhttp: 4.10.0 -> 4.11.0 * picocli: 4.7.1 -> 4.7.3 * postgresql: 42.5.4 -> 42.6.0 * protobuf: 3.22.0 -> 3.23.0 * reload4j: 1.2.24 -> 1.2.25 * rsyntaxtextarea: 3.3.2 -> 3.3.3 * threetenbp: 1.6.5 -> 1.6.8 --- pom.xml | 80 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/pom.xml b/pom.xml index afbb0c66..355371a4 100644 --- a/pom.xml +++ b/pom.xml @@ -474,7 +474,7 @@ ${imagej.version} - 1.54c + 1.54d ${imagej1.version} ${ij.version} @@ -1101,7 +1101,7 @@ - 0.11.4 + 0.11.5 ${imglib2-label-multisets.version} @@ -1166,7 +1166,7 @@ ${clijx-weka_.version} - 1.1.3 + 1.1.5 1.2.8 0.2.0 ${BigStitcher.version} @@ -1187,7 +1187,7 @@ ${bonej-utilities.version} - 4.1.15 + 4.1.16 ${SNT.version} @@ -1287,7 +1287,7 @@ - 1.12.423 + 1.12.465 ${aws.version} ${aws.version} ${aws-java-sdk-core.version} @@ -1380,8 +1380,8 @@ 0.13.1 3.3.2 - 3.9.0 - 3.8.1 + 3.9.1 + 3.8.2 2.1.1 3.5.1 2.6.0 @@ -1427,7 +1427,7 @@ ${args4j.version} - 9.4 + 9.5 ${asm.version} ${asm.version} ${asm.version} @@ -1510,7 +1510,7 @@ ${cdi-api.version} - 3.32.0 + 3.34.0 ${checker-qual.version} @@ -1532,7 +1532,7 @@ ${commons-collections4.version} - 1.22 + 1.23.0 ${commons-compress.version} @@ -1617,7 +1617,7 @@ ${ejml.version} - 2.18.0 + 2.19.0 - 2.6.2 - 2.23.2 + 2.9.0 + 2.26.0 ${gax.version} - 0.108.2 - 2.14.2 - 1.9.2 + 0.111.0 + 2.17.0 + 1.12.0 ${api-common.version} ${gax.version} ${gax-grpc.version} @@ -1666,7 +1666,7 @@ ${proto-google-iam-v1.version} - 1.16.0 + 1.16.1 ${google-auth-library.version} ${google-auth-library.version} ${google-auth-library.version} @@ -1681,11 +1681,11 @@ ${auto-value-annotations.version} - 2.12.0 + 2.16.0 ${google-cloud-core.version} - 0.126.8 - 1.14.0 - 2.20.1 + 0.126.14 + 1.18.0 + 2.22.1 ${google-cloud-core.version} ${google-cloud-core-http.version} ${google-cloud-nio.version} @@ -1693,7 +1693,7 @@ ${google-cloud-storage.version} - 1.43.0 + 1.43.1 ${google-http-client.version} ${google-http-client.version} ${google-http-client.version} @@ -1707,7 +1707,7 @@ ${google-http-client-xml.version} - 1.53.0 + 1.55.1 ${grpc.version} ${grpc-context.version} @@ -1737,10 +1737,14 @@ ${j2objc-annotations.version} - 2.21.15 + 2.21.16 ${jackrabbit-webdav.version} + 2.14.2 ${jackson.version} ${jackson.version} @@ -1987,7 +1991,7 @@ ${jna-platform.version} - 1.3.10 + 1.3.11 0.10.4 2.2.13 3.1.16 @@ -1997,11 +2001,11 @@ ${jnr-posix.version} - 2.12.2 + 2.12.5 ${joda-time.version} - 2.0.4 + 2.0.5 ${jocl.version} @@ -2057,7 +2061,7 @@ ${junit.version} - 5.9.2 + 5.9.3 ${junit-jupiter.version} ${junit-jupiter.version} ${junit-jupiter.version} @@ -2081,7 +2085,7 @@ ${jzlib.version} - 2.2.0 + 2.2.1 ${jzy3d.version} ${jzy3d.version} ${jzy3d.version} @@ -2131,7 +2135,7 @@ ${kotlinx-coroutines-core-jvm.version} - 5.4.0 + 5.5.0 1.3.1 1.11.9 ${kryo.version} @@ -2143,7 +2147,7 @@ NB: 1.3.x is the last version with Java 8 support, and 1.2.x is the last version with an SLF4J binding in logback-classic. --> - 1.2.11 + 1.2.12 ${logback.version} ${logback.version} ${logback-classic.version} @@ -2180,7 +2184,7 @@ ${objenesis.version} - 4.10.0 + 4.11.0 3.3.0 ${okhttp.version} ${okio.version} @@ -2194,15 +2198,15 @@ ${opencsv.version} - 4.7.1 + 4.7.3 ${picocli.version} - 42.5.4 + 42.6.0 ${postgresql.version} - 3.22.0 + 3.23.0 - 1.2.24 + 1.2.25 ${reload4j.version} - 3.3.2 + 3.3.3 3.3.1 3.3.0 ${rsyntaxtextarea.version} @@ -2287,7 +2291,7 @@ ${therapi.version} - 1.6.5 + 1.6.8 ${threetenbp.version} From 148b8b78de5d4c76dd6a72e180f89b2b014c9a9b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 9 May 2023 13:05:43 -0500 Subject: [PATCH 572/996] Update OMERO component versions * omero-blitz: 5.5.10 -> 5.6.2 * omero-common: 5.5.9 -> 5.6.1 * omero-gateway: 5.6.9 -> 5.8.0 * omero-model: 5.6.5 -> 5.6.10 * omero-renderer: 5.5.9 -> 5.5.12 * omero-romio: 5.6.4 -> 5.7.2 * omero-server: 5.6.3 -> 5.6.7 --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 355371a4..76513fb9 100644 --- a/pom.xml +++ b/pom.xml @@ -1243,11 +1243,11 @@ ${formats-gpl.version} - 5.5.10 + 5.6.2 ${omero-blitz.version} - 5.5.9 + 5.6.1 ${omero-common.version} @@ -1255,23 +1255,23 @@ ${omero-dsl-plugin.version} - 5.6.9 + 5.8.0 ${omero-gateway.version} - 5.6.5 + 5.6.10 ${omero-model.version} - 5.5.9 + 5.5.12 ${omero-renderer.version} - 5.6.4 + 5.7.2 ${omero-romio.version} - 5.6.3 + 5.6.7 ${omero-server.version} From 7464ac67d43612d0a08ca7eb077eb054d6ae7862 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 12 May 2023 08:02:50 -0500 Subject: [PATCH 573/996] Update components for new major ImgLib2 versions In testing this upgrade, I needed to write a custom script facilitating execution of the mega-melt test with some SNAPSHOT components built from branches. The script I used is preserved in SNAPSHOTS.md here, so that we can more easily reuse it in the future. This commit also makes a minor adjustment to the tests/run.sh script allowing the mega-melt to continue even if the version to be cloned is a SNAPSHOT. Base components with breaking changes: * imglib2: 5.12.0 -> 6.1.0 * imglib2-realtransform: 3.1.2 -> 4.0.1 Downstream affected components: * imagej-deprecated: 0.1.5 -> 0.2.0 * imagej-ops: 1.0.0 -> 2.0.0 * imglib2-algorithm: 0.13.0 -> 0.13.2 * imglib2-algorithm-gpl: 0.3.0 -> 0.3.1 * imglib2-cache: 1.0.0-beta-16 -> 1.0.0-beta-17 * imglib2-imglyb: 1.1.0 -> 2.0.0 * imglib2-roi: 0.13.0 -> 0.14.1 * scifio: 0.44.1 -> 0.45.0 * Colocalisation_Analysis: 3.0.5 -> 3.0.6 * SPIM_Registration: 5.0.24 -> 5.0.25 * z_spacing: 1.1.1 -> 1.1.2 * bigdataviewer-core: 10.4.5 -> 10.4.6 * bigdataviewer-server: 3.1.1 -> 3.1.2 * bigdataviewer-vistools: 1.0.0-beta-31 -> 1.0.0-beta-32 * bigdataviewer_fiji: 6.2.3 -> 6.2.4 * TrackMate: 7.11.0 -> 7.11.1 * n5-imglib2: 4.4.0 -> 5.0.0 * BigStitcher: 1.1.5 -> 1.1.6 * multiview-reconstruction: 1.2.8 -> 2.0.0 * labkit-pixel-classification: 0.1.16 -> 0.1.17 * labkit-ui: 0.3.10 -> 0.3.11 Co-authored-by: Mark Hiner --- SNAPSHOTS.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ pom.xml | 46 +++++++++++++++++++++++----------------------- tests/run.sh | 4 ++-- 3 files changed, 77 insertions(+), 25 deletions(-) create mode 100644 SNAPSHOTS.md diff --git a/SNAPSHOTS.md b/SNAPSHOTS.md new file mode 100644 index 00000000..70a0f0b0 --- /dev/null +++ b/SNAPSHOTS.md @@ -0,0 +1,52 @@ +So, you want to run the mega-melt, but with some SNAPSHOTs built from branches? + +Here is an example script that does so for the labkit-pixel-classification and +labkit-ui components. Copy this script into a file called `go`, change the +`adjust`... lines below to match the branches of your SNAPSHOT component(s), + and then give it a try with `sh go`! + +```shell ++#!/bin/sh ++ ++# Fail on error. ++set -e ++ ++# Generate the mega melt structure. ++tests/run.sh -s ++ ++# Pull appropriate branches, build artifacts, and install them locally. ++adjust() { ++ dir=$1 ++ remote=$2 ++ branch=$3 ++ cd "target/mega-melt/melting-pot/$dir" ++ ++ # fetch the needed branch ++ git remote add upstream "$remote" ++ git fetch upstream ++ ++ # discard pom.xml hacks ++ git checkout pom.xml ++ ++ # switch to the needed branch ++ git checkout "upstream/$branch" ++ ++ # reapply pom.xml hacks ++ mv pom.xml pom.xml.original && ++ sed -E -e 's_(https?://maven.imagej.net|http://maven.scijava.org)_https://maven.scijava.org_g' \ ++ -e 's_http://maven.apache.org/xsd_https://maven.apache.org/xsd_g' pom.xml.original > pom.xml || ++ die "Failed to adjust pom.xml" ++ perl -0777 -i -pe 's/(\s*org.scijava<\/groupId>\s*pom-scijava<\/artifactId>\s*)[^\n]*/${1}999-mega-melt<\/version>/igs' pom.xml ++ ++ # build and install the component ++ mvn -Denforcer.skip -DskipTests -Dmaven.test.skip -Dinvoker.skip clean install ++ ++ cd - >/dev/null ++} ++adjust sc.fiji/labkit-pixel-classification https://github.com/ctrueden/labkit-pixel-classification bump-to-imglib2-6.1.0 ++adjust sc.fiji/labkit-ui https://github.com/ctrueden/labkit-ui bump-to-imglib2-6.1.0 ++ ++# Run the mega melt! ++cd target/mega-melt/melting-pot ++./melt.sh 2>&1 | tee melt.log +``` diff --git a/pom.xml b/pom.xml index 76513fb9..6663c266 100644 --- a/pom.xml +++ b/pom.xml @@ -487,7 +487,7 @@ ${imagej-common.version} - 0.1.5 + 0.2.0 ${imagej-deprecated.version} @@ -527,7 +527,7 @@ ${imagej-opencv.version} - 1.0.0 + 2.0.0 ${imagej-ops.version} @@ -581,11 +581,11 @@ - 5.12.0 + 6.1.0 ${imglib2.version} - 0.13.0 + 0.13.2 ${imglib2-algorithm.version} @@ -593,11 +593,11 @@ ${imglib2-algorithm-fft.version} - 0.3.0 + 0.3.1 ${imglib2-algorithm-gpl.version} - 1.0.0-beta-16 + 1.0.0-beta-17 ${imglib2-cache.version} @@ -605,15 +605,15 @@ ${imglib2-ij.version} - 1.1.0 + 2.0.0 ${imglib2-imglyb.version} - 3.1.2 + 4.0.1 ${imglib2-realtransform.version} - 0.13.0 + 0.14.1 ${imglib2-roi.version} @@ -623,7 +623,7 @@ - 0.44.1 + 0.45.0 ${scifio.version} @@ -709,7 +709,7 @@ 3.0.0 ${Cell_Counter.version} - 3.0.5 + 3.0.6 ${Colocalisation_Analysis.version} 2.0.7 @@ -858,7 +858,7 @@ 2.0.2 ${SPIM_Opener.version} - 5.0.24 + 5.0.25 ${SPIM_Registration.version} 2.0.3 @@ -1002,25 +1002,25 @@ ${trakem2_tps.version} - 1.1.1 + 1.1.2 ${z_spacing.version} - 10.4.5 + 10.4.6 ${bigdataviewer-core.version} - 3.1.1 + 3.1.2 ${bigdataviewer-server.version} - 1.0.0-beta-31 + 1.0.0-beta-32 ${bigdataviewer-vistools.version} - 6.2.3 + 6.2.4 ${bigdataviewer_fiji.version} @@ -1030,7 +1030,7 @@ - 7.11.0 + 7.11.1 ${TrackMate.version} @@ -1129,7 +1129,7 @@ ${n5-ij.version} - 4.4.0 + 5.0.0 ${n5-imglib2.version} @@ -1166,8 +1166,8 @@ ${clijx-weka_.version} - 1.1.5 - 1.2.8 + 1.1.6 + 2.0.0 0.2.0 ${BigStitcher.version} ${multiview-reconstruction.version} @@ -1195,8 +1195,8 @@ ${MaMuT.version} - 0.1.16 - 0.3.10 + 0.1.17 + 0.3.11 ${labkit-pixel-classification.version} ${labkit-ui.version} diff --git a/tests/run.sh b/tests/run.sh index 062abf10..185bfbbb 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -111,7 +111,7 @@ chmod +x "$meltingPotScript" && # NB: The pipe to tee eats the melting-pot error code. # Even with the POSIX-unfriendly pipefail flag set. # So we resort to this hacky error check of the log. -grep -qF "[ERROR]" "$meltingPotLog" && +test "$(grep -F "[ERROR]" "$meltingPotLog" | grep -v "using default branch")" && die 'Melting pot generation failed!' sectionStart 'Adjusting the melting pot' @@ -190,7 +190,7 @@ chmod +x "$meltScript" || # fixed in imagej-ops. But for now, let's not let it ruin the melt. rm -f "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/cached/CachedOpEnvironmentTest.java" -# TEMP: Until saalfeldlab/n5-aws-s3#13 is fixed. +# TEMP: Until saalfeldlab/n5-aws-s3#13 is released. echo "org.janelia.saalfeldlab/n5-aws-s3" >> "$skipTestsFile" && # Error while checking the CLIJ2 installation: null From 80e6327fc025d311f0a666885dd484c8b2431a49 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 13 May 2023 09:49:27 -0500 Subject: [PATCH 574/996] CI: skip another maybe-problematic imagej-ops test I'm hoping to sidestep the imagej-ops test phase's OutOfMemoryErrors... --- tests/run.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 185bfbbb..b6901799 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -185,10 +185,16 @@ grep -qxF "$f" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ chmod +x "$meltScript" || die "Failed to adjust $meltScript" -# HACK: Remove flaky test from imagej-ops builds. -# This test fails intermittently. Of course, it should be somehow -# fixed in imagej-ops. But for now, let's not let it ruin the melt. +# HACK: Remove flaky tests from imagej-ops builds. +# CachedOpEnvironmentTest fails intermittently. Of course, it should be +# somehow fixed in imagej-ops. But for now, let's not let it ruin the melt. rm -f "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/cached/CachedOpEnvironmentTest.java" +# LocalThresholdTest has started failing with: +# java.lang.OutOfMemoryError: GC overhead limit exceeded +# And then all subsequent tests also fail with this error. +# I'm guessing it's a bug in a dependency, which causes spiralling memory use, +# but for the moment, we want to keep making a best effort to test imagej-ops. +rm -f "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/threshold/apply/LocalThresholdTest.java" # TEMP: Until saalfeldlab/n5-aws-s3#13 is released. echo "org.janelia.saalfeldlab/n5-aws-s3" >> "$skipTestsFile" && From 1b817efe560fa689d801aed156f9a96ab08d9989 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 13 May 2023 09:50:47 -0500 Subject: [PATCH 575/996] Use a separate workflow for cutting releases Let's not run the mega-melt when cutting a release; just do it. I made a separate workflow to avoid needlessly restoring and/or saving the melting-pot cache, which won't be used for the release process. --- .github/build.sh | 5 +++++ .github/workflows/build.yml | 2 -- .github/workflows/release.yml | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/build.sh b/.github/build.sh index 02f11608..b24b46d6 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -2,6 +2,11 @@ curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh && sh ci-build.sh || { echo "Maven build failed. Skipping melting pot tests."; exit 1; } +if [ -f release.properties ]; then + # Skip melting pot when cutting a release. + exit 0 +fi + # Helper method to get the last cache modified date as seconds since epoch last_cache_modified() { find "$HOME/.cache/scijava/melting-pot" -type f | while read f diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e95435c4..0a83a169 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,8 +4,6 @@ on: push: branches: - master - tags: - - "*-[0-9]+.*" pull_request: branches: - master diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..e6d3c23b --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,34 @@ +name: build + +on: + push: + tags: + - "*-[0-9]+.*" + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up Java + uses: actions/setup-java@v3 + with: + java-version: '8' + java-package: 'jdk+fx' + distribution: 'zulu' + cache: 'maven' + + - name: Set up CI environment + run: .github/setup.sh + + - name: Execute the build + id: execute-build + run: .github/build.sh + env: + GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + MAVEN_USER: ${{ secrets.MAVEN_USER }} + MAVEN_PASS: ${{ secrets.MAVEN_PASS }} + OSSRH_PASS: ${{ secrets.OSSRH_PASS }} + SIGNING_ASC: ${{ secrets.SIGNING_ASC }} From 4b63c6aa87802b5af40445e4604ad6b9e2fa81b5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 13 May 2023 09:57:23 -0500 Subject: [PATCH 576/996] Update scijava-common: 2.93.0 -> 2.93.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6663c266..73ff8654 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.93.0 + 2.93.1 ${scijava-common.version} From 44f8ac9b7476677e9349579816fc3d0cfa2eb244 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 13 May 2023 15:22:42 -0500 Subject: [PATCH 577/996] CI: further tweak the imagej-ops component tests --- tests/run.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index b6901799..6cfc1a7d 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -194,7 +194,10 @@ rm -f "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/cached/ # And then all subsequent tests also fail with this error. # I'm guessing it's a bug in a dependency, which causes spiralling memory use, # but for the moment, we want to keep making a best effort to test imagej-ops. -rm -f "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/threshold/apply/LocalThresholdTest.java" +rm -f \ + "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/threshold/apply/LocalThresholdTest.java" \ + "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/image/integral/IntegralImgTest.java" \ + "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/image/integral/SquareIntegralImgTest.java" # TEMP: Until saalfeldlab/n5-aws-s3#13 is released. echo "org.janelia.saalfeldlab/n5-aws-s3" >> "$skipTestsFile" && From 0e9dc180a6a28a43a9f03d826ce619887b1a0939 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 14 May 2023 08:41:11 -0500 Subject: [PATCH 578/996] CI: disable imagej-ops tests temporarily --- tests/run.sh | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 6cfc1a7d..a8e72cae 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -188,16 +188,10 @@ chmod +x "$meltScript" || # HACK: Remove flaky tests from imagej-ops builds. # CachedOpEnvironmentTest fails intermittently. Of course, it should be # somehow fixed in imagej-ops. But for now, let's not let it ruin the melt. -rm -f "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/cached/CachedOpEnvironmentTest.java" -# LocalThresholdTest has started failing with: -# java.lang.OutOfMemoryError: GC overhead limit exceeded -# And then all subsequent tests also fail with this error. -# I'm guessing it's a bug in a dependency, which causes spiralling memory use, -# but for the moment, we want to keep making a best effort to test imagej-ops. -rm -f \ - "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/threshold/apply/LocalThresholdTest.java" \ - "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/image/integral/IntegralImgTest.java" \ - "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/image/integral/SquareIntegralImgTest.java" +#rm -f "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/cached/CachedOpEnvironmentTest.java" + +# TEMP: Until scijava/pom-scijava#236 is solved. +echo "net.imagej/imagej-ops" >> "$skipTestsFile" && # TEMP: Until saalfeldlab/n5-aws-s3#13 is released. echo "org.janelia.saalfeldlab/n5-aws-s3" >> "$skipTestsFile" && From 876235501249bb4ded0f6c02ed118658e5ca1218 Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Fri, 12 May 2023 11:16:34 +0800 Subject: [PATCH 579/996] BoneJ 7.0.16 -> 7.0.17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 73ff8654..68a8cc6e 100644 --- a/pom.xml +++ b/pom.xml @@ -1174,7 +1174,7 @@ ${multiview-simulation.version} - 7.0.16 + 7.0.17 ${bonej.version} ${bonej.version} ${bonej.version} From 537065bee7ca94666706cf3e1dc1a2528bf75278 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 14 May 2023 09:31:27 -0500 Subject: [PATCH 580/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 68a8cc6e..a2d263f0 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 35.0.0-SNAPSHOT + 35.0.1-SNAPSHOT pom SciJava Parent POM @@ -469,7 +469,7 @@ - 2.11.0 + 2.12.0 ${imagej2.version} ${imagej.version} @@ -657,7 +657,7 @@ - 2.11.0 + 2.12.0 ${fiji.version} From f0bb36c02bf98effb54232113002cb2c0c0e67b2 Mon Sep 17 00:00:00 2001 From: Jarek Sacha Date: Mon, 15 May 2023 20:17:34 -0400 Subject: [PATCH 581/996] Bump scripting-scala version to 0.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a2d263f0..c2863388 100644 --- a/pom.xml +++ b/pom.xml @@ -455,7 +455,7 @@ ${scripting-renjin.version} - 0.3.0 + 0.3.1 ${scripting-scala.version} From e0531e03c3d1322a118133718de3c9778cd3f27e Mon Sep 17 00:00:00 2001 From: Jarek Sacha Date: Mon, 15 May 2023 20:47:52 -0400 Subject: [PATCH 582/996] Add script-editor-scala --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index c2863388..274e920e 100644 --- a/pom.xml +++ b/pom.xml @@ -410,6 +410,10 @@ 1.0.0 ${script-editor-jython.version} + + 0.2.0 + ${script-editor-scala.version} + 0.4.1 ${scripting-beanshell.version} @@ -2480,6 +2484,13 @@ ${org.scijava.script-editor-jython.version} + + + org.scijava + script-editor-scala + ${org.scijava.script-editor-scala.version} + + org.scijava From 474e2990d62cd6cb3edf68f0c2e816d732ac1809 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 23 May 2023 09:52:09 -0500 Subject: [PATCH 583/996] Update scijava-common: 2.93.1 -> 2.94.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a2d263f0..ec2767b9 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 35.0.1-SNAPSHOT + 35.1.0-SNAPSHOT pom SciJava Parent POM @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.93.1 + 2.94.0 ${scijava-common.version} From 9c9b3d13f6bd8a999a5f32b1000add59381e40fe Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 23 May 2023 09:57:23 -0500 Subject: [PATCH 584/996] Fix the release workflow * Try harder to skip mega-melt when releasing. * Change release workflow name to "release". --- .github/build.sh | 12 ++++++++++-- .github/workflows/release.yml | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index b24b46d6..3820a247 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -1,9 +1,17 @@ #!/bin/sh + +# Discern whether this is a release build. +releasing= +if [ -f release.properties ]; then + releasing=1 +fi + +# Run the SciJava CI build script. curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/master/ci-build.sh && sh ci-build.sh || { echo "Maven build failed. Skipping melting pot tests."; exit 1; } -if [ -f release.properties ]; then - # Skip melting pot when cutting a release. +# Skip melting pot if cutting a release. +if [ "$releasing" ]; then exit 0 fi diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e6d3c23b..2bc2a513 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: build +name: release on: push: From 4372cf6afa46ebef5171d32f313c089e679c1117 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 23 May 2023 10:08:31 -0500 Subject: [PATCH 585/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index ec2767b9..8fe26d0c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 35.1.0-SNAPSHOT + 35.1.1-SNAPSHOT pom SciJava Parent POM @@ -469,7 +469,7 @@ - 2.12.0 + 2.13.0 ${imagej2.version} ${imagej.version} @@ -657,7 +657,7 @@ - 2.12.0 + 2.13.0 ${fiji.version} From 590cdfa9f1d7ac3263fe25a183da3b3eee1dd69b Mon Sep 17 00:00:00 2001 From: hinerm Date: Tue, 23 May 2023 15:17:14 -0500 Subject: [PATCH 586/996] Bump pom-scijava to 2.94.1 Includes support for base /script directory discovery --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8fe26d0c..a08dbc45 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.94.0 + 2.94.1 ${scijava-common.version} From 5177b90e743eec6208d35e7702d4d241e3c649d2 Mon Sep 17 00:00:00 2001 From: hinerm Date: Tue, 23 May 2023 12:05:40 -0500 Subject: [PATCH 587/996] Update ij1-patcher: 1.2.5 -> 1.2.6 Fixes a potential "Fiji won't quit" situation. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a08dbc45..c6a6d585 100644 --- a/pom.xml +++ b/pom.xml @@ -479,7 +479,7 @@ ${ij.version} - 1.2.5 + 1.2.6 ${ij1-patcher.version} From 756c2f10e20680ddc205095153f4175f8b8a4110 Mon Sep 17 00:00:00 2001 From: Jarek Sacha Date: Tue, 23 May 2023 22:25:30 -0400 Subject: [PATCH 588/996] Bump scala-scripting to 0.3.2 and script-editor-scala to 0.2.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 274e920e..0e47372d 100644 --- a/pom.xml +++ b/pom.xml @@ -411,7 +411,7 @@ ${script-editor-jython.version} - 0.2.0 + 0.2.1 ${script-editor-scala.version} @@ -459,7 +459,7 @@ ${scripting-renjin.version} - 0.3.1 + 0.3.2 ${scripting-scala.version} From b9cc9d76f3538e5f2395b0cb18a34af9a34049d0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 24 May 2023 09:57:17 -0500 Subject: [PATCH 589/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 570d560d..23fc1985 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 35.1.1-SNAPSHOT + 35.1.2-SNAPSHOT pom SciJava Parent POM @@ -473,7 +473,7 @@ - 2.13.0 + 2.13.1 ${imagej2.version} ${imagej.version} @@ -661,7 +661,7 @@ - 2.13.0 + 2.13.1 ${fiji.version} From 63a99bb786a5ce1d927e2d32d70a418b71a9d3c4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 13 Jun 2023 12:16:03 +0200 Subject: [PATCH 590/996] Remove leading + signs from SNAPSHOTs.md script --- SNAPSHOTS.md | 86 ++++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/SNAPSHOTS.md b/SNAPSHOTS.md index 70a0f0b0..ccbdeb5b 100644 --- a/SNAPSHOTS.md +++ b/SNAPSHOTS.md @@ -6,47 +6,47 @@ labkit-ui components. Copy this script into a file called `go`, change the and then give it a try with `sh go`! ```shell -+#!/bin/sh -+ -+# Fail on error. -+set -e -+ -+# Generate the mega melt structure. -+tests/run.sh -s -+ -+# Pull appropriate branches, build artifacts, and install them locally. -+adjust() { -+ dir=$1 -+ remote=$2 -+ branch=$3 -+ cd "target/mega-melt/melting-pot/$dir" -+ -+ # fetch the needed branch -+ git remote add upstream "$remote" -+ git fetch upstream -+ -+ # discard pom.xml hacks -+ git checkout pom.xml -+ -+ # switch to the needed branch -+ git checkout "upstream/$branch" -+ -+ # reapply pom.xml hacks -+ mv pom.xml pom.xml.original && -+ sed -E -e 's_(https?://maven.imagej.net|http://maven.scijava.org)_https://maven.scijava.org_g' \ -+ -e 's_http://maven.apache.org/xsd_https://maven.apache.org/xsd_g' pom.xml.original > pom.xml || -+ die "Failed to adjust pom.xml" -+ perl -0777 -i -pe 's/(\s*org.scijava<\/groupId>\s*pom-scijava<\/artifactId>\s*)[^\n]*/${1}999-mega-melt<\/version>/igs' pom.xml -+ -+ # build and install the component -+ mvn -Denforcer.skip -DskipTests -Dmaven.test.skip -Dinvoker.skip clean install -+ -+ cd - >/dev/null -+} -+adjust sc.fiji/labkit-pixel-classification https://github.com/ctrueden/labkit-pixel-classification bump-to-imglib2-6.1.0 -+adjust sc.fiji/labkit-ui https://github.com/ctrueden/labkit-ui bump-to-imglib2-6.1.0 -+ -+# Run the mega melt! -+cd target/mega-melt/melting-pot -+./melt.sh 2>&1 | tee melt.log +#!/bin/sh + +# Fail on error. +set -e + +# Generate the mega melt structure. +tests/run.sh -s + +# Pull appropriate branches, build artifacts, and install them locally. +adjust() { + dir=$1 + remote=$2 + branch=$3 + cd "target/mega-melt/melting-pot/$dir" + + # fetch the needed branch + git remote add upstream "$remote" + git fetch upstream + + # discard pom.xml hacks + git checkout pom.xml + + # switch to the needed branch + git checkout "upstream/$branch" + + # reapply pom.xml hacks + mv pom.xml pom.xml.original && + sed -E -e 's_(https?://maven.imagej.net|http://maven.scijava.org)_https://maven.scijava.org_g' \ + -e 's_http://maven.apache.org/xsd_https://maven.apache.org/xsd_g' pom.xml.original > pom.xml || + die "Failed to adjust pom.xml" + perl -0777 -i -pe 's/(\s*org.scijava<\/groupId>\s*pom-scijava<\/artifactId>\s*)[^\n]*/${1}999-mega-melt<\/version>/igs' pom.xml + + # build and install the component + mvn -Denforcer.skip -DskipTests -Dmaven.test.skip -Dinvoker.skip clean install + + cd - >/dev/null +} +adjust sc.fiji/labkit-pixel-classification https://github.com/ctrueden/labkit-pixel-classification bump-to-imglib2-6.1.0 +adjust sc.fiji/labkit-ui https://github.com/ctrueden/labkit-ui bump-to-imglib2-6.1.0 + +# Run the mega melt! +cd target/mega-melt/melting-pot +./melt.sh 2>&1 | tee melt.log ``` From 3c3b9ba417f1160fbe9f35f818ce8dcfc6f61512 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 13 Jun 2023 12:38:42 +0200 Subject: [PATCH 591/996] Manage kotlinx-coroutines-core --- pom.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 23fc1985..1594f4df 100644 --- a/pom.xml +++ b/pom.xml @@ -2123,7 +2123,9 @@ ${kotlin.version} ${kotlin.version} ${kotlin.version} - 1.6.4 + 1.6.4 + ${kotlinx-coroutines.version} + ${kotlinx-coroutines.version} ${kotlin-compiler-embeddable.version} ${kotlin-daemon-embeddable.version} ${kotlin-reflect.version} @@ -2136,6 +2138,7 @@ ${kotlin-stdlib.version} ${kotlin-stdlib-common.version} ${kotlin-stdlib-jdk8.version} + ${kotlinx-coroutines-core.version} ${kotlinx-coroutines-core-jvm.version} @@ -6189,6 +6192,11 @@ kotlin-stdlib-jdk8 ${org.jetbrains.kotlin.kotlin-stdlib-jdk8.version} + + org.jetbrains.kotlinx + kotlinx-coroutines-core + ${org.jetbrains.kotlinx.kotlinx-coroutines-core.version} + org.jetbrains.kotlinx kotlinx-coroutines-core-jvm From 97cbfe2bb153ed492a95fa6db1a973118e1cb1fe Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 15 Jun 2023 15:14:11 -0500 Subject: [PATCH 592/996] Manage version of dev.dirs:directories See scenerygraphics/sciview#506. --- pom.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1594f4df..08cd994e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 35.1.2-SNAPSHOT + 35.2.0-SNAPSHOT pom SciJava Parent POM @@ -1573,6 +1573,10 @@ 3.3.0 ${cglib.version} + + 26 + ${directories.version} + 11.1.0 ${eclipse-collections.version} @@ -4767,6 +4771,13 @@ ${cglib.cglib.version} + + + dev.dirs + directories + ${dev.dirs.directories.version} + + org.eclipse.collections From c2d0e6182f89459616e1d4bf437e9b3a529fa849 Mon Sep 17 00:00:00 2001 From: hinerm Date: Mon, 19 Jun 2023 11:07:55 -0500 Subject: [PATCH 593/996] Bump imglib2-ij to 2.0.1 Fixes error when wrapping ImagePlus to PlanarImg --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 08cd994e..585c627a 100644 --- a/pom.xml +++ b/pom.xml @@ -605,7 +605,7 @@ ${imglib2-cache.version} - 2.0.0 + 2.0.1 ${imglib2-ij.version} From 2e615a789a7acfd5e830da263a05f70d1c8385b6 Mon Sep 17 00:00:00 2001 From: hinerm Date: Wed, 28 Jun 2023 10:58:09 -0500 Subject: [PATCH 594/996] Bump imagej-common to 2.0.4 Prevents unnecessary Dataset/ImageDisplay creation for non-single-input modules. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 585c627a..985e06c0 100644 --- a/pom.xml +++ b/pom.xml @@ -487,7 +487,7 @@ ${ij1-patcher.version} - 2.0.3 + 2.0.4 ${imagej-common.version} From 1fe85585b010a906c759c80526c6ce82a50e2924 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 22 Jun 2023 08:11:42 -0500 Subject: [PATCH 595/996] Manage the version of org.apache.ivy:ivy --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 985e06c0..bd9b4b4b 100644 --- a/pom.xml +++ b/pom.xml @@ -1374,6 +1374,10 @@ ${groovy-xml.version} ${groovy-yaml.version} + + 2.5.1 + ${ivy.version} + 2.20.0 ${log4j.version} @@ -4308,6 +4312,13 @@ ${org.codehaus.groovy.groovy-yaml.version} + + + org.apache.ivy + ivy + ${org.apache.ivy.ivy.version} + + org.apache.logging.log4j From 5e55b2f0e0e9d579687e5a7f064fd51b22f1d4fc Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 29 Jun 2023 14:05:59 -0500 Subject: [PATCH 596/996] mega-melt: ensure kotlin.version is one line long For some reason, on my current system, there is now a trailing newline which gets captured. (Different version of mvn, maybe?) So let's just take the first line. --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index a8e72cae..0afb9b0f 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -147,7 +147,7 @@ sed -E 's; -Dij\.version=([^ ]*);& -Dimagej1.version=\1;' "$buildScriptTemp" > " # Otherwise, components built on older pom-scijava-base will have # mismatched kotlin component versions. kotlinVersion=$(mvn -B -U -q -Denforcer.skip=true -Dexec.executable=echo \ - -Dexec.args='${kotlin.version}' --non-recursive validate exec:exec 2>&1) && + -Dexec.args='${kotlin.version}' --non-recursive validate exec:exec 2>&1 | head -n1) && mv -f "$buildScript" "$buildScriptTemp" && sed -E "s;mvn -Denforcer.skip;& -Dkotlin.version=$kotlinVersion;" "$buildScriptTemp" > "$buildScript" && From 09a30a5d94329c0bd42960dd2e1b8be309436df9 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 29 Jun 2023 19:28:19 -0500 Subject: [PATCH 597/996] Update ij: 1.54d -> 1.54f --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd9b4b4b..5bbff6d3 100644 --- a/pom.xml +++ b/pom.xml @@ -478,7 +478,7 @@ ${imagej.version} - 1.54d + 1.54f ${imagej1.version} ${ij.version} From f4da0b56de4b00edef613c4bb352bc969ed91612 Mon Sep 17 00:00:00 2001 From: David Gault Date: Wed, 5 Jul 2023 15:04:59 +0100 Subject: [PATCH 598/996] Bump Bio-Formats version to 6.14.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5bbff6d3..76973e77 100644 --- a/pom.xml +++ b/pom.xml @@ -1234,7 +1234,7 @@ ${jxrlib-all.version} - 6.13.0 + 6.14.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From 53d636b501388ecf22899701b88d20778c706b57 Mon Sep 17 00:00:00 2001 From: hinerm Date: Thu, 6 Jul 2023 09:54:34 -0500 Subject: [PATCH 599/996] Bump imagej-legacy to 1.2.0 Includes fix for multiple instances of images in input selector --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 76973e77..025be1cd 100644 --- a/pom.xml +++ b/pom.xml @@ -499,7 +499,7 @@ ${imagej-launcher.version} - 1.1.0 + 1.2.0 ${imagej-legacy.version} From c2c4af4615811f02eb00f8facfee3a63355fc9a3 Mon Sep 17 00:00:00 2001 From: hinerm Date: Thu, 6 Jul 2023 10:12:50 -0500 Subject: [PATCH 600/996] Bump scijava-common to 2.94.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 025be1cd..99d4d2fd 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.94.1 + 2.94.2 ${scijava-common.version} From 999bcbe48f2479eb5e3641c4235d13e44797dc14 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 7 Jul 2023 14:37:11 -0500 Subject: [PATCH 601/996] Update pom-scijava-base parent to 18.0.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 99d4d2fd..ac42c56c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.scijava pom-scijava-base - 17.1.1 + 18.0.0 pom-scijava - 35.2.0-SNAPSHOT + 36.0.0-SNAPSHOT pom SciJava Parent POM From 30f5b3c16bdf3f7d2b1c4ba124fdaa2337ca1ed7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 7 Jul 2023 14:37:50 -0500 Subject: [PATCH 602/996] Update ImageJ2 and Fiji preemptively to 2.14.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ac42c56c..33bfe429 100644 --- a/pom.xml +++ b/pom.xml @@ -473,7 +473,7 @@ - 2.13.1 + 2.14.0 ${imagej2.version} ${imagej.version} @@ -661,7 +661,7 @@ - 2.13.1 + 2.14.0 ${fiji.version} From ad8af90f2528d471dcc2f44391f278cf8462d668 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 7 Jul 2023 14:39:05 -0500 Subject: [PATCH 603/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 33bfe429..493ecc19 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 36.0.0-SNAPSHOT + 36.0.1-SNAPSHOT pom SciJava Parent POM From d86b474d3a00a8722d5a2da35e099bbe1e9178cd Mon Sep 17 00:00:00 2001 From: hinerm Date: Tue, 18 Jul 2023 13:11:31 -0500 Subject: [PATCH 604/996] Bump imagej-legacy to 1.2.1 Improve support for null overlays --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 493ecc19..5834a81d 100644 --- a/pom.xml +++ b/pom.xml @@ -499,7 +499,7 @@ ${imagej-launcher.version} - 1.2.0 + 1.2.1 ${imagej-legacy.version} From b5d3f8f39c46c1fb7d4d38617720fa12c4ba420c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 25 Jul 2023 19:48:48 -0500 Subject: [PATCH 605/996] Update component versions * scijava-search: 2.0.3 -> 2.0.4 * imagej-updater: 1.0.0 -> 1.0.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5834a81d..5ce27c6c 100644 --- a/pom.xml +++ b/pom.xml @@ -387,7 +387,7 @@ ${scijava-plugins-text-plain.version} - 2.0.3 + 2.0.4 ${scijava-search.version} @@ -575,7 +575,7 @@ ${imagej-ui-swing.version} - 1.0.0 + 1.0.1 ${imagej-updater.version} From 816dc21e78a6f677e821c53818cbf497ebfe3b6c Mon Sep 17 00:00:00 2001 From: David Gault Date: Tue, 1 Aug 2023 15:17:36 +0100 Subject: [PATCH 606/996] Bump Bio-Formats version to 7.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5ce27c6c..299e0067 100644 --- a/pom.xml +++ b/pom.xml @@ -1234,7 +1234,7 @@ ${jxrlib-all.version} - 6.14.0 + 7.0.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From 5e7625776c80316a983419d33330278831536dba Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Fri, 4 Aug 2023 10:58:22 +0200 Subject: [PATCH 607/996] Bump bigdataviewer-core to 10.4.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 299e0067..7f60e5cb 100644 --- a/pom.xml +++ b/pom.xml @@ -1012,7 +1012,7 @@ - 10.4.6 + 10.4.9 ${bigdataviewer-core.version} From c92cb4e12a9a7fa3fcca05b2efc7fb596b855a0e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 4 Aug 2023 10:33:34 -0500 Subject: [PATCH 608/996] Bump major version digit to 37 The Bio-Formats 7.0.0 update is a breaking change. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f60e5cb..42f4d3e9 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 36.0.1-SNAPSHOT + 37.0.0-SNAPSHOT pom SciJava Parent POM From bbe4948943d20dd3974d3ddf5320820bab03c63f Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Wed, 23 Aug 2023 14:14:00 +0200 Subject: [PATCH 609/996] Bump imglib2 to 6.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 42f4d3e9..707d0100 100644 --- a/pom.xml +++ b/pom.xml @@ -585,7 +585,7 @@ - 6.1.0 + 6.2.0 ${imglib2.version} From 07025ac8caef1f8b5001a11e3cab0699e24a63bd Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Wed, 23 Aug 2023 14:14:18 +0200 Subject: [PATCH 610/996] Bump imglib2-algorithm to 0.14.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 707d0100..a5ffc452 100644 --- a/pom.xml +++ b/pom.xml @@ -589,7 +589,7 @@ ${imglib2.version} - 0.13.2 + 0.14.0 ${imglib2-algorithm.version} From 6474166bdef9661d2b05df4d4d72d885312f3dc8 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 1 Sep 2023 09:39:59 +0100 Subject: [PATCH 611/996] bump org.openmicroscopy.omero-blitz to 5.7.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a5ffc452..41a7c1e3 100644 --- a/pom.xml +++ b/pom.xml @@ -1247,7 +1247,7 @@ ${formats-gpl.version} - 5.6.2 + 5.7.0 ${omero-blitz.version} From 75fe04e7d6d7e0bc3e2f65125b0dc7424545480a Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 1 Sep 2023 09:40:51 +0100 Subject: [PATCH 612/996] bump org.openmicroscopy.omero-gateway to 5.8.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41a7c1e3..241b7d07 100644 --- a/pom.xml +++ b/pom.xml @@ -1259,7 +1259,7 @@ ${omero-dsl-plugin.version} - 5.8.0 + 5.8.1 ${omero-gateway.version} From 052c5c2592e52536895b69886162cee0d9baf54c Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 1 Sep 2023 09:41:25 +0100 Subject: [PATCH 613/996] bump org.openmicroscopy.omero-common to 5.6.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 241b7d07..decc5b5e 100644 --- a/pom.xml +++ b/pom.xml @@ -1251,7 +1251,7 @@ ${omero-blitz.version} - 5.6.1 + 5.6.2 ${omero-common.version} From 64d317c969336b2c3f304f0a9cef6720e5a57a88 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 1 Sep 2023 09:41:55 +0100 Subject: [PATCH 614/996] bump org.openmicroscopy.omero-model to 5.6.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index decc5b5e..7b221974 100644 --- a/pom.xml +++ b/pom.xml @@ -1263,7 +1263,7 @@ ${omero-gateway.version} - 5.6.10 + 5.6.11 ${omero-model.version} From a611d0251810b934eacd66397c40c34be15b8c75 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 1 Sep 2023 09:42:23 +0100 Subject: [PATCH 615/996] bump org.openmicroscopy.omero-renderer to 5.5.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7b221974..5fddbdf7 100644 --- a/pom.xml +++ b/pom.xml @@ -1267,7 +1267,7 @@ ${omero-model.version} - 5.5.12 + 5.5.13 ${omero-renderer.version} From 0948e26532442bb44ef76e512feaea6c4a41f7f5 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 1 Sep 2023 09:42:52 +0100 Subject: [PATCH 616/996] bump org.openmicroscopy.omero-romio to 5.7.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5fddbdf7..85f27f7f 100644 --- a/pom.xml +++ b/pom.xml @@ -1271,7 +1271,7 @@ ${omero-renderer.version} - 5.7.2 + 5.7.3 ${omero-romio.version} From d8a8efef898b1d62264ca75893585526f5c8fd0c Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 1 Sep 2023 09:43:18 +0100 Subject: [PATCH 617/996] bump org.openmicroscopy.omero-server to 5.6.8 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 85f27f7f..d05fc8a9 100644 --- a/pom.xml +++ b/pom.xml @@ -1275,7 +1275,7 @@ ${omero-romio.version} - 5.6.7 + 5.6.8 ${omero-server.version} From 4877d66e8e9efc615753e510ba592259c7661400 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 27 Sep 2023 12:28:32 -0500 Subject: [PATCH 618/996] Update scijava-common: 2.94.2 -> 2.96.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d05fc8a9..8b1b49f4 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.94.2 + 2.96.0 ${scijava-common.version} From edd6c3592279885555e3c17b41334dab3a0d8558 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Thu, 3 Aug 2023 17:01:49 -0400 Subject: [PATCH 619/996] Bump n5 to 3.0.0 * bump all other n5 artifact versions * add n5-universe * update n5 dependencies: bigwarp, bigdataviewer --- pom.xml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 8b1b49f4..25e69ad2 100644 --- a/pom.xml +++ b/pom.xml @@ -991,7 +991,7 @@ ${jitk-tps.version} - 7.0.7 + 8.0.0 ${bigwarp.version} ${bigwarp_fiji.version} @@ -1109,11 +1109,11 @@ ${imglib2-label-multisets.version} - 2.5.1 + 3.0.0 ${n5.version} - 3.2.0 + 4.0.1 ${n5-aws-s3.version} @@ -1121,29 +1121,33 @@ ${n5-blosc.version} - 3.3.2 + 4.0.0 ${n5-google-cloud.version} - 1.4.2 + 2.0.0 ${n5-hdf5.version} - 3.2.3 + 3.2.6 ${n5-ij.version} - 5.0.0 + 7.0.0 ${n5-imglib2.version} - 5.3.0 + 5.3.1 ${n5-viewer_fiji.version} - 0.0.8 + 1.0.0 ${n5-zarr.version} + + 1.1.0 + ${n5-universe.version} + @@ -3629,6 +3633,11 @@ n5-zarr ${org.janelia.saalfeldlab.n5-zarr.version} + + org.janelia.saalfeldlab + n5-universe + ${org.janelia.saalfeldlab.n5-universe.version} + From 26dfabfcb3afe9eabc8c68ef5b96342259deef14 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Fri, 4 Aug 2023 15:54:31 -0400 Subject: [PATCH 620/996] bump versions n5-blosc and multiview-reconstruction * and n5 core bug fix version --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 25e69ad2..fc116887 100644 --- a/pom.xml +++ b/pom.xml @@ -1109,7 +1109,7 @@ ${imglib2-label-multisets.version} - 3.0.0 + 3.0.1 ${n5.version} @@ -1117,7 +1117,7 @@ ${n5-aws-s3.version} - 1.1.0 + 1.1.1 ${n5-blosc.version} @@ -1175,7 +1175,7 @@ 1.1.6 - 2.0.0 + 3.2.3 0.2.0 ${BigStitcher.version} ${multiview-reconstruction.version} From 48290683f36d9d67f916b4af5225cc831b0f1c38 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Thu, 3 Aug 2023 17:01:49 -0400 Subject: [PATCH 621/996] Bump n5 to 3.0.0 * bump all other n5 artifact versions * fix alphabetization of n5-universe * update n5 dependencies: bigwarp Signed-off-by: Curtis Rueden --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index fc116887..6fdef251 100644 --- a/pom.xml +++ b/pom.xml @@ -1136,6 +1136,10 @@ 7.0.0 ${n5-imglib2.version} + + 1.1.0 + ${n5-universe.version} + 5.3.1 ${n5-viewer_fiji.version} @@ -1144,10 +1148,6 @@ 1.0.0 ${n5-zarr.version} - - 1.1.0 - ${n5-universe.version} - @@ -3623,6 +3623,11 @@ n5-imglib2 ${org.janelia.saalfeldlab.n5-imglib2.version} + + org.janelia.saalfeldlab + n5-universe + ${org.janelia.saalfeldlab.n5-universe.version} + org.janelia.saalfeldlab n5-viewer_fiji @@ -3633,11 +3638,6 @@ n5-zarr ${org.janelia.saalfeldlab.n5-zarr.version} - - org.janelia.saalfeldlab - n5-universe - ${org.janelia.saalfeldlab.n5-universe.version} - From cca05cba020966d4812d8b33f4b2559da5989413 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Fri, 1 Sep 2023 11:40:28 -0400 Subject: [PATCH 622/996] bump n5-3.0.2, n5-zarr-1.0.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6fdef251..234f3a75 100644 --- a/pom.xml +++ b/pom.xml @@ -1109,7 +1109,7 @@ ${imglib2-label-multisets.version} - 3.0.1 + 3.0.2 ${n5.version} @@ -1145,7 +1145,7 @@ ${n5-viewer_fiji.version} - 1.0.0 + 1.0.1 ${n5-zarr.version} From 72218adb608b9c49bbb51866cf55712d4708d07c Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Fri, 1 Sep 2023 12:06:25 -0400 Subject: [PATCH 623/996] bump BigStitcher-1.2.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 234f3a75..e1d4fa14 100644 --- a/pom.xml +++ b/pom.xml @@ -1174,7 +1174,7 @@ ${clijx-weka_.version} - 1.1.6 + 1.2.6 3.2.3 0.2.0 ${BigStitcher.version} From 558bdb3990b11f1d9f5716ad65f79c793efea517 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Fri, 1 Sep 2023 13:38:42 -0400 Subject: [PATCH 624/996] bump n5-hdf5-2.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e1d4fa14..254a9a46 100644 --- a/pom.xml +++ b/pom.xml @@ -1125,7 +1125,7 @@ ${n5-google-cloud.version} - 2.0.0 + 2.0.1 ${n5-hdf5.version} From 20991d5bd32a1c099a6c6595bb5cb591bcda9c0f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 16 Aug 2023 15:51:17 -0500 Subject: [PATCH 625/996] Update snakeyaml to 2.0 And update versions of downstream components: * ui-behaviour: 2.0.7 -> 2.0.8 * bigdataviewer-core: 10.4.9 -> 10.4.10 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 254a9a46..7c44ae24 100644 --- a/pom.xml +++ b/pom.xml @@ -467,7 +467,7 @@ ${swing-checkbox-tree.version} - 2.0.7 + 2.0.8 ${ui-behaviour.version} @@ -1012,7 +1012,7 @@ - 10.4.9 + 10.4.10 ${bigdataviewer-core.version} @@ -2271,7 +2271,7 @@ ${jcl-over-slf4j.version} - 1.33 + 2.0 ${snakeyaml.version} From 8d24b1f393c1f0a157383ee86d5f5048764db09c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 27 Sep 2023 15:10:38 -0500 Subject: [PATCH 626/996] mega-melt: avoid mvn ANSI color bug Otherwise, the kotlin.version property comes back as: [0m[0m1.8.22 rather than the expected: 1.8.22 --- tests/run.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 0afb9b0f..a4c756ac 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -145,9 +145,13 @@ sed -E 's; -Dij\.version=([^ ]*);& -Dimagej1.version=\1;' "$buildScriptTemp" > " # HACK: Add explicit kotlin.version to match our pom-scijava-base. # Otherwise, components built on older pom-scijava-base will have -# mismatched kotlin component versions. -kotlinVersion=$(mvn -B -U -q -Denforcer.skip=true -Dexec.executable=echo \ - -Dexec.args='${kotlin.version}' --non-recursive validate exec:exec 2>&1 | head -n1) && +# mismatched kotlin component versions. The sed expression avoids +# a bug in mvn's batch mode that results in [0m[0m still +# appearing as a leading ANSI sequence when echoing the property. +kotlinVersion=$( + mvn -B -U -q -Denforcer.skip=true -Dexec.executable=echo \ + -Dexec.args='${kotlin.version}' --non-recursive validate exec:exec 2>&1 | + head -n1 | sed 's;\(.\[[0-9]m\)*;;') && mv -f "$buildScript" "$buildScriptTemp" && sed -E "s;mvn -Denforcer.skip;& -Dkotlin.version=$kotlinVersion;" "$buildScriptTemp" > "$buildScript" && From 765f28f8be16a88825da378ea70f1841ddb048a4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 12 Oct 2023 11:41:29 +0200 Subject: [PATCH 627/996] Update scijava-common: 2.96.0 -> 2.97.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c44ae24..9addeae2 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.96.0 + 2.97.0 ${scijava-common.version} From cbf7caf5c2b3c96fe266a62aa2e84c8e02f34884 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 12 Oct 2023 00:36:32 +0200 Subject: [PATCH 628/996] Add kotlin script to dump managed components This could be the start of code to automatically generate a SciJava gradle catalog; see: https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog --- gradle/catalog.kts | 22 ++++++++++++++++++++++ gradle/generate-catalog.sh | 8 ++++++++ 2 files changed, 30 insertions(+) create mode 100755 gradle/catalog.kts create mode 100755 gradle/generate-catalog.sh diff --git a/gradle/catalog.kts b/gradle/catalog.kts new file mode 100755 index 00000000..22564d93 --- /dev/null +++ b/gradle/catalog.kts @@ -0,0 +1,22 @@ +#!/usr/bin/env kscript + +@file:DependsOn("org.scijava:scijava-common:2.94.1") + +import java.io.File +import java.util.ArrayList +import org.scijava.util.POM +import org.scijava.util.XML +import org.w3c.dom.Element + +val pom: POM = POM(File(args[0])) + +val deps = pom.elements("//project/dependencyManagement/dependencies/dependency") + +deps.forEach { dep -> + val g: String = XML.cdata(dep, "groupId") + val a: String = XML.cdata(dep, "artifactId") + val v: String = XML.cdata(dep, "version") + val exclusionsElement: List = XML.elements(dep, "exclusions") + val exclusions: List = if (exclusionsElement.isEmpty()) emptyList() else XML.elements(exclusionsElement[0], "exclusion") + println("$g : $a : $v -- # of exclusions = ${exclusions.size}") +} diff --git a/gradle/generate-catalog.sh b/gradle/generate-catalog.sh new file mode 100755 index 00000000..12b067c1 --- /dev/null +++ b/gradle/generate-catalog.sh @@ -0,0 +1,8 @@ +#!/bin/sh +dir=$(dirname "$0") +pom="$dir/../pom.xml" +mvn -B -f "$pom" help:effective-pom | + grep -A9999999 '^' > eff.xml +"$dir/catalog.kts" eff.xml +rm eff.xml From 1ff0a5623c81e084bb071ee72ec5ddb6a3bf472b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 11 Oct 2023 18:00:25 +0200 Subject: [PATCH 629/996] Update component versions preemptively * imagej2: 2.14.0 -> 2.15.0 * fiji: 2.14.0 -> 2.15.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9addeae2..c4a3b36c 100644 --- a/pom.xml +++ b/pom.xml @@ -473,7 +473,7 @@ - 2.14.0 + 2.15.0 ${imagej2.version} ${imagej.version} @@ -661,7 +661,7 @@ - 2.14.0 + 2.15.0 ${fiji.version} From 6d8c17ad945dddd1d59325e182d588b6f7ace229 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 12 Oct 2023 11:42:30 +0200 Subject: [PATCH 630/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c4a3b36c..1aff61a0 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 37.0.0-SNAPSHOT + 37.0.1-SNAPSHOT pom SciJava Parent POM From c3961d1c1052db9bc6e8b8b0034de0459503f42b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 12 Oct 2023 14:15:32 +0200 Subject: [PATCH 631/996] Update scijava-common: 2.97.0 -> 2.97.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1aff61a0..174f40d7 100644 --- a/pom.xml +++ b/pom.xml @@ -335,7 +335,7 @@ ${scijava-cache.version} - 2.97.0 + 2.97.1 ${scijava-common.version} From caf36fda76b0214c469f49a81082d516c77f6b99 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 16 Oct 2023 14:30:44 +0200 Subject: [PATCH 632/996] Update parent to pom-scijava-base 18.1.0 This adds support for launching jshell via the jshell profile. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 174f40d7..22f42a06 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.scijava pom-scijava-base - 18.0.0 + 18.1.0 pom-scijava - 37.0.1-SNAPSHOT + 37.1.0-SNAPSHOT pom SciJava Parent POM From aa36e4de68d0a30e881fdd138d9da51dc2aac8fc Mon Sep 17 00:00:00 2001 From: David Gault Date: Tue, 17 Oct 2023 14:36:06 +0100 Subject: [PATCH 633/996] Bump Bio-Formats version to 7.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 22f42a06..fafd0d98 100644 --- a/pom.xml +++ b/pom.xml @@ -1238,7 +1238,7 @@ ${jxrlib-all.version} - 7.0.0 + 7.0.1 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From cfcd6a6f263e2ac6ba858044c808e09267b6db7e Mon Sep 17 00:00:00 2001 From: Mark Kittisopikul Date: Mon, 4 Dec 2023 12:37:35 -0500 Subject: [PATCH 634/996] Add zstd-jni to pom scijava --- pom.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pom.xml b/pom.xml index fafd0d98..0221c722 100644 --- a/pom.xml +++ b/pom.xml @@ -2325,6 +2325,9 @@ 1.9 ${xz.version} + + 1.5.5-10 + ${zstd-jni.version} @@ -6581,6 +6584,12 @@ ${org.tukaani.xz.version} + + com.github.luben + zstd-jni + ${com.github.luben.zstd-jni.version} + + From 8a41957ae3759ddc951c7ff1ded67ca5ba4df5ca Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 4 Dec 2023 23:16:33 -0600 Subject: [PATCH 635/996] Clean up whitespace and add comment for zstd-jni --- pom.xml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 0221c722..0b2be3d5 100644 --- a/pom.xml +++ b/pom.xml @@ -2326,8 +2326,9 @@ 1.9 ${xz.version} - 1.5.5-10 - ${zstd-jni.version} + + 1.5.5-10 + ${zstd-jni.version} @@ -6584,11 +6585,12 @@ ${org.tukaani.xz.version} - - com.github.luben - zstd-jni - ${com.github.luben.zstd-jni.version} - + + + com.github.luben + zstd-jni + ${com.github.luben.zstd-jni.version} + From 30549959b8d0ecfa29749d171903b9d72af1482a Mon Sep 17 00:00:00 2001 From: David Gault Date: Mon, 11 Dec 2023 16:26:59 +0000 Subject: [PATCH 636/996] Bump Bio-Formats version to 7.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fafd0d98..0c0f3533 100644 --- a/pom.xml +++ b/pom.xml @@ -1238,7 +1238,7 @@ ${jxrlib-all.version} - 7.0.1 + 7.1.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From 459392ce73fe9434cf2637b96d2427b8fbcaa6b2 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 12 Dec 2023 09:13:56 -0600 Subject: [PATCH 637/996] Update OME component versions * ome-common: 6.0.16 -> 6.0.21 * metakit: 5.3.5 -> 5.3.6 * ome-poi: 5.3.7 -> 5.3.8 * ome-xml: 6.3.3 -> 6.3.4 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 54ead45f..f0a3473b 100644 --- a/pom.xml +++ b/pom.xml @@ -1217,19 +1217,19 @@ ${ice.version} - 6.0.16 + 6.0.21 ${ome-common.version} - 5.3.5 + 5.3.6 ${metakit.version} - 5.3.7 + 5.3.8 ${ome-poi.version} - 6.3.3 + 6.3.4 ${ome-xml.version} From ddc76d944811723bb2fd5c28fb83be94e377cf97 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 12 Dec 2023 09:15:38 -0600 Subject: [PATCH 638/996] Manage version of org.openmicroscopy:ome-codecs --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index f0a3473b..590b184f 100644 --- a/pom.xml +++ b/pom.xml @@ -1216,6 +1216,10 @@ ${glacier2.version} ${ice.version} + + 1.1.0 + ${ome-codecs.version} + 6.0.21 ${ome-common.version} @@ -3818,6 +3822,13 @@ + + + org.openmicroscopy + ome-codecs + ${org.openmicroscopy.ome-codecs.version} + + org.openmicroscopy From 7961fa92bbafd7336f7d24a50a853a027d60ea00 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 12 Dec 2023 10:02:10 -0600 Subject: [PATCH 639/996] Correct version of ome-codecs: 1.0.1 The version 1.1.0 does not yet exist. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 590b184f..9ec41e87 100644 --- a/pom.xml +++ b/pom.xml @@ -1217,7 +1217,7 @@ ${ice.version} - 1.1.0 + 1.0.1 ${ome-codecs.version} From c3687bc11297741eb823aacc0aa858328dc3e3d3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 17 Jan 2024 10:48:44 -0600 Subject: [PATCH 640/996] Update TrakEM2_: 1.3.8 -> 1.3.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9ec41e87..6e57235b 100644 --- a/pom.xml +++ b/pom.xml @@ -1090,7 +1090,7 @@ ${T2-TreelineGraph.version} - 1.3.8 + 1.3.9 ${TrakEM2.version} ${TrakEM2_.version} From fb96bdbfbbd4133192e60f1ff22deebaf7dcf90b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 18 Jan 2024 14:58:50 -0600 Subject: [PATCH 641/996] Update TrakEM2_: 1.3.9 -> 1.3.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e57235b..78560f51 100644 --- a/pom.xml +++ b/pom.xml @@ -1090,7 +1090,7 @@ ${T2-TreelineGraph.version} - 1.3.9 + 1.3.10 ${TrakEM2.version} ${TrakEM2_.version} From 1fd6bd2ca3a3d6a544a40b0307e074ef70969456 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Jan 2024 13:37:52 -0600 Subject: [PATCH 642/996] Update script-editor-jython: 1.0.0 -> 1.0.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78560f51..3984ef01 100644 --- a/pom.xml +++ b/pom.xml @@ -407,7 +407,7 @@ ${script-editor.version} - 1.0.0 + 1.0.1 ${script-editor-jython.version} From d64480127432cd88d389128a0c554e604f38ada5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Jan 2024 15:03:08 -0600 Subject: [PATCH 643/996] Update script-editor-jython: 1.0.1 -> 1.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3984ef01..d97bae55 100644 --- a/pom.xml +++ b/pom.xml @@ -407,7 +407,7 @@ ${script-editor.version} - 1.0.1 + 1.1.0 ${script-editor-jython.version} From 7dec1bfbbd64569f0895107ca6395508aa23b0a6 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Thu, 1 Feb 2024 14:09:58 -0500 Subject: [PATCH 644/996] bump n5, bigdataviewer, bigwarp versions * add n5-zstandard --- pom.xml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index d97bae55..a8d32b70 100644 --- a/pom.xml +++ b/pom.xml @@ -991,7 +991,7 @@ ${jitk-tps.version} - 8.0.0 + 9.1.0 ${bigwarp.version} ${bigwarp_fiji.version} @@ -1012,7 +1012,7 @@ - 10.4.10 + 10.4.13 ${bigdataviewer-core.version} @@ -1020,7 +1020,7 @@ ${bigdataviewer-server.version} - 1.0.0-beta-32 + 1.0.0-beta-34 ${bigdataviewer-vistools.version} @@ -1109,7 +1109,7 @@ ${imglib2-label-multisets.version} - 3.0.2 + 3.1.1 ${n5.version} @@ -1125,11 +1125,11 @@ ${n5-google-cloud.version} - 2.0.1 + 2.1.0 ${n5-hdf5.version} - 3.2.6 + 4.0.2 ${n5-ij.version} @@ -1137,17 +1137,21 @@ ${n5-imglib2.version} - 1.1.0 + 1.3.1 ${n5-universe.version} - 5.3.1 + 6.0.1 ${n5-viewer_fiji.version} - 1.0.1 + 1.2.0 ${n5-zarr.version} + + 1.0.2 + ${n5-zstandard.version} + From b082130cd60e106bf826f02b8a9d77f5fc2b3714 Mon Sep 17 00:00:00 2001 From: David Gault Date: Thu, 8 Feb 2024 15:05:30 +0000 Subject: [PATCH 645/996] Bump Bio-Formats version to 7.2.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d97bae55..35bd592f 100644 --- a/pom.xml +++ b/pom.xml @@ -1242,7 +1242,7 @@ ${jxrlib-all.version} - 7.1.0 + 7.2.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From 7e0b04b30b688825f3190bba74b26fd0d4d08471 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Thu, 8 Feb 2024 13:18:45 -0500 Subject: [PATCH 646/996] n5-3.1.2 * fixes build issue for n5-blosc --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a8d32b70..8cddb9db 100644 --- a/pom.xml +++ b/pom.xml @@ -1109,7 +1109,7 @@ ${imglib2-label-multisets.version} - 3.1.1 + 3.1.2 ${n5.version} From 30e3812ff9b4f165045d68b612625e259d0cd1be Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 9 Feb 2024 12:18:10 -0600 Subject: [PATCH 647/996] Update asm: 9.5 -> 9.6 This update is needed for ASM to be able to process Java 21 classes. Without it, things like Groovy script execution are broken on Java 21. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d97bae55..c541b249 100644 --- a/pom.xml +++ b/pom.xml @@ -1443,7 +1443,7 @@ ${args4j.version} - 9.5 + 9.6 ${asm.version} ${asm.version} ${asm.version} From bc48b5c28dfae014297ab4134515321fa8da95bc Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Wed, 10 Jan 2024 15:08:50 -0500 Subject: [PATCH 648/996] Update component versions * batik: 1.16 -> 1.17 * commons-lang3: 3.12.0 -> 3.14.0 * commons-text: 1.10.0 -> 1.11.0 * flatlaf: 3.1.1 -> 3.2.1 * okhttp: 4.11.0 -> 4.12.0 * okio: 3.3.0 -> 3.7.0 * rsyntaxtextarea: 3.3.3 -> 3.3.4 Co-authored-by: Curtis Rueden --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 9ec41e87..7d486f07 100644 --- a/pom.xml +++ b/pom.xml @@ -1455,7 +1455,7 @@ ${asm-util.version} - 1.16 + 1.17 ${batik.version} ${batik.version} ${batik.version} @@ -1561,7 +1561,7 @@ 2.6 - 3.12.0 + 3.14.0 ${commons-lang.version} ${commons-lang3.version} @@ -1578,7 +1578,7 @@ ${commons-pool2.version} - 1.10.0 + 1.11.0 ${commons-text.version} @@ -1646,7 +1646,7 @@ ${error_prone_annotations.version} - 3.1.1 + 3.2.1 ${flatlaf.version} 2.242 ${flatlaf-fonts-jetbrains-mono.version} @@ -2207,8 +2207,8 @@ ${objenesis.version} - 4.11.0 - 3.3.0 + 4.12.0 + 3.7.0 ${okhttp.version} ${okio.version} @@ -2250,7 +2250,7 @@ ${reload4j.version} - 3.3.3 + 3.3.4 3.3.1 3.3.0 ${rsyntaxtextarea.version} From 75079e7f1aaa29017a76783cebda3900e95f6db7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 13 Feb 2024 17:47:28 -0600 Subject: [PATCH 649/996] Update groovy: 3.0.4 -> 4.0.18 And in conjunction, scripting-groovy: 0.4.2 -> 1.0.0. --- pom.xml | 168 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/pom.xml b/pom.xml index cf35ad27..63275def 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ pom-scijava - 37.1.0-SNAPSHOT + 38.0.0-SNAPSHOT pom SciJava Parent POM @@ -423,7 +423,7 @@ ${scripting-clojure.version} - 0.4.2 + 1.0.0 ${scripting-groovy.version} @@ -1331,7 +1331,7 @@ ${ant-launcher.version} - 3.0.4 + 4.0.18 ${groovy.version} ${groovy.version} ${groovy.version} @@ -1358,33 +1358,33 @@ ${groovy.version} ${groovy.version} ${groovy.version} - ${groovy.version} - ${groovy-ant.version} - ${groovy-astbuilder.version} - ${groovy-bsf.version} - ${groovy-cli-commons.version} - ${groovy-cli-picocli.version} - ${groovy-console.version} - ${groovy-datetime.version} - ${groovy-dateutil.version} - ${groovy-docgenerator.version} - ${groovy-groovydoc.version} - ${groovy-groovysh.version} - ${groovy-jaxb.version} - ${groovy-jmx.version} - ${groovy-json.version} - ${groovy-jsr223.version} - ${groovy-macro.version} - ${groovy-nio.version} - ${groovy-servlet.version} - ${groovy-sql.version} - ${groovy-swing.version} - ${groovy-templates.version} - ${groovy-test.version} - ${groovy-test-junit5.version} - ${groovy-testng.version} - ${groovy-xml.version} - ${groovy-yaml.version} + ${groovy.version} + ${groovy-ant.version} + ${groovy-astbuilder.version} + ${groovy-bsf.version} + ${groovy-cli-commons.version} + ${groovy-cli-picocli.version} + ${groovy-console.version} + ${groovy-datetime.version} + ${groovy-dateutil.version} + ${groovy-docgenerator.version} + ${groovy-groovydoc.version} + ${groovy-groovysh.version} + ${groovy-jaxb.version} + ${groovy-jmx.version} + ${groovy-json.version} + ${groovy-jsr223.version} + ${groovy-macro.version} + ${groovy-nio.version} + ${groovy-servlet.version} + ${groovy-sql.version} + ${groovy-swing.version} + ${groovy-templates.version} + ${groovy-test.version} + ${groovy-test-junit5.version} + ${groovy-testng.version} + ${groovy-xml.version} + ${groovy-yaml.version} 2.5.1 @@ -4205,139 +4205,139 @@ - org.codehaus.groovy + org.apache.groovy groovy - ${org.codehaus.groovy.groovy.version} + ${org.apache.groovy.groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-ant - ${org.codehaus.groovy.groovy-ant.version} + ${org.apache.groovy.groovy-ant.version} - org.codehaus.groovy + org.apache.groovy groovy-astbuilder - ${org.codehaus.groovy.groovy-astbuilder.version} + ${org.apache.groovy.groovy-astbuilder.version} - org.codehaus.groovy + org.apache.groovy groovy-bsf - ${org.codehaus.groovy.groovy-bsf.version} + ${org.apache.groovy.groovy-bsf.version} - org.codehaus.groovy + org.apache.groovy groovy-cli-commons - ${org.codehaus.groovy.groovy-cli-commons.version} + ${org.apache.groovy.groovy-cli-commons.version} - org.codehaus.groovy + org.apache.groovy groovy-cli-picocli - ${org.codehaus.groovy.groovy-cli-picocli.version} + ${org.apache.groovy.groovy-cli-picocli.version} - org.codehaus.groovy + org.apache.groovy groovy-console - ${org.codehaus.groovy.groovy-console.version} + ${org.apache.groovy.groovy-console.version} - org.codehaus.groovy + org.apache.groovy groovy-datetime - ${org.codehaus.groovy.groovy-datetime.version} + ${org.apache.groovy.groovy-datetime.version} - org.codehaus.groovy + org.apache.groovy groovy-dateutil - ${org.codehaus.groovy.groovy-dateutil.version} + ${org.apache.groovy.groovy-dateutil.version} - org.codehaus.groovy + org.apache.groovy groovy-docgenerator - ${org.codehaus.groovy.groovy-docgenerator.version} + ${org.apache.groovy.groovy-docgenerator.version} - org.codehaus.groovy + org.apache.groovy groovy-groovydoc - ${org.codehaus.groovy.groovy-groovydoc.version} + ${org.apache.groovy.groovy-groovydoc.version} - org.codehaus.groovy + org.apache.groovy groovy-groovysh - ${org.codehaus.groovy.groovy-groovysh.version} + ${org.apache.groovy.groovy-groovysh.version} - org.codehaus.groovy + org.apache.groovy groovy-jaxb - ${org.codehaus.groovy.groovy-jaxb.version} + ${org.apache.groovy.groovy-jaxb.version} - org.codehaus.groovy + org.apache.groovy groovy-jmx - ${org.codehaus.groovy.groovy-jmx.version} + ${org.apache.groovy.groovy-jmx.version} - org.codehaus.groovy + org.apache.groovy groovy-json - ${org.codehaus.groovy.groovy-json.version} + ${org.apache.groovy.groovy-json.version} - org.codehaus.groovy + org.apache.groovy groovy-jsr223 - ${org.codehaus.groovy.groovy-jsr223.version} + ${org.apache.groovy.groovy-jsr223.version} - org.codehaus.groovy + org.apache.groovy groovy-macro - ${org.codehaus.groovy.groovy-macro.version} + ${org.apache.groovy.groovy-macro.version} - org.codehaus.groovy + org.apache.groovy groovy-nio - ${org.codehaus.groovy.groovy-nio.version} + ${org.apache.groovy.groovy-nio.version} - org.codehaus.groovy + org.apache.groovy groovy-servlet - ${org.codehaus.groovy.groovy-servlet.version} + ${org.apache.groovy.groovy-servlet.version} - org.codehaus.groovy + org.apache.groovy groovy-sql - ${org.codehaus.groovy.groovy-sql.version} + ${org.apache.groovy.groovy-sql.version} - org.codehaus.groovy + org.apache.groovy groovy-swing - ${org.codehaus.groovy.groovy-swing.version} + ${org.apache.groovy.groovy-swing.version} - org.codehaus.groovy + org.apache.groovy groovy-templates - ${org.codehaus.groovy.groovy-templates.version} + ${org.apache.groovy.groovy-templates.version} - org.codehaus.groovy + org.apache.groovy groovy-test - ${org.codehaus.groovy.groovy-test.version} + ${org.apache.groovy.groovy-test.version} - org.codehaus.groovy + org.apache.groovy groovy-test-junit5 - ${org.codehaus.groovy.groovy-test-junit5.version} + ${org.apache.groovy.groovy-test-junit5.version} - org.codehaus.groovy + org.apache.groovy groovy-testng - ${org.codehaus.groovy.groovy-testng.version} + ${org.apache.groovy.groovy-testng.version} - org.codehaus.groovy + org.apache.groovy groovy-xml - ${org.codehaus.groovy.groovy-xml.version} + ${org.apache.groovy.groovy-xml.version} - org.codehaus.groovy + org.apache.groovy groovy-yaml - ${org.codehaus.groovy.groovy-yaml.version} + ${org.apache.groovy.groovy-yaml.version} From bc7a684bbca2c58f92655fb5451fa4ca24debd40 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 16 Feb 2024 12:23:59 -0600 Subject: [PATCH 650/996] Update FlatLaf components * flatlaf: 3.2.1 -> 3.3 * flatlaf-fonts-jetbrains-mono: 2.242 -> 2.304 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 63275def..87ce225a 100644 --- a/pom.xml +++ b/pom.xml @@ -1650,9 +1650,9 @@ ${error_prone_annotations.version} - 3.2.1 + 3.3 ${flatlaf.version} - 2.242 + 2.304 ${flatlaf-fonts-jetbrains-mono.version} From ac117b5fb313eb45c8108995fc1531cd46a3dc86 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 21 Feb 2024 13:08:59 -0600 Subject: [PATCH 651/996] Update Groovy components list to match 4.0.18 The following components were removed: * groovy-bsf * groovy-jaxb And the following components are new since Groovy 3.0.4: * groovy-contracts * groovy-ginq * groovy-macro-library * groovy-toml * groovy-typecheckers --- pom.xml | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 87ce225a..2b086fab 100644 --- a/pom.xml +++ b/pom.xml @@ -1334,20 +1334,21 @@ 4.0.18 ${groovy.version} ${groovy.version} - ${groovy.version} ${groovy.version} ${groovy.version} ${groovy.version} + ${groovy.version} ${groovy.version} ${groovy.version} ${groovy.version} + ${groovy.version} ${groovy.version} ${groovy.version} - ${groovy.version} ${groovy.version} ${groovy.version} ${groovy.version} ${groovy.version} + ${groovy.version} ${groovy.version} ${groovy.version} ${groovy.version} @@ -1356,25 +1357,28 @@ ${groovy.version} ${groovy.version} ${groovy.version} + ${groovy.version} + ${groovy.version} ${groovy.version} ${groovy.version} ${groovy.version} ${groovy-ant.version} ${groovy-astbuilder.version} - ${groovy-bsf.version} ${groovy-cli-commons.version} ${groovy-cli-picocli.version} ${groovy-console.version} + ${groovy-contracts.version} ${groovy-datetime.version} ${groovy-dateutil.version} ${groovy-docgenerator.version} + ${groovy-ginq.version} ${groovy-groovydoc.version} ${groovy-groovysh.version} - ${groovy-jaxb.version} ${groovy-jmx.version} ${groovy-json.version} ${groovy-jsr223.version} ${groovy-macro.version} + ${groovy-macro-library.version} ${groovy-nio.version} ${groovy-servlet.version} ${groovy-sql.version} @@ -1383,6 +1387,8 @@ ${groovy-test.version} ${groovy-test-junit5.version} ${groovy-testng.version} + ${groovy-toml.version} + ${groovy-typecheckers.version} ${groovy-xml.version} ${groovy-yaml.version} @@ -4219,11 +4225,6 @@ groovy-astbuilder ${org.apache.groovy.groovy-astbuilder.version} - - org.apache.groovy - groovy-bsf - ${org.apache.groovy.groovy-bsf.version} - org.apache.groovy groovy-cli-commons @@ -4239,6 +4240,11 @@ groovy-console ${org.apache.groovy.groovy-console.version} + + org.apache.groovy + groovy-contracts + ${org.apache.groovy.groovy-contracts.version} + org.apache.groovy groovy-datetime @@ -4254,6 +4260,11 @@ groovy-docgenerator ${org.apache.groovy.groovy-docgenerator.version} + + org.apache.groovy + groovy-ginq + ${org.apache.groovy.groovy-ginq.version} + org.apache.groovy groovy-groovydoc @@ -4264,11 +4275,6 @@ groovy-groovysh ${org.apache.groovy.groovy-groovysh.version} - - org.apache.groovy - groovy-jaxb - ${org.apache.groovy.groovy-jaxb.version} - org.apache.groovy groovy-jmx @@ -4289,6 +4295,11 @@ groovy-macro ${org.apache.groovy.groovy-macro.version} + + org.apache.groovy + groovy-macro-library + ${org.apache.groovy.groovy-macro-library.version} + org.apache.groovy groovy-nio @@ -4329,6 +4340,16 @@ groovy-testng ${org.apache.groovy.groovy-testng.version} + + org.apache.groovy + groovy-toml + ${org.apache.groovy.groovy-toml.version} + + + org.apache.groovy + groovy-typecheckers + ${org.apache.groovy.groovy-typecheckers.version} + org.apache.groovy groovy-xml From 081dd2375bfe9147c0fe44c6b49d097dcc0fa96c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 21 Feb 2024 13:27:27 -0600 Subject: [PATCH 652/996] Update parent to pom-scijava-base 18.2.0 This updates the following component versions: * jacoco-maven-plugin: 0.8.10 -> 0.8.11 * dokka-maven-plugin: 1.8.20 -> 1.9.10 * kotlin: 1.8.22 -> 1.9.22 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b086fab..e924cd14 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 18.1.0 + 18.2.0 From 68b31cd4a818091b67df042aaec7797c7c888327 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 21 Feb 2024 14:35:02 -0600 Subject: [PATCH 653/996] Stop managing retired kotlin-script-util component --- pom.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index e924cd14..c2223815 100644 --- a/pom.xml +++ b/pom.xml @@ -251,17 +251,11 @@ Also in: org.jmockit:jmockit Enables: junit:junit + org.jmockit:jmockit == - Classes: org.jetbrains.kotlin.daemon.common.* - Part of: kotlin-daemon-client, kotlin-daemon-embeddable - Enables: - org.jetbrains.kotlin:kotlin-compiler-embeddable (kotlin-daemon-embeddable) + - org.jetbrains.kotlin:kotlin-script-util (kotlin-compiler-client) - == Classes: org.jzy3d.plot3d.pipelines.* Part of: org.jzy3d:jzy3d-core, org.jzy3d:jzy3d-native-jogl-awt Enables: org.jzy3d:jzy3d-core + org.jzy3d:jzy3d-native-jogl-awt --> - com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.jetbrains.kotlin.daemon.common.*,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* + com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* - - 2.14.2 + 2.16.1 ${jackson.version} ${jackson.version} ${jackson.version} From 59f590d8f6e3a9d5380f48f1231aefc95da098a7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 14:07:53 -0600 Subject: [PATCH 655/996] Update version update rules for Groovy v4 --- rules.xml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/rules.xml b/rules.xml index 1dae14e3..3451542b 100644 --- a/rules.xml +++ b/rules.xml @@ -138,13 +138,9 @@ .*-(alpha|beta|rc)-?[0-9]+ - + - - ^(?!3\.0\.4\.).* + .*-(alpha|beta|rc)-?[0-9]+ From 0a9980721fa27d2e12603baed6ddc4b6c5e92f05 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 14:08:21 -0600 Subject: [PATCH 656/996] Add comment marker for missing macosx-arm64 builds --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 738315c5..e419a7ba 100644 --- a/pom.xml +++ b/pom.xml @@ -1804,15 +1804,15 @@ ${javacpp.version} ${javacv.version} - 2.3.1-${org.bytedeco.javacpp.version} + 2.3.1-${org.bytedeco.javacpp.version} 5.1.2-${org.bytedeco.javacpp.version} - 1.07-${org.bytedeco.javacpp.version} - 1.12.2-${org.bytedeco.javacpp.version} + 1.07-${org.bytedeco.javacpp.version} + 1.12.2-${org.bytedeco.javacpp.version} 1.82.0-${org.bytedeco.javacpp.version} - 2.2.6-${org.bytedeco.javacpp.version} - 0.5.7-${org.bytedeco.javacpp.version} - 0.2.0-${org.bytedeco.javacpp.version} - 1.12.4-${org.bytedeco.javacpp.version} + 2.2.6-${org.bytedeco.javacpp.version} + 0.5.7-${org.bytedeco.javacpp.version} + 0.2.0-${org.bytedeco.javacpp.version} + 1.12.4-${org.bytedeco.javacpp.version} 0.3.21-${org.bytedeco.javacpp.version} 4.6.0-${org.bytedeco.javacpp.version} 5.2.0-${org.bytedeco.javacpp.version} From d645be6ad32e065bbdb2bee1a7122014d26dfbc0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 14:09:21 -0600 Subject: [PATCH 657/996] Update maven-core: 3.9.1 -> 3.9.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e419a7ba..c8d23922 100644 --- a/pom.xml +++ b/pom.xml @@ -1400,7 +1400,7 @@ 0.13.1 3.3.2 - 3.9.1 + 3.9.6 3.8.2 2.1.1 3.5.1 From d01dbeb0e5a639ecdc7e8d86ec9156a1b4aef87e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 14:52:32 -0600 Subject: [PATCH 658/996] Update scijava-grab: 0.1.1 -> 0.1.2 This replaces the org.codehaus.groovy:groovy dependency with org.apache.groovy:groovy, to avoid artifact clashes. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8d23922..ae7de233 100644 --- a/pom.xml +++ b/pom.xml @@ -337,7 +337,7 @@ ${scijava-config.version} - 0.1.1 + 0.1.2 ${scijava-grab.version} From 2aa0f03f1f42f935542f9d0a39bc2832d606e4e5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 15:00:27 -0600 Subject: [PATCH 659/996] Avoid bringing in com.google.android.tools:dx It is an unshaded uberjar bundling junit. Naughty. --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index ae7de233..c88260bd 100644 --- a/pom.xml +++ b/pom.xml @@ -4704,6 +4704,13 @@ com.nativelibs4java bridj ${com.nativelibs4java.bridj.version} + + + + com.google.android.tools + dx + + From 4a28948f439f9f5fee2fe061310808e074a13f81 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 15:05:43 -0600 Subject: [PATCH 660/996] Update parent to pom-scijava-base 19.0.0 This upgrades the maven-enforcer-plugin component stack to play more nicely when updating components, particularly Jackson. In particular, this update fixes the following error in the mega-melt: Failed to execute goal org.apache.maven.plugins:maven-enforcer-plugin:3.3.0:enforce (enforce-rules) on project mega-melt: Execution enforce-rules of goal org.apache.maven.plugins:maven-enforcer-plugin:3.3.0:enforce failed. NullPointerException --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c88260bd..0ed3b238 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.scijava pom-scijava-base - 18.2.0 + 19.0.0 From 6896aaba7225b0ce902f994ab3a48c9c7e7303b1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 15:58:25 -0600 Subject: [PATCH 661/996] Stop managing version of therapi-runtime-javadoc The only project I know of in the SciJava ecosystem that was using it is scijava-ops. And that project ended up implementing its own more targeted javadoc annotation processor. --- pom.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pom.xml b/pom.xml index 0ed3b238..2f6bf577 100644 --- a/pom.xml +++ b/pom.xml @@ -2309,10 +2309,6 @@ ${libtensorflow_jni_gpu.version} ${proto.version} - - - ${therapi.version} - 1.6.8 ${threetenbp.version} @@ -6543,13 +6539,6 @@ ${org.tensorflow.proto.version} - - - com.github.therapi - therapi-runtime-javadoc - ${com.github.therapi.therapi-runtime-javadoc.version} - - org.threeten From bb95e4afae7d1efdc6dbfdb86231672ae30b7b9b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 15:59:51 -0600 Subject: [PATCH 662/996] Update component versions * native-lib-loader: 2.4.0 -> 2.5.0 * scijava-common: 2.97.1 -> 2.98.0 * scijava-io-http: 0.2.1 -> 0.3.0 * imagej1: 1.54f -> 1.54h * imglib2: 6.2.0 -> 6.3.0 * scifio: 0.45.0 -> 0.46.0 * IO: 4.2.1 -> 4.2.2 * LocalThickness: 4.0.3 -> 5.0.0 * jitk-tps: 3.0.3 -> 3.0.4 * TrackMate-Ilastik: 1.3.1 -> 1.4.0 * imglib2-label-multisets: 0.11.5 -> 0.12.0 * n5: 3.1.2 -> 3.1.3 * n5-aws-s3: 4.0.1 -> 4.0.2 * n5-zarr: 1.2.0 -> 1.2.1 * MorphoLibJ: 1.6.0.1 -> 1.6.2 * BigStitcher: 1.2.6 -> 1.2.10 * multiview-reconstruction: 3.2.3 -> 3.2.6 * bonej: 7.0.17 -> 7.0.18 * SNT: 4.1.16 -> 4.2.1 * omero-blitz: 5.7.0 -> 5.7.2 * omero-common: 5.6.2 -> 5.6.4 * omero-gateway: 5.8.1 -> 5.9.0 * omero-model: 5.6.11 -> 5.6.13 * omero-renderer: 5.5.13 -> 5.5.15 * omero-romio: 5.7.3 -> 5.7.5 * omero-server: 5.6.8 -> 5.6.10 * aws: 1.12.465 -> 1.12.663 * ant: 1.10.13 -> 1.10.14 * ivy: 2.5.1 -> 2.5.2 * maven-plugin-tools-api: 3.8.2 -> 3.11.0 * plexus-component-annotations: 2.1.1 -> 2.2.0 * poi: 5.2.3 -> 5.2.5 * xmlgraphics-commons: 2.8 -> 2.9 * checker-qual: 3.34.0 -> 3.42.0 * commons-cli: 1.5.0 -> 1.6.0 * commons-codec: 1.15 -> 1.16.1 * commons-compress: 1.23.0 -> 1.26.0 * commons-io: 2.11.0 -> 2.15.1 * commons-logging: 1.2 -> 1.3.0 * commons-pool2: 2.11.1 -> 2.12.0 * error_prone: 2.19.0 -> 2.25.0 * flatlaf: 3.3 -> 3.4 * google-api-client: 2.2.0 -> 2.3.0 * api-common: 2.9.0 -> 2.26.0 * gax: 2.26.0 -> 2.43.0 * proto-google-common-protos: 2.17.0 -> 2.34.0 * proto-google-iam-v1: 1.12.0 -> 1.29.0 * google-auth-library: 1.16.1 -> 1.23.0 * auto-value: 1.10.1 -> 1.10.4 * google-cloud-core: 2.16.0 -> 2.33.0 * google-cloud-nio: 0.126.14 -> 0.127.13 * google-cloud-resourcemanager: 1.18.0 -> 1.38.0 * google-cloud-storage: 2.22.1 -> 2.34.0 * google-http-client: 1.43.1 -> 1.44.1 * grpc: 1.55.1 -> 1.61.1 * guava: 31.1-jre -> 33.0.0-jre * jackrabbit-webdav: 2.21.16 -> 2.21.23 * javassist: 3.29.2-GA -> 3.30.2-GA * jetty: 9.4.51.v20230217 -> 9.4.54.v20240208 * jline3: 3.23.0 -> 3.25.1 * jmh: 1.36 -> 1.37 * jna: 5.13.0 -> 5.14.0 * jffi: 1.3.11 -> 1.3.13 * jnr-ffi: 2.2.13 -> 2.2.16 * jnr-posix: 3.1.16 -> 3.1.19 * joda-time: 2.12.5 -> 2.12.7 * jogamp: 2.4.0 -> 2.5.0 * joni: 2.1.48 -> 2.2.1 * json: 20230227 -> 20240205 * junit-jupiter: 5.9.3 -> 5.10.2 * jython: 2.7.2 -> 2.7.3 * kotlinx-coroutines: 1.6.4 -> 1.8.0 * kryo: 5.5.0 -> 5.6.0 * mapdb: 3.0.9 -> 3.1.0 * okio: 3.7.0 -> 3.8.0 * opencsv: 5.7.1 -> 5.9 * picocli: 4.7.3 -> 4.7.5 * postgresql: 42.6.0 -> 42.7.2 * rsyntaxtextarea: 3.3.4 -> 3.4.0 * snakeyaml: 2.0 -> 2.2 * snakeyaml-engine: 2.6 -> 2.7 * zstd-jni: 1.5.5-10 -> 1.5.5-11 --- pom.xml | 165 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 82 insertions(+), 83 deletions(-) diff --git a/pom.xml b/pom.xml index 2f6bf577..2e90a20d 100644 --- a/pom.xml +++ b/pom.xml @@ -317,7 +317,7 @@ ${minimaven.version} - 2.4.0 + 2.5.0 ${native-lib-loader.version} @@ -329,7 +329,7 @@ ${scijava-cache.version} - 2.97.1 + 2.98.0 ${scijava-common.version} @@ -341,7 +341,7 @@ ${scijava-grab.version} - 0.2.1 + 0.3.0 ${scijava-io-http.version} @@ -472,7 +472,7 @@ ${imagej.version} - 1.54f + 1.54h ${imagej1.version} ${ij.version} @@ -579,7 +579,7 @@ - 6.2.0 + 6.3.0 ${imglib2.version} @@ -621,7 +621,7 @@ - 0.45.0 + 0.46.0 ${scifio.version} @@ -780,7 +780,7 @@ 2.0.1 ${IJ_Robot.version} - 4.2.1 + 4.2.2 ${IO.version} ${IO_.version} @@ -817,7 +817,7 @@ 2.0.1 ${Linear_Kuwahara.version} - 4.0.3 + 5.0.0 ${LocalThickness.version} ${LocalThickness.version} @@ -981,7 +981,7 @@ - 3.0.3 + 3.0.4 ${jitk-tps.version} @@ -1050,7 +1050,7 @@ ${TrackMate-ExTrack.version} - 1.3.1 + 1.4.0 ${TrackMate-Ilastik.version} @@ -1099,15 +1099,15 @@ - 0.11.5 + 0.12.0 ${imglib2-label-multisets.version} - 3.1.2 + 3.1.3 ${n5.version} - 4.0.1 + 4.0.2 ${n5-aws-s3.version} @@ -1139,7 +1139,7 @@ ${n5-viewer_fiji.version} - 1.2.0 + 1.2.1 ${n5-zarr.version} @@ -1149,7 +1149,7 @@ - 1.6.0.1 + 1.6.2 ${MorphoLibJ.version} ${MorphoLibJ_.version} @@ -1172,15 +1172,15 @@ ${clijx-weka_.version} - 1.2.6 - 3.2.3 + 1.2.10 + 3.2.6 0.2.0 ${BigStitcher.version} ${multiview-reconstruction.version} ${multiview-simulation.version} - 7.0.17 + 7.0.18 ${bonej.version} ${bonej.version} ${bonej.version} @@ -1193,7 +1193,7 @@ ${bonej-utilities.version} - 4.1.16 + 4.2.1 ${SNT.version} @@ -1253,11 +1253,11 @@ ${formats-gpl.version} - 5.7.0 + 5.7.2 ${omero-blitz.version} - 5.6.2 + 5.6.4 ${omero-common.version} @@ -1265,23 +1265,23 @@ ${omero-dsl-plugin.version} - 5.8.1 + 5.9.0 ${omero-gateway.version} - 5.6.11 + 5.6.13 ${omero-model.version} - 5.5.13 + 5.5.15 ${omero-renderer.version} - 5.7.3 + 5.7.5 ${omero-romio.version} - 5.6.8 + 5.6.10 ${omero-server.version} @@ -1297,7 +1297,7 @@ - 1.12.465 + 1.12.663 ${aws.version} ${aws.version} ${aws-java-sdk-core.version} @@ -1319,7 +1319,7 @@ ${antlr4-runtime.version} - 1.10.13 + 1.10.14 ${ant.version} ${ant.version} ${ant-launcher.version} @@ -1387,7 +1387,7 @@ ${groovy-yaml.version} - 2.5.1 + 2.5.2 ${ivy.version} @@ -1401,8 +1401,8 @@ 0.13.1 3.3.2 3.9.6 - 3.8.2 - 2.1.1 + 3.11.0 + 2.2.0 3.5.1 2.6.0 2.6.0 @@ -1416,7 +1416,7 @@ ${sisu-inject-plexus.version} - 5.2.3 + 5.2.5 ${poi.version} ${poi.version} ${poi.version} @@ -1487,7 +1487,7 @@ ${batik.version} ${batik.version} ${batik.version} - 2.8 + 2.9 ${batik-anim.version} ${batik-awt-util.version} ${batik-bridge.version} @@ -1530,7 +1530,7 @@ ${cdi-api.version} - 3.34.0 + 3.42.0 ${checker-qual.version} @@ -1538,11 +1538,11 @@ ${commons-beanutils.version} - 1.5.0 + 1.6.0 ${commons-cli.version} - 1.15 + 1.16.1 ${commons-codec.version} @@ -1552,7 +1552,7 @@ ${commons-collections4.version} - 1.23.0 + 1.26.0 ${commons-compress.version} @@ -1560,7 +1560,7 @@ ${commons-csv.version} - 2.11.0 + 2.15.1 ${commons-io.version} @@ -1570,7 +1570,7 @@ ${commons-lang3.version} - 1.2 + 1.3.0 ${commons-logging.version} @@ -1578,7 +1578,7 @@ ${commons-math3.version} - 2.11.1 + 2.12.0 ${commons-pool2.version} @@ -1641,7 +1641,7 @@ ${ejml.version} - 2.19.0 + 2.25.0 - 3.3 + 3.4 ${flatlaf.version} 2.304 ${flatlaf-fonts-jetbrains-mono.version} - 2.2.0 + 2.3.0 ${google-api-client.version} ${google-api-client.version} ${google-api-client.version} @@ -1674,12 +1674,12 @@ ${google-api-client-xml.version} - 2.9.0 - 2.26.0 + 2.26.0 + 2.43.0 ${gax.version} 0.111.0 - 2.17.0 - 1.12.0 + 2.34.0 + 1.29.0 ${api-common.version} ${gax.version} ${gax-grpc.version} @@ -1690,7 +1690,7 @@ ${proto-google-iam-v1.version} - 1.16.1 + 1.23.0 ${google-auth-library.version} ${google-auth-library.version} ${google-auth-library.version} @@ -1699,17 +1699,17 @@ ${google-auth-library-oauth2-http.version} - 1.10.1 + 1.10.4 ${auto-value.version} ${auto-value.version} ${auto-value-annotations.version} - 2.16.0 + 2.33.0 ${google-cloud-core.version} - 0.126.14 - 1.18.0 - 2.22.1 + 0.127.13 + 1.38.0 + 2.34.0 ${google-cloud-core.version} ${google-cloud-core-http.version} ${google-cloud-nio.version} @@ -1717,7 +1717,7 @@ ${google-cloud-storage.version} - 1.43.1 + 1.44.1 ${google-http-client.version} ${google-http-client.version} ${google-http-client.version} @@ -1731,7 +1731,7 @@ ${google-http-client-xml.version} - 1.55.1 + 1.61.1 ${grpc.version} ${grpc-context.version} @@ -1740,7 +1740,7 @@ ${gson.version} - 31.1-jre + 33.0.0-jre ${guava.version} @@ -1761,7 +1761,7 @@ ${j2objc-annotations.version} - 2.21.16 + 2.21.23 ${jackrabbit-webdav.version} @@ -1843,7 +1843,7 @@ ${scijava.natives.classifier.javacpp} - 3.29.2-GA + 3.30.2-GA ${javassist.version} @@ -1859,7 +1859,7 @@ ${jep.version} - 9.4.51.v20230217 + 9.4.54.v20240208 ${jetty.version} @@ -1994,7 +1994,7 @@ ${jline-terminal-jna.version} - 1.36 + 1.37 ${jmh.version} ${jmh.version} ${jmh-core.version} @@ -2005,23 +2005,23 @@ ${jmockit.version} - 5.13.0 + 5.14.0 ${jna.version} ${jna.version} ${jna-platform.version} - 1.3.11 + 1.3.13 0.10.4 - 2.2.13 - 3.1.16 + 2.2.16 + 3.1.19 ${jffi.version} ${jnr-constants.version} ${jnr-ffi.version} ${jnr-posix.version} - 2.12.5 + 2.12.7 ${joda-time.version} @@ -2030,7 +2030,7 @@ - 2.4.0 + 2.5.0 ${jogamp.version} ${jogamp.version} @@ -2056,7 +2056,7 @@ ${joml.version} - 2.1.48 + 2.2.1 ${joni.version} @@ -2073,7 +2073,7 @@ ${jsch.version} - 20230227 + 20240205 ${json.version} @@ -2081,7 +2081,7 @@ ${junit.version} - 5.9.3 + 5.10.2 ${junit-jupiter.version} ${junit-jupiter.version} ${junit-jupiter.version} @@ -2095,8 +2095,7 @@ ${junit-vintage-engine.version} - - 2.7.2 + 2.7.3 ${jython.version} ${jython-slim.version} @@ -2139,7 +2138,7 @@ ${kotlin.version} ${kotlin.version} ${kotlin.version} - 1.6.4 + 1.8.0 ${kotlinx-coroutines.version} ${kotlinx-coroutines.version} ${kotlin-compiler-embeddable.version} @@ -2158,7 +2157,7 @@ ${kotlinx-coroutines-core-jvm.version} - 5.5.0 + 5.6.0 1.3.1 1.11.9 ${kryo.version} @@ -2181,7 +2180,7 @@ ${lz4-java.version} - 3.0.9 + 3.1.0 ${mapdb.version} @@ -2208,7 +2207,7 @@ 4.12.0 - 3.7.0 + 3.8.0 ${okhttp.version} ${okio.version} @@ -2217,15 +2216,15 @@ ${ojalgo.version} - 5.7.1 + 5.9 ${opencsv.version} - 4.7.3 + 4.7.5 ${picocli.version} - 42.6.0 + 42.7.2 ${postgresql.version} @@ -2250,7 +2249,7 @@ ${reload4j.version} - 3.3.4 + 3.4.0 3.3.1 3.3.0 ${rsyntaxtextarea.version} @@ -2275,11 +2274,11 @@ ${jcl-over-slf4j.version} - 2.0 + 2.2 ${snakeyaml.version} - 2.6 + 2.7 ${snakeyaml-engine.version} @@ -2327,7 +2326,7 @@ ${xz.version} - 1.5.5-10 + 1.5.5-11 ${zstd-jni.version} From 25d7d81cf34178329a11f060e6d735241798f7e7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 16:16:21 -0600 Subject: [PATCH 663/996] Update more component versions * multiview-reconstruction: 3.2.6 -> 3.2.7 * aws: 1.12.663 -> 1.12.667 * gax-httpjson: 0.111.0 -> 2.43.0 * grpc: 1.61.1 -> 1.62.2 * jackrabbit-webdav: 2.21.23 -> 2.21.25 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 2e90a20d..273e9e9a 100644 --- a/pom.xml +++ b/pom.xml @@ -1173,7 +1173,7 @@ 1.2.10 - 3.2.6 + 3.2.7 0.2.0 ${BigStitcher.version} ${multiview-reconstruction.version} @@ -1297,7 +1297,7 @@ - 1.12.663 + 1.12.667 ${aws.version} ${aws.version} ${aws-java-sdk-core.version} @@ -1677,7 +1677,7 @@ 2.26.0 2.43.0 ${gax.version} - 0.111.0 + ${gax.version} 2.34.0 1.29.0 ${api-common.version} @@ -1731,7 +1731,7 @@ ${google-http-client-xml.version} - 1.61.1 + 1.62.2 ${grpc.version} ${grpc-context.version} @@ -1761,7 +1761,7 @@ ${j2objc-annotations.version} - 2.21.23 + 2.21.25 ${jackrabbit-webdav.version} From 959e94615390c0504d90edd564c318763965442f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 16:20:26 -0600 Subject: [PATCH 664/996] Update javacpp: 1.5.8 -> 1.5.10 And remove most presets without macOS arm64 natives. I left hdf5 because it *has* updated to 1.5.10, unlike the others. But it would be nice if the hdf5 preset had a macOS arm64 build. --- pom.xml | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 273e9e9a..0c1aa1cc 100644 --- a/pom.xml +++ b/pom.xml @@ -1799,32 +1799,20 @@ - 1.5.8 + 1.5.10 ${org.bytedeco.javacpp.version} ${javacpp.version} ${javacv.version} - 2.3.1-${org.bytedeco.javacpp.version} - 5.1.2-${org.bytedeco.javacpp.version} - 1.07-${org.bytedeco.javacpp.version} - 1.12.2-${org.bytedeco.javacpp.version} - 1.82.0-${org.bytedeco.javacpp.version} - 2.2.6-${org.bytedeco.javacpp.version} - 0.5.7-${org.bytedeco.javacpp.version} - 0.2.0-${org.bytedeco.javacpp.version} - 1.12.4-${org.bytedeco.javacpp.version} - 0.3.21-${org.bytedeco.javacpp.version} - 4.6.0-${org.bytedeco.javacpp.version} - 5.2.0-${org.bytedeco.javacpp.version} - ${artoolkitplus.version} + 6.1.1-${org.bytedeco.javacpp.version} + 1.14.3-${org.bytedeco.javacpp.version} + 1.84.1-${org.bytedeco.javacpp.version} + 0.3.26-${org.bytedeco.javacpp.version} + 4.9.0-${org.bytedeco.javacpp.version} + 5.3.4-${org.bytedeco.javacpp.version} ${ffmpeg.version} - ${flandmark.version} ${hdf5.version} ${leptonica.version} - ${libdc1394.version} - ${libfreenect.version} - ${libfreenect2.version} - ${librealsense.version} ${openblas.version} ${opencv.version} ${tesseract.version} From 50f80640fa768f60a1cc728cc003fc5463ce5767 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 16:22:32 -0600 Subject: [PATCH 665/996] Update n5-universe: 1.3.1 -> 1.3.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0c1aa1cc..5fd56289 100644 --- a/pom.xml +++ b/pom.xml @@ -1131,7 +1131,7 @@ ${n5-imglib2.version} - 1.3.1 + 1.3.2 ${n5-universe.version} From 8c183be542a7bef962a5213fd93b38ec4f61d137 Mon Sep 17 00:00:00 2001 From: Nicolas Chiaruttini Date: Thu, 19 Oct 2023 13:32:11 +0200 Subject: [PATCH 666/996] ejml 0.25 -> 0.41 see https://forum.image.sc/t/updating-ejml-0-25-to-ejml-0-41/87468/12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5fd56289..851936ae 100644 --- a/pom.xml +++ b/pom.xml @@ -1637,7 +1637,7 @@ ${org.eclipse.swt.win32.win32.x86_64.version} - 0.25 + 0.41 ${ejml.version} From 60bdfd4eae311d346f74cc78a920259c5ad87cd1 Mon Sep 17 00:00:00 2001 From: Jan Eglinger Date: Thu, 2 Nov 2023 14:30:07 +0100 Subject: [PATCH 667/996] Try fixing conflicting group IDs for ejml update --- pom.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 851936ae..01e6e8e5 100644 --- a/pom.xml +++ b/pom.xml @@ -1638,7 +1638,9 @@ 0.41 - ${ejml.version} + ${ejml.version} + + 0.25 2.25.0 @@ -4919,9 +4921,9 @@ - com.googlecode.efficient-java-matrix-library - ejml - ${com.googlecode.efficient-java-matrix-library.ejml.version} + org.ejml + ejml-all + ${org.ejml.ejml-all.version} From 5bfd63638576c5904d149a04cb436b505e816bf4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 16:28:04 -0600 Subject: [PATCH 668/996] Remove obsolete ejml version property --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 01e6e8e5..8e1eb8c9 100644 --- a/pom.xml +++ b/pom.xml @@ -1639,8 +1639,6 @@ 0.41 ${ejml.version} - - 0.25 2.25.0 From bcb37c5de76a9e8976e701797990b585f711e02e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 16:36:39 -0600 Subject: [PATCH 669/996] Remove remaining cruft from old javacpp presets --- pom.xml | 72 --------------------------------------------------------- 1 file changed, 72 deletions(-) diff --git a/pom.xml b/pom.xml index 8e1eb8c9..5dc497fe 100644 --- a/pom.xml +++ b/pom.xml @@ -1817,15 +1817,9 @@ ${opencv.version} ${tesseract.version} - ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} - ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} - ${scijava.natives.classifier.javacpp} - ${scijava.natives.classifier.javacpp} - ${scijava.natives.classifier.javacpp} - ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} ${scijava.natives.classifier.javacpp} @@ -5259,21 +5253,11 @@ ${org.bytedeco.javacv.version} - - org.bytedeco - artoolkitplus - ${org.bytedeco.artoolkitplus.version} - org.bytedeco ffmpeg ${org.bytedeco.ffmpeg.version} - - org.bytedeco - flandmark - ${org.bytedeco.flandmark.version} - org.bytedeco hdf5 @@ -5284,26 +5268,6 @@ leptonica ${org.bytedeco.leptonica.version} - - org.bytedeco - libdc1394 - ${org.bytedeco.libdc1394.version} - - - org.bytedeco - libfreenect - ${org.bytedeco.libfreenect.version} - - - org.bytedeco - libfreenect2 - ${org.bytedeco.libfreenect2.version} - - - org.bytedeco - librealsense - ${org.bytedeco.librealsense.version} - org.bytedeco openblas @@ -5320,24 +5284,12 @@ ${org.bytedeco.tesseract.version} - - org.bytedeco - artoolkitplus - ${org.bytedeco.artoolkitplus.version} - ${scijava.natives.classifier.artoolkitplus} - org.bytedeco ffmpeg ${org.bytedeco.ffmpeg.version} ${scijava.natives.classifier.ffmpeg} - - org.bytedeco - flandmark - ${org.bytedeco.flandmark.version} - ${scijava.natives.classifier.flandmark} - org.bytedeco hdf5 @@ -5350,30 +5302,6 @@ ${org.bytedeco.leptonica.version} ${scijava.natives.classifier.leptonica} - - org.bytedeco - libdc1394 - ${org.bytedeco.libdc1394.version} - ${scijava.natives.classifier.libdc1394} - - - org.bytedeco - libfreenect - ${org.bytedeco.libfreenect.version} - ${scijava.natives.classifier.libfreenect} - - - org.bytedeco - libfreenect2 - ${org.bytedeco.libfreenect2.version} - ${scijava.natives.classifier.libfreenect2} - - - org.bytedeco - librealsense - ${org.bytedeco.librealsense.version} - ${scijava.natives.classifier.librealsense} - org.bytedeco openblas From 274bd8142d000078ebb4a2da3f4f3ecf20cf97bf Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 17:31:38 -0600 Subject: [PATCH 670/996] Stop old EJML artifact from entering the dep tree We'll need a new release of BigWarp at some point. --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 5dc497fe..caa55bb4 100644 --- a/pom.xml +++ b/pom.xml @@ -3422,6 +3422,12 @@ sc.fiji bigwarp_fiji ${sc.fiji.bigwarp_fiji.version} + + + com.googlecode.efficient-java-matrix-library + ejml + + From deeeb10e98256bb7358e3c8020d0c1562e224964 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 27 Feb 2024 17:38:05 -0600 Subject: [PATCH 671/996] Downgrade jackrabbit-webdav: 2.21.25 -> 2.21.22 It's the last Java-8-compatible version. --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index caa55bb4..317a5929 100644 --- a/pom.xml +++ b/pom.xml @@ -1761,7 +1761,8 @@ ${j2objc-annotations.version} - 2.21.25 + + 2.21.22 ${jackrabbit-webdav.version} From 302c612d7a1e68a8233d470704a23ea49854bb33 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 28 Feb 2024 08:42:03 -0600 Subject: [PATCH 672/996] Update plexus-utils: 3.5.1 -> 4.0.0 The 3.5.1 version has overlapping classes with plexus-xml. Checking the last release dates, plexus-utils 4.0.0 was released 282 days ago, whereas the first release of plexus-xml, 3.0.0, was released 170 days ago. So I infer that the classes actually moved from plexus-utils into a new, more targeted artifact. Updating *any* Maven components to 4.x might be a slippery slope toward migration pain, but AFAIK nothing in the SciJava component collection actually depends on plexus-utils, so we'll see what happens. If it creates build issues, we can solve the duplicate classes issue here a different way. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 317a5929..26b3becf 100644 --- a/pom.xml +++ b/pom.xml @@ -1403,7 +1403,7 @@ 3.9.6 3.11.0 2.2.0 - 3.5.1 + 4.0.0 2.6.0 2.6.0 ${maven-artifact-transfer.version} From 28661fabd771aaf624fad63261fcfb0e47e9b5da Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 28 Feb 2024 10:37:51 -0600 Subject: [PATCH 673/996] Manage versions of JogAmp Java 3D artifacts And deprecate the no-longer-needed SciJava fork of Java 3D. --- pom.xml | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 26b3becf..2f55fecf 100644 --- a/pom.xml +++ b/pom.xml @@ -1789,7 +1789,7 @@ 1.0.3 ${jama.version} - + 1.6.0-scijava-2 ${java3d.version} ${java3d.version} @@ -2034,6 +2034,16 @@ ${scijava.natives.classifier.jogamp} ${scijava.natives.classifier.jogamp} + + 1.7.2 + ${jogamp-java3d.version} + ${jogamp-java3d.version} + + + ${java3d-core.version} + ${java3d-utils.version} + ${jogamp-java3d.version} + 1.10.5 ${joml.version} @@ -5230,7 +5240,7 @@ ${gov.nist.math.jama.version} - + org.scijava j3dcore @@ -5881,6 +5891,23 @@ natives-windows-amd64 + + + org.jogamp.java3d + java3d-core + ${org.jogamp.java3d.java3d-core.version} + + + org.jogamp.java3d + java3d-utils + ${org.jogamp.java3d.java3d-utils.version} + + + org.jogamp.java3d + vecmath + ${org.jogamp.java3d.vecmath.version} + + org.joml From ef29431dec452d0d157f4f8a5399c4b991fe5c2e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 28 Feb 2024 10:46:22 -0600 Subject: [PATCH 674/996] Exclude org.bytedeco:hdf5 from mega-melt for now It has overlapping classes with cisd:jhdf5, and we use cisd:jhdf5 (for now) in several places in SciJava-land. --- tests/generate-mega-melt.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index a075e0de..55a60228 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -21,9 +21,8 @@ def child(node, tag): # Artifacts to exclude from the mega melt. ignoredArtifacts = [ - # TEMP: The SNT project needs a new release with cleaned - # up dependencies before it can be reenabled in the melt. - 'SNT', + # TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone. + 'hdf5', # TEMP: The original ImageJ requires Java 9+ to compile, # because it has a module-info.java, so skip it until the # component collection is updated from Java 8 to Java 11. From 770e083a086efbc26b9f45c3f3998fe23d88efb3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 28 Feb 2024 11:52:50 -0600 Subject: [PATCH 675/996] Manage net.algart:algart-tiff at version 1.2.7 Thanks to Daniel Alievsky for making this improved TIFF support into a standalone library. --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 2f55fecf..fb07fdf2 100644 --- a/pom.xml +++ b/pom.xml @@ -1296,6 +1296,10 @@ + + 1.2.7 + ${algart-tiff.version} + 1.12.667 ${aws.version} @@ -4134,6 +4138,13 @@ + + + net.algart + algart-tiff + ${net.algart.algart-tiff.version} + + com.amazonaws From a2e4bc4da3015075f46ef475da3266a5d934f29e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 28 Feb 2024 13:27:20 -0600 Subject: [PATCH 676/996] Downgrade ij: 1.54h -> 1.54g We cannot update to 1.54h due to a potentially critical bug in the handling of virtual stacks when combined with ImgLib2; see: https://github.com/imglib/imglib2-ij/issues/39 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fb07fdf2..e10c209c 100644 --- a/pom.xml +++ b/pom.xml @@ -472,7 +472,7 @@ ${imagej.version} - 1.54h + 1.54g ${imagej1.version} ${ij.version} From 41185adc7b4a09bfc89d4ab7904892e25a7b7474 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 28 Feb 2024 13:57:12 -0600 Subject: [PATCH 677/996] Revert n5 component upgrades * n5: 3.1.3 -> 3.1.2 * n5-aws-s3: 4.0.2 -> 4.0.1 * n5-universe: 1.3.2 -> 1.3.1 * n5-zarr: 1.2.1 -> 1.2.0 See https://github.com/saalfeldlab/n5-hdf5/issues/34 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e10c209c..8d50ff0a 100644 --- a/pom.xml +++ b/pom.xml @@ -1103,11 +1103,11 @@ ${imglib2-label-multisets.version} - 3.1.3 + 3.1.2 ${n5.version} - 4.0.2 + 4.0.1 ${n5-aws-s3.version} @@ -1131,7 +1131,7 @@ ${n5-imglib2.version} - 1.3.2 + 1.3.1 ${n5-universe.version} @@ -1139,7 +1139,7 @@ ${n5-viewer_fiji.version} - 1.2.1 + 1.2.0 ${n5-zarr.version} From 9e183c3efb9f036ac29eee989008eb10f195556e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 28 Feb 2024 15:00:02 -0600 Subject: [PATCH 678/996] mega-melt: exclude artifacts with too-new Java min --- tests/generate-mega-melt.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index 55a60228..84ccb897 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -27,6 +27,8 @@ def child(node, tag): # because it has a module-info.java, so skip it until the # component collection is updated from Java 8 to Java 11. 'ij', + # NB: Skip artifacts requiring minimum Java version >8. + 'algart-tiff', # NB: The following artifacts have messy dependency trees. # Too many problems to test as part of the mega-melt. # See WARNING block in pom-scijava's pom.xml for details. From a88a6b3b6cec0119cc97844de27f4cf3c27bf1d5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 28 Feb 2024 16:06:51 -0600 Subject: [PATCH 679/996] mega-melt: force matching version of the enforcer Otherwise, some n5 component builds fail because they pin to a too-old version. --- tests/run.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index a4c756ac..3fc2421f 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -152,8 +152,26 @@ kotlinVersion=$( mvn -B -U -q -Denforcer.skip=true -Dexec.executable=echo \ -Dexec.args='${kotlin.version}' --non-recursive validate exec:exec 2>&1 | head -n1 | sed 's;\(.\[[0-9]m\)*;;') && +# TEMP: Also fix the version of maven-enforcer-plugin, to prevent n5 from +# overriding it with a too-old version. Even though we pass enforcer.skip, +# so that the enforcer plugin does not actually do any checking, this version +# mismatch still triggers a problem: +# +# [ERROR] Failed to execute goal +# org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M3:enforce +# (enforce-rules) on project n5-blosc: Unable to parse configuration of +# mojo org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M3:enforce +# for parameter banDuplicateClasses: Cannot create instance of interface +# org.apache.maven.enforcer.rule.api.EnforcerRule: +# org.apache.maven.enforcer.rule.api.EnforcerRule.() -> [Help 1] +# +# Once n5 components stop doing that version pin, we can remove this here. +enforcerVersion=$( + mvn -B -U -q -Denforcer.skip=true -Dexec.executable=echo \ + -Dexec.args='${maven-enforcer-plugin.version}' --non-recursive validate exec:exec 2>&1 | + head -n1 | sed 's;\(.\[[0-9]m\)*;;') && mv -f "$buildScript" "$buildScriptTemp" && -sed -E "s;mvn -Denforcer.skip;& -Dkotlin.version=$kotlinVersion;" "$buildScriptTemp" > "$buildScript" && +sed -E "s;mvn -Denforcer.skip;& -Dmaven-enforcer-plugin.version=$enforcerVersion -Dkotlin.version=$kotlinVersion;" "$buildScriptTemp" > "$buildScript" && chmod +x "$buildScript" && rm "$buildScriptTemp" || From 6388e544626b42f975c77e92c81494be24587146 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Mon, 4 Mar 2024 03:23:54 +0100 Subject: [PATCH 680/996] gradle platform --- gradle/.gitattributes | 6 + gradle/.gitignore | 5 + gradle/build.gradle.kts | 6 + gradle/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + gradle/gradlew | 234 + gradle/gradlew.bat | 89 + gradle/platform/build.gradle.kts | 28 + gradle/platform/eff.xml | 6379 +++++++++++++++++ gradle/settings.gradle.kts | 12 + 10 files changed, 6764 insertions(+) create mode 100644 gradle/.gitattributes create mode 100644 gradle/.gitignore create mode 100644 gradle/build.gradle.kts create mode 100644 gradle/gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/gradle/wrapper/gradle-wrapper.properties create mode 100755 gradle/gradlew create mode 100644 gradle/gradlew.bat create mode 100644 gradle/platform/build.gradle.kts create mode 100644 gradle/platform/eff.xml create mode 100644 gradle/settings.gradle.kts diff --git a/gradle/.gitattributes b/gradle/.gitattributes new file mode 100644 index 00000000..00a51aff --- /dev/null +++ b/gradle/.gitattributes @@ -0,0 +1,6 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# These are explicitly windows files and should use crlf +*.bat text eol=crlf + diff --git a/gradle/.gitignore b/gradle/.gitignore new file mode 100644 index 00000000..1b6985c0 --- /dev/null +++ b/gradle/.gitignore @@ -0,0 +1,5 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/gradle/build.gradle.kts b/gradle/build.gradle.kts new file mode 100644 index 00000000..da92a1d8 --- /dev/null +++ b/gradle/build.gradle.kts @@ -0,0 +1,6 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This is a general purpose Gradle build. + * Learn more about Gradle by exploring our samples at https://docs.gradle.org/7.2/samples + */ diff --git a/gradle/gradle/wrapper/gradle-wrapper.jar b/gradle/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa GIT binary patch literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..17655d0e --- /dev/null +++ b/gradle/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradle/gradlew b/gradle/gradlew new file mode 100755 index 00000000..1b6c7873 --- /dev/null +++ b/gradle/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradle/gradlew.bat b/gradle/gradlew.bat new file mode 100644 index 00000000..107acd32 --- /dev/null +++ b/gradle/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/gradle/platform/build.gradle.kts b/gradle/platform/build.gradle.kts new file mode 100644 index 00000000..c5f9e95f --- /dev/null +++ b/gradle/platform/build.gradle.kts @@ -0,0 +1,28 @@ +import groovy.xml.XmlSlurper +import groovy.xml.slurpersupport.GPathResult +import groovy.xml.slurpersupport.NodeChild + +plugins { + `java-platform` +} + +tasks { + register("eff.xml") { + commandLine("bash", "-c", "mvn -B -f \"../../pom.xml\" help:effective-pom | grep -A9999999 '^' > eff.xml") + } +} + +dependencies { + operator fun GPathResult.div(child: String) = children().find { (it!! as NodeChild).name() == child } as GPathResult + val deps = XmlSlurper().parse("platform/eff.xml") / "dependencyManagement" / "dependencies" + constraints { + deps.children().forEach { + val node = it!! as NodeChild + val g = node / "groupId" + val a = node / "artifactId" + val v = node / "version" + api("$g:$a:$v") +// println("$g:$a:$v") + } + } +} \ No newline at end of file diff --git a/gradle/platform/eff.xml b/gradle/platform/eff.xml new file mode 100644 index 00000000..1bb3642d --- /dev/null +++ b/gradle/platform/eff.xml @@ -0,0 +1,6379 @@ + + + + + + + + + + + + + + + 4.0.0 + + org.scijava + pom-scijava-base + 19.0.0 + + + org.scijava + pom-scijava + 38.0.0-SNAPSHOT + pom + SciJava Parent POM + This POM provides a parent from which participating projects can declare their build configurations. It ensures that projects all use a compatible build environment, including Java version, as well as versions of dependencies and plugins. + https://scijava.org/ + 2011 + + SciJava + https://scijava.org/ + + + + Unlicense + https://unlicense.org/ + repo + + + + + ctrueden + Curtis Rueden + https://imagej.net/people/ctrueden + + founder + lead + developer + debugger + reviewer + support + maintainer + + + + + + Mark Hiner + https://imagej.net/people/hinerm + + hinerm + + + + Johannes Schindelin + https://imagej.net/people/dscho + + dscho + + + + Sébastien Besson + https://imagej.net/people/sbesson + + sbesson + + + + John Bogovic + https://imagej.net/people/bogovicj + + bogovicj + + + + Nicolas Chiaruttini + https://imagej.net/people/NicoKiaru + + NicoKiaru + + + + Barry DeZonia + https://imagej.net/people/bdezonia + + bdezonia + + + + Richard Domander + https://imagej.net/people/rimadoma + + rimadoma + + + + Karl Duderstadt + https://imagej.net/people/karlduderstadt + + karlduderstadt + + + + Jan Eglinger + https://imagej.net/people/imagejan + + imagejan + + + + Gabriel Einsdorf + https://imagej.net/people/gab1one + + gab1one + + + + Tiago Ferreira + https://imagej.net/people/tferr + + tferr + + + + David Gault + + dgault + + + + Ulrik Günther + https://imagej.net/people/skalarproduktraum + + skalarproduktraum + + + + Philipp Hanslovsky + https://imagej.net/people/hanslovsky + + hanslovsky + + + + Stefan Helfrich + https://imagej.net/people/stelfrich + + stelfrich + + + + Cameron Lloyd + https://imagej.net/people/camlloyd + + camlloyd + + + + Hadrien Mary + https://imagej.net/people/hadim + + hadim + + + + Tobias Pietzsch + https://imagej.net/people/tpietzsch + + tpietzsch + + + + Stephan Preibisch + https://imagej.net/people/StephanPreibisch + + StephanPreibisch + + + + Stephan Saalfeld + https://imagej.net/people/axtimwalde + + axtimwalde + + + + Deborah Schmidt + https://imagej.net/people/frauzufall + + frauzufall + + + + Lorenzo Scianatico + https://imagej.net/people/LoreScianatico + + LoreScianatico + + + + Jean-Yves Tinevez + https://imagej.net/people/tinevez + + tinevez + + + + Christian Tischer + https://imagej.net/people/tischi + + tischi + + + + Gabriella Turek + https://imagej.net/people/turekg + + turekg + + + + + + SciJava + https://groups.google.com/group/scijava + https://groups.google.com/group/scijava + scijava@googlegroups.com + https://groups.google.com/group/scijava + + + + scm:git:https://github.com/scijava/pom-scijava + scm:git:git@github.com:scijava/pom-scijava + https://github.com/scijava/pom-scijava + + + GitHub Issues + https://github.com/scijava/pom-scijava/issues + + + GitHub Actions + https://github.com/scijava/pom-scijava/actions + + + 3.4.2 + 3.4.2 + 2.0.1 + 0.5.4 + 2.0.2 + 2.0.2 + 1.11.0 + 1.18.0 + 3.0.1 + 3.0.1 + 1.2.10 + 2.1.1 + 2.0.2 + 2.0.1 + 3.0.0 + 3.0.6 + 2.0.7 + 2.5.0 + 3.0.3 + 2.1.0 + 2.1.0 + 1.0.6 + 2.1.8 + 2.1.2 + 2.1.2 + 2.3.0 + 2.3.0 + 2.0.4 + 2.0.3 + 2.0.1 + 2.0.8 + 2.1.1 + 3.1.3 + 2.0.1 + 2.0.1 + 2.0.1 + 1.0.2 + 2.3.5 + 1.1.5 + 1.1.1 + 2.0.2 + 2.0.1 + 4.2.2 + 4.2.2 + 2.0.2 + 3.0.1 + 3.0.1 + 2.0.1 + 2.0.0 + 2.0.1 + 3.0.0 + 4.1.2 + 4.1.2 + 2.0.2 + 2.0.1 + 5.0.0 + 5.0.0 + 2.0.1 + 2.0.1 + 2.0.1 + 7.1.1 + 2.1.1 + 1.6.2 + 1.6.2 + 3.0.1 + 2.0.0 + 2.0.0 + 1.1.2 + 1.1.2 + 2.0.2 + 2.0.2 + 2.0.5 + 4.2.1 + 2.0.2 + 5.0.25 + 4.3.4 + 2.0.3 + 2.0.3 + 2.0.1 + 3.1.10 + 1.0.5 + 2.1.1 + 2.1.1 + 2.0.2 + 2.0.2 + 2.1.2 + 2.0.1 + 3.1.9 + 3.1.9 + 1.7-fiji4 + 1.1.4 + 1.1.4 + 2.0.1 + 2.1.1 + 2.1.0 + 25.0.2 + 25.0.2 + 2.0.1 + 2.0.1 + 3.1.4 + 0.1.2 + 1.2.5 + 1.4.0 + 1.2.1 + 3.2.0 + 2.0.1 + 1.2.1 + 1.3.1 + 7.11.1 + 3.3.4 + 1.3.10 + 1.3.10 + 2.0.4 + 2.2.0 + 3.0.4 + 3.0.4 + 2.0.3 + 1.0.3 + 2.0.3 + 2.0.1 + 2.5.0 + 2.5.0 + 2.0.3 + 2.01.4 + <_3D_Blob_Segmentation.version>3.0.2 + <_3D_Objects_Counter.version>2.0.1 + <_3D_Viewer.version>4.0.5 + 1.2.7 + com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* + 1.10.14 + 1.10.14 + 3.5.3 + 2.7.7 + 3.5.3 + 2.7.7 + 3.5.3 + 4.11.1 + 4.11.1 + 2.26.0 + 2.33 + 2.33 + 9.6 + 9.6 + 9.6 + 9.6 + 9.6 + 1.10.4 + 1.10.4 + 3.3.1 + ${package-guess} + 1.12.667 + 1.12.667 + 1.12.667 + 2.6.13 + 2.6.13 + 0.4.2 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 10.4.13 + 3.1.2 + 1.0.0-beta-34 + 6.2.4 + 9.1.0 + 9.1.0 + 1.0.0 + 7.2.0 + 7.2.0 + 7.2.0 + 2.1.4 + 2.1.4 + 7.0.18 + 7.0.18 + 7.0.18 + 7.0.18 + 7.0.18 + 7.0.18 + 0.7.0 + 3.5.0 + 3.2.0 + 2.0.SP1 + 3.3.0 + 3.3.0 + 1.2.12 + 1.2.12 + 1.2.25 + 3.42.0 + 19.04.1 + 2.2.10 + 2.5.0.1 + 1.8.1.1 + 2.3.0.4 + 2.5.1.4 + 2.5.3.1 + 1.9.0.1 + 0.32.1.1 + 0.32.2.0 + 2.7 + 1.12.667 + 1.12.667 + 5.6.0 + 1.3.1 + 1.11.9 + 2.16.1 + 2.16.1 + 2.16.1 + 2.16.1 + 2.16.1 + 3.3.1 + 3.3.0 + 3.4.0 + 2.304 + 3.4 + 1.3.13 + 0.10.4 + 2.2.16 + 3.1.19 + 1.5.5-11 + 0.12.0 + 4.2.2 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.26.0 + 2.43.0 + 2.43.0 + 2.43.0 + 2.34.0 + 1.29.0 + 1.23.0 + 1.23.0 + 1.23.0 + 1.10.4 + 1.10.4 + 2.33.0 + 2.33.0 + 0.127.13 + 1.38.0 + 2.34.0 + 2.10.1 + 2.25.0 + 33.0.0-jre + 1.44.1 + 1.44.1 + 1.44.1 + 1.44.1 + 1.44.1 + 1.44.1 + 2.8 + 3.23.0 + 3.23.0 + 3.23.0 + 1.7 + 5.5.13.3 + 0.1.55 + 1.1.3 + 5.3 + 5.3 + 5.3 + 0.7.0 + 5.9 + 4.12.0 + 3.8.0 + 1.1.3 + 3.6.5 + 3.6.5 + 1.9.4 + 1.9.4 + 1.6.0 + 1.6.0 + 1.16.1 + 1.16.1 + 3.2.2 + 3.2.2 + 4.4 + 1.26.0 + 1.10.0 + 2.15.1 + 2.15.1 + 2.6 + 2.6 + 3.14.0 + 1.3.0 + 1.3.0 + 3.6.1 + 2.12.0 + 1.11.0 + 0.4.8 + 26 + 26 + 1.9.10 + 11.1.0 + 11.1.0 + 11.1.0 + 11.1.0 + 4.3 + 20151125 + 0.41 + 2.25.0 + 2.25.0 + 3.2.0 + + 0.12.0 + 1.7.0 + 6.1.1-1.5.10 + 2.1.3 + 2.15.0 + 2.304 + 3.4 + 7.2.0 + 7.2.0 + 7.2.0 + 2.23.0 + 1.6.2 + 2.43.0 + 2.43.0 + 2.43.0 + 3.6.5 + 2.5.0 + 2.5.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 1.23.0 + 1.23.0 + 1.23.0 + 1.23.0 + 2.33.0 + 2.33.0 + 0.127.13 + 1.38.0 + 2.34.0 + 1.44.1 + 1.44.1 + 1.44.1 + 1.44.1 + 1.44.1 + 1.44.1 + 1.0.3 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 1.5 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 1.62.2 + 1.62.2 + 2.10.1 + 33.0.0-jre + 1.14.3-1.5.10 + 1.8.0.10 + 1.8.0.10 + 4.5.14 + 4.4.16 + 4.5.14 + 0.3.0 + 0.3.0 + 3.6.5 + 1.54h + 1.2.6 + 2.0.4 + 0.2.0 + 6.0.2 + 1.2.1 + 0.7.5 + 0.1.2 + 0.8.1 + 0.7.1 + 1.0.0-5.6 + 1.0.0-5.6 + 0.1.3 + 2.0.0 + 0.1.1 + 0.8.1 + 0.3.1 + 0.3.2 + 0.3.3 + 0.8.4 + 0.2.0 + 1.1.7 + 0.3.1 + 1.0.1 + 1.0.1 + 2.15.0 + 1.54h + 2.15.0 + 0.2.1 + 0.3.1 + 0.14.0 + 1.0.0-beta-17 + 2.0.1 + 2.0.0 + 0.12.0 + 4.0.1 + 0.14.1 + 1.0.0 + 6.3.0 + 1.9.0 + 4.7.5 + 1.62.2 + 0.3.0 + 4.1.1 + 0.6.1 + 0.2.2 + 1.1.1 + 0.3.1 + 0.9.0 + 0.17.1 + 0.46.0 + 5.5.13.3 + 2.5.2 + 2.8 + 1.6.0-scijava-2 + 1.6.0-scijava-2 + 2.21.22 + 2.16.1 + 2.16.1 + 2.16.1 + 2.16.1 + 2.16.1 + 2.16.1 + 0.8.11 + 1.1.3 + 1.1.3 + 1.1.3 + 1.0.3 + 1.7.2 + 1.7.2 + 1.6.0-scijava-2 + 1.5.10 + 1.5.10 + - + 8.8.3 + 3.30.2-GA + 2.0.SP1 + 1.1.3 + 1.0.1 + 1.7.36 + 1.0.58 + 2.0.6.1 + 2.4.2 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 1.3.13 + 1.5.4 + 3.4.3 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 4.2.2 + 19.04.1 + 0.14 + 3.0.4 + 3.0.4 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 2.14.6 + 2.14.6 + 2.14.6 + 3.25.1 + 1.37 + 1.37 + 1.37 + 1.49 + 5.14.0 + 5.14.0 + 0.10.4 + 2.2.16 + 3.1.19 + 2.5.0 + 2.0.5 + 2.12.7 + 2.12.7 + 1.7.2 + 2.5.0 + 2.5.0 + 2.5.0 + 1.10.5 + 2.2.1 + 2.80b11 + 2.80b11 + 0.2.1 + 0.1.55 + 1.4 + 20240205 + 0.7.4-scijava + 5.10.2 + 5.10.2 + 5.10.2 + 5.10.2 + 5.10.2 + 5.10.2 + 4.13.2 + 4.13.2 + 0.2.4 + 0.2.4 + 2.7.3 + 2.7.3 + 1.1.3 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.8.0 + 1.8.0 + 1.8.0 + 5.6.0 + 0.1.17 + 0.3.11 + 3.3.0 + 1.1.10 + 1.84.1-1.5.10 + 1.0.2 + 1.12.0 + 1.12.0 + 1.12.0 + 2.4.0 + N/A + **/script_templates/** + N/A + This POM provides a parent from which participating projects can declare their build configurations. It ensures that projects all use a compatible build environment, including Java version, as well as versions of dependencies and plugins. + 2.20.0 + 2.20.0 + 2.20.0 + 1.2.12 + 1.2.12 + 1.2.12 + 1.8.0 + + 3.1.0 + 3.1.0 + 0.13.1 + 3.6.0 + 3.3.2 + 3.3.2 + 3.8.1 + 3.9.6 + 3.6.1 + 3.1.1 + 3.4.1 + 3.2.5 + 3.1.0 + 1.45 + 3.4.0 + 3.1.1 + 3.6.0 + 3.3.0 + 3.6.3 + 3.11.0 + 3.11.0 + 3.5.0 + 3.0.1 + 3.3.1 + 3.5.2 + 3.12.1 + 3.3.0 + 3.2.5 + yyyy-MM-dd'T'HH:mm:ssZ + 8 + 8 + 8 + 8 + 8 + false + 5.3.6 + 5.3 + 5.3 + 5.3 + 5.3 + 20151125 + 2.2.2 + 1.3.1 + 2.19.0 + 2.19.0 + 1.5.0 + 1.5.0 + 1.5.0 + 1.5.0 + 3.2.7 + 0.2.0 + 4.0.2 + 1.1.1 + 4.0.0 + 2.1.0 + 4.0.2 + 7.0.0 + 1.3.2 + 6.0.1 + 1.2.1 + 1.0.2 + 3.1.3 + 2.5.0 + 1.2.7 + 0.4.8 + 2.2.10 + 2.5.0.1 + 1.8.1.1 + 2.3.0.4 + 2.5.1.4 + 2.5.3.1 + 1.9.0.1 + 0.32.1.1 + 0.32.2.0 + 1.54h + 1.2.6 + 2.0.4 + 0.2.0 + 6.0.2 + 1.2.1 + 0.7.5 + 0.1.2 + 0.8.1 + 0.7.1 + 1.0.0-5.6 + 1.0.0-5.6 + 0.1.3 + 2.0.0 + 0.1.1 + 0.8.1 + 0.3.1 + 0.3.2 + 0.3.3 + 0.8.4 + 0.2.0 + 1.1.7 + 0.3.1 + 1.0.1 + 1.0.1 + 2.15.0 + 0.1.4 + 0.2.1 + 0.3.1 + 0.14.0 + 1.0.0-beta-17 + 2.0.1 + 2.0.0 + 0.12.0 + 4.0.1 + 0.14.1 + 1.0.0 + 6.3.0 + 5.14.0 + 5.14.0 + 1.2.10 + 3.2.7 + 0.2.0 + 3.0.3 + 1.6.13 + 3.9.6 + 3.3 + 45.1.1 + 4.12.0 + 3.8.0 + 1.0.1 + 6.0.21 + 5.3.8 + 6.3.4 + 7.2.0 + 7.2.0 + 7.2.0 + 7.2.0 + 7.2.0 + 0.2.4 + 5.7.2 + 5.6.4 + 5.5.2 + 5.9.0 + 5.6.13 + 5.5.15 + 5.7.5 + 5.6.10 + 0.1.4 + 0.3.26-1.5.10 + 5.9 + 4.9.0-1.5.10 + 4.3.4 + 3.5.3 + 3.5.3 + 4.11.1 + 4.11.1 + 1.10.14 + 1.10.14 + 4.4 + 1.26.0 + 1.10.0 + 3.14.0 + 3.6.1 + 2.12.0 + 1.11.0 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.5.14 + 4.4.16 + 4.5.14 + 2.5.2 + 2.21.22 + 2.20.0 + 2.20.0 + 3.9.6 + 3.11.0 + 0.13.1 + 3.3.2 + 5.2.5 + 5.2.5 + 5.2.5 + 5.2.5 + 5.2.5 + 5.2.5 + 2.4.8 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 2.9 + 7.0.18 + 7.0.18 + 7.0.18 + 7.0.18 + 7.0.18 + 6.1.1-1.5.10 + 1.14.3-1.5.10 + 1.5.10 + 1.5.10 + 1.84.1-1.5.10 + 0.3.26-1.5.10 + 4.9.0-1.5.10 + 5.3.4-1.5.10 + 3.42.0 + 2.2.0 + 4.0.0 + 11.1.0 + 11.1.0 + 11.1.0 + 11.1.0 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 0.41 + 1.1.5 + 1.0.2 + 4.0.2 + 1.1.1 + 4.0.0 + 2.1.0 + 4.0.2 + 7.0.0 + 1.3.2 + 6.0.1 + 1.2.1 + 3.1.3 + 3.30.2-GA + 2.0.6.1 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.8.0 + 1.8.0 + 1.5.4 + 3.4.3 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 0.14 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 1.49 + 2.0.5 + 2.5.0 + 2.5.0 + 1.7.2 + 1.7.2 + 1.7.2 + 2.5.0 + 2.5.0 + 2.5.0 + 2.5.0 + 1.10.5 + 2.80b11 + 1.0.58 + 2.2.1 + 20240205 + 5.10.2 + 5.10.2 + 5.10.2 + 5.10.2 + 5.10.2 + 5.10.2 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 1.0.1 + 1.8.0 + 3.1.0 + 2.19.0 + 4.2.1 + 3.3 + 45.1.1 + 1.37 + 1.37 + 5.3.6 + 1.0.1 + 6.0.21 + 5.3.8 + 6.3.4 + 5.7.2 + 5.6.4 + 5.5.2 + 5.9.0 + 5.6.13 + 5.5.15 + 5.7.5 + 5.6.10 + 9.6 + 9.6 + 9.6 + 9.6 + 9.6 + 42.7.2 + 2.7.3 + 0.4.2 + 1.6.0-scijava-2 + 1.6.0-scijava-2 + 2.4.2 + 0.7.4-scijava + 2.2.2 + 2.5.0 + 3.1.0 + 0.1.2 + 2.98.0 + 2.0.3 + 0.1.2 + 0.3.0 + 0.1.0 + 1.0.0-beta-3 + 1.0.6 + 1.0.1 + 0.2.0 + 0.2.4 + 0.3.1 + 0.1.3 + 0.1.4 + 2.0.4 + 1.0.2 + 0.1.7 + 1.0.1 + 1.1.0 + 0.2.1 + 1.0.0 + 0.4.1 + 0.1.6 + 1.0.0 + 0.4.1 + 1.0.0 + 0.3.1 + 1.0.1 + 0.2.1 + 0.5.3 + 0.3.0 + 0.2.3 + 0.3.2 + 1.0.2 + 2.0.8 + 1.6.0-scijava-2 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 0.2.1 + 2.7 + 2.6.0 + 2.6.0 + 3.2.9.RELEASE + 3.2.9.RELEASE + 3.2.9.RELEASE + 1.12.0 + 1.12.0 + 1.12.0 + 1.12.0 + 1.12.0 + 1.6.8 + 1.9 + 2.2 + ${package-guess} + 2.0.1 + 3.0.2 + 3.0.2 + 3.1.0 + 4.7.5 + 2.2.0 + 4.0.0 + 5.2.5 + 5.2.5 + 5.2.5 + 5.2.5 + 5.2.5 + 5.2.5 + 42.7.2 + + UTF-8 + UTF-8 + 2.34.0 + 1.29.0 + 1.12.0 + 3.23.0 + 3.23.0 + 3.23.0 + 3.23.0 + 1.7 + 1.11.9 + 3.0.8 + 2.0.1 + sonatype-oss-release + 1.2.25 + 0.28.1 + 0.15.0 + 3.4.0 + 3.0.2 + 2.0.1 + 4.0.5 + 3.4.2 + 2.0.1 + 0.5.4 + 2.0.2 + 1.11.0 + 1.18.0 + 3.0.1 + 3.0.1 + 2.1.1 + 2.0.2 + 2.0.1 + 3.0.0 + 3.0.6 + 2.0.7 + 2.5.0 + 3.0.3 + 2.1.0 + 1.0.6 + 2.1.8 + 2.1.2 + 2.3.0 + 2.0.4 + 2.0.3 + 2.0.1 + 2.0.8 + 2.1.1 + 3.1.3 + 2.0.1 + 2.0.1 + 1.0.2 + 2.3.5 + 1.1.1 + 2.0.2 + 2.0.1 + 4.2.2 + 2.0.2 + 3.0.1 + 3.0.1 + 2.0.1 + 2.0.0 + 2.0.1 + 3.0.0 + 4.1.2 + 4.1.2 + 2.0.2 + 2.0.1 + 5.0.0 + 5.0.0 + 2.0.1 + 2.0.1 + 7.1.1 + 2.1.1 + 3.0.1 + 2.0.0 + 2.0.0 + 1.1.2 + 2.0.2 + 2.0.5 + 2.0.2 + 5.0.25 + 2.0.3 + 2.0.1 + 3.1.10 + 1.0.5 + 2.1.1 + 2.0.2 + 2.1.2 + 2.0.1 + 3.1.9 + 1.7-fiji4 + 1.1.4 + 1.1.4 + 2.0.1 + 2.1.1 + 2.1.0 + 25.0.2 + 2.0.1 + 3.1.4 + 0.1.2 + 1.2.5 + 1.4.0 + 1.2.1 + 3.2.0 + 2.0.1 + 1.2.1 + 1.3.1 + 7.11.1 + 3.3.4 + 1.3.10 + 2.0.4 + 2.2.0 + 3.0.4 + 2.0.3 + 1.0.3 + 2.0.3 + 2.0.1 + 2.5.0 + 2.0.3 + 2.01.4 + 2.6.13 + 10.4.13 + 3.1.2 + 1.0.0-beta-34 + 6.2.4 + 9.1.0 + 1.0.0 + 2.1.4 + 2.1.3 + 2.15.0 + 0.1.17 + 0.3.11 + 1.1.10 + 1.0.2 + 2.0.1 + 3.0.2 + 3.0.8 + 2.0.1 + 2.2.7 + 1.0.1 + 2.0.0 + 2.1.1 + 1.1.2 + 4.1.1 + 0.6.1 + 0.2.2 + 1.1.1 + 0.3.1 + 0.9.0 + 0.17.1 + 0.46.0 + 0.1.2 + 2.1.1 + 2.98.0 + 2.0.3 + 0.1.2 + 0.3.0 + 0.1.0 + 1.0.0-beta-3 + 1.0.6 + 3.0.0 + 1.0.1 + 0.2.0 + 0.2.4 + 0.3.1 + 0.1.3 + 0.1.4 + 2.0.4 + 1.0.2 + 0.1.7 + 1.0.1 + com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* + scijava + **/script_templates/** + java + org.scijava,net.imagej,net.imglib2,io.scif,sc.fiji + https://javadoc.scijava.org/Java8/ + https://javadoc.scijava.org/JavaFX8/ + [1.8.0-101,) + 8 + 8 + 3.6.3 + natives-linux_64 + linux-x86_64 + natives-linux-amd64 + linux-x86_64 + linux-x86_64 + natives-linux-amd64 + natives-linux-amd64 + natives-linux-amd64 + natives-linux-amd64 + linux-x86_64 + linux-x86_64 + linux-x86_64 + linux-x86_64 + 64 + x86_64 + amd64 + linux + linux + linux + linux + + founder,lead,developer,debugger,reviewer,support,maintainer + 1.1.0 + 0.2.1 + 1.0.0 + 0.4.1 + 0.1.6 + 1.0.0 + 0.4.1 + 1.0.0 + 0.3.1 + 1.0.1 + 0.2.1 + 0.5.3 + 0.3.0 + 0.2.3 + 0.3.2 + 2.6.0 + 2.6.0 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 2.7 + 2.2 + 3.10.0.2594 + https://s01.oss.sonatype.org + 2.4.8 + 2.4.8 + 2.2.7 + 3.2.9.RELEASE + 3.2.9.RELEASE + 3.2.9.RELEASE + 3.2.9.RELEASE + 1.0.2 + 1.12.0 + 5.3.4-1.5.10 + 0.12.0 + 1.6.8 + 1.2.0 + 1.0.1 + 2.0.0 + 3.0.3 + all + 2.0.8 + 1.6.0-scijava-2 + 1.7 + 2.16.2 + 1.0 + 2.1.1 + 3.9.6 + 3.9.6 + 2.9 + 1.9 + 1.1.2 + 1.5.5-11 + + + + + org.scijava + batch-processor + 0.4.2 + + + org.scijava + minimaven + 2.2.2 + + + org.scijava + native-lib-loader + 2.5.0 + + + org.scijava + parsington + 3.1.0 + + + org.scijava + scijava-cache + 0.1.2 + + + org.scijava + scijava-common + 2.98.0 + + + org.scijava + scijava-config + 2.0.3 + + + org.scijava + scijava-grab + 0.1.2 + + + org.scijava + scijava-io-http + 0.3.0 + + + org.scijava + scijava-java3d + 0.1.0 + + + org.scijava + scijava-listeners + 1.0.0-beta-3 + + + org.scijava + scijava-log-slf4j + 1.0.6 + + + org.scijava + scijava-optional + 1.0.1 + + + org.scijava + scijava-plot + 0.2.0 + + + org.scijava + scijava-plugins-commands + 0.2.4 + + + org.scijava + scijava-plugins-platforms + 0.3.1 + + + org.scijava + scijava-plugins-text-markdown + 0.1.3 + + + org.scijava + scijava-plugins-text-plain + 0.1.4 + + + org.scijava + scijava-search + 2.0.4 + + + org.scijava + scijava-table + 1.0.2 + + + org.scijava + scijava-ui-awt + 0.1.7 + + + org.scijava + scijava-ui-swing + 1.0.1 + + + org.scijava + script-editor + 1.0.0 + + + org.scijava + script-editor-jython + 1.1.0 + + + org.scijava + script-editor-scala + 0.2.1 + + + org.scijava + scripting-beanshell + 0.4.1 + + + org.scijava + scripting-clojure + 0.1.6 + + + org.scijava + scripting-groovy + 1.0.0 + + + org.scijava + scripting-java + 0.4.1 + + + org.scijava + scripting-javascript + 1.0.0 + + + org.scijava + scripting-jruby + 0.3.1 + + + org.scijava + scripting-jython + 1.0.1 + + + org.scijava + scripting-kotlin + 0.2.1 + + + org.scijava + scripting-matlab + 0.5.3 + + + org.scijava + scripting-python + 0.3.0 + + + org.scijava + scripting-renjin + 0.2.3 + + + org.scijava + scripting-scala + 0.3.2 + + + org.scijava + swing-checkbox-tree + 1.0.2 + + + org.scijava + ui-behaviour + 2.0.8 + + + net.imagej + imagej + 2.15.0 + + + net.imagej + ij + 1.54h + + + com.sun + tools + + + + + net.imagej + ij1-patcher + 1.2.6 + + + net.imagej + imagej-common + 2.0.4 + + + net.imagej + imagej-deprecated + 0.2.0 + + + net.imagej + imagej-launcher + 6.0.2 + + + net.imagej + imagej-legacy + 1.2.1 + + + net.imagej + imagej-matlab + 0.7.5 + + + net.imagej + imagej-mesh + 0.8.1 + + + net.imagej + imagej-mesh-io + 0.1.2 + + + net.imagej + imagej-notebook + 0.7.1 + + + net.imagej + imagej-omero + 1.0.0-5.6 + + + net.imagej + imagej-omero-legacy + 1.0.0-5.6 + + + net.imagej + imagej-opencv + 0.1.3 + + + net.imagej + imagej-ops + 2.0.0 + + + net.imagej + imagej-plugins-batch + 0.1.1 + + + net.imagej + imagej-plugins-commands + 0.8.1 + + + net.imagej + imagej-plugins-tools + 0.3.1 + + + net.imagej + imagej-plugins-uploader-ssh + 0.3.2 + + + net.imagej + imagej-plugins-uploader-webdav + 0.3.3 + + + net.imagej + imagej-scripting + 0.8.4 + + + net.imagej + imagej-server + 0.2.0 + + + net.imagej + imagej-tensorflow + 1.1.7 + + + net.imagej + imagej-ui-awt + 0.3.1 + + + net.imagej + imagej-ui-swing + 1.0.1 + + + net.imagej + imagej-updater + 1.0.1 + + + net.imagej + op-finder + 0.1.4 + + + net.imglib2 + imglib2 + 6.3.0 + + + net.imglib2 + imglib2-algorithm + 0.14.0 + + + net.imglib2 + imglib2-algorithm-fft + 0.2.1 + + + net.imglib2 + imglib2-algorithm-gpl + 0.3.1 + + + net.imglib2 + imglib2-cache + 1.0.0-beta-17 + + + net.imglib2 + imglib2-ij + 2.0.1 + + + net.imglib2 + imglib2-imglyb + 2.0.0 + + + net.imglib2 + imglib2-realtransform + 4.0.1 + + + net.imglib2 + imglib2-roi + 0.14.1 + + + net.imglib2 + imglib2-unsafe + 1.0.0 + + + io.scif + scifio + 0.46.0 + + + io.scif + scifio-bf-compat + 4.1.1 + + + io.scif + scifio-cli + 0.6.1 + + + io.scif + scifio-hdf5 + 0.2.2 + + + io.scif + scifio-jai-imageio + 1.1.1 + + + io.scif + scifio-labeling + 0.3.1 + + + io.scif + scifio-lifesci + 0.9.0 + + + io.scif + scifio-ome-xml + 0.17.1 + + + sc.fiji + fiji + 2.15.0 + + + sc.fiji + 3D_Blob_Segmentation + 3.0.2 + + + sc.fiji + 3D_Objects_Counter + 2.0.1 + + + sc.fiji + 3D_Viewer + 4.0.5 + + + sc.fiji + AnalyzeSkeleton_ + 3.4.2 + + + sc.fiji + Anisotropic_Diffusion_2D + 2.0.1 + + + sc.fiji + Archipelago_Plugins + 0.5.4 + + + sc.fiji + Arrow_ + 2.0.2 + + + sc.fiji + Auto_Local_Threshold + 1.11.0 + + + sc.fiji + Auto_Threshold + 1.18.0 + + + sc.fiji + BalloonSegmentation_ + 3.0.1 + + + sc.fiji + Bug_Submitter + 2.1.1 + + + sc.fiji + CPU_Meter + 2.0.2 + + + sc.fiji + Calculator_Plus + 2.0.1 + + + sc.fiji + Cell_Counter + 3.0.0 + + + sc.fiji + Colocalisation_Analysis + 3.0.6 + + + sc.fiji + Color_Histogram + 2.0.7 + + + sc.fiji + Color_Inspector_3D + 2.5.0 + + + sc.fiji + Colour_Deconvolution + 3.0.3 + + + sc.fiji + CorrectBleach_ + 2.1.0 + + + sc.fiji + Correct_3D_Drift + 1.0.6 + + + sc.fiji + Descriptor_based_registration + 2.1.8 + + + sc.fiji + Dichromacy_ + 2.1.2 + + + sc.fiji + Directionality_ + 2.3.0 + + + sc.fiji + FS_Align_TrakEM2 + 2.0.4 + + + sc.fiji + Feature_Detection + 2.0.3 + + + sc.fiji + Fiji_Archipelago + 2.0.1 + + + sc.fiji + Fiji_Developer + 2.0.8 + + + sc.fiji + Fiji_Package_Maker + 2.1.1 + + + sc.fiji + Fiji_Plugins + 3.1.3 + + + sc.fiji + FilamentDetector + 2.0.1 + + + sc.fiji + FlowJ_ + 2.0.1 + + + sc.fiji + Graph_Cut + 1.0.2 + + + sc.fiji + Gray_Morphology + 2.3.5 + + + org.janelia + H5J_Loader_Plugin + 1.1.5 + + + sc.fiji + HDF5_Vibez + 1.1.1 + + + sc.fiji + Helmholtz_Analysis + 2.0.2 + + + sc.fiji + IJ_Robot + 2.0.1 + + + sc.fiji + IO_ + 4.2.2 + + + sc.fiji + Image_5D + 2.0.2 + + + sc.fiji + Image_Expression_Parser + 3.0.1 + + + sc.fiji + Interactive_3D_Surface_Plot + 3.0.1 + + + sc.fiji + IsoData_Classifier + 2.0.1 + + + sc.fiji + Kappa + 2.0.0 + + + sc.fiji + Kuwahara_Filter + 2.0.1 + + + sc.fiji + KymographBuilder + 3.0.0 + + + sc.fiji + LSM_Reader + 4.1.2 + + + sc.fiji + LSM_Toolbox + 4.1.2 + + + sc.fiji + Lasso_and_Blow_Tool + 2.0.2 + + + sc.fiji + Linear_Kuwahara + 2.0.1 + + + sc.fiji + LocalThickness_ + 5.0.0 + + + sc.fiji + MTrack2_ + 2.0.1 + + + sc.fiji + M_I_P + 2.0.1 + + + sc.fiji + Manual_Tracking + 2.1.1 + + + sc.fiji + Multi_Kymograph + 3.0.1 + + + sc.fiji + OMEVisual + 2.0.0 + + + sc.fiji + PIV_analyser + 2.0.0 + + + sc.fiji + QuickPALM_ + 1.1.2 + + + sc.fiji + RATS_ + 2.0.2 + + + sc.fiji + Reconstruct_Reader + 2.0.5 + + + sc.fiji + SPIM_Opener + 2.0.2 + + + sc.fiji + SPIM_Registration + 5.0.25 + + + sc.fiji + Samples_ + 2.0.3 + + + sc.fiji + Series_Labeler + 2.0.1 + + + sc.fiji + Siox_Segmentation + 1.0.5 + + + sc.fiji + Skeletonize3D_ + 2.1.1 + + + sc.fiji + SplineDeformationGenerator_ + 2.0.2 + + + sc.fiji + Stack_Manipulation + 2.1.2 + + + sc.fiji + Statistical_Region_Merging + 2.0.1 + + + sc.fiji + Stitching_ + 3.1.9 + + + sc.fiji + Sync_Win + 1.7-fiji4 + + + sc.fiji + Thread_Killer + 2.0.1 + + + sc.fiji + Time_Lapse + 2.1.1 + + + sc.fiji + Time_Stamper + 2.1.0 + + + sc.fiji + ToAST_ + 25.0.2 + + + sc.fiji + TopoJ_ + 2.0.1 + + + sc.fiji + Trainable_Segmentation + 3.3.4 + + + sc.fiji + TrakEM2_Archipelago + 2.0.4 + + + sc.fiji + VIB-lib + 2.2.0 + + + sc.fiji + VIB_ + 3.0.4 + + + sc.fiji + Vaa3d_Reader + 2.0.3 + + + sc.fiji + Vaa3d_Writer + 1.0.3 + + + sc.fiji + Video_Editing + 2.0.1 + + + sc.fiji + View5D_ + 2.5.0 + + + sc.fiji + Volume_Calculator + 2.0.3 + + + sc.fiji + Volume_Viewer + 2.01.4 + + + sc.fiji + bUnwarpJ_ + 2.6.13 + + + sc.fiji + bij + 1.0.0 + + + sc.fiji + blockmatching_ + 2.1.4 + + + sc.fiji + fiji-lib + 2.1.3 + + + sc.fiji + legacy-imglib1 + 1.1.10 + + + sc.fiji + level_sets + 1.0.2 + + + sc.fiji + pal-optimization + 2.0.1 + + + sc.fiji + panorama_ + 3.0.2 + + + sc.fiji + register_virtual_stack_slices + 3.0.8 + + + sc.fiji + registration_3d + 2.0.1 + + + sc.fiji + weave_jy2java + 2.1.1 + + + jitk + jitk-tps + 3.0.4 + + + sc.fiji + bigwarp_fiji + 9.1.0 + + + com.googlecode.efficient-java-matrix-library + ejml + + + + + mpicbg + mpicbg + 1.5.0 + + + mpicbg + mpicbg_ + 1.5.0 + + + sc.fiji + trakem2_tps + 2.0.0 + + + sc.fiji + z_spacing + 1.1.2 + + + sc.fiji + bigdataviewer-core + 10.4.13 + + + sc.fiji + bigdataviewer-server + 3.1.2 + + + sc.fiji + bigdataviewer-vistools + 1.0.0-beta-34 + + + sc.fiji + bigdataviewer_fiji + 6.2.4 + + + sc.fiji + spim_data + 2.2.7 + + + sc.fiji + TrackMate + 7.11.1 + + + sc.fiji + TrackMate-Cellpose + 0.1.2 + + + sc.fiji + TrackMate-CSVImporter + 3.1.4 + + + sc.fiji + TrackMate-ExTrack + 1.2.5 + + + sc.fiji + TrackMate-Ilastik + 1.4.0 + + + sc.fiji + TrackMate-MorphoLibJ + 1.2.1 + + + sc.fiji + TrackMate-Oneat + 3.2.0 + + + sc.fiji + TrackMate-Skeleton + 2.0.1 + + + sc.fiji + TrackMate-StarDist + 1.2.1 + + + sc.fiji + TrackMate-Weka + 1.3.1 + + + sc.fiji + T2-NIT + 1.1.4 + + + sc.fiji + T2-TreelineGraph + 1.1.4 + + + sc.fiji + TrakEM2_ + 1.3.10 + + + sc.fiji + VectorString + 2.0.3 + + + sc.fiji + trakem2-transform + 1.0.1 + + + net.imglib2 + imglib2-label-multisets + 0.12.0 + + + org.janelia.saalfeldlab + n5 + 3.1.3 + + + org.janelia.saalfeldlab + n5-aws-s3 + 4.0.2 + + + org.janelia.saalfeldlab + n5-blosc + 1.1.1 + + + org.janelia.saalfeldlab + n5-google-cloud + 4.0.0 + + + org.janelia.saalfeldlab + n5-hdf5 + 2.1.0 + + + org.janelia.saalfeldlab + n5-ij + 4.0.2 + + + org.janelia.saalfeldlab + n5-imglib2 + 7.0.0 + + + org.janelia.saalfeldlab + n5-universe + 1.3.2 + + + org.janelia.saalfeldlab + n5-viewer_fiji + 6.0.1 + + + org.janelia.saalfeldlab + n5-zarr + 1.2.1 + + + fr.inra.ijpb + MorphoLibJ_ + 1.6.2 + + + net.haesleinhuepf + clij_ + 1.9.0.1 + + + net.haesleinhuepf + clij-core + 1.8.1.1 + + + net.haesleinhuepf + clij-coremem + 2.3.0.4 + + + net.haesleinhuepf + clij-clearcl + 2.5.0.1 + + + net.haesleinhuepf + clij2_ + 2.5.3.1 + + + net.haesleinhuepf + clij2-assistant_ + 2.5.1.4 + + + net.haesleinhuepf + clijx_ + 0.32.2.0 + + + net.haesleinhuepf + clijx-weka_ + 0.32.1.1 + + + net.preibisch + BigStitcher + 1.2.10 + + + net.preibisch + multiview-reconstruction + 3.2.7 + + + net.preibisch + multiview-simulation + 0.2.0 + + + org.bonej + bonej-plugins + 7.0.18 + + + org.bonej + bonej-ops + 7.0.18 + + + org.bonej + bonej-legacy-plugins_ + 7.0.18 + + + org.bonej + bonej-legacy-util_ + 7.0.18 + + + org.bonej + bonej-utilities + 7.0.18 + + + org.morphonets + SNT + 4.2.1 + + + org.jzy3d + jzy3d-emul-gl + + + org.jzy3d + jGL + + + + + sc.fiji + MaMuT + 7.1.1 + + + sc.fiji + labkit-pixel-classification + 0.1.17 + + + sc.fiji + labkit-ui + 0.3.11 + + + com.zeroc + glacier2 + 3.6.5 + + + com.zeroc + ice + 3.6.5 + + + org.openmicroscopy + metakit + 5.3.6 + + + ch.qos.logback + logback-classic + + + + + org.openmicroscopy + ome-codecs + 1.0.1 + + + org.openmicroscopy + ome-common + 6.0.21 + + + ch.qos.logback + logback-classic + + + xalan + serializer + + + xalan + xalan + + + + + org.openmicroscopy + ome-poi + 5.3.8 + + + org.openmicroscopy + ome-xml + 6.3.4 + + + ome + jxrlib-all + 0.2.4 + + + ome + bio-formats-tools + 7.2.0 + + + xalan + serializer + + + xalan + xalan + + + + + ome + bio-formats_plugins + 7.2.0 + + + ch.qos.logback + logback-classic + + + + + ome + formats-api + 7.2.0 + + + xalan + serializer + + + xalan + xalan + + + + + ome + formats-bsd + 7.2.0 + + + xalan + serializer + + + xalan + xalan + + + + + ome + formats-gpl + 7.2.0 + + + org.openmicroscopy + omero-blitz + 5.7.2 + + + com.sun.activation + javax.activation + + + org.apache.xmlgraphics + batik-all + + + + + org.openmicroscopy + omero-common + 5.6.4 + + + ch.qos.logback + logback-classic + + + + + org.openmicroscopy + omero-dsl-plugin + 5.5.2 + + + org.openmicroscopy + omero-gateway + 5.9.0 + + + org.openmicroscopy + omero-model + 5.6.13 + + + javax.transaction + jta + + + org.apache.solr + solr-commons-csv + + + + + org.openmicroscopy + omero-renderer + 5.5.15 + + + c3p0 + c3p0 + + + + + org.openmicroscopy + omero-romio + 5.7.5 + + + org.openmicroscopy + omero-server + 5.6.10 + + + c3p0 + c3p0 + + + com.sun.mail + javax.mail + + + javax.activation + activation + + + org.apache.xmlgraphics + batik-all + + + + + net.clearcontrol + coremem + 0.4.8 + + + com.google.android.tools + dx + + + + + net.clearvolume + cleargl + 2.2.10 + + + org.jogamp.gluegen + gluegen-rt-main + + + org.jogamp.jogl + jogl-all-main + + + + + net.algart + algart-tiff + 1.2.7 + + + com.amazonaws + aws-java-sdk-core + 1.12.667 + + + com.amazonaws + aws-java-sdk-s3 + 1.12.667 + + + antlr + antlr + 2.7.7 + + + org.antlr + ST4 + 4.3.4 + + + org.antlr + antlr + 3.5.3 + + + org.antlr + antlr-runtime + 3.5.3 + + + org.apache.ant + ant + 1.10.14 + + + org.apache.ant + ant-launcher + 1.10.14 + + + org.apache.groovy + groovy + 4.0.18 + + + org.apache.groovy + groovy-ant + 4.0.18 + + + org.apache.groovy + groovy-astbuilder + 4.0.18 + + + org.apache.groovy + groovy-cli-commons + 4.0.18 + + + org.apache.groovy + groovy-cli-picocli + 4.0.18 + + + org.apache.groovy + groovy-console + 4.0.18 + + + org.apache.groovy + groovy-contracts + 4.0.18 + + + org.apache.groovy + groovy-datetime + 4.0.18 + + + org.apache.groovy + groovy-dateutil + 4.0.18 + + + org.apache.groovy + groovy-docgenerator + 4.0.18 + + + org.apache.groovy + groovy-ginq + 4.0.18 + + + org.apache.groovy + groovy-groovydoc + 4.0.18 + + + org.apache.groovy + groovy-groovysh + 4.0.18 + + + org.apache.groovy + groovy-jmx + 4.0.18 + + + org.apache.groovy + groovy-json + 4.0.18 + + + org.apache.groovy + groovy-jsr223 + 4.0.18 + + + org.apache.groovy + groovy-macro + 4.0.18 + + + org.apache.groovy + groovy-macro-library + 4.0.18 + + + org.apache.groovy + groovy-nio + 4.0.18 + + + org.apache.groovy + groovy-servlet + 4.0.18 + + + org.apache.groovy + groovy-sql + 4.0.18 + + + org.apache.groovy + groovy-swing + 4.0.18 + + + org.apache.groovy + groovy-templates + 4.0.18 + + + org.apache.groovy + groovy-test + 4.0.18 + + + org.apache.groovy + groovy-test-junit5 + 4.0.18 + + + org.apache.groovy + groovy-testng + 4.0.18 + + + org.apache.groovy + groovy-toml + 4.0.18 + + + org.apache.groovy + groovy-typecheckers + 4.0.18 + + + org.apache.groovy + groovy-xml + 4.0.18 + + + org.apache.groovy + groovy-yaml + 4.0.18 + + + org.apache.ivy + ivy + 2.5.2 + + + org.apache.logging.log4j + log4j-api + 2.20.0 + + + org.apache.logging.log4j + log4j-core + 2.20.0 + + + org.apache.maven.shared + maven-artifact-transfer + 0.13.1 + + + org.apache.maven.shared + maven-common-artifact-filters + 3.3.2 + + + org.apache.maven + maven-core + 3.9.6 + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + 3.11.0 + + + org.codehaus.plexus + plexus-component-annotations + 2.2.0 + + + org.codehaus.plexus + plexus-utils + 4.0.0 + + + org.sonatype.sisu + sisu-inject-bean + 2.6.0 + + + org.sonatype.sisu + sisu-inject-plexus + 2.6.0 + + + org.apache.poi + poi + 5.2.5 + + + org.apache.poi + poi-examples + 5.2.5 + + + org.apache.poi + poi-excelant + 5.2.5 + + + org.apache.poi + poi-ooxml + 5.2.5 + + + org.apache.poi + poi-ooxml-lite + 5.2.5 + + + org.apache.poi + poi-scratchpad + 5.2.5 + + + org.apache.spark + spark-core_2.11 + 2.4.8 + + + com.sun.jersey + jersey-core + + + commons-beanutils + commons-beanutils-core + + + io.netty + netty-all + + + + + org.apache.httpcomponents + httpclient + 4.5.14 + + + org.apache.httpcomponents + httpcore + 4.4.16 + + + org.apache.httpcomponents + httpmime + 4.5.14 + + + args4j + args4j + 2.33 + + + org.ow2.asm + asm + 9.6 + + + org.ow2.asm + asm-analysis + 9.6 + + + org.ow2.asm + asm-commons + 9.6 + + + org.ow2.asm + asm-tree + 9.6 + + + org.ow2.asm + asm-util + 9.6 + + + org.apache.xmlgraphics + batik-anim + 1.17 + + + org.apache.xmlgraphics + batik-awt-util + 1.17 + + + org.apache.xmlgraphics + batik-bridge + 1.17 + + + xalan + xalan + + + + + org.apache.xmlgraphics + batik-codec + 1.17 + + + org.apache.xmlgraphics + batik-constants + 1.17 + + + org.apache.xmlgraphics + batik-css + 1.17 + + + org.apache.xmlgraphics + batik-dom + 1.17 + + + xalan + xalan + + + + + org.apache.xmlgraphics + batik-ext + 1.17 + + + org.apache.xmlgraphics + batik-extension + 1.17 + + + org.apache.xmlgraphics + batik-gui-util + 1.17 + + + org.apache.xmlgraphics + batik-gvt + 1.17 + + + org.apache.xmlgraphics + batik-i18n + 1.17 + + + org.apache.xmlgraphics + batik-parser + 1.17 + + + org.apache.xmlgraphics + batik-rasterizer + 1.17 + + + org.apache.xmlgraphics + batik-rasterizer-ext + 1.17 + + + org.apache.xmlgraphics + batik-extensions + + + + + org.apache.xmlgraphics + batik-script + 1.17 + + + org.apache.xmlgraphics + batik-slideshow + 1.17 + + + org.apache.xmlgraphics + batik-squiggle + 1.17 + + + org.apache.xmlgraphics + batik-squiggle-ext + 1.17 + + + org.apache.xmlgraphics + batik-extensions + + + + + org.apache.xmlgraphics + batik-svg-dom + 1.17 + + + org.apache.xmlgraphics + batik-svggen + 1.17 + + + org.apache.xmlgraphics + batik-svgpp + 1.17 + + + org.apache.xmlgraphics + batik-swing + 1.17 + + + org.apache.xmlgraphics + batik-transcoder + 1.17 + + + org.apache.xmlgraphics + batik-ttf2svg + 1.17 + + + org.apache.xmlgraphics + batik-util + 1.17 + + + org.apache.xmlgraphics + batik-xml + 1.17 + + + org.apache.xmlgraphics + xmlgraphics-commons + 2.9 + + + org.lasersonlab + jblosc + 1.0.1 + + + com.nativelibs4java + bridj + 0.7.0 + + + com.google.android.tools + dx + + + + + javax.enterprise + cdi-api + 2.0.SP1 + + + org.checkerframework + checker-qual + 3.42.0 + + + commons-beanutils + commons-beanutils + 1.9.4 + + + commons-cli + commons-cli + 1.6.0 + + + commons-codec + commons-codec + 1.16.1 + + + commons-collections + commons-collections + 3.2.2 + + + org.apache.commons + commons-collections4 + 4.4 + + + org.apache.commons + commons-compress + 1.26.0 + + + org.apache.commons + commons-csv + 1.10.0 + + + commons-io + commons-io + 2.15.1 + + + commons-lang + commons-lang + 2.6 + + + org.apache.commons + commons-lang3 + 3.14.0 + + + commons-logging + commons-logging + 1.3.0 + + + org.apache.commons + commons-math3 + 3.6.1 + + + org.apache.commons + commons-pool2 + 2.12.0 + + + org.apache.commons + commons-text + 1.11.0 + + + cglib + cglib + 3.3.0 + + + dev.dirs + directories + 26 + + + org.eclipse.collections + eclipse-collections + 11.1.0 + + + org.eclipse.collections + eclipse-collections-api + 11.1.0 + + + org.eclipse.collections + eclipse-collections-forkjoin + 11.1.0 + + + org.eclipse.collections + eclipse-collections-testutils + 11.1.0 + + + org.eclipse.swt + org.eclipse.swt.cocoa.macosx + 4.3 + + + org.eclipse.swt + org.eclipse.swt.cocoa.macosx.x86_64 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.aix.ppc + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.aix.ppc64 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.hpux.ia64 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.ppc + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.ppc64 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.s390 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.s390x + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86_64 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.solaris.sparc + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.solaris.x86 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.win32.win32.x86 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.win32.win32.x86_64 + 4.3 + + + org.ejml + ejml-all + 0.41 + + + com.google.errorprone + error_prone_annotations + 2.25.0 + + + com.formdev + flatlaf + 3.4 + + + com.formdev + flatlaf-fonts-jetbrains-mono + 2.304 + + + com.google.api-client + google-api-client + 2.3.0 + + + com.google.api-client + google-api-client-android + 2.3.0 + + + com.google.api-client + google-api-client-appengine + 2.3.0 + + + com.google.api-client + google-api-client-gson + 2.3.0 + + + com.google.api-client + google-api-client-jackson2 + 2.3.0 + + + com.google.api-client + google-api-client-protobuf + 2.3.0 + + + com.google.api-client + google-api-client-servlet + 2.3.0 + + + javax.servlet + servlet-api + + + + + com.google.api-client + google-api-client-xml + 2.3.0 + + + com.google.api + api-common + 2.26.0 + + + com.google.api + gax + 2.43.0 + + + com.google.api + gax-grpc + 2.43.0 + + + com.google.api + gax-httpjson + 2.43.0 + + + com.google.api.grpc + proto-google-common-protos + 2.34.0 + + + com.google.api.grpc + proto-google-iam-v1 + 1.29.0 + + + com.google.auth + google-auth-library-appengine + 1.23.0 + + + com.google.auth + google-auth-library-credentials + 1.23.0 + + + com.google.auth + google-auth-library-oauth2-http + 1.23.0 + + + com.google.auto.value + auto-value + 1.10.4 + + + com.google.auto.value + auto-value-annotations + 1.10.4 + + + com.google.cloud + google-cloud-core + 2.33.0 + + + com.google.cloud + google-cloud-core-http + 2.33.0 + + + com.google.cloud + google-cloud-nio + 0.127.13 + + + com.google.cloud + google-cloud-resourcemanager + 1.38.0 + + + com.google.cloud + google-cloud-storage + 2.34.0 + + + com.google.http-client + google-http-client + 1.44.1 + + + com.google.http-client + google-http-client-apache-v2 + 1.44.1 + + + com.google.http-client + google-http-client-appengine + 1.44.1 + + + com.google.http-client + google-http-client-gson + 1.44.1 + + + com.google.http-client + google-http-client-jackson2 + 1.44.1 + + + com.google.http-client + google-http-client-xml + 1.44.1 + + + io.grpc + grpc-context + 1.62.2 + + + com.google.code.gson + gson + 2.10.1 + + + com.google.guava + guava + 33.0.0-jre + + + io.humble + humble-video-all + 0.3.0 + + + hsqldb + hsqldb + 1.8.0.10 + + + com.itextpdf + itextpdf + 5.5.13.3 + + + com.google.j2objc + j2objc-annotations + 2.8 + + + org.apache.jackrabbit + jackrabbit-webdav + 2.21.22 + + + org.slf4j + jcl-over-slf4j + + + + + com.fasterxml.jackson.core + jackson-annotations + 2.16.1 + + + com.fasterxml.jackson.core + jackson-core + 2.16.1 + + + com.fasterxml.jackson.core + jackson-databind + 2.16.1 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + 2.16.1 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.16.1 + + + com.sun.media + jai-codec + 1.1.3 + + + javax.media + jai-core + 1.1.3 + + + gov.nist.math + jama + 1.0.3 + + + org.scijava + j3dcore + 1.6.0-scijava-2 + + + org.scijava + j3dutils + 1.6.0-scijava-2 + + + org.scijava + vecmath + 1.6.0-scijava-2 + + + org.bytedeco + javacpp + 1.5.10 + + + org.bytedeco + javacv + 1.5.10 + + + org.bytedeco + ffmpeg + 6.1.1-1.5.10 + + + org.bytedeco + hdf5 + 1.14.3-1.5.10 + + + org.bytedeco + leptonica + 1.84.1-1.5.10 + + + org.bytedeco + openblas + 0.3.26-1.5.10 + + + org.bytedeco + opencv + 4.9.0-1.5.10 + + + org.bytedeco + tesseract + 5.3.4-1.5.10 + + + org.bytedeco + ffmpeg + 6.1.1-1.5.10 + linux-x86_64 + + + org.bytedeco + hdf5 + 1.14.3-1.5.10 + linux-x86_64 + + + org.bytedeco + leptonica + 1.84.1-1.5.10 + linux-x86_64 + + + org.bytedeco + openblas + 0.3.26-1.5.10 + linux-x86_64 + + + org.bytedeco + opencv + 4.9.0-1.5.10 + linux-x86_64 + + + org.bytedeco + tesseract + 5.3.4-1.5.10 + linux-x86_64 + + + org.javassist + javassist + 3.30.2-GA + + + org.jruby.jcodings + jcodings + 1.0.58 + + + org.jdom + jdom2 + 2.0.6.1 + + + org.scijava + jep + 2.4.2 + + + org.eclipse.jetty + jetty-annotations + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-client + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-continuation + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-deploy + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-http + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-http-spi + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-io + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-jaspi + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-jmx + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-jndi + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-nosql + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-plus + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-proxy + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-rewrite + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-security + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-server + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-servlet + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-servlets + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-spring + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-start + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-util + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-util-ajax + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-webapp + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-xml + 9.4.54.v20240208 + + + org.jfree + jfreechart + 1.5.4 + + + org.jfree + jfreesvg + 3.4.3 + + + org.jgrapht + jgrapht-core + 1.4.0 + + + org.jgrapht + jgrapht-demo + 1.4.0 + + + org.jgrapht + jgrapht-ext + 1.4.0 + + + org.jgrapht + jgrapht-guava + 1.4.0 + + + org.jgrapht + jgrapht-io + 1.4.0 + + + org.jgrapht + jgrapht-opt + 1.4.0 + + + it.unimi.dsi + fastutil + + + + + com.github.vlsi.mxgraph + jgraphx + 4.2.2 + + + cisd + jhdf5 + 19.04.1 + + + org.jheaps + jheaps + 0.14 + + + jline + jline + 2.14.6 + + + org.jline + jline-builtins + 3.25.1 + + + org.jline + jline-console + 3.25.1 + + + org.jline + jline-reader + 3.25.1 + + + org.jline + jline-remote-ssh + 3.25.1 + + + org.jline + jline-remote-telnet + 3.25.1 + + + org.jline + jline-style + 3.25.1 + + + org.jline + jline-terminal + 3.25.1 + + + org.jline + jline-terminal-jna + 3.25.1 + + + net.java.dev.jna + jna + 5.14.0 + + + net.java.dev.jna + jna-platform + 5.14.0 + + + com.github.jnr + jffi + 1.3.13 + + + com.github.jnr + jffi + 1.3.13 + native + + + com.github.jnr + jnr-constants + 0.10.4 + + + com.github.jnr + jnr-ffi + 2.2.16 + + + com.github.jnr + jnr-posix + 3.1.19 + + + joda-time + joda-time + 2.12.7 + + + org.jocl + jocl + 2.0.5 + + + org.jogamp.gluegen + gluegen + 2.5.0 + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + + + org.jogamp.joal + joal + 2.5.0 + + + org.jogamp.jocl + jocl + 2.5.0 + + + org.jogamp.jogl + jogl-all + 2.5.0 + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + natives-android-aarch64 + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + natives-linux-aarch64 + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + natives-linux-amd64 + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + natives-linux-armv6hf + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + natives-windows-amd64 + + + org.jogamp.joal + joal + 2.5.0 + natives-android-aarch64 + + + org.jogamp.joal + joal + 2.5.0 + natives-linux-aarch64 + + + org.jogamp.joal + joal + 2.5.0 + natives-linux-amd64 + + + org.jogamp.joal + joal + 2.5.0 + natives-linux-armv6hf + + + org.jogamp.joal + joal + 2.5.0 + natives-macosx-universal + + + org.jogamp.joal + joal + 2.5.0 + natives-windows-amd64 + + + org.jogamp.jocl + jocl + 2.5.0 + natives-android-aarch64 + + + org.jogamp.jocl + jocl + 2.5.0 + natives-linux-aarch64 + + + org.jogamp.jocl + jocl + 2.5.0 + natives-linux-amd64 + + + org.jogamp.jocl + jocl + 2.5.0 + natives-linux-armv6hf + + + org.jogamp.jocl + jocl + 2.5.0 + natives-macosx-universal + + + org.jogamp.jocl + jocl + 2.5.0 + natives-windows-amd64 + + + org.jogamp.jogl + jogl-all + 2.5.0 + natives-android-aarch64 + + + org.jogamp.jogl + jogl-all + 2.5.0 + natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all + 2.5.0 + natives-linux-amd64 + + + org.jogamp.jogl + jogl-all + 2.5.0 + natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all + 2.5.0 + natives-macosx-universal + + + org.jogamp.jogl + jogl-all + 2.5.0 + natives-windows-amd64 + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + natives-android-aarch64 + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + natives-linux-amd64 + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + natives-macosx-universal + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + natives-windows-amd64 + + + org.jogamp.java3d + java3d-core + 1.7.2 + + + org.jogamp.java3d + java3d-utils + 1.7.2 + + + org.jogamp.java3d + vecmath + 1.7.2 + + + org.joml + joml + 1.10.5 + + + org.jruby.joni + joni + 2.2.1 + + + org.jpedal + jpedalSTD + 2.80b11 + + + org.smurn + jply + 0.2.1 + + + com.jcraft + jsch + 0.1.55 + + + org.json + json + 20240205 + + + org.python + jython-slim + 2.7.3 + + + com.jcraft + jzlib + 1.1.3 + + + org.jzy3d + jzy3d-core + 2.2.1 + + + org.jzy3d + jzy3d-core-awt + 2.2.1 + + + org.jzy3d + jzy3d-emul-gl-awt + 2.2.1 + + + org.jzy3d + jzy3d-jGL-awt + 2.2.1 + + + org.jzy3d + jzy3d-jdt-core + 2.2.1 + + + org.jzy3d + jzy3d-native-jogl-awt + 2.2.1 + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-linux-aarch64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-armv6hf + + + org.jogamp.gluegen + gluegen-rt-natives-linux-i586 + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-windows-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-windows-i586 + + + org.jogamp.jogl + jogl-all-natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all-natives-linux-amd64 + + + org.jogamp.jogl + jogl-all-natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all-natives-linux-i586 + + + org.jogamp.jogl + jogl-all-natives-macosx-universal + + + org.jogamp.jogl + jogl-all-natives-windows-amd64 + + + org.jogamp.jogl + jogl-all-natives-windows-i586 + + + + + org.jzy3d + jzy3d-native-jogl-core + 2.2.1 + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-linux-aarch64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-armv6hf + + + org.jogamp.gluegen + gluegen-rt-natives-linux-i586 + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-windows-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-windows-i586 + + + org.jogamp.jogl + jogl-all-natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all-natives-linux-amd64 + + + org.jogamp.jogl + jogl-all-natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all-natives-linux-i586 + + + org.jogamp.jogl + jogl-all-natives-macosx-universal + + + org.jogamp.jogl + jogl-all-natives-windows-amd64 + + + org.jogamp.jogl + jogl-all-natives-windows-i586 + + + + + org.jzy3d + jzy3d-native-jogl-swing + 2.2.1 + + + com.miglayout + miglayout + + + + + org.jzy3d + jzy3d-tester + 2.2.1 + + + org.jetbrains.kotlin + kotlin-compiler-embeddable + 1.9.22 + + + org.jetbrains.kotlin + kotlin-daemon-embeddable + 1.9.22 + + + org.jetbrains.kotlin + kotlin-reflect + 1.9.22 + + + org.jetbrains.kotlin + kotlin-script-runtime + 1.9.22 + + + org.jetbrains.kotlin + kotlin-scripting-common + 1.9.22 + + + org.jetbrains.kotlin + kotlin-scripting-compiler-embeddable + 1.9.22 + + + org.jetbrains.kotlin + kotlin-scripting-jsr223 + 1.9.22 + + + org.jetbrains.kotlin + kotlin-scripting-jvm + 1.9.22 + + + org.jetbrains.kotlin + kotlin-stdlib + 1.9.22 + + + org.jetbrains.kotlin + kotlin-stdlib-common + 1.9.22 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + 1.9.22 + + + org.jetbrains.kotlinx + kotlinx-coroutines-core + 1.8.0 + + + org.jetbrains.kotlinx + kotlinx-coroutines-core-jvm + 1.8.0 + + + com.esotericsoftware + kryo + 5.6.0 + + + com.esotericsoftware + minlog + 1.3.1 + + + com.esotericsoftware + reflectasm + 1.11.9 + + + ch.qos.logback + logback-classic + 1.2.12 + + + javax.activation + activation + + + + + ch.qos.logback + logback-core + 1.2.12 + + + org.lz4 + lz4-java + 1.8.0 + + + org.mapdb + mapdb + 3.1.0 + + + net.jpountz.lz4 + lz4 + + + + + com.miglayout + miglayout-core + 5.3 + + + com.miglayout + miglayout-swing + 5.3 + + + com.miglayout + miglayout-swt + 5.3 + + + edu.mines + mines-jtk + 20151125 + + + org.objenesis + objenesis + 3.3 + + + com.squareup.okhttp3 + okhttp + 4.12.0 + + + com.squareup.okio + okio + 3.8.0 + + + org.ojalgo + ojalgo + 45.1.1 + + + com.opencsv + opencsv + 5.9 + + + info.picocli + picocli + 4.7.5 + + + org.postgresql + postgresql + 42.7.2 + + + com.google.protobuf + protobuf-java + 3.23.0 + + + com.google.protobuf + protobuf-java-util + 3.23.0 + + + com.google.protobuf + protobuf-kotlin + 3.23.0 + + + com.google.re2j + re2j + 1.7 + + + ch.qos.reload4j + reload4j + 1.2.25 + + + com.fifesoft + rsyntaxtextarea + 3.4.0 + + + com.fifesoft + autocomplete + 3.3.1 + + + com.fifesoft + languagesupport + 3.3.0 + + + org.slf4j + slf4j-api + 1.7.36 + + + org.slf4j + slf4j-ext + 1.7.36 + + + org.slf4j + slf4j-jcl + 1.7.36 + + + org.slf4j + slf4j-jdk14 + 1.7.36 + + + org.slf4j + slf4j-nop + 1.7.36 + + + org.slf4j + slf4j-simple + 1.7.36 + + + org.slf4j + jcl-over-slf4j + 1.7.36 + + + org.yaml + snakeyaml + 2.2 + + + org.snakeyaml + snakeyaml-engine + 2.7 + + + org.springframework + spring-aop + 3.2.9.RELEASE + + + org.springframework + spring-beans + 3.2.9.RELEASE + + + org.springframework + spring-core + 3.2.9.RELEASE + + + org.tensorflow + tensorflow + 1.12.0 + + + org.tensorflow + libtensorflow + 1.12.0 + + + org.tensorflow + libtensorflow_jni + 1.12.0 + + + org.tensorflow + libtensorflow_jni_gpu + 1.12.0 + + + org.tensorflow + proto + 1.12.0 + + + org.threeten + threetenbp + 1.6.8 + + + net.sf.trove4j + trove4j + 3.0.3 + + + nz.ac.waikato.cms.weka + weka-dev + 3.9.6 + + + com.github.fommil.netlib + all + + + com.github.vbmacher + java-cup-runtime + + + com.googlecode.netlib-java + netlib-java + + + com.sun.activation + jakarta.activation + + + nz.ac.waikato.cms.weka.thirdparty + java-cup-11b + + + nz.ac.waikato.cms.weka.thirdparty + java-cup-11b-runtime + + + net.sourceforge.f2j + arpack_combined_all + + + + + org.tukaani + xz + 1.9 + + + com.github.luben + zstd-jni + 1.5.5-11 + + + org.scijava + scijava-common + 2.98.0 + tests + test + + + net.imagej + imagej-legacy + 1.2.1 + tests + test + + + net.imagej + imagej-ops + 2.0.0 + tests + test + + + net.imagej + imagej-updater + 1.0.1 + tests + test + + + net.imglib2 + imglib2 + 6.3.0 + tests + test + + + org.janelia.saalfeldlab + n5 + 3.1.3 + tests + test + + + junit + junit + 4.13.2 + test + + + org.junit.jupiter + junit-jupiter-api + 5.10.2 + test + + + org.junit.jupiter + junit-jupiter-engine + 5.10.2 + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + 5.10.2 + test + + + org.junit.jupiter + junit-jupiter-params + 5.10.2 + test + + + org.junit.vintage + junit-vintage-engine + 5.10.2 + test + + + org.scijava + junit-benchmarks + 0.7.4-scijava + test + + + org.jmockit + jmockit + 1.49 + test + + + org.mockito + mockito-core + 2.19.0 + test + + + org.openjdk.jmh + jmh-core + 1.37 + test + + + org.openjdk.jmh + jmh-generator-annprocess + 1.37 + test + + + + + + + false + + central + Central Repository + https://repo.maven.apache.org/maven2 + + + + + + never + + + false + + central + Central Repository + https://repo.maven.apache.org/maven2 + + + + /home/elect/IdeaProjects/pom-scijava/src/main/java + /home/elect/IdeaProjects/pom-scijava/src/main/scripts + /home/elect/IdeaProjects/pom-scijava/src/test/java + /home/elect/IdeaProjects/pom-scijava/target/classes + /home/elect/IdeaProjects/pom-scijava/target/test-classes + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 1.0 + + + install + + + /home/elect/IdeaProjects/pom-scijava/src/main/resources + + + + + /home/elect/IdeaProjects/pom-scijava/src/test/resources + + + /home/elect/IdeaProjects/pom-scijava/target + pom-scijava-38.0.0-SNAPSHOT + + + + maven-antrun-plugin + 3.1.0 + + + maven-assembly-plugin + 3.6.0 + + + maven-clean-plugin + 3.3.2 + + + maven-compiler-plugin + 3.8.1 + + + maven-dependency-plugin + 3.6.1 + + + maven-deploy-plugin + 3.1.1 + + + maven-enforcer-plugin + 3.4.1 + + + org.codehaus.mojo + extra-enforcer-rules + 1.7.0 + compile + + + org.scijava + scijava-maven-plugin + 3.0.0 + compile + + + + + maven-failsafe-plugin + 3.2.5 + + + + integration-test + verify + + + + + + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + true + + + + + true + + + + maven-help-plugin + 3.4.0 + + + maven-install-plugin + 3.1.1 + + + maven-jar-plugin + 3.3.0 + + + + test-jar + + + + + true + true + true + + ${package-guess} + + + + ${buildNumber} + 2024-03-03T16:51:20+0000 + ${package-guess} + + + true + + + + + + + true + true + true + + ${package-guess} + + + + ${buildNumber} + 2024-03-03T16:51:20+0000 + ${package-guess} + + + true + + + + maven-javadoc-plugin + 3.6.3 + + 1024m + + https://javadoc.scijava.org/Java8/ + https://javadoc.scijava.org/JavaFX8/ + https://javadoc.scijava.org/SciJava/ + https://javadoc.scijava.org/Alida/ + https://javadoc.scijava.org/Bio-Formats/ + https://javadoc.scijava.org/FLIMLib/ + https://javadoc.scijava.org/Fiji/ + https://javadoc.scijava.org/Icy/ + https://javadoc.scijava.org/ImageJ/ + https://javadoc.scijava.org/ImageJ1/ + https://javadoc.scijava.org/ImgLib2/ + https://javadoc.scijava.org/Java3D/ + https://javadoc.scijava.org/KNIME/ + https://javadoc.scijava.org/LOCI/ + https://javadoc.scijava.org/MiToBo/ + https://javadoc.scijava.org/Micro-Manager-Core/ + https://javadoc.scijava.org/Micro-Manager-Studio/ + https://javadoc.scijava.org/MorphoLibJ/ + https://javadoc.scijava.org/OMERO/ + https://javadoc.scijava.org/SCIFIO/ + https://javadoc.scijava.org/Apache-Commons-IO/ + https://javadoc.scijava.org/Apache-Commons-Lang/ + https://javadoc.scijava.org/Apache-Commons-Math/ + https://javadoc.scijava.org/Apache-Commons-Text/ + https://javadoc.scijava.org/BoneJ/ + https://javadoc.scijava.org/Eclipse/ + https://javadoc.scijava.org/Guava/ + https://javadoc.scijava.org/JAMA/ + https://javadoc.scijava.org/JFreeChart/ + https://javadoc.scijava.org/JGraphT/ + https://javadoc.scijava.org/JHotDraw/ + https://javadoc.scijava.org/JOML/ + https://javadoc.scijava.org/Javassist/ + https://javadoc.scijava.org/MigLayout/ + https://javadoc.scijava.org/NetBeans/ + https://javadoc.scijava.org/Pivot/ + https://javadoc.scijava.org/VisAD/ + https://javadoc.scijava.org/Weka/ + https://javadoc.scijava.org/ojAlgo/ + + + + + maven-plugin-plugin + 3.11.0 + + + maven-project-info-reports-plugin + 3.5.0 + + + maven-release-plugin + 3.0.1 + + + maven-resources-plugin + 3.3.1 + + + maven-shade-plugin + 3.5.2 + + + maven-site-plugin + 3.12.1 + + + maven-source-plugin + 3.3.0 + + + attach-sources + none + + + attach-sources-jar + + jar + + + + + + maven-surefire-plugin + 3.2.5 + + @{argLine} -Xms512m -Xmx512m -Dapple.awt.UIElement=true + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.5.0 + + + sanitize-version + + regex-property + + + sanitizedVersion + 38.0.0-SNAPSHOT + ^([0-9]+)\.([0-9]+)\.([0-9]+).*$ + $1.$2.$3 + false + + + + guess-package + + regex-property + + + package-guess + org.scijava.pom-scijava + [^a-z0-9_.]+ + _ + false + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 3.2.0 + + + validate + + create + + + true + UNKNOWN + + + + + + net.java.dev.jna + platform + 3.5.2 + compile + + + + true + UNKNOWN + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + html + xml + + + + + org.codehaus.mojo + exec-maven-plugin + 3.2.0 + + + org.codehaus.mojo + license-maven-plugin + 2.4.0 + + false + true + true + + java + properties + java + + + + + org.codehaus.mojo + tidy-maven-plugin + 1.2.0 + + + org.codehaus.mojo + versions-maven-plugin + 2.16.2 + + + org.scijava + scijava-maven-plugin + 3.0.0 + + + set-rootdir + validate + + set-rootdir + + + + + + com.zenjava + javafx-maven-plugin + 8.8.3 + + SciJava Parent POM + SciJava Parent POM + SciJava Parent POM.jar + + ${sanitizedVersion} + true + + + + net.revelc.code + impsort-maven-plugin + 1.9.0 + + + none + + java.,javax.,com.,net.,org. + java,* + true + + + + + java.,javax.,com.,net.,org. + java,* + true + + + + net.revelc.code.formatter + formatter-maven-plugin + 2.23.0 + + + org.scijava + scijava-coding-style + 2.1.1 + compile + + + + eclipse-formatter-settings/scijava-coding-style.xml + + + + org.fusesource.mvnplugins + maven-graph-plugin + 1.45 + + provided,runtime,system,test + true + + /home/elect/IdeaProjects/pom-scijava/target/dependency-graph.dot + + + + org.honton.chas + exists-maven-plugin + 0.12.0 + + + + remote + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + + org.revapi + revapi-maven-plugin + 0.15.0 + + + org.revapi + revapi-java + 0.28.1 + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.10.0.2594 + + + + + + maven-enforcer-plugin + 3.4.1 + + + enforce-rules + + enforce + + + + + 3.6.3 + + + Plugins need to be versioned! + + + [1.8.0-101,) + + + No Duplicate Classes Allowed! +- For duplicate transitive dependencies, add dependency exclusions. +- For duplications between direct dependencies, resolve or add + ignored classes to this rule's configuration. + true + com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* + + + founder,lead,developer,debugger,reviewer,support,maintainer + + + founder,lead,developer,debugger,reviewer,support,maintainer + + + 8 + + com.headius:invokebinder + com.sun:tools + + + module-info + + + test + + + + + name + description + url + inceptionYear + organization + licenses + developers + contributors + mailingLists + scm + issueManagement + ciManagement + properties//license.licenseName + properties//license.copyrightOwners + + + + org.scijava,net.imagej,net.imglib2,io.scif,sc.fiji + + + + + + + + org.codehaus.mojo + extra-enforcer-rules + 1.7.0 + compile + + + org.scijava + scijava-maven-plugin + 3.0.0 + compile + + + + + + 3.6.3 + + + Plugins need to be versioned! + + + [1.8.0-101,) + + + No Duplicate Classes Allowed! +- For duplicate transitive dependencies, add dependency exclusions. +- For duplications between direct dependencies, resolve or add + ignored classes to this rule's configuration. + true + com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* + + + founder,lead,developer,debugger,reviewer,support,maintainer + + + founder,lead,developer,debugger,reviewer,support,maintainer + + + 8 + + com.headius:invokebinder + com.sun:tools + + + module-info + + + test + + + + + name + description + url + inceptionYear + organization + licenses + developers + contributors + mailingLists + scm + issueManagement + ciManagement + properties//license.licenseName + properties//license.copyrightOwners + + + + org.scijava,net.imagej,net.imglib2,io.scif,sc.fiji + + + + + + maven-failsafe-plugin + 3.2.5 + + + + integration-test + verify + + + + + + maven-source-plugin + 3.3.0 + + + attach-sources + none + + + attach-sources-jar + + jar + + + + + + maven-surefire-plugin + 3.2.5 + + @{argLine} -Xms512m -Xmx512m -Dapple.awt.UIElement=true + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.5.0 + + + sanitize-version + + regex-property + + + sanitizedVersion + 38.0.0-SNAPSHOT + ^([0-9]+)\.([0-9]+)\.([0-9]+).*$ + $1.$2.$3 + false + + + + guess-package + + regex-property + + + package-guess + org.scijava.pom-scijava + [^a-z0-9_.]+ + _ + false + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 3.2.0 + + + validate + + create + + + true + UNKNOWN + + + + + + net.java.dev.jna + platform + 3.5.2 + compile + + + + true + UNKNOWN + + + + org.scijava + scijava-maven-plugin + 3.0.0 + + + set-rootdir + validate + + set-rootdir + + + older + + + + populate-app + install + + populate-app + + + older + + + + + older + + + + com.zenjava + javafx-maven-plugin + 8.8.3 + + SciJava Parent POM + SciJava Parent POM + SciJava Parent POM.jar + + ${sanitizedVersion} + true + + + + net.revelc.code + impsort-maven-plugin + 1.9.0 + + + none + + java.,javax.,com.,net.,org. + java,* + true + + + + + java.,javax.,com.,net.,org. + java,* + true + + + + net.revelc.code.formatter + formatter-maven-plugin + 2.23.0 + + + org.scijava + scijava-coding-style + 2.1.1 + compile + + + + eclipse-formatter-settings/scijava-coding-style.xml + + + + org.fusesource.mvnplugins + maven-graph-plugin + 1.45 + + provided,runtime,system,test + true + + /home/elect/IdeaProjects/pom-scijava/target/dependency-graph.dot + + + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + + maven-javadoc-plugin + 3.6.3 + + /usr/lib/jvm/jdk-19/bin/javadoc + 1024m + + https://javadoc.scijava.org/Java8/ + https://javadoc.scijava.org/JavaFX8/ + https://javadoc.scijava.org/SciJava/ + https://javadoc.scijava.org/Alida/ + https://javadoc.scijava.org/Bio-Formats/ + https://javadoc.scijava.org/FLIMLib/ + https://javadoc.scijava.org/Fiji/ + https://javadoc.scijava.org/Icy/ + https://javadoc.scijava.org/ImageJ/ + https://javadoc.scijava.org/ImageJ1/ + https://javadoc.scijava.org/ImgLib2/ + https://javadoc.scijava.org/Java3D/ + https://javadoc.scijava.org/KNIME/ + https://javadoc.scijava.org/LOCI/ + https://javadoc.scijava.org/MiToBo/ + https://javadoc.scijava.org/Micro-Manager-Core/ + https://javadoc.scijava.org/Micro-Manager-Studio/ + https://javadoc.scijava.org/MorphoLibJ/ + https://javadoc.scijava.org/OMERO/ + https://javadoc.scijava.org/SCIFIO/ + https://javadoc.scijava.org/Apache-Commons-IO/ + https://javadoc.scijava.org/Apache-Commons-Lang/ + https://javadoc.scijava.org/Apache-Commons-Math/ + https://javadoc.scijava.org/Apache-Commons-Text/ + https://javadoc.scijava.org/BoneJ/ + https://javadoc.scijava.org/Eclipse/ + https://javadoc.scijava.org/Guava/ + https://javadoc.scijava.org/JAMA/ + https://javadoc.scijava.org/JFreeChart/ + https://javadoc.scijava.org/JGraphT/ + https://javadoc.scijava.org/JHotDraw/ + https://javadoc.scijava.org/JOML/ + https://javadoc.scijava.org/Javassist/ + https://javadoc.scijava.org/MigLayout/ + https://javadoc.scijava.org/NetBeans/ + https://javadoc.scijava.org/Pivot/ + https://javadoc.scijava.org/VisAD/ + https://javadoc.scijava.org/Weka/ + https://javadoc.scijava.org/ojAlgo/ + + + + + maven-clean-plugin + 3.3.2 + + + default-clean + clean + + clean + + + + + + maven-install-plugin + 3.1.1 + + + default-install + install + + install + + + + + + maven-deploy-plugin + 3.1.1 + + + default-deploy + deploy + + deploy + + + + + + maven-site-plugin + 3.12.1 + + + default-site + site + + site + + + /home/elect/IdeaProjects/pom-scijava/target/site + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + default-deploy + site-deploy + + deploy + + + /home/elect/IdeaProjects/pom-scijava/target/site + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + + /home/elect/IdeaProjects/pom-scijava/target/site + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + + + /home/elect/IdeaProjects/pom-scijava/target/site + + + maven-javadoc-plugin + + + + diff --git a/gradle/settings.gradle.kts b/gradle/settings.gradle.kts new file mode 100644 index 00000000..d8d62852 --- /dev/null +++ b/gradle/settings.gradle.kts @@ -0,0 +1,12 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/7.2/userguide/multi_project_builds.html + */ + +rootProject.name = "gradle" + +include("platform") \ No newline at end of file From e48041ea95f9ebc00de7478ed9c3ca2c3b0b1b0e Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Tue, 5 Mar 2024 14:49:19 +0100 Subject: [PATCH 681/996] first publishing support --- gradle/platform/build.gradle.kts | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/gradle/platform/build.gradle.kts b/gradle/platform/build.gradle.kts index c5f9e95f..9605d8cd 100644 --- a/gradle/platform/build.gradle.kts +++ b/gradle/platform/build.gradle.kts @@ -4,6 +4,7 @@ import groovy.xml.slurpersupport.NodeChild plugins { `java-platform` + `maven-publish` } tasks { @@ -12,9 +13,13 @@ tasks { } } +operator fun GPathResult.div(child: String) = children().find { (it!! as NodeChild).name() == child } as GPathResult + +val effXml = XmlSlurper().parse("platform/eff.xml") + dependencies { - operator fun GPathResult.div(child: String) = children().find { (it!! as NodeChild).name() == child } as GPathResult - val deps = XmlSlurper().parse("platform/eff.xml") / "dependencyManagement" / "dependencies" + + val deps = effXml / "dependencyManagement" / "dependencies" constraints { deps.children().forEach { val node = it!! as NodeChild @@ -25,4 +30,22 @@ dependencies { // println("$g:$a:$v") } } -} \ No newline at end of file +} + + + +publishing { + publications { + repositories { + maven("to fill") + } + create("sciJavaPlatform") { + groupId = "org.scijava" + artifactId = "pom-scijava" + version = (effXml / "version").toString() + + from(components["javaPlatform"]) + } + } +} + From f883fb99b63984aac71bb66c785c7a1aa47815c7 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Mon, 4 Mar 2024 17:05:39 +0100 Subject: [PATCH 682/996] Update bigdataviewer-core: 10.4.13 -> 10.4.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d50ff0a..ae88fe2b 100644 --- a/pom.xml +++ b/pom.xml @@ -1006,7 +1006,7 @@ - 10.4.13 + 10.4.14 ${bigdataviewer-core.version} From 6d8ffdec369c2f8607ec370cd340f5f7af5ce4f7 Mon Sep 17 00:00:00 2001 From: tpietzsch Date: Mon, 4 Mar 2024 17:06:06 +0100 Subject: [PATCH 683/996] Update bigdataviewer_fiji: 6.2.4 -> 6.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae88fe2b..e4b5ca2c 100644 --- a/pom.xml +++ b/pom.xml @@ -1018,7 +1018,7 @@ ${bigdataviewer-vistools.version} - 6.2.4 + 6.3.0 ${bigdataviewer_fiji.version} From bf4e8819f489e221e3f9cddfa4817a87fb78ee1f Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Wed, 6 Mar 2024 15:42:47 -0500 Subject: [PATCH 684/996] bump n5 artifact and plugin versions --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index e4b5ca2c..6ee7a70f 100644 --- a/pom.xml +++ b/pom.xml @@ -1103,11 +1103,11 @@ ${imglib2-label-multisets.version} - 3.1.2 + 3.2.0 ${n5.version} - 4.0.1 + 4.1.1 ${n5-aws-s3.version} @@ -1115,15 +1115,15 @@ ${n5-blosc.version} - 4.0.0 + 4.1.0 ${n5-google-cloud.version} - 2.1.0 + 2.2.0 ${n5-hdf5.version} - 4.0.2 + 4.1.1 ${n5-ij.version} @@ -1131,15 +1131,15 @@ ${n5-imglib2.version} - 1.3.1 + 1.4.1 ${n5-universe.version} - 6.0.1 + 6.1.0 ${n5-viewer_fiji.version} - 1.2.0 + 1.3.1 ${n5-zarr.version} From ff0ad51c830a0d06a0e3fb5383e00045f18d1b5d Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Wed, 6 Mar 2024 17:35:47 -0500 Subject: [PATCH 685/996] bump bigwarp to deal with the n5 dependencies --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6ee7a70f..5d59212b 100644 --- a/pom.xml +++ b/pom.xml @@ -985,7 +985,7 @@ ${jitk-tps.version} - 9.1.0 + 9.1.1 ${bigwarp.version} ${bigwarp_fiji.version} From 50bded09dca0616ae9ea43a39e085d3ad79a049f Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Fri, 8 Mar 2024 13:07:59 -0500 Subject: [PATCH 686/996] downgrade imglib2-label-multisets 0.11.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d59212b..c4e02a2c 100644 --- a/pom.xml +++ b/pom.xml @@ -1099,7 +1099,7 @@ - 0.12.0 + 0.11.5 ${imglib2-label-multisets.version} From 7683316aef9426d4befc15727fbec7d451643aba Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 8 Mar 2024 12:41:33 -0600 Subject: [PATCH 687/996] Manage versions of new transitive dependencies The mega-melt exposed some dependencies that weren't locked down: * io.grpc:grpc-*: ${grpc.version} (1.62.2) * com.google.guava:failureaccess: 1.0.2 * com.ibm.icu:icu4j: 74.2 * org.jline:jline-native: ${jline3.version} (3.25.1) * com.squareup.okio:okio-jvm: ${okio.version} (3.8.0) * io.perfmark:perfmark-api: 0.27.0 --- pom.xml | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 142 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index c4e02a2c..91da7548 100644 --- a/pom.xml +++ b/pom.xml @@ -1736,8 +1736,32 @@ 1.62.2 + ${grpc.version} + ${grpc.version} + ${grpc.version} ${grpc.version} + ${grpc.version} + ${grpc.version} + ${grpc.version} + ${grpc.version} + ${grpc.version} + ${grpc.version} + ${grpc.version} + ${grpc.version} + ${grpc.version} + ${grpc-alts.version} + ${grpc-api.version} + ${grpc-auth.version} ${grpc-context.version} + ${grpc-core.version} + ${grpc-googleapis.version} + ${grpc-grpclb.version} + ${grpc-netty-shaded.version} + ${grpc-protobuf.version} + ${grpc-protobuf-lite.version} + ${grpc-services.version} + ${grpc-stub.version} + ${grpc-xds.version} 2.10.1 @@ -1745,7 +1769,9 @@ 33.0.0-jre + 1.0.2 ${guava.version} + ${failureaccess.version} 0.3.0 @@ -1756,6 +1782,10 @@ 1.8.0.10 ${hsqldb.version} + + 74.2 + ${icu4j.version} + 5.5.13.3 ${itextpdf.version} @@ -1961,6 +1991,7 @@ ${jline3.version} + ${jline3.version} ${jline3.version} ${jline3.version} ${jline3.version} @@ -1972,6 +2003,7 @@ ${jline-builtins.version} ${jline-console.version} + ${jline-native.version} ${jline-reader.version} ${jline-remote-ssh.version} ${jline-remote-telnet.version} @@ -2202,20 +2234,29 @@ 3.3 ${objenesis.version} + + 45.1.1 + ${ojalgo.version} + 4.12.0 - 3.8.0 ${okhttp.version} - ${okio.version} - - 45.1.1 - ${ojalgo.version} + + 3.8.0 + ${okio.version} + ${okio.version} + ${okio-jvm.version} 5.9 ${opencsv.version} + + 0.27.0 + ${perfmark.version} + ${perfmark-api.version} + 4.7.5 ${picocli.version} @@ -5138,11 +5179,71 @@ + + io.grpc + grpc-alts + ${io.grpc.grpc-alts.version} + + + io.grpc + grpc-api + ${io.grpc.grpc-api.version} + + + io.grpc + grpc-auth + ${io.grpc.grpc-auth.version} + io.grpc grpc-context ${io.grpc.grpc-context.version} + + io.grpc + grpc-core + ${io.grpc.grpc-core.version} + + + io.grpc + grpc-googleapis + ${io.grpc.grpc-googleapis.version} + + + io.grpc + grpc-grpclb + ${io.grpc.grpc-grpclb.version} + + + io.grpc + grpc-netty-shaded + ${io.grpc.grpc-netty-shaded.version} + + + io.grpc + grpc-protobuf + ${io.grpc.grpc-protobuf.version} + + + io.grpc + grpc-protobuf-lite + ${io.grpc.grpc-protobuf-lite.version} + + + io.grpc + grpc-services + ${io.grpc.grpc-services.version} + + + io.grpc + grpc-stub + ${io.grpc.grpc-stub.version} + + + io.grpc + grpc-xds + ${io.grpc.grpc-xds.version} + @@ -5157,6 +5258,11 @@ guava ${com.google.guava.guava.version} + + com.google.guava + failureaccess + ${com.google.guava.failureaccess.version} + @@ -5172,6 +5278,13 @@ ${hsqldb.hsqldb.version} + + + com.github.icu + icu4j + ${com.github.icu.icu4j.version} + + com.itextpdf @@ -5596,6 +5709,11 @@ ${org.jline.jline-groovy.version} --> + + org.jline + jline-native + ${org.jline.jline-native.version} + org.jline jline-reader @@ -6316,23 +6434,30 @@ ${org.objenesis.objenesis.version} + + + org.ojalgo + ojalgo + ${org.ojalgo.ojalgo.version} + + com.squareup.okhttp3 okhttp ${com.squareup.okhttp3.okhttp.version} + + com.squareup.okio okio ${com.squareup.okio.okio.version} - - - org.ojalgo - ojalgo - ${org.ojalgo.ojalgo.version} + com.squareup.okio + okio-jvm + ${com.squareup.okio.okio-jvm.version} @@ -6342,6 +6467,13 @@ ${com.opencsv.opencsv.version} + + + io.perfmark + perfmark-api + ${io.perfmark.perfmark-api.version} + + info.picocli From a140951c8d90b346fffffb40e58ded760424f1f5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 8 Mar 2024 13:26:10 -0600 Subject: [PATCH 688/996] mega-melt: disable SNT again for now --- tests/generate-mega-melt.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index 84ccb897..1b548da3 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -21,6 +21,10 @@ def child(node, tag): # Artifacts to exclude from the mega melt. ignoredArtifacts = [ + # TEMP: The SNT project needs a new release without the + # obsolete scijava-plugins-io-table dependency. + 'SNT', + # TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone. 'hdf5', # TEMP: The original ImageJ requires Java 9+ to compile, From 4a08e05a82e969a1f89ed903120dbf445e4cfe79 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 8 Mar 2024 13:37:19 -0600 Subject: [PATCH 689/996] Fix groupId of icu4j --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 91da7548..822cef29 100644 --- a/pom.xml +++ b/pom.xml @@ -1784,7 +1784,7 @@ 74.2 - ${icu4j.version} + ${icu4j.version} 5.5.13.3 @@ -5280,9 +5280,9 @@ - com.github.icu + com.ibm.icu icu4j - ${com.github.icu.icu4j.version} + ${com.ibm.icu.icu4j.version} From 7a099c9a7cc1f8a0d09deb25f47d58418fc15f31 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 8 Mar 2024 13:40:35 -0600 Subject: [PATCH 690/996] Do not manage grpc-protobuf-lite It depends on com.google.protobuf:protobuf-javalite, which clashes with com.google.protobuf:protobuf-kotlin. --- pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index 822cef29..27115226 100644 --- a/pom.xml +++ b/pom.xml @@ -1745,7 +1745,6 @@ ${grpc.version} ${grpc.version} ${grpc.version} - ${grpc.version} ${grpc.version} ${grpc.version} ${grpc.version} @@ -1758,7 +1757,6 @@ ${grpc-grpclb.version} ${grpc-netty-shaded.version} ${grpc-protobuf.version} - ${grpc-protobuf-lite.version} ${grpc-services.version} ${grpc-stub.version} ${grpc-xds.version} @@ -5224,11 +5222,6 @@ grpc-protobuf ${io.grpc.grpc-protobuf.version} - - io.grpc - grpc-protobuf-lite - ${io.grpc.grpc-protobuf-lite.version} - io.grpc grpc-services From 2bf748123976fe12fe5c51f1f0cc6e6583c7e023 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Mon, 11 Mar 2024 12:08:04 -0400 Subject: [PATCH 691/996] bump bigwarp to 9.1.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 27115226..2771cc76 100644 --- a/pom.xml +++ b/pom.xml @@ -985,7 +985,7 @@ ${jitk-tps.version} - 9.1.1 + 9.1.2 ${bigwarp.version} ${bigwarp_fiji.version} From f2eaabf6bb32ae0beeb7702957c527b4df6f2eed Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 11 Mar 2024 13:22:21 -0500 Subject: [PATCH 692/996] Remove no-longer-needed ejml exclusion The new bigwarp_fiji no longer depends on the old groupId. --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2771cc76..8a3c0ef7 100644 --- a/pom.xml +++ b/pom.xml @@ -3476,12 +3476,6 @@ sc.fiji bigwarp_fiji ${sc.fiji.bigwarp_fiji.version} - - - com.googlecode.efficient-java-matrix-library - ejml - - From 7749f3d2e41f8516d2c0b269e7541763569e5490 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Thu, 14 Mar 2024 09:10:39 +0100 Subject: [PATCH 693/996] remove duplicated exclusion --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8a3c0ef7..42bbd59d 100644 --- a/pom.xml +++ b/pom.xml @@ -6112,10 +6112,6 @@ ${org.jzy3d.jzy3d-native-jogl-awt.version} - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - org.jogamp.gluegen gluegen-rt-natives-linux-aarch64 From 9fdc663130b5e0128ce50f9841706c832e2ec321 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 15 Mar 2024 11:48:45 -0500 Subject: [PATCH 694/996] Update View5D: 2.5.0 -> 2.5.3 Note that the groupId changed! --- pom.xml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 42bbd59d..50b4c61d 100644 --- a/pom.xml +++ b/pom.xml @@ -932,10 +932,6 @@ 2.0.1 ${Video_Editing.version} - 2.5.0 - ${View5D.version} - ${View5D_.version} - 2.0.3 ${Volume_Calculator.version} @@ -980,6 +976,11 @@ + + 2.5.3 + ${View5D.version} + ${View5D_.version} + 3.0.4 ${jitk-tps.version} @@ -3391,11 +3392,6 @@ Video_Editing ${sc.fiji.Video_Editing.version} - - sc.fiji - View5D_ - ${sc.fiji.View5D_.version} - sc.fiji Volume_Calculator @@ -3464,6 +3460,13 @@ + + + de.nanoimaging + View5D_ + ${de.nanoimaging.View5D_.version} + + jitk From 0ac8a9ef8c984b992df478f3fb66f5b9f8ec4fc7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 15 Mar 2024 12:11:23 -0500 Subject: [PATCH 695/996] Update fiji: 2.15.0 -> 2.15.1 This release incorporates the View5D groupId change. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 50b4c61d..22cd0b24 100644 --- a/pom.xml +++ b/pom.xml @@ -655,7 +655,7 @@ - 2.15.0 + 2.15.1 ${fiji.version} From ae13c161bf05185ff26a52b674d9db3bd9c537d8 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 15 Mar 2024 21:33:32 -0500 Subject: [PATCH 696/996] Update script-editor: 1.0.0 -> 1.1.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 22cd0b24..fa9ee681 100644 --- a/pom.xml +++ b/pom.xml @@ -397,7 +397,7 @@ ${scijava-ui-swing.version} - 1.0.0 + 1.1.0 ${script-editor.version} From 214c415524f88b6119400af71cbcc66e390fbd91 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 18 Mar 2024 11:48:18 -0500 Subject: [PATCH 697/996] Update View5D: 2.5.3 -> 2.5.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa9ee681..3fa48e19 100644 --- a/pom.xml +++ b/pom.xml @@ -977,7 +977,7 @@ - 2.5.3 + 2.5.4 ${View5D.version} ${View5D_.version} From ade1ad99031daf372b46ea0a8524cc5b89273837 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Mon, 18 Mar 2024 14:40:12 -0400 Subject: [PATCH 698/996] bump n5-aws-s3 to 4.1.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fa48e19..8d87236f 100644 --- a/pom.xml +++ b/pom.xml @@ -1108,7 +1108,7 @@ ${n5.version} - 4.1.1 + 4.1.2 ${n5-aws-s3.version} From c71506079e3c19056574f13d1e9f46cb6105c3ba Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 25 Mar 2024 10:26:56 -0500 Subject: [PATCH 699/996] Update imglib2-realtransform: 4.0.1 -> 4.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d87236f..30838522 100644 --- a/pom.xml +++ b/pom.xml @@ -607,7 +607,7 @@ ${imglib2-imglyb.version} - 4.0.1 + 4.0.2 ${imglib2-realtransform.version} From 0d15b2569499b5b7eabc17b4bd783c880ab366ba Mon Sep 17 00:00:00 2001 From: Stephan Saalfeld Date: Wed, 27 Mar 2024 12:48:59 -0400 Subject: [PATCH 700/996] pom: bump to mpicbg-1.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 30838522..3ace5d2f 100644 --- a/pom.xml +++ b/pom.xml @@ -991,7 +991,7 @@ ${bigwarp_fiji.version} - 1.5.0 + 1.6.0 ${mpicbg.version} ${mpicbg.version} ${mpicbg_.version} From 082b64e3f1a0f1218f72c100868166becbd4ca3d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 27 Mar 2024 15:37:33 -0500 Subject: [PATCH 701/996] Update TrackMate: 7.11.1 -> 7.12.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3ace5d2f..c23a0f43 100644 --- a/pom.xml +++ b/pom.xml @@ -1029,7 +1029,7 @@ - 7.11.1 + 7.12.1 ${TrackMate.version} From c5ec98bddd0cbeb345ca389a7a1e79496f3275a4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 28 Mar 2024 13:15:45 -0500 Subject: [PATCH 702/996] Manage the version of net.imglib2:imglib2-mesh --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index c23a0f43..c7aacbe1 100644 --- a/pom.xml +++ b/pom.xml @@ -606,6 +606,10 @@ 2.0.0 ${imglib2-imglyb.version} + + 1.0.0 + ${imglib2-mesh.version} + 4.0.2 ${imglib2-realtransform.version} @@ -2892,6 +2896,13 @@ ${net.imglib2.imglib2-imglyb.version} + + + net.imglib2 + imglib2-mesh + ${net.imglib2.imglib2-mesh.version} + + net.imglib2 From abd7eadbae320beaa01ae50822e2b9dac7033cc3 Mon Sep 17 00:00:00 2001 From: Caleb Hulbert Date: Mon, 1 Apr 2024 11:00:07 -0400 Subject: [PATCH 703/996] bump imglib2-label-multisets --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c4e02a2c..bb216dff 100644 --- a/pom.xml +++ b/pom.xml @@ -1099,7 +1099,7 @@ - 0.11.5 + 0.13.0 ${imglib2-label-multisets.version} From a8bfdc4c10df3e383fc6865c06c9df9e69717d54 Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Mon, 8 Apr 2024 16:32:42 +0800 Subject: [PATCH 704/996] Update pom.xml to use Mockito 4.11.0 Mockito 4.11.0 is the last version that supports Java 8. The previous version stopped working with Maven, Eclipse, etc. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 17bfa875..3884ce01 100644 --- a/pom.xml +++ b/pom.xml @@ -2229,7 +2229,7 @@ ${mines-jtk.version} - 2.19.0 + 4.11.0 ${mockito.version} ${mockito-core.version} From 10eb8c57ca88fe7bc93a37c717054f0c8d72eace Mon Sep 17 00:00:00 2001 From: Caleb Hulbert Date: Fri, 12 Apr 2024 16:03:16 -0400 Subject: [PATCH 705/996] bump imglib2-label-multiset for bugfix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3884ce01..28d87466 100644 --- a/pom.xml +++ b/pom.xml @@ -1104,7 +1104,7 @@ - 0.13.0 + 0.13.1 ${imglib2-label-multisets.version} From 7a467440c10539c06290a7ed2780668404f2ad76 Mon Sep 17 00:00:00 2001 From: David Gault Date: Thu, 18 Apr 2024 15:01:31 +0100 Subject: [PATCH 706/996] ump Bio-Formats version to 7.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 28d87466..ffe5f3ef 100644 --- a/pom.xml +++ b/pom.xml @@ -1245,7 +1245,7 @@ ${jxrlib-all.version} - 7.2.0 + 7.3.0 ${bio-formats.version} ${bio-formats.version} ${bio-formats.version} From 62588b50c9be32512f07bdba45ca0a9c20e7c508 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 16 Apr 2024 13:48:28 +0200 Subject: [PATCH 707/996] Update components * scijava-plugins-commands: 0.2.4 -> 0.2.5 * imagej-common: 2.0.4 -> 2.1.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ffe5f3ef..82bd0af1 100644 --- a/pom.xml +++ b/pom.xml @@ -365,7 +365,7 @@ ${scijava-plot.version} - 0.2.4 + 0.2.5 ${scijava-plugins-commands.version} @@ -481,7 +481,7 @@ ${ij1-patcher.version} - 2.0.4 + 2.1.0 ${imagej-common.version} From 6787e54719109f20a8c509287cb1a0e27967e9f6 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Apr 2024 10:42:36 +0200 Subject: [PATCH 708/996] Manage version of org.openmicroscopy:specification It is a monoversioned ome-model component, along with org.openmicroscopy:ome-xml. --- pom.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 82bd0af1..5b2449e5 100644 --- a/pom.xml +++ b/pom.xml @@ -1236,8 +1236,11 @@ ${ome-poi.version} - 6.3.4 + 6.3.6 + ${ome-model.version} + ${ome-model.version} ${ome-xml.version} + ${specification.version} 0.2.4 @@ -3926,6 +3929,11 @@ ome-xml ${org.openmicroscopy.ome-xml.version} + + org.openmicroscopy + specification + ${org.openmicroscopy.specification.version} + From 89a9489789ef00c1b47eb029643d98acf6807ae9 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 6 May 2024 12:05:21 -0500 Subject: [PATCH 709/996] Update imagej-legacy: 1.2.1 -> 1.2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b2449e5..4a18e0b4 100644 --- a/pom.xml +++ b/pom.xml @@ -493,7 +493,7 @@ ${imagej-launcher.version} - 1.2.1 + 1.2.2 ${imagej-legacy.version} From f9f712f477134f7d6c6bef9e0ef5d3416f6451cc Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 6 May 2024 14:07:47 -0500 Subject: [PATCH 710/996] Manage new component versions * org.abego.treelayout:org.abego.treelayout.core: 1.0.3 * com.google.inject:guice: 7.0.0 * com.github.jnr:jnr-netdb: 1.2.0 --- pom.xml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pom.xml b/pom.xml index 4a18e0b4..3184a274 100644 --- a/pom.xml +++ b/pom.xml @@ -1304,6 +1304,10 @@ + + 1.0.3 + ${org.abego.treelayout.core.version} + 1.2.7 ${algart-tiff.version} @@ -1779,6 +1783,10 @@ ${guava.version} ${failureaccess.version} + + 7.0.0 + ${guice.version} + 0.3.0 ${humble-video.version} @@ -2039,10 +2047,12 @@ 1.3.13 0.10.4 2.2.16 + 1.2.0 3.1.19 ${jffi.version} ${jnr-constants.version} ${jnr-ffi.version} + ${jnr-netdb.version} ${jnr-posix.version} @@ -4193,6 +4203,13 @@ + + + org.abego.treelayout + org.abego.treelayout.core + ${org.abego.treelayout.org.abego.treelayout.core.version} + + net.algart @@ -5273,6 +5290,13 @@ ${com.google.guava.failureaccess.version} + + + com.google.inject + guice + ${com.google.inject.guice.version} + + io.humble @@ -5795,6 +5819,11 @@ jnr-ffi ${com.github.jnr.jnr-ffi.version} + + com.github.jnr + jnr-netdb + ${com.github.jnr.jnr-netdb.version} + com.github.jnr jnr-posix From 637dd6152f90f480a81e47f46af23e5d4d3bc1fb Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Wed, 15 May 2024 08:30:28 +0800 Subject: [PATCH 711/996] Bump BoneJ to version 7.0.19 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3184a274..31a60426 100644 --- a/pom.xml +++ b/pom.xml @@ -1185,7 +1185,7 @@ ${multiview-simulation.version} - 7.0.18 + 7.0.19 ${bonej.version} ${bonej.version} ${bonej.version} From e7511a197dbb2f897f7d466a7e0ed237a4411a9b Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Thu, 16 May 2024 15:40:34 -0400 Subject: [PATCH 712/996] bump n5 artifacts * n5-ij 4.2.0 * n5-universe 1.5.0 * n5-viewer_fiji 6.1.1 * n5-zarr 1.3.2 --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3184a274..4e285718 100644 --- a/pom.xml +++ b/pom.xml @@ -1128,7 +1128,7 @@ ${n5-hdf5.version} - 4.1.1 + 4.2.0 ${n5-ij.version} @@ -1136,15 +1136,15 @@ ${n5-imglib2.version} - 1.4.1 + 1.5.0 ${n5-universe.version} - 6.1.0 + 6.1.1 ${n5-viewer_fiji.version} - 1.3.1 + 1.3.2 ${n5-zarr.version} From b0cb0ee523e3581a79798befb2a48b80feb8409f Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Thu, 16 May 2024 15:44:25 -0400 Subject: [PATCH 713/996] bump imglib2-label-multisets 0.13.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e285718..3a3707ee 100644 --- a/pom.xml +++ b/pom.xml @@ -1104,7 +1104,7 @@ - 0.13.1 + 0.13.2 ${imglib2-label-multisets.version} From 7e63de8cc4c67a9c3878a97a83196ca571186538 Mon Sep 17 00:00:00 2001 From: Caleb Hulbert Date: Mon, 3 Jun 2024 16:02:29 -0400 Subject: [PATCH 714/996] build: bump imglib2-label-multiset --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3184a274..40057690 100644 --- a/pom.xml +++ b/pom.xml @@ -1104,7 +1104,7 @@ - 0.13.1 + 0.14.0 ${imglib2-label-multisets.version} From 881466a7fb6fd3bb160c84ad8a7764c353fd7ccb Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Wed, 5 Jun 2024 13:47:31 -0400 Subject: [PATCH 715/996] bump more n5 versions --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3a3707ee..5b902bbc 100644 --- a/pom.xml +++ b/pom.xml @@ -1112,7 +1112,7 @@ ${n5.version} - 4.1.2 + 4.2.0 ${n5-aws-s3.version} @@ -1128,7 +1128,7 @@ ${n5-hdf5.version} - 4.2.0 + 4.2.1 ${n5-ij.version} @@ -1136,7 +1136,7 @@ ${n5-imglib2.version} - 1.5.0 + 1.6.0 ${n5-universe.version} @@ -1144,7 +1144,7 @@ ${n5-viewer_fiji.version} - 1.3.2 + 1.3.4 ${n5-zarr.version} From 397d5d0443ac3c00738d6428e90d7399b7d60f6e Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Tue, 5 Mar 2024 15:30:42 +0100 Subject: [PATCH 716/996] additional publishing info --- gradle/platform/build.gradle.kts | 91 +++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 1 deletion(-) diff --git a/gradle/platform/build.gradle.kts b/gradle/platform/build.gradle.kts index 9605d8cd..43dd9b54 100644 --- a/gradle/platform/build.gradle.kts +++ b/gradle/platform/build.gradle.kts @@ -27,7 +27,7 @@ dependencies { val a = node / "artifactId" val v = node / "version" api("$g:$a:$v") -// println("$g:$a:$v") + // println("$g:$a:$v") } } } @@ -45,6 +45,95 @@ publishing { version = (effXml / "version").toString() from(components["javaPlatform"]) + pom { + name = "SciJava Parent POM" + description = "This POM provides a parent from which participating projects can declare their build configurations. It ensures that projects all use a compatible build environment, including Java version, as well as versions of dependencies and plugins." + url = "https://scijava.org/" + inceptionYear = "2011" + organization { + name = "SciJava" + url = "https://scijava.org/" + } + licenses { + license { + name = "Unlicense" + url = "https://unlicense.org/" + distribution = "repo" + } + } + developers { + developer { + id = "ctrueden" + name = "Curtis Rueden" + url = "https://imagej.net/people/ctrueden" + roles.addAll("founder", "lead", "developer", "debugger", "reviewer", "support", "maintainer") + } + } + contributors { + operator fun String.invoke(id: String) = contributor { + name = this@invoke + url = "https://imagej.net/people/$id" + properties = mapOf("id" to id) + } + "Mark Hiner"("hinerm") + "Johannes Schindelin"("dscho") + "Sébastien Besson"("sbesson") + "John Bogovic"("bogovicj") + "Nicolas Chiaruttini"("NicoKiaru") + "Barry DeZonia"("bdezonia") + "Richard Domander"("rimadoma") + "Karl Duderstadt"("karlduderstadt") + "Jan Eglinger"("imagejan") + "Gabriel Einsdorf"("gab1one") + "Tiago Ferreira"("tferr") + contributor { + name = "David Gault" + properties = mapOf("id" to "dgault") + } + "Ulrik Günther"("skalarproduktraum") + "Philipp Hanslovsky"("hanslovsky") + "Stefan Helfrich"("stelfrich") + "Cameron Lloyd"("camlloyd") + "Hadrien Mary"("hadim") + "Tobias Pietzsch"("tpietzsch") + "Stephan Preibisch"("StephanPreibisch") + "Stephan Saalfeld"("axtimwalde") + "Deborah Schmidt"("frauzufall") + "Lorenzo Scianatico"("LoreScianatico") + "Jean - Yves Tinevez"("tinevez") + "Christian Tischer"("tischi") + "Gabriella Turek"("turekg") + contributor { + name = "Giuseppe Barbieri" + properties = mapOf("id" to "elect") + } + } + + mailingLists { + mailingList { + name = "SciJava" + subscribe = "https://groups.google.com/group/scijava" + unsubscribe = subscribe + post = "scijava@googlegroups.com" + archive = "https://groups.google.com/group/scijava" + } + } + + scm { + connection = "scm:git:https://github.com/scijava/pom-scijava" + developerConnection = "scm:git:git@github.com:scijava/pom-scijava" + tag = "HEAD" + url = "https://github.com/scijava/pom-scijava" + } + issueManagement { + system = "GitHub Issues" + url = "https://github.com/scijava/pom-scijava/issues" + } + ciManagement { + system = "GitHub Actions" + url = "https: //github.com/scijava/pom-scijava/actions" + } + } } } } From 4cf7560ae1f441cdd6988d495965bcd317b24923 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Tue, 5 Mar 2024 15:32:48 +0100 Subject: [PATCH 717/996] remove spaces --- gradle/platform/build.gradle.kts | 3 --- 1 file changed, 3 deletions(-) diff --git a/gradle/platform/build.gradle.kts b/gradle/platform/build.gradle.kts index 43dd9b54..f29fa936 100644 --- a/gradle/platform/build.gradle.kts +++ b/gradle/platform/build.gradle.kts @@ -43,7 +43,6 @@ publishing { groupId = "org.scijava" artifactId = "pom-scijava" version = (effXml / "version").toString() - from(components["javaPlatform"]) pom { name = "SciJava Parent POM" @@ -108,7 +107,6 @@ publishing { properties = mapOf("id" to "elect") } } - mailingLists { mailingList { name = "SciJava" @@ -118,7 +116,6 @@ publishing { archive = "https://groups.google.com/group/scijava" } } - scm { connection = "scm:git:https://github.com/scijava/pom-scijava" developerConnection = "scm:git:git@github.com:scijava/pom-scijava" From ff3d1af0f58d86d5fe5e82aa277ad1c5df2ebda0 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Tue, 12 Mar 2024 09:18:55 +0100 Subject: [PATCH 718/996] up --- gradle/catalog/build.gradle.kts | 67 + gradle/catalog/eff.xml | 6379 +++++++++++++++++ gradle/catalog/settings.gradle.kts | 12 + gradle/platform/build.gradle.kts | 150 +- gradle/platform/buildSrc/build.gradle.kts | 13 + gradle/platform/buildSrc/settings.gradle.kts | 4 + .../src/main/kotlin/publish.gradle.kts | 235 + gradle/platform/settings.gradle.kts | 25 + gradle/playground/build.gradle.kts | 228 + gradle/playground/settings.gradle.kts | 25 + gradle/settings.gradle.kts | 16 +- 11 files changed, 7037 insertions(+), 117 deletions(-) create mode 100644 gradle/catalog/build.gradle.kts create mode 100644 gradle/catalog/eff.xml create mode 100644 gradle/catalog/settings.gradle.kts create mode 100644 gradle/platform/buildSrc/build.gradle.kts create mode 100644 gradle/platform/buildSrc/settings.gradle.kts create mode 100644 gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts create mode 100644 gradle/platform/settings.gradle.kts create mode 100644 gradle/playground/build.gradle.kts create mode 100644 gradle/playground/settings.gradle.kts diff --git a/gradle/catalog/build.gradle.kts b/gradle/catalog/build.gradle.kts new file mode 100644 index 00000000..7cf6db15 --- /dev/null +++ b/gradle/catalog/build.gradle.kts @@ -0,0 +1,67 @@ +import groovy.xml.XmlSlurper +import groovy.xml.slurpersupport.GPathResult +import groovy.xml.slurpersupport.NodeChild + +plugins { + `version-catalog` + `maven-publish` +} + +group = "org.scijava" +version = "0.1" + +catalog.versionCatalog { + + operator fun GPathResult.div(child: String) = children().find { (it!! as NodeChild).name() == child } as GPathResult + + val effXml = XmlSlurper().parse(projectDir.resolve("eff.xml")) + val deps = effXml / "dependencyManagement" / "dependencies" + val bundles = mutableMapOf>() + val skip = listOf("mpicbg" to "mpicbg_") + val cache = mutableSetOf() // skip duplicates, such as org.bytedeco:ffmpeg + for (dep in deps.children()) { + val node = dep as NodeChild + val g = node / "groupId" + val a = node / "artifactId" + val v = node / "version" + val gav = "$g:$a:$v" + + if (("$g" to "$a") in skip || gav in cache) + continue + + cache += gav + + // println(gav) + val camel = "$a".split('-', '_') + .joinToString("") { if (it.isEmpty()) "" else it[0].uppercase() + it.substring(1).lowercase() } + .replaceFirstChar { it.lowercase() } + + fun getAlias(group: String = "$g".substringAfterLast('.')) = + "$group." + when { + camel.startsWith(group) -> camel.substringAfter(group).replaceFirstChar { it.lowercase() }.ifEmpty { group } + else -> camel + }.also { bundles.getOrPut(group, ::ArrayList) += it } + + val alias = when ("$g") { + in listOf("org.scijava", "net.imagej", "net.imglib2", "sc.fiji", "org.janelia.saalfeldlab") -> getAlias() + "io.scif" -> getAlias("scifio") + else -> "$g.$camel" + } + + println("$alias($gav)") + library(alias, gav) + } + for ((alias, aliases) in bundles) + bundle(alias, aliases) +} + +publishing.publications { + repositories.maven { + name = "sciJava" + credentials(PasswordCredentials::class) + url = uri("https://maven.scijava.org/content/repositories/releases") + } + create("sciJavaCatalog") { + from(components["versionCatalog"]) + } +} \ No newline at end of file diff --git a/gradle/catalog/eff.xml b/gradle/catalog/eff.xml new file mode 100644 index 00000000..1bb3642d --- /dev/null +++ b/gradle/catalog/eff.xml @@ -0,0 +1,6379 @@ + + + + + + + + + + + + + + + 4.0.0 + + org.scijava + pom-scijava-base + 19.0.0 + + + org.scijava + pom-scijava + 38.0.0-SNAPSHOT + pom + SciJava Parent POM + This POM provides a parent from which participating projects can declare their build configurations. It ensures that projects all use a compatible build environment, including Java version, as well as versions of dependencies and plugins. + https://scijava.org/ + 2011 + + SciJava + https://scijava.org/ + + + + Unlicense + https://unlicense.org/ + repo + + + + + ctrueden + Curtis Rueden + https://imagej.net/people/ctrueden + + founder + lead + developer + debugger + reviewer + support + maintainer + + + + + + Mark Hiner + https://imagej.net/people/hinerm + + hinerm + + + + Johannes Schindelin + https://imagej.net/people/dscho + + dscho + + + + Sébastien Besson + https://imagej.net/people/sbesson + + sbesson + + + + John Bogovic + https://imagej.net/people/bogovicj + + bogovicj + + + + Nicolas Chiaruttini + https://imagej.net/people/NicoKiaru + + NicoKiaru + + + + Barry DeZonia + https://imagej.net/people/bdezonia + + bdezonia + + + + Richard Domander + https://imagej.net/people/rimadoma + + rimadoma + + + + Karl Duderstadt + https://imagej.net/people/karlduderstadt + + karlduderstadt + + + + Jan Eglinger + https://imagej.net/people/imagejan + + imagejan + + + + Gabriel Einsdorf + https://imagej.net/people/gab1one + + gab1one + + + + Tiago Ferreira + https://imagej.net/people/tferr + + tferr + + + + David Gault + + dgault + + + + Ulrik Günther + https://imagej.net/people/skalarproduktraum + + skalarproduktraum + + + + Philipp Hanslovsky + https://imagej.net/people/hanslovsky + + hanslovsky + + + + Stefan Helfrich + https://imagej.net/people/stelfrich + + stelfrich + + + + Cameron Lloyd + https://imagej.net/people/camlloyd + + camlloyd + + + + Hadrien Mary + https://imagej.net/people/hadim + + hadim + + + + Tobias Pietzsch + https://imagej.net/people/tpietzsch + + tpietzsch + + + + Stephan Preibisch + https://imagej.net/people/StephanPreibisch + + StephanPreibisch + + + + Stephan Saalfeld + https://imagej.net/people/axtimwalde + + axtimwalde + + + + Deborah Schmidt + https://imagej.net/people/frauzufall + + frauzufall + + + + Lorenzo Scianatico + https://imagej.net/people/LoreScianatico + + LoreScianatico + + + + Jean-Yves Tinevez + https://imagej.net/people/tinevez + + tinevez + + + + Christian Tischer + https://imagej.net/people/tischi + + tischi + + + + Gabriella Turek + https://imagej.net/people/turekg + + turekg + + + + + + SciJava + https://groups.google.com/group/scijava + https://groups.google.com/group/scijava + scijava@googlegroups.com + https://groups.google.com/group/scijava + + + + scm:git:https://github.com/scijava/pom-scijava + scm:git:git@github.com:scijava/pom-scijava + https://github.com/scijava/pom-scijava + + + GitHub Issues + https://github.com/scijava/pom-scijava/issues + + + GitHub Actions + https://github.com/scijava/pom-scijava/actions + + + 3.4.2 + 3.4.2 + 2.0.1 + 0.5.4 + 2.0.2 + 2.0.2 + 1.11.0 + 1.18.0 + 3.0.1 + 3.0.1 + 1.2.10 + 2.1.1 + 2.0.2 + 2.0.1 + 3.0.0 + 3.0.6 + 2.0.7 + 2.5.0 + 3.0.3 + 2.1.0 + 2.1.0 + 1.0.6 + 2.1.8 + 2.1.2 + 2.1.2 + 2.3.0 + 2.3.0 + 2.0.4 + 2.0.3 + 2.0.1 + 2.0.8 + 2.1.1 + 3.1.3 + 2.0.1 + 2.0.1 + 2.0.1 + 1.0.2 + 2.3.5 + 1.1.5 + 1.1.1 + 2.0.2 + 2.0.1 + 4.2.2 + 4.2.2 + 2.0.2 + 3.0.1 + 3.0.1 + 2.0.1 + 2.0.0 + 2.0.1 + 3.0.0 + 4.1.2 + 4.1.2 + 2.0.2 + 2.0.1 + 5.0.0 + 5.0.0 + 2.0.1 + 2.0.1 + 2.0.1 + 7.1.1 + 2.1.1 + 1.6.2 + 1.6.2 + 3.0.1 + 2.0.0 + 2.0.0 + 1.1.2 + 1.1.2 + 2.0.2 + 2.0.2 + 2.0.5 + 4.2.1 + 2.0.2 + 5.0.25 + 4.3.4 + 2.0.3 + 2.0.3 + 2.0.1 + 3.1.10 + 1.0.5 + 2.1.1 + 2.1.1 + 2.0.2 + 2.0.2 + 2.1.2 + 2.0.1 + 3.1.9 + 3.1.9 + 1.7-fiji4 + 1.1.4 + 1.1.4 + 2.0.1 + 2.1.1 + 2.1.0 + 25.0.2 + 25.0.2 + 2.0.1 + 2.0.1 + 3.1.4 + 0.1.2 + 1.2.5 + 1.4.0 + 1.2.1 + 3.2.0 + 2.0.1 + 1.2.1 + 1.3.1 + 7.11.1 + 3.3.4 + 1.3.10 + 1.3.10 + 2.0.4 + 2.2.0 + 3.0.4 + 3.0.4 + 2.0.3 + 1.0.3 + 2.0.3 + 2.0.1 + 2.5.0 + 2.5.0 + 2.0.3 + 2.01.4 + <_3D_Blob_Segmentation.version>3.0.2 + <_3D_Objects_Counter.version>2.0.1 + <_3D_Viewer.version>4.0.5 + 1.2.7 + com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* + 1.10.14 + 1.10.14 + 3.5.3 + 2.7.7 + 3.5.3 + 2.7.7 + 3.5.3 + 4.11.1 + 4.11.1 + 2.26.0 + 2.33 + 2.33 + 9.6 + 9.6 + 9.6 + 9.6 + 9.6 + 1.10.4 + 1.10.4 + 3.3.1 + ${package-guess} + 1.12.667 + 1.12.667 + 1.12.667 + 2.6.13 + 2.6.13 + 0.4.2 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 10.4.13 + 3.1.2 + 1.0.0-beta-34 + 6.2.4 + 9.1.0 + 9.1.0 + 1.0.0 + 7.2.0 + 7.2.0 + 7.2.0 + 2.1.4 + 2.1.4 + 7.0.18 + 7.0.18 + 7.0.18 + 7.0.18 + 7.0.18 + 7.0.18 + 0.7.0 + 3.5.0 + 3.2.0 + 2.0.SP1 + 3.3.0 + 3.3.0 + 1.2.12 + 1.2.12 + 1.2.25 + 3.42.0 + 19.04.1 + 2.2.10 + 2.5.0.1 + 1.8.1.1 + 2.3.0.4 + 2.5.1.4 + 2.5.3.1 + 1.9.0.1 + 0.32.1.1 + 0.32.2.0 + 2.7 + 1.12.667 + 1.12.667 + 5.6.0 + 1.3.1 + 1.11.9 + 2.16.1 + 2.16.1 + 2.16.1 + 2.16.1 + 2.16.1 + 3.3.1 + 3.3.0 + 3.4.0 + 2.304 + 3.4 + 1.3.13 + 0.10.4 + 2.2.16 + 3.1.19 + 1.5.5-11 + 0.12.0 + 4.2.2 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.26.0 + 2.43.0 + 2.43.0 + 2.43.0 + 2.34.0 + 1.29.0 + 1.23.0 + 1.23.0 + 1.23.0 + 1.10.4 + 1.10.4 + 2.33.0 + 2.33.0 + 0.127.13 + 1.38.0 + 2.34.0 + 2.10.1 + 2.25.0 + 33.0.0-jre + 1.44.1 + 1.44.1 + 1.44.1 + 1.44.1 + 1.44.1 + 1.44.1 + 2.8 + 3.23.0 + 3.23.0 + 3.23.0 + 1.7 + 5.5.13.3 + 0.1.55 + 1.1.3 + 5.3 + 5.3 + 5.3 + 0.7.0 + 5.9 + 4.12.0 + 3.8.0 + 1.1.3 + 3.6.5 + 3.6.5 + 1.9.4 + 1.9.4 + 1.6.0 + 1.6.0 + 1.16.1 + 1.16.1 + 3.2.2 + 3.2.2 + 4.4 + 1.26.0 + 1.10.0 + 2.15.1 + 2.15.1 + 2.6 + 2.6 + 3.14.0 + 1.3.0 + 1.3.0 + 3.6.1 + 2.12.0 + 1.11.0 + 0.4.8 + 26 + 26 + 1.9.10 + 11.1.0 + 11.1.0 + 11.1.0 + 11.1.0 + 4.3 + 20151125 + 0.41 + 2.25.0 + 2.25.0 + 3.2.0 + + 0.12.0 + 1.7.0 + 6.1.1-1.5.10 + 2.1.3 + 2.15.0 + 2.304 + 3.4 + 7.2.0 + 7.2.0 + 7.2.0 + 2.23.0 + 1.6.2 + 2.43.0 + 2.43.0 + 2.43.0 + 3.6.5 + 2.5.0 + 2.5.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 2.3.0 + 1.23.0 + 1.23.0 + 1.23.0 + 1.23.0 + 2.33.0 + 2.33.0 + 0.127.13 + 1.38.0 + 2.34.0 + 1.44.1 + 1.44.1 + 1.44.1 + 1.44.1 + 1.44.1 + 1.44.1 + 1.0.3 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 1.5 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 1.62.2 + 1.62.2 + 2.10.1 + 33.0.0-jre + 1.14.3-1.5.10 + 1.8.0.10 + 1.8.0.10 + 4.5.14 + 4.4.16 + 4.5.14 + 0.3.0 + 0.3.0 + 3.6.5 + 1.54h + 1.2.6 + 2.0.4 + 0.2.0 + 6.0.2 + 1.2.1 + 0.7.5 + 0.1.2 + 0.8.1 + 0.7.1 + 1.0.0-5.6 + 1.0.0-5.6 + 0.1.3 + 2.0.0 + 0.1.1 + 0.8.1 + 0.3.1 + 0.3.2 + 0.3.3 + 0.8.4 + 0.2.0 + 1.1.7 + 0.3.1 + 1.0.1 + 1.0.1 + 2.15.0 + 1.54h + 2.15.0 + 0.2.1 + 0.3.1 + 0.14.0 + 1.0.0-beta-17 + 2.0.1 + 2.0.0 + 0.12.0 + 4.0.1 + 0.14.1 + 1.0.0 + 6.3.0 + 1.9.0 + 4.7.5 + 1.62.2 + 0.3.0 + 4.1.1 + 0.6.1 + 0.2.2 + 1.1.1 + 0.3.1 + 0.9.0 + 0.17.1 + 0.46.0 + 5.5.13.3 + 2.5.2 + 2.8 + 1.6.0-scijava-2 + 1.6.0-scijava-2 + 2.21.22 + 2.16.1 + 2.16.1 + 2.16.1 + 2.16.1 + 2.16.1 + 2.16.1 + 0.8.11 + 1.1.3 + 1.1.3 + 1.1.3 + 1.0.3 + 1.7.2 + 1.7.2 + 1.6.0-scijava-2 + 1.5.10 + 1.5.10 + - + 8.8.3 + 3.30.2-GA + 2.0.SP1 + 1.1.3 + 1.0.1 + 1.7.36 + 1.0.58 + 2.0.6.1 + 2.4.2 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 1.3.13 + 1.5.4 + 3.4.3 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 4.2.2 + 19.04.1 + 0.14 + 3.0.4 + 3.0.4 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 2.14.6 + 2.14.6 + 2.14.6 + 3.25.1 + 1.37 + 1.37 + 1.37 + 1.49 + 5.14.0 + 5.14.0 + 0.10.4 + 2.2.16 + 3.1.19 + 2.5.0 + 2.0.5 + 2.12.7 + 2.12.7 + 1.7.2 + 2.5.0 + 2.5.0 + 2.5.0 + 1.10.5 + 2.2.1 + 2.80b11 + 2.80b11 + 0.2.1 + 0.1.55 + 1.4 + 20240205 + 0.7.4-scijava + 5.10.2 + 5.10.2 + 5.10.2 + 5.10.2 + 5.10.2 + 5.10.2 + 4.13.2 + 4.13.2 + 0.2.4 + 0.2.4 + 2.7.3 + 2.7.3 + 1.1.3 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.8.0 + 1.8.0 + 1.8.0 + 5.6.0 + 0.1.17 + 0.3.11 + 3.3.0 + 1.1.10 + 1.84.1-1.5.10 + 1.0.2 + 1.12.0 + 1.12.0 + 1.12.0 + 2.4.0 + N/A + **/script_templates/** + N/A + This POM provides a parent from which participating projects can declare their build configurations. It ensures that projects all use a compatible build environment, including Java version, as well as versions of dependencies and plugins. + 2.20.0 + 2.20.0 + 2.20.0 + 1.2.12 + 1.2.12 + 1.2.12 + 1.8.0 + + 3.1.0 + 3.1.0 + 0.13.1 + 3.6.0 + 3.3.2 + 3.3.2 + 3.8.1 + 3.9.6 + 3.6.1 + 3.1.1 + 3.4.1 + 3.2.5 + 3.1.0 + 1.45 + 3.4.0 + 3.1.1 + 3.6.0 + 3.3.0 + 3.6.3 + 3.11.0 + 3.11.0 + 3.5.0 + 3.0.1 + 3.3.1 + 3.5.2 + 3.12.1 + 3.3.0 + 3.2.5 + yyyy-MM-dd'T'HH:mm:ssZ + 8 + 8 + 8 + 8 + 8 + false + 5.3.6 + 5.3 + 5.3 + 5.3 + 5.3 + 20151125 + 2.2.2 + 1.3.1 + 2.19.0 + 2.19.0 + 1.5.0 + 1.5.0 + 1.5.0 + 1.5.0 + 3.2.7 + 0.2.0 + 4.0.2 + 1.1.1 + 4.0.0 + 2.1.0 + 4.0.2 + 7.0.0 + 1.3.2 + 6.0.1 + 1.2.1 + 1.0.2 + 3.1.3 + 2.5.0 + 1.2.7 + 0.4.8 + 2.2.10 + 2.5.0.1 + 1.8.1.1 + 2.3.0.4 + 2.5.1.4 + 2.5.3.1 + 1.9.0.1 + 0.32.1.1 + 0.32.2.0 + 1.54h + 1.2.6 + 2.0.4 + 0.2.0 + 6.0.2 + 1.2.1 + 0.7.5 + 0.1.2 + 0.8.1 + 0.7.1 + 1.0.0-5.6 + 1.0.0-5.6 + 0.1.3 + 2.0.0 + 0.1.1 + 0.8.1 + 0.3.1 + 0.3.2 + 0.3.3 + 0.8.4 + 0.2.0 + 1.1.7 + 0.3.1 + 1.0.1 + 1.0.1 + 2.15.0 + 0.1.4 + 0.2.1 + 0.3.1 + 0.14.0 + 1.0.0-beta-17 + 2.0.1 + 2.0.0 + 0.12.0 + 4.0.1 + 0.14.1 + 1.0.0 + 6.3.0 + 5.14.0 + 5.14.0 + 1.2.10 + 3.2.7 + 0.2.0 + 3.0.3 + 1.6.13 + 3.9.6 + 3.3 + 45.1.1 + 4.12.0 + 3.8.0 + 1.0.1 + 6.0.21 + 5.3.8 + 6.3.4 + 7.2.0 + 7.2.0 + 7.2.0 + 7.2.0 + 7.2.0 + 0.2.4 + 5.7.2 + 5.6.4 + 5.5.2 + 5.9.0 + 5.6.13 + 5.5.15 + 5.7.5 + 5.6.10 + 0.1.4 + 0.3.26-1.5.10 + 5.9 + 4.9.0-1.5.10 + 4.3.4 + 3.5.3 + 3.5.3 + 4.11.1 + 4.11.1 + 1.10.14 + 1.10.14 + 4.4 + 1.26.0 + 1.10.0 + 3.14.0 + 3.6.1 + 2.12.0 + 1.11.0 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.0.18 + 4.5.14 + 4.4.16 + 4.5.14 + 2.5.2 + 2.21.22 + 2.20.0 + 2.20.0 + 3.9.6 + 3.11.0 + 0.13.1 + 3.3.2 + 5.2.5 + 5.2.5 + 5.2.5 + 5.2.5 + 5.2.5 + 5.2.5 + 2.4.8 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 1.17 + 2.9 + 7.0.18 + 7.0.18 + 7.0.18 + 7.0.18 + 7.0.18 + 6.1.1-1.5.10 + 1.14.3-1.5.10 + 1.5.10 + 1.5.10 + 1.84.1-1.5.10 + 0.3.26-1.5.10 + 4.9.0-1.5.10 + 5.3.4-1.5.10 + 3.42.0 + 2.2.0 + 4.0.0 + 11.1.0 + 11.1.0 + 11.1.0 + 11.1.0 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 9.4.54.v20240208 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 4.3 + 0.41 + 1.1.5 + 1.0.2 + 4.0.2 + 1.1.1 + 4.0.0 + 2.1.0 + 4.0.2 + 7.0.0 + 1.3.2 + 6.0.1 + 1.2.1 + 3.1.3 + 3.30.2-GA + 2.0.6.1 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.9.22 + 1.8.0 + 1.8.0 + 1.5.4 + 3.4.3 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 1.4.0 + 0.14 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 3.25.1 + 1.49 + 2.0.5 + 2.5.0 + 2.5.0 + 1.7.2 + 1.7.2 + 1.7.2 + 2.5.0 + 2.5.0 + 2.5.0 + 2.5.0 + 1.10.5 + 2.80b11 + 1.0.58 + 2.2.1 + 20240205 + 5.10.2 + 5.10.2 + 5.10.2 + 5.10.2 + 5.10.2 + 5.10.2 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 2.2.1 + 1.0.1 + 1.8.0 + 3.1.0 + 2.19.0 + 4.2.1 + 3.3 + 45.1.1 + 1.37 + 1.37 + 5.3.6 + 1.0.1 + 6.0.21 + 5.3.8 + 6.3.4 + 5.7.2 + 5.6.4 + 5.5.2 + 5.9.0 + 5.6.13 + 5.5.15 + 5.7.5 + 5.6.10 + 9.6 + 9.6 + 9.6 + 9.6 + 9.6 + 42.7.2 + 2.7.3 + 0.4.2 + 1.6.0-scijava-2 + 1.6.0-scijava-2 + 2.4.2 + 0.7.4-scijava + 2.2.2 + 2.5.0 + 3.1.0 + 0.1.2 + 2.98.0 + 2.0.3 + 0.1.2 + 0.3.0 + 0.1.0 + 1.0.0-beta-3 + 1.0.6 + 1.0.1 + 0.2.0 + 0.2.4 + 0.3.1 + 0.1.3 + 0.1.4 + 2.0.4 + 1.0.2 + 0.1.7 + 1.0.1 + 1.1.0 + 0.2.1 + 1.0.0 + 0.4.1 + 0.1.6 + 1.0.0 + 0.4.1 + 1.0.0 + 0.3.1 + 1.0.1 + 0.2.1 + 0.5.3 + 0.3.0 + 0.2.3 + 0.3.2 + 1.0.2 + 2.0.8 + 1.6.0-scijava-2 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 0.2.1 + 2.7 + 2.6.0 + 2.6.0 + 3.2.9.RELEASE + 3.2.9.RELEASE + 3.2.9.RELEASE + 1.12.0 + 1.12.0 + 1.12.0 + 1.12.0 + 1.12.0 + 1.6.8 + 1.9 + 2.2 + ${package-guess} + 2.0.1 + 3.0.2 + 3.0.2 + 3.1.0 + 4.7.5 + 2.2.0 + 4.0.0 + 5.2.5 + 5.2.5 + 5.2.5 + 5.2.5 + 5.2.5 + 5.2.5 + 42.7.2 + + UTF-8 + UTF-8 + 2.34.0 + 1.29.0 + 1.12.0 + 3.23.0 + 3.23.0 + 3.23.0 + 3.23.0 + 1.7 + 1.11.9 + 3.0.8 + 2.0.1 + sonatype-oss-release + 1.2.25 + 0.28.1 + 0.15.0 + 3.4.0 + 3.0.2 + 2.0.1 + 4.0.5 + 3.4.2 + 2.0.1 + 0.5.4 + 2.0.2 + 1.11.0 + 1.18.0 + 3.0.1 + 3.0.1 + 2.1.1 + 2.0.2 + 2.0.1 + 3.0.0 + 3.0.6 + 2.0.7 + 2.5.0 + 3.0.3 + 2.1.0 + 1.0.6 + 2.1.8 + 2.1.2 + 2.3.0 + 2.0.4 + 2.0.3 + 2.0.1 + 2.0.8 + 2.1.1 + 3.1.3 + 2.0.1 + 2.0.1 + 1.0.2 + 2.3.5 + 1.1.1 + 2.0.2 + 2.0.1 + 4.2.2 + 2.0.2 + 3.0.1 + 3.0.1 + 2.0.1 + 2.0.0 + 2.0.1 + 3.0.0 + 4.1.2 + 4.1.2 + 2.0.2 + 2.0.1 + 5.0.0 + 5.0.0 + 2.0.1 + 2.0.1 + 7.1.1 + 2.1.1 + 3.0.1 + 2.0.0 + 2.0.0 + 1.1.2 + 2.0.2 + 2.0.5 + 2.0.2 + 5.0.25 + 2.0.3 + 2.0.1 + 3.1.10 + 1.0.5 + 2.1.1 + 2.0.2 + 2.1.2 + 2.0.1 + 3.1.9 + 1.7-fiji4 + 1.1.4 + 1.1.4 + 2.0.1 + 2.1.1 + 2.1.0 + 25.0.2 + 2.0.1 + 3.1.4 + 0.1.2 + 1.2.5 + 1.4.0 + 1.2.1 + 3.2.0 + 2.0.1 + 1.2.1 + 1.3.1 + 7.11.1 + 3.3.4 + 1.3.10 + 2.0.4 + 2.2.0 + 3.0.4 + 2.0.3 + 1.0.3 + 2.0.3 + 2.0.1 + 2.5.0 + 2.0.3 + 2.01.4 + 2.6.13 + 10.4.13 + 3.1.2 + 1.0.0-beta-34 + 6.2.4 + 9.1.0 + 1.0.0 + 2.1.4 + 2.1.3 + 2.15.0 + 0.1.17 + 0.3.11 + 1.1.10 + 1.0.2 + 2.0.1 + 3.0.2 + 3.0.8 + 2.0.1 + 2.2.7 + 1.0.1 + 2.0.0 + 2.1.1 + 1.1.2 + 4.1.1 + 0.6.1 + 0.2.2 + 1.1.1 + 0.3.1 + 0.9.0 + 0.17.1 + 0.46.0 + 0.1.2 + 2.1.1 + 2.98.0 + 2.0.3 + 0.1.2 + 0.3.0 + 0.1.0 + 1.0.0-beta-3 + 1.0.6 + 3.0.0 + 1.0.1 + 0.2.0 + 0.2.4 + 0.3.1 + 0.1.3 + 0.1.4 + 2.0.4 + 1.0.2 + 0.1.7 + 1.0.1 + com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* + scijava + **/script_templates/** + java + org.scijava,net.imagej,net.imglib2,io.scif,sc.fiji + https://javadoc.scijava.org/Java8/ + https://javadoc.scijava.org/JavaFX8/ + [1.8.0-101,) + 8 + 8 + 3.6.3 + natives-linux_64 + linux-x86_64 + natives-linux-amd64 + linux-x86_64 + linux-x86_64 + natives-linux-amd64 + natives-linux-amd64 + natives-linux-amd64 + natives-linux-amd64 + linux-x86_64 + linux-x86_64 + linux-x86_64 + linux-x86_64 + 64 + x86_64 + amd64 + linux + linux + linux + linux + + founder,lead,developer,debugger,reviewer,support,maintainer + 1.1.0 + 0.2.1 + 1.0.0 + 0.4.1 + 0.1.6 + 1.0.0 + 0.4.1 + 1.0.0 + 0.3.1 + 1.0.1 + 0.2.1 + 0.5.3 + 0.3.0 + 0.2.3 + 0.3.2 + 2.6.0 + 2.6.0 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 1.7.36 + 2.7 + 2.2 + 3.10.0.2594 + https://s01.oss.sonatype.org + 2.4.8 + 2.4.8 + 2.2.7 + 3.2.9.RELEASE + 3.2.9.RELEASE + 3.2.9.RELEASE + 3.2.9.RELEASE + 1.0.2 + 1.12.0 + 5.3.4-1.5.10 + 0.12.0 + 1.6.8 + 1.2.0 + 1.0.1 + 2.0.0 + 3.0.3 + all + 2.0.8 + 1.6.0-scijava-2 + 1.7 + 2.16.2 + 1.0 + 2.1.1 + 3.9.6 + 3.9.6 + 2.9 + 1.9 + 1.1.2 + 1.5.5-11 + + + + + org.scijava + batch-processor + 0.4.2 + + + org.scijava + minimaven + 2.2.2 + + + org.scijava + native-lib-loader + 2.5.0 + + + org.scijava + parsington + 3.1.0 + + + org.scijava + scijava-cache + 0.1.2 + + + org.scijava + scijava-common + 2.98.0 + + + org.scijava + scijava-config + 2.0.3 + + + org.scijava + scijava-grab + 0.1.2 + + + org.scijava + scijava-io-http + 0.3.0 + + + org.scijava + scijava-java3d + 0.1.0 + + + org.scijava + scijava-listeners + 1.0.0-beta-3 + + + org.scijava + scijava-log-slf4j + 1.0.6 + + + org.scijava + scijava-optional + 1.0.1 + + + org.scijava + scijava-plot + 0.2.0 + + + org.scijava + scijava-plugins-commands + 0.2.4 + + + org.scijava + scijava-plugins-platforms + 0.3.1 + + + org.scijava + scijava-plugins-text-markdown + 0.1.3 + + + org.scijava + scijava-plugins-text-plain + 0.1.4 + + + org.scijava + scijava-search + 2.0.4 + + + org.scijava + scijava-table + 1.0.2 + + + org.scijava + scijava-ui-awt + 0.1.7 + + + org.scijava + scijava-ui-swing + 1.0.1 + + + org.scijava + script-editor + 1.0.0 + + + org.scijava + script-editor-jython + 1.1.0 + + + org.scijava + script-editor-scala + 0.2.1 + + + org.scijava + scripting-beanshell + 0.4.1 + + + org.scijava + scripting-clojure + 0.1.6 + + + org.scijava + scripting-groovy + 1.0.0 + + + org.scijava + scripting-java + 0.4.1 + + + org.scijava + scripting-javascript + 1.0.0 + + + org.scijava + scripting-jruby + 0.3.1 + + + org.scijava + scripting-jython + 1.0.1 + + + org.scijava + scripting-kotlin + 0.2.1 + + + org.scijava + scripting-matlab + 0.5.3 + + + org.scijava + scripting-python + 0.3.0 + + + org.scijava + scripting-renjin + 0.2.3 + + + org.scijava + scripting-scala + 0.3.2 + + + org.scijava + swing-checkbox-tree + 1.0.2 + + + org.scijava + ui-behaviour + 2.0.8 + + + net.imagej + imagej + 2.15.0 + + + net.imagej + ij + 1.54h + + + com.sun + tools + + + + + net.imagej + ij1-patcher + 1.2.6 + + + net.imagej + imagej-common + 2.0.4 + + + net.imagej + imagej-deprecated + 0.2.0 + + + net.imagej + imagej-launcher + 6.0.2 + + + net.imagej + imagej-legacy + 1.2.1 + + + net.imagej + imagej-matlab + 0.7.5 + + + net.imagej + imagej-mesh + 0.8.1 + + + net.imagej + imagej-mesh-io + 0.1.2 + + + net.imagej + imagej-notebook + 0.7.1 + + + net.imagej + imagej-omero + 1.0.0-5.6 + + + net.imagej + imagej-omero-legacy + 1.0.0-5.6 + + + net.imagej + imagej-opencv + 0.1.3 + + + net.imagej + imagej-ops + 2.0.0 + + + net.imagej + imagej-plugins-batch + 0.1.1 + + + net.imagej + imagej-plugins-commands + 0.8.1 + + + net.imagej + imagej-plugins-tools + 0.3.1 + + + net.imagej + imagej-plugins-uploader-ssh + 0.3.2 + + + net.imagej + imagej-plugins-uploader-webdav + 0.3.3 + + + net.imagej + imagej-scripting + 0.8.4 + + + net.imagej + imagej-server + 0.2.0 + + + net.imagej + imagej-tensorflow + 1.1.7 + + + net.imagej + imagej-ui-awt + 0.3.1 + + + net.imagej + imagej-ui-swing + 1.0.1 + + + net.imagej + imagej-updater + 1.0.1 + + + net.imagej + op-finder + 0.1.4 + + + net.imglib2 + imglib2 + 6.3.0 + + + net.imglib2 + imglib2-algorithm + 0.14.0 + + + net.imglib2 + imglib2-algorithm-fft + 0.2.1 + + + net.imglib2 + imglib2-algorithm-gpl + 0.3.1 + + + net.imglib2 + imglib2-cache + 1.0.0-beta-17 + + + net.imglib2 + imglib2-ij + 2.0.1 + + + net.imglib2 + imglib2-imglyb + 2.0.0 + + + net.imglib2 + imglib2-realtransform + 4.0.1 + + + net.imglib2 + imglib2-roi + 0.14.1 + + + net.imglib2 + imglib2-unsafe + 1.0.0 + + + io.scif + scifio + 0.46.0 + + + io.scif + scifio-bf-compat + 4.1.1 + + + io.scif + scifio-cli + 0.6.1 + + + io.scif + scifio-hdf5 + 0.2.2 + + + io.scif + scifio-jai-imageio + 1.1.1 + + + io.scif + scifio-labeling + 0.3.1 + + + io.scif + scifio-lifesci + 0.9.0 + + + io.scif + scifio-ome-xml + 0.17.1 + + + sc.fiji + fiji + 2.15.0 + + + sc.fiji + 3D_Blob_Segmentation + 3.0.2 + + + sc.fiji + 3D_Objects_Counter + 2.0.1 + + + sc.fiji + 3D_Viewer + 4.0.5 + + + sc.fiji + AnalyzeSkeleton_ + 3.4.2 + + + sc.fiji + Anisotropic_Diffusion_2D + 2.0.1 + + + sc.fiji + Archipelago_Plugins + 0.5.4 + + + sc.fiji + Arrow_ + 2.0.2 + + + sc.fiji + Auto_Local_Threshold + 1.11.0 + + + sc.fiji + Auto_Threshold + 1.18.0 + + + sc.fiji + BalloonSegmentation_ + 3.0.1 + + + sc.fiji + Bug_Submitter + 2.1.1 + + + sc.fiji + CPU_Meter + 2.0.2 + + + sc.fiji + Calculator_Plus + 2.0.1 + + + sc.fiji + Cell_Counter + 3.0.0 + + + sc.fiji + Colocalisation_Analysis + 3.0.6 + + + sc.fiji + Color_Histogram + 2.0.7 + + + sc.fiji + Color_Inspector_3D + 2.5.0 + + + sc.fiji + Colour_Deconvolution + 3.0.3 + + + sc.fiji + CorrectBleach_ + 2.1.0 + + + sc.fiji + Correct_3D_Drift + 1.0.6 + + + sc.fiji + Descriptor_based_registration + 2.1.8 + + + sc.fiji + Dichromacy_ + 2.1.2 + + + sc.fiji + Directionality_ + 2.3.0 + + + sc.fiji + FS_Align_TrakEM2 + 2.0.4 + + + sc.fiji + Feature_Detection + 2.0.3 + + + sc.fiji + Fiji_Archipelago + 2.0.1 + + + sc.fiji + Fiji_Developer + 2.0.8 + + + sc.fiji + Fiji_Package_Maker + 2.1.1 + + + sc.fiji + Fiji_Plugins + 3.1.3 + + + sc.fiji + FilamentDetector + 2.0.1 + + + sc.fiji + FlowJ_ + 2.0.1 + + + sc.fiji + Graph_Cut + 1.0.2 + + + sc.fiji + Gray_Morphology + 2.3.5 + + + org.janelia + H5J_Loader_Plugin + 1.1.5 + + + sc.fiji + HDF5_Vibez + 1.1.1 + + + sc.fiji + Helmholtz_Analysis + 2.0.2 + + + sc.fiji + IJ_Robot + 2.0.1 + + + sc.fiji + IO_ + 4.2.2 + + + sc.fiji + Image_5D + 2.0.2 + + + sc.fiji + Image_Expression_Parser + 3.0.1 + + + sc.fiji + Interactive_3D_Surface_Plot + 3.0.1 + + + sc.fiji + IsoData_Classifier + 2.0.1 + + + sc.fiji + Kappa + 2.0.0 + + + sc.fiji + Kuwahara_Filter + 2.0.1 + + + sc.fiji + KymographBuilder + 3.0.0 + + + sc.fiji + LSM_Reader + 4.1.2 + + + sc.fiji + LSM_Toolbox + 4.1.2 + + + sc.fiji + Lasso_and_Blow_Tool + 2.0.2 + + + sc.fiji + Linear_Kuwahara + 2.0.1 + + + sc.fiji + LocalThickness_ + 5.0.0 + + + sc.fiji + MTrack2_ + 2.0.1 + + + sc.fiji + M_I_P + 2.0.1 + + + sc.fiji + Manual_Tracking + 2.1.1 + + + sc.fiji + Multi_Kymograph + 3.0.1 + + + sc.fiji + OMEVisual + 2.0.0 + + + sc.fiji + PIV_analyser + 2.0.0 + + + sc.fiji + QuickPALM_ + 1.1.2 + + + sc.fiji + RATS_ + 2.0.2 + + + sc.fiji + Reconstruct_Reader + 2.0.5 + + + sc.fiji + SPIM_Opener + 2.0.2 + + + sc.fiji + SPIM_Registration + 5.0.25 + + + sc.fiji + Samples_ + 2.0.3 + + + sc.fiji + Series_Labeler + 2.0.1 + + + sc.fiji + Siox_Segmentation + 1.0.5 + + + sc.fiji + Skeletonize3D_ + 2.1.1 + + + sc.fiji + SplineDeformationGenerator_ + 2.0.2 + + + sc.fiji + Stack_Manipulation + 2.1.2 + + + sc.fiji + Statistical_Region_Merging + 2.0.1 + + + sc.fiji + Stitching_ + 3.1.9 + + + sc.fiji + Sync_Win + 1.7-fiji4 + + + sc.fiji + Thread_Killer + 2.0.1 + + + sc.fiji + Time_Lapse + 2.1.1 + + + sc.fiji + Time_Stamper + 2.1.0 + + + sc.fiji + ToAST_ + 25.0.2 + + + sc.fiji + TopoJ_ + 2.0.1 + + + sc.fiji + Trainable_Segmentation + 3.3.4 + + + sc.fiji + TrakEM2_Archipelago + 2.0.4 + + + sc.fiji + VIB-lib + 2.2.0 + + + sc.fiji + VIB_ + 3.0.4 + + + sc.fiji + Vaa3d_Reader + 2.0.3 + + + sc.fiji + Vaa3d_Writer + 1.0.3 + + + sc.fiji + Video_Editing + 2.0.1 + + + sc.fiji + View5D_ + 2.5.0 + + + sc.fiji + Volume_Calculator + 2.0.3 + + + sc.fiji + Volume_Viewer + 2.01.4 + + + sc.fiji + bUnwarpJ_ + 2.6.13 + + + sc.fiji + bij + 1.0.0 + + + sc.fiji + blockmatching_ + 2.1.4 + + + sc.fiji + fiji-lib + 2.1.3 + + + sc.fiji + legacy-imglib1 + 1.1.10 + + + sc.fiji + level_sets + 1.0.2 + + + sc.fiji + pal-optimization + 2.0.1 + + + sc.fiji + panorama_ + 3.0.2 + + + sc.fiji + register_virtual_stack_slices + 3.0.8 + + + sc.fiji + registration_3d + 2.0.1 + + + sc.fiji + weave_jy2java + 2.1.1 + + + jitk + jitk-tps + 3.0.4 + + + sc.fiji + bigwarp_fiji + 9.1.0 + + + com.googlecode.efficient-java-matrix-library + ejml + + + + + mpicbg + mpicbg + 1.5.0 + + + mpicbg + mpicbg_ + 1.5.0 + + + sc.fiji + trakem2_tps + 2.0.0 + + + sc.fiji + z_spacing + 1.1.2 + + + sc.fiji + bigdataviewer-core + 10.4.13 + + + sc.fiji + bigdataviewer-server + 3.1.2 + + + sc.fiji + bigdataviewer-vistools + 1.0.0-beta-34 + + + sc.fiji + bigdataviewer_fiji + 6.2.4 + + + sc.fiji + spim_data + 2.2.7 + + + sc.fiji + TrackMate + 7.11.1 + + + sc.fiji + TrackMate-Cellpose + 0.1.2 + + + sc.fiji + TrackMate-CSVImporter + 3.1.4 + + + sc.fiji + TrackMate-ExTrack + 1.2.5 + + + sc.fiji + TrackMate-Ilastik + 1.4.0 + + + sc.fiji + TrackMate-MorphoLibJ + 1.2.1 + + + sc.fiji + TrackMate-Oneat + 3.2.0 + + + sc.fiji + TrackMate-Skeleton + 2.0.1 + + + sc.fiji + TrackMate-StarDist + 1.2.1 + + + sc.fiji + TrackMate-Weka + 1.3.1 + + + sc.fiji + T2-NIT + 1.1.4 + + + sc.fiji + T2-TreelineGraph + 1.1.4 + + + sc.fiji + TrakEM2_ + 1.3.10 + + + sc.fiji + VectorString + 2.0.3 + + + sc.fiji + trakem2-transform + 1.0.1 + + + net.imglib2 + imglib2-label-multisets + 0.12.0 + + + org.janelia.saalfeldlab + n5 + 3.1.3 + + + org.janelia.saalfeldlab + n5-aws-s3 + 4.0.2 + + + org.janelia.saalfeldlab + n5-blosc + 1.1.1 + + + org.janelia.saalfeldlab + n5-google-cloud + 4.0.0 + + + org.janelia.saalfeldlab + n5-hdf5 + 2.1.0 + + + org.janelia.saalfeldlab + n5-ij + 4.0.2 + + + org.janelia.saalfeldlab + n5-imglib2 + 7.0.0 + + + org.janelia.saalfeldlab + n5-universe + 1.3.2 + + + org.janelia.saalfeldlab + n5-viewer_fiji + 6.0.1 + + + org.janelia.saalfeldlab + n5-zarr + 1.2.1 + + + fr.inra.ijpb + MorphoLibJ_ + 1.6.2 + + + net.haesleinhuepf + clij_ + 1.9.0.1 + + + net.haesleinhuepf + clij-core + 1.8.1.1 + + + net.haesleinhuepf + clij-coremem + 2.3.0.4 + + + net.haesleinhuepf + clij-clearcl + 2.5.0.1 + + + net.haesleinhuepf + clij2_ + 2.5.3.1 + + + net.haesleinhuepf + clij2-assistant_ + 2.5.1.4 + + + net.haesleinhuepf + clijx_ + 0.32.2.0 + + + net.haesleinhuepf + clijx-weka_ + 0.32.1.1 + + + net.preibisch + BigStitcher + 1.2.10 + + + net.preibisch + multiview-reconstruction + 3.2.7 + + + net.preibisch + multiview-simulation + 0.2.0 + + + org.bonej + bonej-plugins + 7.0.18 + + + org.bonej + bonej-ops + 7.0.18 + + + org.bonej + bonej-legacy-plugins_ + 7.0.18 + + + org.bonej + bonej-legacy-util_ + 7.0.18 + + + org.bonej + bonej-utilities + 7.0.18 + + + org.morphonets + SNT + 4.2.1 + + + org.jzy3d + jzy3d-emul-gl + + + org.jzy3d + jGL + + + + + sc.fiji + MaMuT + 7.1.1 + + + sc.fiji + labkit-pixel-classification + 0.1.17 + + + sc.fiji + labkit-ui + 0.3.11 + + + com.zeroc + glacier2 + 3.6.5 + + + com.zeroc + ice + 3.6.5 + + + org.openmicroscopy + metakit + 5.3.6 + + + ch.qos.logback + logback-classic + + + + + org.openmicroscopy + ome-codecs + 1.0.1 + + + org.openmicroscopy + ome-common + 6.0.21 + + + ch.qos.logback + logback-classic + + + xalan + serializer + + + xalan + xalan + + + + + org.openmicroscopy + ome-poi + 5.3.8 + + + org.openmicroscopy + ome-xml + 6.3.4 + + + ome + jxrlib-all + 0.2.4 + + + ome + bio-formats-tools + 7.2.0 + + + xalan + serializer + + + xalan + xalan + + + + + ome + bio-formats_plugins + 7.2.0 + + + ch.qos.logback + logback-classic + + + + + ome + formats-api + 7.2.0 + + + xalan + serializer + + + xalan + xalan + + + + + ome + formats-bsd + 7.2.0 + + + xalan + serializer + + + xalan + xalan + + + + + ome + formats-gpl + 7.2.0 + + + org.openmicroscopy + omero-blitz + 5.7.2 + + + com.sun.activation + javax.activation + + + org.apache.xmlgraphics + batik-all + + + + + org.openmicroscopy + omero-common + 5.6.4 + + + ch.qos.logback + logback-classic + + + + + org.openmicroscopy + omero-dsl-plugin + 5.5.2 + + + org.openmicroscopy + omero-gateway + 5.9.0 + + + org.openmicroscopy + omero-model + 5.6.13 + + + javax.transaction + jta + + + org.apache.solr + solr-commons-csv + + + + + org.openmicroscopy + omero-renderer + 5.5.15 + + + c3p0 + c3p0 + + + + + org.openmicroscopy + omero-romio + 5.7.5 + + + org.openmicroscopy + omero-server + 5.6.10 + + + c3p0 + c3p0 + + + com.sun.mail + javax.mail + + + javax.activation + activation + + + org.apache.xmlgraphics + batik-all + + + + + net.clearcontrol + coremem + 0.4.8 + + + com.google.android.tools + dx + + + + + net.clearvolume + cleargl + 2.2.10 + + + org.jogamp.gluegen + gluegen-rt-main + + + org.jogamp.jogl + jogl-all-main + + + + + net.algart + algart-tiff + 1.2.7 + + + com.amazonaws + aws-java-sdk-core + 1.12.667 + + + com.amazonaws + aws-java-sdk-s3 + 1.12.667 + + + antlr + antlr + 2.7.7 + + + org.antlr + ST4 + 4.3.4 + + + org.antlr + antlr + 3.5.3 + + + org.antlr + antlr-runtime + 3.5.3 + + + org.apache.ant + ant + 1.10.14 + + + org.apache.ant + ant-launcher + 1.10.14 + + + org.apache.groovy + groovy + 4.0.18 + + + org.apache.groovy + groovy-ant + 4.0.18 + + + org.apache.groovy + groovy-astbuilder + 4.0.18 + + + org.apache.groovy + groovy-cli-commons + 4.0.18 + + + org.apache.groovy + groovy-cli-picocli + 4.0.18 + + + org.apache.groovy + groovy-console + 4.0.18 + + + org.apache.groovy + groovy-contracts + 4.0.18 + + + org.apache.groovy + groovy-datetime + 4.0.18 + + + org.apache.groovy + groovy-dateutil + 4.0.18 + + + org.apache.groovy + groovy-docgenerator + 4.0.18 + + + org.apache.groovy + groovy-ginq + 4.0.18 + + + org.apache.groovy + groovy-groovydoc + 4.0.18 + + + org.apache.groovy + groovy-groovysh + 4.0.18 + + + org.apache.groovy + groovy-jmx + 4.0.18 + + + org.apache.groovy + groovy-json + 4.0.18 + + + org.apache.groovy + groovy-jsr223 + 4.0.18 + + + org.apache.groovy + groovy-macro + 4.0.18 + + + org.apache.groovy + groovy-macro-library + 4.0.18 + + + org.apache.groovy + groovy-nio + 4.0.18 + + + org.apache.groovy + groovy-servlet + 4.0.18 + + + org.apache.groovy + groovy-sql + 4.0.18 + + + org.apache.groovy + groovy-swing + 4.0.18 + + + org.apache.groovy + groovy-templates + 4.0.18 + + + org.apache.groovy + groovy-test + 4.0.18 + + + org.apache.groovy + groovy-test-junit5 + 4.0.18 + + + org.apache.groovy + groovy-testng + 4.0.18 + + + org.apache.groovy + groovy-toml + 4.0.18 + + + org.apache.groovy + groovy-typecheckers + 4.0.18 + + + org.apache.groovy + groovy-xml + 4.0.18 + + + org.apache.groovy + groovy-yaml + 4.0.18 + + + org.apache.ivy + ivy + 2.5.2 + + + org.apache.logging.log4j + log4j-api + 2.20.0 + + + org.apache.logging.log4j + log4j-core + 2.20.0 + + + org.apache.maven.shared + maven-artifact-transfer + 0.13.1 + + + org.apache.maven.shared + maven-common-artifact-filters + 3.3.2 + + + org.apache.maven + maven-core + 3.9.6 + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + 3.11.0 + + + org.codehaus.plexus + plexus-component-annotations + 2.2.0 + + + org.codehaus.plexus + plexus-utils + 4.0.0 + + + org.sonatype.sisu + sisu-inject-bean + 2.6.0 + + + org.sonatype.sisu + sisu-inject-plexus + 2.6.0 + + + org.apache.poi + poi + 5.2.5 + + + org.apache.poi + poi-examples + 5.2.5 + + + org.apache.poi + poi-excelant + 5.2.5 + + + org.apache.poi + poi-ooxml + 5.2.5 + + + org.apache.poi + poi-ooxml-lite + 5.2.5 + + + org.apache.poi + poi-scratchpad + 5.2.5 + + + org.apache.spark + spark-core_2.11 + 2.4.8 + + + com.sun.jersey + jersey-core + + + commons-beanutils + commons-beanutils-core + + + io.netty + netty-all + + + + + org.apache.httpcomponents + httpclient + 4.5.14 + + + org.apache.httpcomponents + httpcore + 4.4.16 + + + org.apache.httpcomponents + httpmime + 4.5.14 + + + args4j + args4j + 2.33 + + + org.ow2.asm + asm + 9.6 + + + org.ow2.asm + asm-analysis + 9.6 + + + org.ow2.asm + asm-commons + 9.6 + + + org.ow2.asm + asm-tree + 9.6 + + + org.ow2.asm + asm-util + 9.6 + + + org.apache.xmlgraphics + batik-anim + 1.17 + + + org.apache.xmlgraphics + batik-awt-util + 1.17 + + + org.apache.xmlgraphics + batik-bridge + 1.17 + + + xalan + xalan + + + + + org.apache.xmlgraphics + batik-codec + 1.17 + + + org.apache.xmlgraphics + batik-constants + 1.17 + + + org.apache.xmlgraphics + batik-css + 1.17 + + + org.apache.xmlgraphics + batik-dom + 1.17 + + + xalan + xalan + + + + + org.apache.xmlgraphics + batik-ext + 1.17 + + + org.apache.xmlgraphics + batik-extension + 1.17 + + + org.apache.xmlgraphics + batik-gui-util + 1.17 + + + org.apache.xmlgraphics + batik-gvt + 1.17 + + + org.apache.xmlgraphics + batik-i18n + 1.17 + + + org.apache.xmlgraphics + batik-parser + 1.17 + + + org.apache.xmlgraphics + batik-rasterizer + 1.17 + + + org.apache.xmlgraphics + batik-rasterizer-ext + 1.17 + + + org.apache.xmlgraphics + batik-extensions + + + + + org.apache.xmlgraphics + batik-script + 1.17 + + + org.apache.xmlgraphics + batik-slideshow + 1.17 + + + org.apache.xmlgraphics + batik-squiggle + 1.17 + + + org.apache.xmlgraphics + batik-squiggle-ext + 1.17 + + + org.apache.xmlgraphics + batik-extensions + + + + + org.apache.xmlgraphics + batik-svg-dom + 1.17 + + + org.apache.xmlgraphics + batik-svggen + 1.17 + + + org.apache.xmlgraphics + batik-svgpp + 1.17 + + + org.apache.xmlgraphics + batik-swing + 1.17 + + + org.apache.xmlgraphics + batik-transcoder + 1.17 + + + org.apache.xmlgraphics + batik-ttf2svg + 1.17 + + + org.apache.xmlgraphics + batik-util + 1.17 + + + org.apache.xmlgraphics + batik-xml + 1.17 + + + org.apache.xmlgraphics + xmlgraphics-commons + 2.9 + + + org.lasersonlab + jblosc + 1.0.1 + + + com.nativelibs4java + bridj + 0.7.0 + + + com.google.android.tools + dx + + + + + javax.enterprise + cdi-api + 2.0.SP1 + + + org.checkerframework + checker-qual + 3.42.0 + + + commons-beanutils + commons-beanutils + 1.9.4 + + + commons-cli + commons-cli + 1.6.0 + + + commons-codec + commons-codec + 1.16.1 + + + commons-collections + commons-collections + 3.2.2 + + + org.apache.commons + commons-collections4 + 4.4 + + + org.apache.commons + commons-compress + 1.26.0 + + + org.apache.commons + commons-csv + 1.10.0 + + + commons-io + commons-io + 2.15.1 + + + commons-lang + commons-lang + 2.6 + + + org.apache.commons + commons-lang3 + 3.14.0 + + + commons-logging + commons-logging + 1.3.0 + + + org.apache.commons + commons-math3 + 3.6.1 + + + org.apache.commons + commons-pool2 + 2.12.0 + + + org.apache.commons + commons-text + 1.11.0 + + + cglib + cglib + 3.3.0 + + + dev.dirs + directories + 26 + + + org.eclipse.collections + eclipse-collections + 11.1.0 + + + org.eclipse.collections + eclipse-collections-api + 11.1.0 + + + org.eclipse.collections + eclipse-collections-forkjoin + 11.1.0 + + + org.eclipse.collections + eclipse-collections-testutils + 11.1.0 + + + org.eclipse.swt + org.eclipse.swt.cocoa.macosx + 4.3 + + + org.eclipse.swt + org.eclipse.swt.cocoa.macosx.x86_64 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.aix.ppc + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.aix.ppc64 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.hpux.ia64 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.ppc + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.ppc64 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.s390 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.s390x + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.linux.x86_64 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.solaris.sparc + 4.3 + + + org.eclipse.swt + org.eclipse.swt.gtk.solaris.x86 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.win32.win32.x86 + 4.3 + + + org.eclipse.swt + org.eclipse.swt.win32.win32.x86_64 + 4.3 + + + org.ejml + ejml-all + 0.41 + + + com.google.errorprone + error_prone_annotations + 2.25.0 + + + com.formdev + flatlaf + 3.4 + + + com.formdev + flatlaf-fonts-jetbrains-mono + 2.304 + + + com.google.api-client + google-api-client + 2.3.0 + + + com.google.api-client + google-api-client-android + 2.3.0 + + + com.google.api-client + google-api-client-appengine + 2.3.0 + + + com.google.api-client + google-api-client-gson + 2.3.0 + + + com.google.api-client + google-api-client-jackson2 + 2.3.0 + + + com.google.api-client + google-api-client-protobuf + 2.3.0 + + + com.google.api-client + google-api-client-servlet + 2.3.0 + + + javax.servlet + servlet-api + + + + + com.google.api-client + google-api-client-xml + 2.3.0 + + + com.google.api + api-common + 2.26.0 + + + com.google.api + gax + 2.43.0 + + + com.google.api + gax-grpc + 2.43.0 + + + com.google.api + gax-httpjson + 2.43.0 + + + com.google.api.grpc + proto-google-common-protos + 2.34.0 + + + com.google.api.grpc + proto-google-iam-v1 + 1.29.0 + + + com.google.auth + google-auth-library-appengine + 1.23.0 + + + com.google.auth + google-auth-library-credentials + 1.23.0 + + + com.google.auth + google-auth-library-oauth2-http + 1.23.0 + + + com.google.auto.value + auto-value + 1.10.4 + + + com.google.auto.value + auto-value-annotations + 1.10.4 + + + com.google.cloud + google-cloud-core + 2.33.0 + + + com.google.cloud + google-cloud-core-http + 2.33.0 + + + com.google.cloud + google-cloud-nio + 0.127.13 + + + com.google.cloud + google-cloud-resourcemanager + 1.38.0 + + + com.google.cloud + google-cloud-storage + 2.34.0 + + + com.google.http-client + google-http-client + 1.44.1 + + + com.google.http-client + google-http-client-apache-v2 + 1.44.1 + + + com.google.http-client + google-http-client-appengine + 1.44.1 + + + com.google.http-client + google-http-client-gson + 1.44.1 + + + com.google.http-client + google-http-client-jackson2 + 1.44.1 + + + com.google.http-client + google-http-client-xml + 1.44.1 + + + io.grpc + grpc-context + 1.62.2 + + + com.google.code.gson + gson + 2.10.1 + + + com.google.guava + guava + 33.0.0-jre + + + io.humble + humble-video-all + 0.3.0 + + + hsqldb + hsqldb + 1.8.0.10 + + + com.itextpdf + itextpdf + 5.5.13.3 + + + com.google.j2objc + j2objc-annotations + 2.8 + + + org.apache.jackrabbit + jackrabbit-webdav + 2.21.22 + + + org.slf4j + jcl-over-slf4j + + + + + com.fasterxml.jackson.core + jackson-annotations + 2.16.1 + + + com.fasterxml.jackson.core + jackson-core + 2.16.1 + + + com.fasterxml.jackson.core + jackson-databind + 2.16.1 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-cbor + 2.16.1 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.16.1 + + + com.sun.media + jai-codec + 1.1.3 + + + javax.media + jai-core + 1.1.3 + + + gov.nist.math + jama + 1.0.3 + + + org.scijava + j3dcore + 1.6.0-scijava-2 + + + org.scijava + j3dutils + 1.6.0-scijava-2 + + + org.scijava + vecmath + 1.6.0-scijava-2 + + + org.bytedeco + javacpp + 1.5.10 + + + org.bytedeco + javacv + 1.5.10 + + + org.bytedeco + ffmpeg + 6.1.1-1.5.10 + + + org.bytedeco + hdf5 + 1.14.3-1.5.10 + + + org.bytedeco + leptonica + 1.84.1-1.5.10 + + + org.bytedeco + openblas + 0.3.26-1.5.10 + + + org.bytedeco + opencv + 4.9.0-1.5.10 + + + org.bytedeco + tesseract + 5.3.4-1.5.10 + + + org.bytedeco + ffmpeg + 6.1.1-1.5.10 + linux-x86_64 + + + org.bytedeco + hdf5 + 1.14.3-1.5.10 + linux-x86_64 + + + org.bytedeco + leptonica + 1.84.1-1.5.10 + linux-x86_64 + + + org.bytedeco + openblas + 0.3.26-1.5.10 + linux-x86_64 + + + org.bytedeco + opencv + 4.9.0-1.5.10 + linux-x86_64 + + + org.bytedeco + tesseract + 5.3.4-1.5.10 + linux-x86_64 + + + org.javassist + javassist + 3.30.2-GA + + + org.jruby.jcodings + jcodings + 1.0.58 + + + org.jdom + jdom2 + 2.0.6.1 + + + org.scijava + jep + 2.4.2 + + + org.eclipse.jetty + jetty-annotations + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-client + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-continuation + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-deploy + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-http + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-http-spi + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-io + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-jaspi + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-jmx + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-jndi + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-nosql + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-plus + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-proxy + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-rewrite + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-security + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-server + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-servlet + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-servlets + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-spring + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-start + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-util + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-util-ajax + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-webapp + 9.4.54.v20240208 + + + org.eclipse.jetty + jetty-xml + 9.4.54.v20240208 + + + org.jfree + jfreechart + 1.5.4 + + + org.jfree + jfreesvg + 3.4.3 + + + org.jgrapht + jgrapht-core + 1.4.0 + + + org.jgrapht + jgrapht-demo + 1.4.0 + + + org.jgrapht + jgrapht-ext + 1.4.0 + + + org.jgrapht + jgrapht-guava + 1.4.0 + + + org.jgrapht + jgrapht-io + 1.4.0 + + + org.jgrapht + jgrapht-opt + 1.4.0 + + + it.unimi.dsi + fastutil + + + + + com.github.vlsi.mxgraph + jgraphx + 4.2.2 + + + cisd + jhdf5 + 19.04.1 + + + org.jheaps + jheaps + 0.14 + + + jline + jline + 2.14.6 + + + org.jline + jline-builtins + 3.25.1 + + + org.jline + jline-console + 3.25.1 + + + org.jline + jline-reader + 3.25.1 + + + org.jline + jline-remote-ssh + 3.25.1 + + + org.jline + jline-remote-telnet + 3.25.1 + + + org.jline + jline-style + 3.25.1 + + + org.jline + jline-terminal + 3.25.1 + + + org.jline + jline-terminal-jna + 3.25.1 + + + net.java.dev.jna + jna + 5.14.0 + + + net.java.dev.jna + jna-platform + 5.14.0 + + + com.github.jnr + jffi + 1.3.13 + + + com.github.jnr + jffi + 1.3.13 + native + + + com.github.jnr + jnr-constants + 0.10.4 + + + com.github.jnr + jnr-ffi + 2.2.16 + + + com.github.jnr + jnr-posix + 3.1.19 + + + joda-time + joda-time + 2.12.7 + + + org.jocl + jocl + 2.0.5 + + + org.jogamp.gluegen + gluegen + 2.5.0 + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + + + org.jogamp.joal + joal + 2.5.0 + + + org.jogamp.jocl + jocl + 2.5.0 + + + org.jogamp.jogl + jogl-all + 2.5.0 + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + natives-android-aarch64 + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + natives-linux-aarch64 + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + natives-linux-amd64 + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + natives-linux-armv6hf + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt + 2.5.0 + natives-windows-amd64 + + + org.jogamp.joal + joal + 2.5.0 + natives-android-aarch64 + + + org.jogamp.joal + joal + 2.5.0 + natives-linux-aarch64 + + + org.jogamp.joal + joal + 2.5.0 + natives-linux-amd64 + + + org.jogamp.joal + joal + 2.5.0 + natives-linux-armv6hf + + + org.jogamp.joal + joal + 2.5.0 + natives-macosx-universal + + + org.jogamp.joal + joal + 2.5.0 + natives-windows-amd64 + + + org.jogamp.jocl + jocl + 2.5.0 + natives-android-aarch64 + + + org.jogamp.jocl + jocl + 2.5.0 + natives-linux-aarch64 + + + org.jogamp.jocl + jocl + 2.5.0 + natives-linux-amd64 + + + org.jogamp.jocl + jocl + 2.5.0 + natives-linux-armv6hf + + + org.jogamp.jocl + jocl + 2.5.0 + natives-macosx-universal + + + org.jogamp.jocl + jocl + 2.5.0 + natives-windows-amd64 + + + org.jogamp.jogl + jogl-all + 2.5.0 + natives-android-aarch64 + + + org.jogamp.jogl + jogl-all + 2.5.0 + natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all + 2.5.0 + natives-linux-amd64 + + + org.jogamp.jogl + jogl-all + 2.5.0 + natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all + 2.5.0 + natives-macosx-universal + + + org.jogamp.jogl + jogl-all + 2.5.0 + natives-windows-amd64 + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + natives-android-aarch64 + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + natives-linux-amd64 + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + natives-macosx-universal + + + org.jogamp.jogl + jogl-all-noawt + 2.5.0 + natives-windows-amd64 + + + org.jogamp.java3d + java3d-core + 1.7.2 + + + org.jogamp.java3d + java3d-utils + 1.7.2 + + + org.jogamp.java3d + vecmath + 1.7.2 + + + org.joml + joml + 1.10.5 + + + org.jruby.joni + joni + 2.2.1 + + + org.jpedal + jpedalSTD + 2.80b11 + + + org.smurn + jply + 0.2.1 + + + com.jcraft + jsch + 0.1.55 + + + org.json + json + 20240205 + + + org.python + jython-slim + 2.7.3 + + + com.jcraft + jzlib + 1.1.3 + + + org.jzy3d + jzy3d-core + 2.2.1 + + + org.jzy3d + jzy3d-core-awt + 2.2.1 + + + org.jzy3d + jzy3d-emul-gl-awt + 2.2.1 + + + org.jzy3d + jzy3d-jGL-awt + 2.2.1 + + + org.jzy3d + jzy3d-jdt-core + 2.2.1 + + + org.jzy3d + jzy3d-native-jogl-awt + 2.2.1 + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-linux-aarch64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-armv6hf + + + org.jogamp.gluegen + gluegen-rt-natives-linux-i586 + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-windows-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-windows-i586 + + + org.jogamp.jogl + jogl-all-natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all-natives-linux-amd64 + + + org.jogamp.jogl + jogl-all-natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all-natives-linux-i586 + + + org.jogamp.jogl + jogl-all-natives-macosx-universal + + + org.jogamp.jogl + jogl-all-natives-windows-amd64 + + + org.jogamp.jogl + jogl-all-natives-windows-i586 + + + + + org.jzy3d + jzy3d-native-jogl-core + 2.2.1 + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-linux-aarch64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-armv6hf + + + org.jogamp.gluegen + gluegen-rt-natives-linux-i586 + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-windows-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-windows-i586 + + + org.jogamp.jogl + jogl-all-natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all-natives-linux-amd64 + + + org.jogamp.jogl + jogl-all-natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all-natives-linux-i586 + + + org.jogamp.jogl + jogl-all-natives-macosx-universal + + + org.jogamp.jogl + jogl-all-natives-windows-amd64 + + + org.jogamp.jogl + jogl-all-natives-windows-i586 + + + + + org.jzy3d + jzy3d-native-jogl-swing + 2.2.1 + + + com.miglayout + miglayout + + + + + org.jzy3d + jzy3d-tester + 2.2.1 + + + org.jetbrains.kotlin + kotlin-compiler-embeddable + 1.9.22 + + + org.jetbrains.kotlin + kotlin-daemon-embeddable + 1.9.22 + + + org.jetbrains.kotlin + kotlin-reflect + 1.9.22 + + + org.jetbrains.kotlin + kotlin-script-runtime + 1.9.22 + + + org.jetbrains.kotlin + kotlin-scripting-common + 1.9.22 + + + org.jetbrains.kotlin + kotlin-scripting-compiler-embeddable + 1.9.22 + + + org.jetbrains.kotlin + kotlin-scripting-jsr223 + 1.9.22 + + + org.jetbrains.kotlin + kotlin-scripting-jvm + 1.9.22 + + + org.jetbrains.kotlin + kotlin-stdlib + 1.9.22 + + + org.jetbrains.kotlin + kotlin-stdlib-common + 1.9.22 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + 1.9.22 + + + org.jetbrains.kotlinx + kotlinx-coroutines-core + 1.8.0 + + + org.jetbrains.kotlinx + kotlinx-coroutines-core-jvm + 1.8.0 + + + com.esotericsoftware + kryo + 5.6.0 + + + com.esotericsoftware + minlog + 1.3.1 + + + com.esotericsoftware + reflectasm + 1.11.9 + + + ch.qos.logback + logback-classic + 1.2.12 + + + javax.activation + activation + + + + + ch.qos.logback + logback-core + 1.2.12 + + + org.lz4 + lz4-java + 1.8.0 + + + org.mapdb + mapdb + 3.1.0 + + + net.jpountz.lz4 + lz4 + + + + + com.miglayout + miglayout-core + 5.3 + + + com.miglayout + miglayout-swing + 5.3 + + + com.miglayout + miglayout-swt + 5.3 + + + edu.mines + mines-jtk + 20151125 + + + org.objenesis + objenesis + 3.3 + + + com.squareup.okhttp3 + okhttp + 4.12.0 + + + com.squareup.okio + okio + 3.8.0 + + + org.ojalgo + ojalgo + 45.1.1 + + + com.opencsv + opencsv + 5.9 + + + info.picocli + picocli + 4.7.5 + + + org.postgresql + postgresql + 42.7.2 + + + com.google.protobuf + protobuf-java + 3.23.0 + + + com.google.protobuf + protobuf-java-util + 3.23.0 + + + com.google.protobuf + protobuf-kotlin + 3.23.0 + + + com.google.re2j + re2j + 1.7 + + + ch.qos.reload4j + reload4j + 1.2.25 + + + com.fifesoft + rsyntaxtextarea + 3.4.0 + + + com.fifesoft + autocomplete + 3.3.1 + + + com.fifesoft + languagesupport + 3.3.0 + + + org.slf4j + slf4j-api + 1.7.36 + + + org.slf4j + slf4j-ext + 1.7.36 + + + org.slf4j + slf4j-jcl + 1.7.36 + + + org.slf4j + slf4j-jdk14 + 1.7.36 + + + org.slf4j + slf4j-nop + 1.7.36 + + + org.slf4j + slf4j-simple + 1.7.36 + + + org.slf4j + jcl-over-slf4j + 1.7.36 + + + org.yaml + snakeyaml + 2.2 + + + org.snakeyaml + snakeyaml-engine + 2.7 + + + org.springframework + spring-aop + 3.2.9.RELEASE + + + org.springframework + spring-beans + 3.2.9.RELEASE + + + org.springframework + spring-core + 3.2.9.RELEASE + + + org.tensorflow + tensorflow + 1.12.0 + + + org.tensorflow + libtensorflow + 1.12.0 + + + org.tensorflow + libtensorflow_jni + 1.12.0 + + + org.tensorflow + libtensorflow_jni_gpu + 1.12.0 + + + org.tensorflow + proto + 1.12.0 + + + org.threeten + threetenbp + 1.6.8 + + + net.sf.trove4j + trove4j + 3.0.3 + + + nz.ac.waikato.cms.weka + weka-dev + 3.9.6 + + + com.github.fommil.netlib + all + + + com.github.vbmacher + java-cup-runtime + + + com.googlecode.netlib-java + netlib-java + + + com.sun.activation + jakarta.activation + + + nz.ac.waikato.cms.weka.thirdparty + java-cup-11b + + + nz.ac.waikato.cms.weka.thirdparty + java-cup-11b-runtime + + + net.sourceforge.f2j + arpack_combined_all + + + + + org.tukaani + xz + 1.9 + + + com.github.luben + zstd-jni + 1.5.5-11 + + + org.scijava + scijava-common + 2.98.0 + tests + test + + + net.imagej + imagej-legacy + 1.2.1 + tests + test + + + net.imagej + imagej-ops + 2.0.0 + tests + test + + + net.imagej + imagej-updater + 1.0.1 + tests + test + + + net.imglib2 + imglib2 + 6.3.0 + tests + test + + + org.janelia.saalfeldlab + n5 + 3.1.3 + tests + test + + + junit + junit + 4.13.2 + test + + + org.junit.jupiter + junit-jupiter-api + 5.10.2 + test + + + org.junit.jupiter + junit-jupiter-engine + 5.10.2 + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + 5.10.2 + test + + + org.junit.jupiter + junit-jupiter-params + 5.10.2 + test + + + org.junit.vintage + junit-vintage-engine + 5.10.2 + test + + + org.scijava + junit-benchmarks + 0.7.4-scijava + test + + + org.jmockit + jmockit + 1.49 + test + + + org.mockito + mockito-core + 2.19.0 + test + + + org.openjdk.jmh + jmh-core + 1.37 + test + + + org.openjdk.jmh + jmh-generator-annprocess + 1.37 + test + + + + + + + false + + central + Central Repository + https://repo.maven.apache.org/maven2 + + + + + + never + + + false + + central + Central Repository + https://repo.maven.apache.org/maven2 + + + + /home/elect/IdeaProjects/pom-scijava/src/main/java + /home/elect/IdeaProjects/pom-scijava/src/main/scripts + /home/elect/IdeaProjects/pom-scijava/src/test/java + /home/elect/IdeaProjects/pom-scijava/target/classes + /home/elect/IdeaProjects/pom-scijava/target/test-classes + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 1.0 + + + install + + + /home/elect/IdeaProjects/pom-scijava/src/main/resources + + + + + /home/elect/IdeaProjects/pom-scijava/src/test/resources + + + /home/elect/IdeaProjects/pom-scijava/target + pom-scijava-38.0.0-SNAPSHOT + + + + maven-antrun-plugin + 3.1.0 + + + maven-assembly-plugin + 3.6.0 + + + maven-clean-plugin + 3.3.2 + + + maven-compiler-plugin + 3.8.1 + + + maven-dependency-plugin + 3.6.1 + + + maven-deploy-plugin + 3.1.1 + + + maven-enforcer-plugin + 3.4.1 + + + org.codehaus.mojo + extra-enforcer-rules + 1.7.0 + compile + + + org.scijava + scijava-maven-plugin + 3.0.0 + compile + + + + + maven-failsafe-plugin + 3.2.5 + + + + integration-test + verify + + + + + + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + true + + + + + true + + + + maven-help-plugin + 3.4.0 + + + maven-install-plugin + 3.1.1 + + + maven-jar-plugin + 3.3.0 + + + + test-jar + + + + + true + true + true + + ${package-guess} + + + + ${buildNumber} + 2024-03-03T16:51:20+0000 + ${package-guess} + + + true + + + + + + + true + true + true + + ${package-guess} + + + + ${buildNumber} + 2024-03-03T16:51:20+0000 + ${package-guess} + + + true + + + + maven-javadoc-plugin + 3.6.3 + + 1024m + + https://javadoc.scijava.org/Java8/ + https://javadoc.scijava.org/JavaFX8/ + https://javadoc.scijava.org/SciJava/ + https://javadoc.scijava.org/Alida/ + https://javadoc.scijava.org/Bio-Formats/ + https://javadoc.scijava.org/FLIMLib/ + https://javadoc.scijava.org/Fiji/ + https://javadoc.scijava.org/Icy/ + https://javadoc.scijava.org/ImageJ/ + https://javadoc.scijava.org/ImageJ1/ + https://javadoc.scijava.org/ImgLib2/ + https://javadoc.scijava.org/Java3D/ + https://javadoc.scijava.org/KNIME/ + https://javadoc.scijava.org/LOCI/ + https://javadoc.scijava.org/MiToBo/ + https://javadoc.scijava.org/Micro-Manager-Core/ + https://javadoc.scijava.org/Micro-Manager-Studio/ + https://javadoc.scijava.org/MorphoLibJ/ + https://javadoc.scijava.org/OMERO/ + https://javadoc.scijava.org/SCIFIO/ + https://javadoc.scijava.org/Apache-Commons-IO/ + https://javadoc.scijava.org/Apache-Commons-Lang/ + https://javadoc.scijava.org/Apache-Commons-Math/ + https://javadoc.scijava.org/Apache-Commons-Text/ + https://javadoc.scijava.org/BoneJ/ + https://javadoc.scijava.org/Eclipse/ + https://javadoc.scijava.org/Guava/ + https://javadoc.scijava.org/JAMA/ + https://javadoc.scijava.org/JFreeChart/ + https://javadoc.scijava.org/JGraphT/ + https://javadoc.scijava.org/JHotDraw/ + https://javadoc.scijava.org/JOML/ + https://javadoc.scijava.org/Javassist/ + https://javadoc.scijava.org/MigLayout/ + https://javadoc.scijava.org/NetBeans/ + https://javadoc.scijava.org/Pivot/ + https://javadoc.scijava.org/VisAD/ + https://javadoc.scijava.org/Weka/ + https://javadoc.scijava.org/ojAlgo/ + + + + + maven-plugin-plugin + 3.11.0 + + + maven-project-info-reports-plugin + 3.5.0 + + + maven-release-plugin + 3.0.1 + + + maven-resources-plugin + 3.3.1 + + + maven-shade-plugin + 3.5.2 + + + maven-site-plugin + 3.12.1 + + + maven-source-plugin + 3.3.0 + + + attach-sources + none + + + attach-sources-jar + + jar + + + + + + maven-surefire-plugin + 3.2.5 + + @{argLine} -Xms512m -Xmx512m -Dapple.awt.UIElement=true + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.5.0 + + + sanitize-version + + regex-property + + + sanitizedVersion + 38.0.0-SNAPSHOT + ^([0-9]+)\.([0-9]+)\.([0-9]+).*$ + $1.$2.$3 + false + + + + guess-package + + regex-property + + + package-guess + org.scijava.pom-scijava + [^a-z0-9_.]+ + _ + false + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 3.2.0 + + + validate + + create + + + true + UNKNOWN + + + + + + net.java.dev.jna + platform + 3.5.2 + compile + + + + true + UNKNOWN + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + html + xml + + + + + org.codehaus.mojo + exec-maven-plugin + 3.2.0 + + + org.codehaus.mojo + license-maven-plugin + 2.4.0 + + false + true + true + + java + properties + java + + + + + org.codehaus.mojo + tidy-maven-plugin + 1.2.0 + + + org.codehaus.mojo + versions-maven-plugin + 2.16.2 + + + org.scijava + scijava-maven-plugin + 3.0.0 + + + set-rootdir + validate + + set-rootdir + + + + + + com.zenjava + javafx-maven-plugin + 8.8.3 + + SciJava Parent POM + SciJava Parent POM + SciJava Parent POM.jar + + ${sanitizedVersion} + true + + + + net.revelc.code + impsort-maven-plugin + 1.9.0 + + + none + + java.,javax.,com.,net.,org. + java,* + true + + + + + java.,javax.,com.,net.,org. + java,* + true + + + + net.revelc.code.formatter + formatter-maven-plugin + 2.23.0 + + + org.scijava + scijava-coding-style + 2.1.1 + compile + + + + eclipse-formatter-settings/scijava-coding-style.xml + + + + org.fusesource.mvnplugins + maven-graph-plugin + 1.45 + + provided,runtime,system,test + true + + /home/elect/IdeaProjects/pom-scijava/target/dependency-graph.dot + + + + org.honton.chas + exists-maven-plugin + 0.12.0 + + + + remote + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + + org.revapi + revapi-maven-plugin + 0.15.0 + + + org.revapi + revapi-java + 0.28.1 + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.10.0.2594 + + + + + + maven-enforcer-plugin + 3.4.1 + + + enforce-rules + + enforce + + + + + 3.6.3 + + + Plugins need to be versioned! + + + [1.8.0-101,) + + + No Duplicate Classes Allowed! +- For duplicate transitive dependencies, add dependency exclusions. +- For duplications between direct dependencies, resolve or add + ignored classes to this rule's configuration. + true + com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* + + + founder,lead,developer,debugger,reviewer,support,maintainer + + + founder,lead,developer,debugger,reviewer,support,maintainer + + + 8 + + com.headius:invokebinder + com.sun:tools + + + module-info + + + test + + + + + name + description + url + inceptionYear + organization + licenses + developers + contributors + mailingLists + scm + issueManagement + ciManagement + properties//license.licenseName + properties//license.copyrightOwners + + + + org.scijava,net.imagej,net.imglib2,io.scif,sc.fiji + + + + + + + + org.codehaus.mojo + extra-enforcer-rules + 1.7.0 + compile + + + org.scijava + scijava-maven-plugin + 3.0.0 + compile + + + + + + 3.6.3 + + + Plugins need to be versioned! + + + [1.8.0-101,) + + + No Duplicate Classes Allowed! +- For duplicate transitive dependencies, add dependency exclusions. +- For duplications between direct dependencies, resolve or add + ignored classes to this rule's configuration. + true + com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* + + + founder,lead,developer,debugger,reviewer,support,maintainer + + + founder,lead,developer,debugger,reviewer,support,maintainer + + + 8 + + com.headius:invokebinder + com.sun:tools + + + module-info + + + test + + + + + name + description + url + inceptionYear + organization + licenses + developers + contributors + mailingLists + scm + issueManagement + ciManagement + properties//license.licenseName + properties//license.copyrightOwners + + + + org.scijava,net.imagej,net.imglib2,io.scif,sc.fiji + + + + + + maven-failsafe-plugin + 3.2.5 + + + + integration-test + verify + + + + + + maven-source-plugin + 3.3.0 + + + attach-sources + none + + + attach-sources-jar + + jar + + + + + + maven-surefire-plugin + 3.2.5 + + @{argLine} -Xms512m -Xmx512m -Dapple.awt.UIElement=true + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.5.0 + + + sanitize-version + + regex-property + + + sanitizedVersion + 38.0.0-SNAPSHOT + ^([0-9]+)\.([0-9]+)\.([0-9]+).*$ + $1.$2.$3 + false + + + + guess-package + + regex-property + + + package-guess + org.scijava.pom-scijava + [^a-z0-9_.]+ + _ + false + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 3.2.0 + + + validate + + create + + + true + UNKNOWN + + + + + + net.java.dev.jna + platform + 3.5.2 + compile + + + + true + UNKNOWN + + + + org.scijava + scijava-maven-plugin + 3.0.0 + + + set-rootdir + validate + + set-rootdir + + + older + + + + populate-app + install + + populate-app + + + older + + + + + older + + + + com.zenjava + javafx-maven-plugin + 8.8.3 + + SciJava Parent POM + SciJava Parent POM + SciJava Parent POM.jar + + ${sanitizedVersion} + true + + + + net.revelc.code + impsort-maven-plugin + 1.9.0 + + + none + + java.,javax.,com.,net.,org. + java,* + true + + + + + java.,javax.,com.,net.,org. + java,* + true + + + + net.revelc.code.formatter + formatter-maven-plugin + 2.23.0 + + + org.scijava + scijava-coding-style + 2.1.1 + compile + + + + eclipse-formatter-settings/scijava-coding-style.xml + + + + org.fusesource.mvnplugins + maven-graph-plugin + 1.45 + + provided,runtime,system,test + true + + /home/elect/IdeaProjects/pom-scijava/target/dependency-graph.dot + + + + org.jacoco + jacoco-maven-plugin + 0.8.11 + + + jacoco-initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + + maven-javadoc-plugin + 3.6.3 + + /usr/lib/jvm/jdk-19/bin/javadoc + 1024m + + https://javadoc.scijava.org/Java8/ + https://javadoc.scijava.org/JavaFX8/ + https://javadoc.scijava.org/SciJava/ + https://javadoc.scijava.org/Alida/ + https://javadoc.scijava.org/Bio-Formats/ + https://javadoc.scijava.org/FLIMLib/ + https://javadoc.scijava.org/Fiji/ + https://javadoc.scijava.org/Icy/ + https://javadoc.scijava.org/ImageJ/ + https://javadoc.scijava.org/ImageJ1/ + https://javadoc.scijava.org/ImgLib2/ + https://javadoc.scijava.org/Java3D/ + https://javadoc.scijava.org/KNIME/ + https://javadoc.scijava.org/LOCI/ + https://javadoc.scijava.org/MiToBo/ + https://javadoc.scijava.org/Micro-Manager-Core/ + https://javadoc.scijava.org/Micro-Manager-Studio/ + https://javadoc.scijava.org/MorphoLibJ/ + https://javadoc.scijava.org/OMERO/ + https://javadoc.scijava.org/SCIFIO/ + https://javadoc.scijava.org/Apache-Commons-IO/ + https://javadoc.scijava.org/Apache-Commons-Lang/ + https://javadoc.scijava.org/Apache-Commons-Math/ + https://javadoc.scijava.org/Apache-Commons-Text/ + https://javadoc.scijava.org/BoneJ/ + https://javadoc.scijava.org/Eclipse/ + https://javadoc.scijava.org/Guava/ + https://javadoc.scijava.org/JAMA/ + https://javadoc.scijava.org/JFreeChart/ + https://javadoc.scijava.org/JGraphT/ + https://javadoc.scijava.org/JHotDraw/ + https://javadoc.scijava.org/JOML/ + https://javadoc.scijava.org/Javassist/ + https://javadoc.scijava.org/MigLayout/ + https://javadoc.scijava.org/NetBeans/ + https://javadoc.scijava.org/Pivot/ + https://javadoc.scijava.org/VisAD/ + https://javadoc.scijava.org/Weka/ + https://javadoc.scijava.org/ojAlgo/ + + + + + maven-clean-plugin + 3.3.2 + + + default-clean + clean + + clean + + + + + + maven-install-plugin + 3.1.1 + + + default-install + install + + install + + + + + + maven-deploy-plugin + 3.1.1 + + + default-deploy + deploy + + deploy + + + + + + maven-site-plugin + 3.12.1 + + + default-site + site + + site + + + /home/elect/IdeaProjects/pom-scijava/target/site + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + default-deploy + site-deploy + + deploy + + + /home/elect/IdeaProjects/pom-scijava/target/site + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + + /home/elect/IdeaProjects/pom-scijava/target/site + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-project-info-reports-plugin + + + + + + + + /home/elect/IdeaProjects/pom-scijava/target/site + + + maven-javadoc-plugin + + + + diff --git a/gradle/catalog/settings.gradle.kts b/gradle/catalog/settings.gradle.kts new file mode 100644 index 00000000..8d995569 --- /dev/null +++ b/gradle/catalog/settings.gradle.kts @@ -0,0 +1,12 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/7.2/userguide/multi_project_builds.html + */ + +rootProject.name = "gradle-catalog" + +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file diff --git a/gradle/platform/build.gradle.kts b/gradle/platform/build.gradle.kts index f29fa936..71e2a05b 100644 --- a/gradle/platform/build.gradle.kts +++ b/gradle/platform/build.gradle.kts @@ -1,21 +1,25 @@ import groovy.xml.XmlSlurper import groovy.xml.slurpersupport.GPathResult import groovy.xml.slurpersupport.NodeChild +import org.gradle.internal.impldep.org.junit.experimental.categories.Categories.CategoryFilter.exclude plugins { `java-platform` - `maven-publish` + publish } -tasks { - register("eff.xml") { - commandLine("bash", "-c", "mvn -B -f \"../../pom.xml\" help:effective-pom | grep -A9999999 '^' > eff.xml") - } -} +group = "org.scijava" +version = "0.1" //(effXml / "version").toString() operator fun GPathResult.div(child: String) = children().find { (it!! as NodeChild).name() == child } as GPathResult -val effXml = XmlSlurper().parse("platform/eff.xml") +val effXml = XmlSlurper().parse(projectDir.resolve("eff.xml")) + +javaPlatform { + allowDependencies() +} + +val runtimeDeps = listOf("xalan:serializer", "xalan:xalan") dependencies { @@ -26,112 +30,42 @@ dependencies { val g = node / "groupId" val a = node / "artifactId" val v = node / "version" - api("$g:$a:$v") + if ("$g:$a" in runtimeDeps) + runtime("$g:$a:$v") + else + api("$g:$a:$v") // println("$g:$a:$v") } } + // versionCatalogs.forEach { versionCatalog -> + // println("catalog ${versionCatalog.name}") + // versionCatalog.libraryAliases.forEach { + // println(versionCatalog.findLibrary(it).get().get()) + // } + // } + + api(platform("com.fasterxml.jackson:jackson-bom:" + libs.com.fasterxml.jackson.core.jacksonCore.get().version)) + // api(platform("com.google.api-client:google-api-client-bom:" + libs.com.google.api.client.googleApiClient.get().version)) + // api(platform("com.google.api:gax-bom:" + libs.com.google.api.gax.get().version)) + // api(platform("com.google.api:gapic-generator-java-bom:" + libs.com.google.api.grpc.protoGoogleCommonProtos.get().version)) + // api(platform("com.google.auth:google-auth-library-bom:" + libs.com.google.auth.googleAuthLibraryAppengine.get().version)) + // // no google auto-value bom + // api(platform("com.google.cloud:google-cloud-core-bom:" + libs.com.google.cloud.googleCloudCore.get().version)) } -publishing { - publications { - repositories { - maven("to fill") - } - create("sciJavaPlatform") { - groupId = "org.scijava" - artifactId = "pom-scijava" - version = (effXml / "version").toString() - from(components["javaPlatform"]) - pom { - name = "SciJava Parent POM" - description = "This POM provides a parent from which participating projects can declare their build configurations. It ensures that projects all use a compatible build environment, including Java version, as well as versions of dependencies and plugins." - url = "https://scijava.org/" - inceptionYear = "2011" - organization { - name = "SciJava" - url = "https://scijava.org/" - } - licenses { - license { - name = "Unlicense" - url = "https://unlicense.org/" - distribution = "repo" - } - } - developers { - developer { - id = "ctrueden" - name = "Curtis Rueden" - url = "https://imagej.net/people/ctrueden" - roles.addAll("founder", "lead", "developer", "debugger", "reviewer", "support", "maintainer") - } - } - contributors { - operator fun String.invoke(id: String) = contributor { - name = this@invoke - url = "https://imagej.net/people/$id" - properties = mapOf("id" to id) - } - "Mark Hiner"("hinerm") - "Johannes Schindelin"("dscho") - "Sébastien Besson"("sbesson") - "John Bogovic"("bogovicj") - "Nicolas Chiaruttini"("NicoKiaru") - "Barry DeZonia"("bdezonia") - "Richard Domander"("rimadoma") - "Karl Duderstadt"("karlduderstadt") - "Jan Eglinger"("imagejan") - "Gabriel Einsdorf"("gab1one") - "Tiago Ferreira"("tferr") - contributor { - name = "David Gault" - properties = mapOf("id" to "dgault") - } - "Ulrik Günther"("skalarproduktraum") - "Philipp Hanslovsky"("hanslovsky") - "Stefan Helfrich"("stelfrich") - "Cameron Lloyd"("camlloyd") - "Hadrien Mary"("hadim") - "Tobias Pietzsch"("tpietzsch") - "Stephan Preibisch"("StephanPreibisch") - "Stephan Saalfeld"("axtimwalde") - "Deborah Schmidt"("frauzufall") - "Lorenzo Scianatico"("LoreScianatico") - "Jean - Yves Tinevez"("tinevez") - "Christian Tischer"("tischi") - "Gabriella Turek"("turekg") - contributor { - name = "Giuseppe Barbieri" - properties = mapOf("id" to "elect") - } - } - mailingLists { - mailingList { - name = "SciJava" - subscribe = "https://groups.google.com/group/scijava" - unsubscribe = subscribe - post = "scijava@googlegroups.com" - archive = "https://groups.google.com/group/scijava" - } - } - scm { - connection = "scm:git:https://github.com/scijava/pom-scijava" - developerConnection = "scm:git:git@github.com:scijava/pom-scijava" - tag = "HEAD" - url = "https://github.com/scijava/pom-scijava" - } - issueManagement { - system = "GitHub Issues" - url = "https://github.com/scijava/pom-scijava/issues" - } - ciManagement { - system = "GitHub Actions" - url = "https: //github.com/scijava/pom-scijava/actions" - } - } - } - } -} +tasks { + // named("generatePomFileForSciJavaPlatformPublication") { + // pom.withXml { + // asNode().appendNode("parent").apply { + // appendNode("groupId", group) + // appendNode("artifactId", project.name) + // appendNode("version", version) + // appendNode("relativePath") + // } + // println(asNode().name()) + // } + // } +} \ No newline at end of file diff --git a/gradle/platform/buildSrc/build.gradle.kts b/gradle/platform/buildSrc/build.gradle.kts new file mode 100644 index 00000000..790460f9 --- /dev/null +++ b/gradle/platform/buildSrc/build.gradle.kts @@ -0,0 +1,13 @@ + +plugins { + `kotlin-dsl` +} + +repositories { + mavenCentral() +// gradlePluginPortal() +} + +//dependencies { +// implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") +//} \ No newline at end of file diff --git a/gradle/platform/buildSrc/settings.gradle.kts b/gradle/platform/buildSrc/settings.gradle.kts new file mode 100644 index 00000000..8ae9b3a4 --- /dev/null +++ b/gradle/platform/buildSrc/settings.gradle.kts @@ -0,0 +1,4 @@ +// This is an empty umbrella build including all the component builds. +// This build is not necessarily needed. The component builds work independently. + +rootProject.name = "buildSrc" \ No newline at end of file diff --git a/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts b/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts new file mode 100644 index 00000000..8dd418e9 --- /dev/null +++ b/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts @@ -0,0 +1,235 @@ +import groovy.util.Node +import groovy.util.NodeList +import java.util.* + +plugins { + `maven-publish` +} + +publishing { + publications { + repositories { + maven { + name = "sciJava" + credentials(PasswordCredentials::class) + url = uri("https://maven.scijava.org/content/repositories/releases") + } + } + create("sciJavaPlatform") { + from(components["javaPlatform"]) + /*pom.withXml { + val nodes = Stack() + + nodes += asNode() + fun parent() = nodes.peek() + // Definition of `groupId` is redundant, because it's inherited from the parent + run { + val list = parent().children() as NodeList + require(list.removeIf { (it as Node).name().toString().substringAfter("{http://maven.apache.org/POM/4.0.0}") == "groupId" }) + } + + var i = 1 // 4.0.0 is first + + operator fun String.invoke(vararg values: Any?) { + for (value in values) { + val node = when (value) { + null -> parent().appendNode(this) + else -> parent().appendNode(this, value) + } + if (nodes.size == 1) { // only at `project` level + val list = parent().value() as NodeList + list.removeLast() + list.add(i++, node) + } + } + } + + // operator fun String.compareTo(value: Any): Int { + // return 0 + // } + + operator fun String.invoke(block: () -> Unit) { + val node = parent() + nodes += node.appendNode(this) + block() + if (nodes.size == 2) { // only as `project` child + val list = node.value() as NodeList + list.removeLast() + list.add(i++, parent()) + } + nodes.pop() + } + + // fun comment(text: String) { + // val builder = asString() + // builder.insert(builder.lastIndex - "".length, text.trimMargin()) + // } + + "parent" { + "groupId"(group) + "artifactId"(project.name) + "version"(version) + "relativePath"() + } + // + // + // + i += 3 + "name"("SciJava Parent POM") + "description"("This POM provides a parent from which participating projects can declare their build configurations. It ensures that projects all use a compatible build environment, including Java version, as well as versions of dependencies and plugins.") + "url"("https://scijava.org/") + "inceptionYear"("2011") + "organization" { + "name"("SciJava") + "url"("https://scijava.org/") + } + "licenses" { + "license" { + "name"("Unlicense") + "url"("https://unlicense.org/") + "distribution"("repo") + } + } + "developers" { + "developer" { + "id"("ctrueden") + "name"("Curtis Rueden") + "url"("https://imagej.net/people/ctrueden") + "roles" { + "role"("founder", "lead", "developer", "debugger", "reviewer", "support", "maintainer") + } + } + } + "contributors" { + operator fun String.minus(id: String) = "contributor" { + "name"(this) + "url"("https://imagej.net/people/$id") + "properties" { "id"(id) } + } + "Mark Hiner" - "hinerm" + "Johannes Schindelin" - "dscho" + "Sébastien Besson" - "sbesson" + "John Bogovic" - "bogovicj" + "Nicolas Chiaruttini" - "NicoKiaru" + "Barry DeZonia" - "bdezonia" + "Richard Domander" - "rimadoma" + "Karl Duderstadt" - "karlduderstadt" + "Jan Eglinger" - "imagejan" + "Gabriel Einsdorf" - "gab1one" + "Tiago Ferreira" - "tferr" + "contributor" { + "name"("David Gault") + "properties" { "id"("dgault") } + } + "Ulrik Günther" - "skalarproduktraum" + "Philipp Hanslovsky" - "hanslovsky" + "Stefan Helfrich" - "stelfrich" + "Cameron Lloyd" - "camlloyd" + "Hadrien Mary" - "hadim" + "Tobias Pietzsch" - "tpietzsch" + "Stephan Preibisch" - "StephanPreibisch" + "Stephan Saalfeld" - "axtimwalde" + "Deborah Schmidt" - "frauzufall" + "Lorenzo Scianatico" - "LoreScianatico" + "Jean - Yves Tinevez" - "tinevez" + "Christian Tischer" - "tischi" + "Gabriella Turek" - "turekg" + "contributor" { + "name"("Giuseppe Barbieri") + "properties" { "id"("elect") } + } + } + "mailingLists" { + "mailingList" { + "name"("SciJava") + "subscribe"("https://groups.google.com/group/scijava") + "unsubscribe"("https://groups.google.com/group/scijava") + "post"("scijava@googlegroups.com") + "archive"("https://groups.google.com/group/scijava") + } + } + "scm" { + "connection"("scm:git:https://github.com/scijava/pom-scijava") + "developerConnection"("scm:git:git@github.com:scijava/pom-scijava") + "tag"("HEAD") + "url"("https://github.com/scijava/pom-scijava") + } + "issueManagement" { + "system"("GitHub Issues") + "url"("https://github.com/scijava/pom-scijava/issues") + } + "ciManagement" { + "system"("GitHub Actions") + "url"("https: //github.com/scijava/pom-scijava/actions") + } + "properties" { + // HACK: The following list of allowed-to-be-duplicated classes + // facilitates intended combinations of artifacts: + // == + // Classes: com.google.inject.* + // Part of: com.google.inject:guice:no_aop + // Also in: org.sonatype.sisu:sisu-guice + // Enables: + // org.apache.maven:maven-core (guice) + + // org.apache.maven.shared:maven-common-artifact-filters (sisu-guice) + // == + // Class: javax.xml.namespace.QName + // Part of: Java Runtime Environment + // Also in: xml-apis:xml-apis, xpp3:xpp3 + // Enables: xml-apis:xml-apis + xpp3:xpp3 + // == + // TEMP: Until scijava/scripting-jruby#5 is resolved. + // Classes: jnr.ffi.* + // Part of: com.github.jnr:jnr-ffi + // Also in: org.jruby:jruby-core + // Enables: org.jruby:jruby-core + org.python:jython-slim (jnr-ffi) + // == + // Classes: org.apache.hadoop.yarn.*.package-info + // Part of: org.apache.hadoop:hadoop-yarn-* + // Enables: + // org.apache.hadoop:hadoop-yarn- + + // org.apache.hadoop:hadoop-yarn- + // == + // Classes: org.apache.spark.unused.UnusedStubClass + // Part of: org.apache.spark:spark-* + // Enables: org.apache.spark:spark-core_2.11 (spark-*) + // == + // Classes: org.eclipse.aether.* + // Part of: + // org.apache.maven.resolver:maven-resolver-api + // org.apache.maven.resolver:maven-resolver-util + // org.apache.maven.shared:maven-artifact-transfer + // org.eclipse.aether:aether-api + // org.eclipse.aether:aether-util + // Enables: dependence on Apache Maven libraries + // == + // Classes: org.hibernate.stat.ConcurrentStatisticsImpl + // Part of: org.hibernate:hibernate-core + // Also in: org.openmicroscopy:omero-blitz + // Enables: + // org.openmicroscopy:omero-blitz + + // org.openmicroscopy:omero-model (hibernate-core) + // == + // Classes: org.junit.runner.Runner + // Part of: junit:junit + // Also in: org.jmockit:jmockit + // Enables: junit:junit + org.jmockit:jmockit + // == + // Classes: org.jzy3d.plot3d.pipelines.* + // Part of: org.jzy3d:jzy3d-core, org.jzy3d:jzy3d-native-jogl-awt + // Enables: org.jzy3d:jzy3d-core + org.jzy3d:jzy3d-native-jogl-awt + "scijava.allowedDuplicateClasses"("com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.*") + // NB: The scijava.allowedDuplicateClasses property above makes it easier to + // append to the list of allowed duplicate classes in downstream projects. + // Simply override the property in your POM with something like this: + // "allowedDuplicateClasses"("\${scijava.allowedDuplicateClasses},com.example.AnotherDuplicate") + "allowedDuplicateClasses"("\${scijava.allowedDuplicateClasses}") + // NB: We override these properties to make the enforcer happy. + // You will need to override them in your POM, too... to valid values. + "license.licenseName"("N/A") + "license.copyrightOwners"("N/A") + } + }*/ + } + } +} \ No newline at end of file diff --git a/gradle/platform/settings.gradle.kts b/gradle/platform/settings.gradle.kts new file mode 100644 index 00000000..5b393496 --- /dev/null +++ b/gradle/platform/settings.gradle.kts @@ -0,0 +1,25 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/7.2/userguide/multi_project_builds.html + */ + +rootProject.name = "gradle-platform" + +dependencyResolutionManagement { + + // repositories { .. } + versionCatalogs { + create("libs").from("org.scijava:gradle-catalog") + + // fails with "Could not resolve all artifacts for configuration 'incomingCatalogForLibs0'." +// create("libs").from(files("../catalog/build/version-catalog/libs.versions.toml")) + } + + includeBuild("../catalog") +} + +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file diff --git a/gradle/playground/build.gradle.kts b/gradle/playground/build.gradle.kts new file mode 100644 index 00000000..a5cdfd03 --- /dev/null +++ b/gradle/playground/build.gradle.kts @@ -0,0 +1,228 @@ +plugins { + embeddedKotlin("jvm") +} + +repositories { + mavenCentral() + maven("https://maven.scijava.org/content/repositories/releases") + maven("https://maven.scijava.org/content/groups/public") +} + +//configurations.filter { it.isCanBeResolved }.map { println(it) } + +dependencies { + api(libs.imagej.ij) + + // Activate the "ScijavaCapability" rule +// components.all() +} + +open class ConflictCapability(val group: String, + val artifact: String = group, + val modules: List, + val reason: String? = null) { + val ga get() = "$group:$artifact" +} + +class ResolutionCapability(group: String, artifact: String = group, modules: List, reason: String? = null) : ConflictCapability(group, artifact, modules, reason) + +// the right module to select will be always the last in the list +val resolutions = listOf( + ResolutionCapability("jzy3d", "emul-gl", listOf("org.jzy3d:jzy3d-emul-gl", "org.jzy3d:jzy3d-emul-gl-awt"), "Replaced by org.jzy3d:jzy3d-emul-gl-awt"), + ResolutionCapability("jzy3d", "jGL", listOf("org.jzy3d:jGL", "jzy3d-jGL-awt"), "Replaced by org.jzy3d:jzy3d-jGL-awt"), + ResolutionCapability("javax", "transaction", listOf("javax.transaction:jta", "jzy3d-jGL-awt"), "Replaced by org.jzy3d:jzy3d-jGL-awt"), + ResolutionCapability("javax", "servlet", listOf("javax.servlet:servlet-api", "javax.servlet:javax.servlet-api"))) +val conflicts = listOf( + ConflictCapability("slf4j", modules = listOf("ch.qos.logback:logback-classic", "org.slf4j:slf4j-simple")), + ConflictCapability("jcl", modules = listOf("commons-logging:commons-logging", "org.slf4j:jcl-over-slf4j")), + ConflictCapability("jakarta", "activation", + listOf("jakarta.activation:jakarta.activation-api", "com.sun.activation:javax.activation", "javax.activation:activation"), + "See: https://wiki.eclipse.org/Jakarta_EE_Maven_Coordinates"), + ConflictCapability("javax" , "transaction", listOf("javax.transaction:javax.transaction-api", "javax.transaction:jta")), + ConflictCapability("apache", "commonsCsv", listOf("org.apache.commons:commons-csv", "org.apache.solr:solr-commons-csv")), + ConflictCapability("c3p0", modules = listOf("com.mchange:c3p0", "com.mchange:mchange-commons-java", "c3p0:c3p0")), + ConflictCapability("javax", "mail", listOf("javax.mail:mail", "com.sun.mail:javax.mail")), + ConflictCapability("jersey", "core", listOf("javax.ws.rs:javax.ws.rs-api", "com.sun.jersey:jersey-core")), + ConflictCapability("commons", "beanutils", listOf("commons-beanutils:commons-beanutils", "commons-collections:commons-collections", "commons-beanutils:commons-beanutils-core"))) + +// TODO + +// Uber-JAR of all batik components +// org.apache.xmlgraphics:batik-all + +// Conflicts with junit:junit. We don't need Android here. +// com.google.android.tools:dx + +// Brings in all gluegen-rt native classifiers. +// org.jogamp.gluegen:gluegen-rt-main + +// Brings in all jogl-all native classifiers. +// org.jogamp.jogl:jogl-all-main + +// Uber-JAR of all netty components +// io.netty:netty-all + +/* + org.jzy3d + jzy3d-native-jogl-awt + ${org.jzy3d.jzy3d-native-jogl-awt.version} + + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-linux-aarch64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-armv6hf + + + org.jogamp.gluegen + gluegen-rt-natives-linux-i586 + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-windows-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-windows-i586 + + + org.jogamp.jogl + jogl-all-natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all-natives-linux-amd64 + + + org.jogamp.jogl + jogl-all-natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all-natives-linux-i586 + + + org.jogamp.jogl + jogl-all-natives-macosx-universal + + + org.jogamp.jogl + jogl-all-natives-windows-amd64 + + + org.jogamp.jogl + jogl-all-natives-windows-i586 + + + + org.jzy3d + jzy3d-native-jogl-core + ${org.jzy3d.jzy3d-native-jogl-core.version} + + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-linux-aarch64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-linux-armv6hf + + + org.jogamp.gluegen + gluegen-rt-natives-linux-i586 + + + org.jogamp.gluegen + gluegen-rt-natives-macosx-universal + + + org.jogamp.gluegen + gluegen-rt-natives-windows-amd64 + + + org.jogamp.gluegen + gluegen-rt-natives-windows-i586 + + + org.jogamp.jogl + jogl-all-natives-linux-aarch64 + + + org.jogamp.jogl + jogl-all-natives-linux-amd64 + + + org.jogamp.jogl + jogl-all-natives-linux-armv6hf + + + org.jogamp.jogl + jogl-all-natives-linux-i586 + + + org.jogamp.jogl + jogl-all-natives-macosx-universal + + + org.jogamp.jogl + jogl-all-natives-windows-amd64 + + + org.jogamp.jogl + jogl-all-natives-windows-i586 + +*/ + +class ScijavaCapability : ComponentMetadataRule { + override + fun execute(context: ComponentMetadataContext) = context.details.run { + for (res in resolutions + conflicts) { + if (id.module.toString() in res.modules) + allVariants { + withCapabilities { + // Declare that all of them provide the same capability + addCapability(res.group, res.artifact, id.version) + } + } + } + } +} + +configurations.all { +// dependencies.forEach { it. } + resolutionStrategy.capabilitiesResolution { + for (res in resolutions) + withCapability(res.ga) { + for (cand in candidates) { + val id = cand.id + if (id is ModuleComponentIdentifier && id.moduleIdentifier.toString() == res.modules.last()) + select(cand) + } + res.reason?.let(::because) + } + } +} \ No newline at end of file diff --git a/gradle/playground/settings.gradle.kts b/gradle/playground/settings.gradle.kts new file mode 100644 index 00000000..de477840 --- /dev/null +++ b/gradle/playground/settings.gradle.kts @@ -0,0 +1,25 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/7.2/userguide/multi_project_builds.html + */ + +rootProject.name = "gradle-playground" + +dependencyResolutionManagement { + + // repositories { .. } + versionCatalogs { + create("libs").from("org.scijava:gradle-catalog") + + // fails with "Could not resolve all artifacts for configuration 'incomingCatalogForLibs0'." +// create("libs").from(files("../catalog/build/version-catalog/libs.versions.toml")) + } + + includeBuild("../catalog") +} + +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file diff --git a/gradle/settings.gradle.kts b/gradle/settings.gradle.kts index d8d62852..5fa82c4f 100644 --- a/gradle/settings.gradle.kts +++ b/gradle/settings.gradle.kts @@ -1,12 +1,10 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user manual at https://docs.gradle.org/7.2/userguide/multi_project_builds.html - */ +// This is an empty umbrella build including all the component builds. +// This build is not necessarily needed. The component builds work independently. rootProject.name = "gradle" -include("platform") \ No newline at end of file +includeBuild("catalog") +includeBuild("platform") +includeBuild("playground") + +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file From 34b499651c62fc19388c29e042c89356580af368 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Thu, 14 Mar 2024 11:30:57 +0100 Subject: [PATCH 719/996] switch exclusions to `Rule`s, best efficiency --- gradle/catalog/build.gradle.kts | 9 +- gradle/platform/build.gradle.kts | 3 + .../src/main/kotlin/publish.gradle.kts | 4 - gradle/playground/build.gradle.kts | 259 ++++-------------- gradle/playground/settings.gradle.kts | 2 + 5 files changed, 65 insertions(+), 212 deletions(-) diff --git a/gradle/catalog/build.gradle.kts b/gradle/catalog/build.gradle.kts index 7cf6db15..66103ca9 100644 --- a/gradle/catalog/build.gradle.kts +++ b/gradle/catalog/build.gradle.kts @@ -48,13 +48,20 @@ catalog.versionCatalog { else -> "$g.$camel" } - println("$alias($gav)") +// println("$alias($gav)") library(alias, gav) } for ((alias, aliases) in bundles) bundle(alias, aliases) + +// jakarta() } +//fun VersionCatalogBuilder.jakarta() { +// val bom = URL.of("https://repo1.maven.org/maven2/jakarta/platform/jakarta.jakartaee-bom/10.0.0/jakarta.jakartaee-bom-10.0.0.pom") +// library("jakarta.json", "jakarta.json:jakarta.json-api:") +//} + publishing.publications { repositories.maven { name = "sciJava" diff --git a/gradle/platform/build.gradle.kts b/gradle/platform/build.gradle.kts index 71e2a05b..722bdc27 100644 --- a/gradle/platform/build.gradle.kts +++ b/gradle/platform/build.gradle.kts @@ -6,6 +6,8 @@ import org.gradle.internal.impldep.org.junit.experimental.categories.Categories. plugins { `java-platform` publish +// id("org.gradlex.java-ecosystem-capabilities-base") // only rules +// id("org.gradlex.logging-capabilities") // logging extension } group = "org.scijava" @@ -45,6 +47,7 @@ dependencies { // } api(platform("com.fasterxml.jackson:jackson-bom:" + libs.com.fasterxml.jackson.core.jacksonCore.get().version)) + api(platform("jakarta.platform:jakarta.jakartaee-bom:10.0.0")) // api(platform("com.google.api-client:google-api-client-bom:" + libs.com.google.api.client.googleApiClient.get().version)) // api(platform("com.google.api:gax-bom:" + libs.com.google.api.gax.get().version)) // api(platform("com.google.api:gapic-generator-java-bom:" + libs.com.google.api.grpc.protoGoogleCommonProtos.get().version)) diff --git a/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts b/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts index 8dd418e9..457bf5e1 100644 --- a/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts +++ b/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts @@ -1,7 +1,3 @@ -import groovy.util.Node -import groovy.util.NodeList -import java.util.* - plugins { `maven-publish` } diff --git a/gradle/playground/build.gradle.kts b/gradle/playground/build.gradle.kts index a5cdfd03..8d9fdc2c 100644 --- a/gradle/playground/build.gradle.kts +++ b/gradle/playground/build.gradle.kts @@ -1,5 +1,6 @@ plugins { embeddedKotlin("jvm") + id("org.gradlex.java-ecosystem-capabilities-base") } repositories { @@ -8,221 +9,65 @@ repositories { maven("https://maven.scijava.org/content/groups/public") } -//configurations.filter { it.isCanBeResolved }.map { println(it) } - -dependencies { - api(libs.imagej.ij) - - // Activate the "ScijavaCapability" rule -// components.all() +// it will appear as this was the original downloaded metadata of the dependency +// @CacheableRule is more verbose but more efficient, because the rule will be applied before the dependency get cached, +inline fun ComponentMetadataHandler.withModules(vararg modules: String) { + for (module in modules) withModule(module) } - -open class ConflictCapability(val group: String, - val artifact: String = group, - val modules: List, - val reason: String? = null) { - val ga get() = "$group:$artifact" +abstract class Rule : ComponentMetadataRule { + fun ComponentMetadataContext.remove(vararg modules: String) = details.allVariants { withDependencies { removeIf { it.module.toString() in modules } } } } +dependencies { + components { + @CacheableRule open class NoXalan : Rule() { + override fun execute(context: ComponentMetadataContext) = context.remove("xalan:serializer", "xalan:xalan") + } + withModules("org.openmicroscopy:ome-common", "ome:bio-formats-tools", "ome:formats-api", "ome:formats-bsd", + "org.apache.xmlgraphics:batik-bridge", "org.apache.xmlgraphics:batik-dom") -class ResolutionCapability(group: String, artifact: String = group, modules: List, reason: String? = null) : ConflictCapability(group, artifact, modules, reason) - -// the right module to select will be always the last in the list -val resolutions = listOf( - ResolutionCapability("jzy3d", "emul-gl", listOf("org.jzy3d:jzy3d-emul-gl", "org.jzy3d:jzy3d-emul-gl-awt"), "Replaced by org.jzy3d:jzy3d-emul-gl-awt"), - ResolutionCapability("jzy3d", "jGL", listOf("org.jzy3d:jGL", "jzy3d-jGL-awt"), "Replaced by org.jzy3d:jzy3d-jGL-awt"), - ResolutionCapability("javax", "transaction", listOf("javax.transaction:jta", "jzy3d-jGL-awt"), "Replaced by org.jzy3d:jzy3d-jGL-awt"), - ResolutionCapability("javax", "servlet", listOf("javax.servlet:servlet-api", "javax.servlet:javax.servlet-api"))) -val conflicts = listOf( - ConflictCapability("slf4j", modules = listOf("ch.qos.logback:logback-classic", "org.slf4j:slf4j-simple")), - ConflictCapability("jcl", modules = listOf("commons-logging:commons-logging", "org.slf4j:jcl-over-slf4j")), - ConflictCapability("jakarta", "activation", - listOf("jakarta.activation:jakarta.activation-api", "com.sun.activation:javax.activation", "javax.activation:activation"), - "See: https://wiki.eclipse.org/Jakarta_EE_Maven_Coordinates"), - ConflictCapability("javax" , "transaction", listOf("javax.transaction:javax.transaction-api", "javax.transaction:jta")), - ConflictCapability("apache", "commonsCsv", listOf("org.apache.commons:commons-csv", "org.apache.solr:solr-commons-csv")), - ConflictCapability("c3p0", modules = listOf("com.mchange:c3p0", "com.mchange:mchange-commons-java", "c3p0:c3p0")), - ConflictCapability("javax", "mail", listOf("javax.mail:mail", "com.sun.mail:javax.mail")), - ConflictCapability("jersey", "core", listOf("javax.ws.rs:javax.ws.rs-api", "com.sun.jersey:jersey-core")), - ConflictCapability("commons", "beanutils", listOf("commons-beanutils:commons-beanutils", "commons-collections:commons-collections", "commons-beanutils:commons-beanutils-core"))) - -// TODO - -// Uber-JAR of all batik components -// org.apache.xmlgraphics:batik-all - -// Conflicts with junit:junit. We don't need Android here. -// com.google.android.tools:dx - -// Brings in all gluegen-rt native classifiers. -// org.jogamp.gluegen:gluegen-rt-main - -// Brings in all jogl-all native classifiers. -// org.jogamp.jogl:jogl-all-main - -// Uber-JAR of all netty components -// io.netty:netty-all - -/* - org.jzy3d - jzy3d-native-jogl-awt - ${org.jzy3d.jzy3d-native-jogl-awt.version} - - - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt-natives-linux-aarch64 - - - org.jogamp.gluegen - gluegen-rt-natives-linux-amd64 - - - org.jogamp.gluegen - gluegen-rt-natives-linux-armv6hf - - - org.jogamp.gluegen - gluegen-rt-natives-linux-i586 - - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt-natives-windows-amd64 - - - org.jogamp.gluegen - gluegen-rt-natives-windows-i586 - - - org.jogamp.jogl - jogl-all-natives-linux-aarch64 - - - org.jogamp.jogl - jogl-all-natives-linux-amd64 - - - org.jogamp.jogl - jogl-all-natives-linux-armv6hf - - - org.jogamp.jogl - jogl-all-natives-linux-i586 - - - org.jogamp.jogl - jogl-all-natives-macosx-universal - - - org.jogamp.jogl - jogl-all-natives-windows-amd64 - - - org.jogamp.jogl - jogl-all-natives-windows-i586 - + @CacheableRule open class NoUeberJars : Rule() { + override fun execute(context: ComponentMetadataContext) = context.remove("org.apache.xmlgraphics:batik-all", "it.unimi.dsi:fastutil") + } + withModules("org.openmicroscopy:omero-blitz", "org.openmicroscopy:omero-server") + @CacheableRule open class NoAndroid : Rule() { + override fun execute(context: ComponentMetadataContext) = context.remove("com.google.android.tools:dx") + } + withModules("net.clearcontrol:coremem", "com.nativelibs4java:bridj") - org.jzy3d - jzy3d-native-jogl-core - ${org.jzy3d.jzy3d-native-jogl-core.version} - - - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt-natives-linux-aarch64 - - - org.jogamp.gluegen - gluegen-rt-natives-linux-amd64 - - - org.jogamp.gluegen - gluegen-rt-natives-linux-armv6hf - - - org.jogamp.gluegen - gluegen-rt-natives-linux-i586 - - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt-natives-windows-amd64 - - - org.jogamp.gluegen - gluegen-rt-natives-windows-i586 - - - org.jogamp.jogl - jogl-all-natives-linux-aarch64 - - - org.jogamp.jogl - jogl-all-natives-linux-amd64 - - - org.jogamp.jogl - jogl-all-natives-linux-armv6hf - - - org.jogamp.jogl - jogl-all-natives-linux-i586 - - - org.jogamp.jogl - jogl-all-natives-macosx-universal - - - org.jogamp.jogl - jogl-all-natives-windows-amd64 - - - org.jogamp.jogl - jogl-all-natives-windows-i586 - -*/ + @CacheableRule open class ClearGl : Rule() { + override fun execute(context: ComponentMetadataContext) = context.remove("org.jogamp.gluegen:gluegen-rt-main", "org.jogamp.jogl:jogl-all-main") + } + withModule("net.clearvolume:cleargl") -class ScijavaCapability : ComponentMetadataRule { - override - fun execute(context: ComponentMetadataContext) = context.details.run { - for (res in resolutions + conflicts) { - if (id.module.toString() in res.modules) - allVariants { - withCapabilities { - // Declare that all of them provide the same capability - addCapability(res.group, res.artifact, id.version) - } - } + @CacheableRule open class SparkCore211 : Rule() { + override fun execute(context: ComponentMetadataContext) = context.remove("io.netty:netty-all") } - } -} + withModule("org.apache.spark:spark-core_2.11") -configurations.all { -// dependencies.forEach { it. } - resolutionStrategy.capabilitiesResolution { - for (res in resolutions) - withCapability(res.ga) { - for (cand in candidates) { - val id = cand.id - if (id is ModuleComponentIdentifier && id.moduleIdentifier.toString() == res.modules.last()) - select(cand) - } - res.reason?.let(::because) + @CacheableRule open class NoBatikExtensions : Rule() { + override fun execute(context: ComponentMetadataContext) = context.remove("org.apache.xmlgraphics:batik-extensions") + } + withModules("org.apache.xmlgraphics:batik-rasterizer-ext", "org.apache.xmlgraphics:batik-squiggle-ext") + + @CacheableRule open class NoJogampNatives : Rule() { + override fun execute(context: ComponentMetadataContext) { + // Conflicts with properly packaged jogamp native classifiers. + val libs = listOf("gluegen:gluegen-rt", "jogl:jogl-all") + val modules = listOf("linux-aarch64", "linux-amd64", "linux-armv6hf", "linux-i586", "macosx-universal", "windows-amd64", "windows-i586") + .flatMap { p -> libs.map { "org.jogamp.$it-natives-$p" } }.toTypedArray() + context.remove(*modules) } + } + withModules("org.jzy3d:jzy3d-native-jogl-awt", "org.jzy3d:jzy3d-native-jogl-core") + + @CacheableRule open class Weka : Rule() { + override fun execute(context: ComponentMetadataContext) = context.remove( + "com.github.fommil.netlib:all", "com.googlecode.netlib-java:netlib-java", "net.sourceforge.f2j:arpack_combined_all", + "nz.ac.waikato.cms.weka.thirdparty:java-cup-11b", "nz.ac.waikato.cms.weka.thirdparty:java-cup-11b-runtime") + } + withModule("nz.ac.waikato.cms.weka:weka-dev") } + implementation(libs.org.morphonets.snt) + implementation("org.jzy3d:jzy3d-emul-gl-awt:2.1.0") } \ No newline at end of file diff --git a/gradle/playground/settings.gradle.kts b/gradle/playground/settings.gradle.kts index de477840..6c09f847 100644 --- a/gradle/playground/settings.gradle.kts +++ b/gradle/playground/settings.gradle.kts @@ -20,6 +20,8 @@ dependencyResolutionManagement { } includeBuild("../catalog") + // java-ecosystem-capabilities + includeBuild("../../../java-ecosystem-capabilities") } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file From 9cc0b9f23f9d566761c5755ff2bdd7069779b1d2 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Mon, 18 Mar 2024 03:54:16 +0100 Subject: [PATCH 720/996] shelve --- gradle/catalog/build.gradle.kts | 39 ++++++++----- gradle/enforcer/settings.gradle.kts | 9 +++ gradle/platform/build.gradle.kts | 15 ++--- .../src/main/kotlin/publish.gradle.kts | 6 ++ gradle/platform/settings.gradle.kts | 2 + gradle/playground/build.gradle.kts | 58 +++++++++++++++++-- gradle/playground/settings.gradle.kts | 10 +++- gradle/settings.gradle.kts | 1 + 8 files changed, 110 insertions(+), 30 deletions(-) create mode 100644 gradle/enforcer/settings.gradle.kts diff --git a/gradle/catalog/build.gradle.kts b/gradle/catalog/build.gradle.kts index 66103ca9..0fe05f57 100644 --- a/gradle/catalog/build.gradle.kts +++ b/gradle/catalog/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "org.scijava" -version = "0.1" +version = "0.11" catalog.versionCatalog { @@ -36,11 +36,14 @@ catalog.versionCatalog { .joinToString("") { if (it.isEmpty()) "" else it[0].uppercase() + it.substring(1).lowercase() } .replaceFirstChar { it.lowercase() } - fun getAlias(group: String = "$g".substringAfterLast('.')) = - "$group." + when { + fun getAlias(group: String = "$g".substringAfterLast('.')): String { + val alias = "$group." + when { camel.startsWith(group) -> camel.substringAfter(group).replaceFirstChar { it.lowercase() }.ifEmpty { group } else -> camel - }.also { bundles.getOrPut(group, ::ArrayList) += it } + } + bundles.getOrPut(group, ::ArrayList) += alias + return alias + } val alias = when ("$g") { in listOf("org.scijava", "net.imagej", "net.imglib2", "sc.fiji", "org.janelia.saalfeldlab") -> getAlias() @@ -48,13 +51,17 @@ catalog.versionCatalog { else -> "$g.$camel" } -// println("$alias($gav)") + // println("$alias($gav)") library(alias, gav) } + for ((alias, aliases) in bundles) bundle(alias, aliases) -// jakarta() + // jakarta() + + // version("groovy", "3.0.5") + // library("groovy-core", "org.codehaus.groovy", "groovy").versionRef("groovy") } //fun VersionCatalogBuilder.jakarta() { @@ -62,13 +69,17 @@ catalog.versionCatalog { // library("jakarta.json", "jakarta.json:jakarta.json-api:") //} -publishing.publications { - repositories.maven { - name = "sciJava" - credentials(PasswordCredentials::class) - url = uri("https://maven.scijava.org/content/repositories/releases") - } - create("sciJavaCatalog") { - from(components["versionCatalog"]) +publishing { + publications { + repositories { + maven { + name = "sciJava" + credentials(PasswordCredentials::class) + url = uri("https://maven.scijava.org/content/repositories/releases") + } + } + create("sciJavaCatalog") { + from(components["versionCatalog"]) + } } } \ No newline at end of file diff --git a/gradle/enforcer/settings.gradle.kts b/gradle/enforcer/settings.gradle.kts new file mode 100644 index 00000000..562e10ef --- /dev/null +++ b/gradle/enforcer/settings.gradle.kts @@ -0,0 +1,9 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.6/userguide/multi_project_builds.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +rootProject.name = "gradle-enforcer" diff --git a/gradle/platform/build.gradle.kts b/gradle/platform/build.gradle.kts index 722bdc27..8f58774b 100644 --- a/gradle/platform/build.gradle.kts +++ b/gradle/platform/build.gradle.kts @@ -11,7 +11,7 @@ plugins { } group = "org.scijava" -version = "0.1" //(effXml / "version").toString() +version = "0.13" //(effXml / "version").toString() operator fun GPathResult.div(child: String) = children().find { (it!! as NodeChild).name() == child } as GPathResult @@ -39,13 +39,14 @@ dependencies { // println("$g:$a:$v") } } - // versionCatalogs.forEach { versionCatalog -> - // println("catalog ${versionCatalog.name}") - // versionCatalog.libraryAliases.forEach { - // println(versionCatalog.findLibrary(it).get().get()) - // } - // } +// versionCatalogs.forEach { versionCatalog -> +// println("catalog ${versionCatalog.name}") +// versionCatalog.libraryAliases.forEach { +// println(versionCatalog.findLibrary(it).get().get()) +// } +// } +// println(libs.groovy.core.get()) api(platform("com.fasterxml.jackson:jackson-bom:" + libs.com.fasterxml.jackson.core.jacksonCore.get().version)) api(platform("jakarta.platform:jakarta.jakartaee-bom:10.0.0")) // api(platform("com.google.api-client:google-api-client-bom:" + libs.com.google.api.client.googleApiClient.get().version)) diff --git a/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts b/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts index 457bf5e1..1ae16b3c 100644 --- a/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts +++ b/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts @@ -13,6 +13,12 @@ publishing { } create("sciJavaPlatform") { from(components["javaPlatform"]) + groupId = "org.scijava" + println(groupId) + artifactId = "gradle-platform" + println(artifactId) + version = "0.13" + println(version) /*pom.withXml { val nodes = Stack() diff --git a/gradle/platform/settings.gradle.kts b/gradle/platform/settings.gradle.kts index 5b393496..162f20ac 100644 --- a/gradle/platform/settings.gradle.kts +++ b/gradle/platform/settings.gradle.kts @@ -14,6 +14,8 @@ dependencyResolutionManagement { // repositories { .. } versionCatalogs { create("libs").from("org.scijava:gradle-catalog") +// maybeCreate("libs").version("groovy", "3.0.9") +// maybeCreate("libs").library("groovy-core", "org.codehaus.groovy:groovy:2.4.15") // fails with "Could not resolve all artifacts for configuration 'incomingCatalogForLibs0'." // create("libs").from(files("../catalog/build/version-catalog/libs.versions.toml")) diff --git a/gradle/playground/build.gradle.kts b/gradle/playground/build.gradle.kts index 8d9fdc2c..b40c122e 100644 --- a/gradle/playground/build.gradle.kts +++ b/gradle/playground/build.gradle.kts @@ -1,6 +1,11 @@ +import org.gradle.api.publish.maven.internal.publication.DefaultMavenPom + plugins { embeddedKotlin("jvm") - id("org.gradlex.java-ecosystem-capabilities-base") + id("org.gradlex.java-ecosystem-capabilities") version "1.5.2.00" + id("dev.jacomet.logging-capabilities") version "0.11.1" + id("io.fuchs.gradle.classpath-collision-detector") version "0.3" + `maven-publish` } repositories { @@ -9,11 +14,13 @@ repositories { maven("https://maven.scijava.org/content/groups/public") } -// it will appear as this was the original downloaded metadata of the dependency -// @CacheableRule is more verbose but more efficient, because the rule will be applied before the dependency get cached, +// @CacheableRule is more verbose but more efficient, because the rule will be applied before the dependency get cached +// in Gradle, it will appear as this was the original downloaded metadata of the given dependency + inline fun ComponentMetadataHandler.withModules(vararg modules: String) { for (module in modules) withModule(module) } + abstract class Rule : ComponentMetadataRule { fun ComponentMetadataContext.remove(vararg modules: String) = details.allVariants { withDependencies { removeIf { it.module.toString() in modules } } } } @@ -62,12 +69,51 @@ dependencies { withModules("org.jzy3d:jzy3d-native-jogl-awt", "org.jzy3d:jzy3d-native-jogl-core") @CacheableRule open class Weka : Rule() { - override fun execute(context: ComponentMetadataContext) = context.remove( + val exclusions = listOf( "com.github.fommil.netlib:all", "com.googlecode.netlib-java:netlib-java", "net.sourceforge.f2j:arpack_combined_all", "nz.ac.waikato.cms.weka.thirdparty:java-cup-11b", "nz.ac.waikato.cms.weka.thirdparty:java-cup-11b-runtime") + + override fun execute(context: ComponentMetadataContext) { + context.details.allVariants { + withDependencies { + removeIf { it.module.toString() in exclusions } + add("runtimeClasspath", "com.github.vbmacher:java-cup-runtime") + } + } + } } withModule("nz.ac.waikato.cms.weka:weka-dev") } - implementation(libs.org.morphonets.snt) - implementation("org.jzy3d:jzy3d-emul-gl-awt:2.1.0") + // implementation("org.jzy3d:jzy3d-emul-gl:+") + // implementation("org.jzy3d:jzy3d-emul-gl-awt:+") + + implementation("junit:junit:4.4") + // implementation("org.hamcrest:hamcrest-core:1.2") +} + +tasks.detectCollisions { + // detectCollisions() // to detect on configuration time + // configurations.from(project.configurations.testRuntimeClasspath) +} + +publishing { + publications.register("maven") { + pom { + this as DefaultMavenPom + println(name.orNull) + println(licenses) + this.licenses { + license { + this.name = "Nich" + url = "URL" + comments = "com" + distribution = "dis" + } + } + println(licenses[0].name.orNull) + println(licenses[0].url.orNull) + println(licenses[0].comments.orNull) + println(licenses[0].distribution.orNull) + } + } } \ No newline at end of file diff --git a/gradle/playground/settings.gradle.kts b/gradle/playground/settings.gradle.kts index 6c09f847..b4fc3041 100644 --- a/gradle/playground/settings.gradle.kts +++ b/gradle/playground/settings.gradle.kts @@ -9,6 +9,11 @@ rootProject.name = "gradle-playground" +pluginManagement.repositories { + gradlePluginPortal() + maven("https://maven.scijava.org/content/repositories/releases") +} + dependencyResolutionManagement { // repositories { .. } @@ -16,12 +21,11 @@ dependencyResolutionManagement { create("libs").from("org.scijava:gradle-catalog") // fails with "Could not resolve all artifacts for configuration 'incomingCatalogForLibs0'." -// create("libs").from(files("../catalog/build/version-catalog/libs.versions.toml")) + // create("libs").from(files("../catalog/build/version-catalog/libs.versions.toml")) } includeBuild("../catalog") - // java-ecosystem-capabilities - includeBuild("../../../java-ecosystem-capabilities") + // includeBuild("../../../java-ecosystem-capabilities") } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file diff --git a/gradle/settings.gradle.kts b/gradle/settings.gradle.kts index 5fa82c4f..6a0ad4b9 100644 --- a/gradle/settings.gradle.kts +++ b/gradle/settings.gradle.kts @@ -6,5 +6,6 @@ rootProject.name = "gradle" includeBuild("catalog") includeBuild("platform") includeBuild("playground") +includeBuild("enforcer") enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file From df137524ce0c7b168b166dc06f91226e3c839c61 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Thu, 25 Apr 2024 11:44:04 +0200 Subject: [PATCH 721/996] catalog and platform properly generated and the corresponding artifacts get added alongside the main publication --- .idea/.gitignore | 8 + .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/compiler.xml | 36 + .idea/encodings.xml | 7 + .idea/gradle.xml | 42 + .idea/jarRepositories.xml | 35 + .idea/kotlinc.xml | 6 + .idea/misc.xml | 16 + .idea/modules.xml | 10 + .idea/vcs.xml | 6 + gradle/catalog/build.gradle.kts | 121 +- gradle/catalog/eff.xml | 6379 ----------------- .../catalog/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + gradle/catalog/gradlew | 249 + gradle/catalog/gradlew.bat | 92 + gradle/enforcer/.gitattributes | 9 + gradle/enforcer/.gitignore | 5 + gradle/enforcer/build.gradle.kts | 63 + gradle/enforcer/gradle.properties | 6 + gradle/enforcer/gradle/libs.versions.toml | 5 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + gradle/enforcer/gradlew | 249 + gradle/enforcer/gradlew.bat | 92 + .../example/EnforcerPluginFunctionalTest.kt | 43 + .../main/kotlin/org/example/EnforcerPlugin.kt | 22 + .../kotlin/org/example/EnforcerPluginTest.kt | 22 + gradle/gradle.properties | 6 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/manifest-dependencies/build.gradle.kts | 65 + .../manifest-dependencies/settings.gradle.kts | 10 + .../example/GradleBasePluginFunctionalTest.kt | 43 + .../kotlin/org/example/GradleBasePlugin.kt | 37 + .../org/example/GradleBasePluginTest.kt | 22 + gradle/platform/build.gradle.kts | 81 +- .../src/main/kotlin/publish.gradle.kts | 8 +- .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43462 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + gradle/platform/gradlew | 249 + gradle/platform/gradlew.bat | 92 + gradle/platform/settings.gradle.kts | 7 +- gradle/settings.gradle.kts | 5 +- pom.xml | 84 + 44 files changed, 1785 insertions(+), 6475 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/kotlinc.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml delete mode 100644 gradle/catalog/eff.xml create mode 100644 gradle/catalog/gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/catalog/gradle/wrapper/gradle-wrapper.properties create mode 100755 gradle/catalog/gradlew create mode 100644 gradle/catalog/gradlew.bat create mode 100644 gradle/enforcer/.gitattributes create mode 100644 gradle/enforcer/.gitignore create mode 100644 gradle/enforcer/build.gradle.kts create mode 100644 gradle/enforcer/gradle.properties create mode 100644 gradle/enforcer/gradle/libs.versions.toml create mode 100644 gradle/enforcer/gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/enforcer/gradle/wrapper/gradle-wrapper.properties create mode 100755 gradle/enforcer/gradlew create mode 100644 gradle/enforcer/gradlew.bat create mode 100644 gradle/enforcer/src/functionalTest/kotlin/org/example/EnforcerPluginFunctionalTest.kt create mode 100644 gradle/enforcer/src/main/kotlin/org/example/EnforcerPlugin.kt create mode 100644 gradle/enforcer/src/test/kotlin/org/example/EnforcerPluginTest.kt create mode 100644 gradle/gradle.properties create mode 100644 gradle/manifest-dependencies/build.gradle.kts create mode 100644 gradle/manifest-dependencies/settings.gradle.kts create mode 100644 gradle/manifest-dependencies/src/functionalTest/kotlin/org/example/GradleBasePluginFunctionalTest.kt create mode 100644 gradle/manifest-dependencies/src/main/kotlin/org/example/GradleBasePlugin.kt create mode 100644 gradle/manifest-dependencies/src/test/kotlin/org/example/GradleBasePluginTest.kt create mode 100644 gradle/platform/gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/platform/gradle/wrapper/gradle-wrapper.properties create mode 100755 gradle/platform/gradlew create mode 100644 gradle/platform/gradlew.bat diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..13566b81 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 00000000..a55e7a17 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..34d49353 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..aa00ffab --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..f2b130e0 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,42 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..24f14f03 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 00000000..8d81632f --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..a4e60c8b --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..c010932b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/gradle/catalog/build.gradle.kts b/gradle/catalog/build.gradle.kts index 0fe05f57..0c8dd02a 100644 --- a/gradle/catalog/build.gradle.kts +++ b/gradle/catalog/build.gradle.kts @@ -1,6 +1,7 @@ import groovy.xml.XmlSlurper import groovy.xml.slurpersupport.GPathResult import groovy.xml.slurpersupport.NodeChild +import java.io.ByteArrayOutputStream plugins { `version-catalog` @@ -10,76 +11,82 @@ plugins { group = "org.scijava" version = "0.11" -catalog.versionCatalog { - - operator fun GPathResult.div(child: String) = children().find { (it!! as NodeChild).name() == child } as GPathResult - - val effXml = XmlSlurper().parse(projectDir.resolve("eff.xml")) - val deps = effXml / "dependencyManagement" / "dependencies" - val bundles = mutableMapOf>() - val skip = listOf("mpicbg" to "mpicbg_") - val cache = mutableSetOf() // skip duplicates, such as org.bytedeco:ffmpeg - for (dep in deps.children()) { - val node = dep as NodeChild - val g = node / "groupId" - val a = node / "artifactId" - val v = node / "version" - val gav = "$g:$a:$v" - - if (("$g" to "$a") in skip || gav in cache) - continue - - cache += gav - - // println(gav) - val camel = "$a".split('-', '_') - .joinToString("") { if (it.isEmpty()) "" else it[0].uppercase() + it.substring(1).lowercase() } - .replaceFirstChar { it.lowercase() } - - fun getAlias(group: String = "$g".substringAfterLast('.')): String { - val alias = "$group." + when { - camel.startsWith(group) -> camel.substringAfter(group).replaceFirstChar { it.lowercase() }.ifEmpty { group } - else -> camel +tasks { + + val generateCatalog by register("generateCatalog") { + + workingDir = projectDir.parentFile.parentFile + commandLine("sh", "-c", "mvn -B -f pom.xml help:effective-pom") + standardOutput = ByteArrayOutputStream() + + doLast { + var output = standardOutput.toString() + // clean output from dirty + output = output.substringAfter("\n\n").substringBefore("\n\n") + + catalog.versionCatalog { + + operator fun GPathResult.div(child: String) = children().find { (it!! as NodeChild).name() == child } as GPathResult + + val xml = XmlSlurper().parseText(output) + val deps = xml / "dependencyManagement" / "dependencies" + val bundles = mutableMapOf>() + val skip = listOf("mpicbg" to "mpicbg_") + val cache = mutableSetOf() // skip duplicates, such as org.bytedeco:ffmpeg + for (dep in deps.children()) { + val node = dep as NodeChild + val g = node / "groupId" + val a = node / "artifactId" + val v = node / "version" + val gav = "$g:$a:$v" + + if (("$g" to "$a") in skip || gav in cache) + continue + + cache += gav + + val camel = "$a".split('-', '_') + .joinToString("") { if (it.isEmpty()) "" else it[0].uppercase() + it.substring(1).lowercase() } + .replaceFirstChar { it.lowercase() } + + fun getAlias(group: String): String { + val alias = "$group." + when { + camel.startsWith(group) -> camel.substringAfter(group).replaceFirstChar { it.lowercase() }.ifEmpty { group } + else -> camel + } + bundles.getOrPut(group, ::ArrayList) += alias + return alias + } + + val lastWordAsGroup = listOf("org.scijava", "net.imagej", "net.imglib2", "sc.fiji", "org.janelia.saalfeldlab") + val alias = when ("$g") { + in lastWordAsGroup -> getAlias(g.toString().substringAfterLast('.')) + "io.scif" -> getAlias("scifio") + else -> "$g.$camel" + } + + library(alias, gav) + } + + for ((alias, aliases) in bundles) + bundle(alias, aliases) } - bundles.getOrPut(group, ::ArrayList) += alias - return alias - } - - val alias = when ("$g") { - in listOf("org.scijava", "net.imagej", "net.imglib2", "sc.fiji", "org.janelia.saalfeldlab") -> getAlias() - "io.scif" -> getAlias("scifio") - else -> "$g.$camel" } - - // println("$alias($gav)") - library(alias, gav) } - - for ((alias, aliases) in bundles) - bundle(alias, aliases) - - // jakarta() - - // version("groovy", "3.0.5") - // library("groovy-core", "org.codehaus.groovy", "groovy").versionRef("groovy") + // dependsOn runs only if the src is successful, finalizedBy not + generateCatalogAsToml { dependsOn(generateCatalog) } } -//fun VersionCatalogBuilder.jakarta() { -// val bom = URL.of("https://repo1.maven.org/maven2/jakarta/platform/jakarta.jakartaee-bom/10.0.0/jakarta.jakartaee-bom-10.0.0.pom") -// library("jakarta.json", "jakarta.json:jakarta.json-api:") -//} - publishing { publications { + create("sciJavaCatalog") { from(components["versionCatalog"]) } repositories { maven { name = "sciJava" credentials(PasswordCredentials::class) url = uri("https://maven.scijava.org/content/repositories/releases") + // url = uri("repo") } } - create("sciJavaCatalog") { - from(components["versionCatalog"]) - } } } \ No newline at end of file diff --git a/gradle/catalog/eff.xml b/gradle/catalog/eff.xml deleted file mode 100644 index 1bb3642d..00000000 --- a/gradle/catalog/eff.xml +++ /dev/null @@ -1,6379 +0,0 @@ - - - - - - - - - - - - - - - 4.0.0 - - org.scijava - pom-scijava-base - 19.0.0 - - - org.scijava - pom-scijava - 38.0.0-SNAPSHOT - pom - SciJava Parent POM - This POM provides a parent from which participating projects can declare their build configurations. It ensures that projects all use a compatible build environment, including Java version, as well as versions of dependencies and plugins. - https://scijava.org/ - 2011 - - SciJava - https://scijava.org/ - - - - Unlicense - https://unlicense.org/ - repo - - - - - ctrueden - Curtis Rueden - https://imagej.net/people/ctrueden - - founder - lead - developer - debugger - reviewer - support - maintainer - - - - - - Mark Hiner - https://imagej.net/people/hinerm - - hinerm - - - - Johannes Schindelin - https://imagej.net/people/dscho - - dscho - - - - Sébastien Besson - https://imagej.net/people/sbesson - - sbesson - - - - John Bogovic - https://imagej.net/people/bogovicj - - bogovicj - - - - Nicolas Chiaruttini - https://imagej.net/people/NicoKiaru - - NicoKiaru - - - - Barry DeZonia - https://imagej.net/people/bdezonia - - bdezonia - - - - Richard Domander - https://imagej.net/people/rimadoma - - rimadoma - - - - Karl Duderstadt - https://imagej.net/people/karlduderstadt - - karlduderstadt - - - - Jan Eglinger - https://imagej.net/people/imagejan - - imagejan - - - - Gabriel Einsdorf - https://imagej.net/people/gab1one - - gab1one - - - - Tiago Ferreira - https://imagej.net/people/tferr - - tferr - - - - David Gault - - dgault - - - - Ulrik Günther - https://imagej.net/people/skalarproduktraum - - skalarproduktraum - - - - Philipp Hanslovsky - https://imagej.net/people/hanslovsky - - hanslovsky - - - - Stefan Helfrich - https://imagej.net/people/stelfrich - - stelfrich - - - - Cameron Lloyd - https://imagej.net/people/camlloyd - - camlloyd - - - - Hadrien Mary - https://imagej.net/people/hadim - - hadim - - - - Tobias Pietzsch - https://imagej.net/people/tpietzsch - - tpietzsch - - - - Stephan Preibisch - https://imagej.net/people/StephanPreibisch - - StephanPreibisch - - - - Stephan Saalfeld - https://imagej.net/people/axtimwalde - - axtimwalde - - - - Deborah Schmidt - https://imagej.net/people/frauzufall - - frauzufall - - - - Lorenzo Scianatico - https://imagej.net/people/LoreScianatico - - LoreScianatico - - - - Jean-Yves Tinevez - https://imagej.net/people/tinevez - - tinevez - - - - Christian Tischer - https://imagej.net/people/tischi - - tischi - - - - Gabriella Turek - https://imagej.net/people/turekg - - turekg - - - - - - SciJava - https://groups.google.com/group/scijava - https://groups.google.com/group/scijava - scijava@googlegroups.com - https://groups.google.com/group/scijava - - - - scm:git:https://github.com/scijava/pom-scijava - scm:git:git@github.com:scijava/pom-scijava - https://github.com/scijava/pom-scijava - - - GitHub Issues - https://github.com/scijava/pom-scijava/issues - - - GitHub Actions - https://github.com/scijava/pom-scijava/actions - - - 3.4.2 - 3.4.2 - 2.0.1 - 0.5.4 - 2.0.2 - 2.0.2 - 1.11.0 - 1.18.0 - 3.0.1 - 3.0.1 - 1.2.10 - 2.1.1 - 2.0.2 - 2.0.1 - 3.0.0 - 3.0.6 - 2.0.7 - 2.5.0 - 3.0.3 - 2.1.0 - 2.1.0 - 1.0.6 - 2.1.8 - 2.1.2 - 2.1.2 - 2.3.0 - 2.3.0 - 2.0.4 - 2.0.3 - 2.0.1 - 2.0.8 - 2.1.1 - 3.1.3 - 2.0.1 - 2.0.1 - 2.0.1 - 1.0.2 - 2.3.5 - 1.1.5 - 1.1.1 - 2.0.2 - 2.0.1 - 4.2.2 - 4.2.2 - 2.0.2 - 3.0.1 - 3.0.1 - 2.0.1 - 2.0.0 - 2.0.1 - 3.0.0 - 4.1.2 - 4.1.2 - 2.0.2 - 2.0.1 - 5.0.0 - 5.0.0 - 2.0.1 - 2.0.1 - 2.0.1 - 7.1.1 - 2.1.1 - 1.6.2 - 1.6.2 - 3.0.1 - 2.0.0 - 2.0.0 - 1.1.2 - 1.1.2 - 2.0.2 - 2.0.2 - 2.0.5 - 4.2.1 - 2.0.2 - 5.0.25 - 4.3.4 - 2.0.3 - 2.0.3 - 2.0.1 - 3.1.10 - 1.0.5 - 2.1.1 - 2.1.1 - 2.0.2 - 2.0.2 - 2.1.2 - 2.0.1 - 3.1.9 - 3.1.9 - 1.7-fiji4 - 1.1.4 - 1.1.4 - 2.0.1 - 2.1.1 - 2.1.0 - 25.0.2 - 25.0.2 - 2.0.1 - 2.0.1 - 3.1.4 - 0.1.2 - 1.2.5 - 1.4.0 - 1.2.1 - 3.2.0 - 2.0.1 - 1.2.1 - 1.3.1 - 7.11.1 - 3.3.4 - 1.3.10 - 1.3.10 - 2.0.4 - 2.2.0 - 3.0.4 - 3.0.4 - 2.0.3 - 1.0.3 - 2.0.3 - 2.0.1 - 2.5.0 - 2.5.0 - 2.0.3 - 2.01.4 - <_3D_Blob_Segmentation.version>3.0.2 - <_3D_Objects_Counter.version>2.0.1 - <_3D_Viewer.version>4.0.5 - 1.2.7 - com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* - 1.10.14 - 1.10.14 - 3.5.3 - 2.7.7 - 3.5.3 - 2.7.7 - 3.5.3 - 4.11.1 - 4.11.1 - 2.26.0 - 2.33 - 2.33 - 9.6 - 9.6 - 9.6 - 9.6 - 9.6 - 1.10.4 - 1.10.4 - 3.3.1 - ${package-guess} - 1.12.667 - 1.12.667 - 1.12.667 - 2.6.13 - 2.6.13 - 0.4.2 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 10.4.13 - 3.1.2 - 1.0.0-beta-34 - 6.2.4 - 9.1.0 - 9.1.0 - 1.0.0 - 7.2.0 - 7.2.0 - 7.2.0 - 2.1.4 - 2.1.4 - 7.0.18 - 7.0.18 - 7.0.18 - 7.0.18 - 7.0.18 - 7.0.18 - 0.7.0 - 3.5.0 - 3.2.0 - 2.0.SP1 - 3.3.0 - 3.3.0 - 1.2.12 - 1.2.12 - 1.2.25 - 3.42.0 - 19.04.1 - 2.2.10 - 2.5.0.1 - 1.8.1.1 - 2.3.0.4 - 2.5.1.4 - 2.5.3.1 - 1.9.0.1 - 0.32.1.1 - 0.32.2.0 - 2.7 - 1.12.667 - 1.12.667 - 5.6.0 - 1.3.1 - 1.11.9 - 2.16.1 - 2.16.1 - 2.16.1 - 2.16.1 - 2.16.1 - 3.3.1 - 3.3.0 - 3.4.0 - 2.304 - 3.4 - 1.3.13 - 0.10.4 - 2.2.16 - 3.1.19 - 1.5.5-11 - 0.12.0 - 4.2.2 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.26.0 - 2.43.0 - 2.43.0 - 2.43.0 - 2.34.0 - 1.29.0 - 1.23.0 - 1.23.0 - 1.23.0 - 1.10.4 - 1.10.4 - 2.33.0 - 2.33.0 - 0.127.13 - 1.38.0 - 2.34.0 - 2.10.1 - 2.25.0 - 33.0.0-jre - 1.44.1 - 1.44.1 - 1.44.1 - 1.44.1 - 1.44.1 - 1.44.1 - 2.8 - 3.23.0 - 3.23.0 - 3.23.0 - 1.7 - 5.5.13.3 - 0.1.55 - 1.1.3 - 5.3 - 5.3 - 5.3 - 0.7.0 - 5.9 - 4.12.0 - 3.8.0 - 1.1.3 - 3.6.5 - 3.6.5 - 1.9.4 - 1.9.4 - 1.6.0 - 1.6.0 - 1.16.1 - 1.16.1 - 3.2.2 - 3.2.2 - 4.4 - 1.26.0 - 1.10.0 - 2.15.1 - 2.15.1 - 2.6 - 2.6 - 3.14.0 - 1.3.0 - 1.3.0 - 3.6.1 - 2.12.0 - 1.11.0 - 0.4.8 - 26 - 26 - 1.9.10 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 - 4.3 - 20151125 - 0.41 - 2.25.0 - 2.25.0 - 3.2.0 - - 0.12.0 - 1.7.0 - 6.1.1-1.5.10 - 2.1.3 - 2.15.0 - 2.304 - 3.4 - 7.2.0 - 7.2.0 - 7.2.0 - 2.23.0 - 1.6.2 - 2.43.0 - 2.43.0 - 2.43.0 - 3.6.5 - 2.5.0 - 2.5.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 1.23.0 - 1.23.0 - 1.23.0 - 1.23.0 - 2.33.0 - 2.33.0 - 0.127.13 - 1.38.0 - 2.34.0 - 1.44.1 - 1.44.1 - 1.44.1 - 1.44.1 - 1.44.1 - 1.44.1 - 1.0.3 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 1.5 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 1.62.2 - 1.62.2 - 2.10.1 - 33.0.0-jre - 1.14.3-1.5.10 - 1.8.0.10 - 1.8.0.10 - 4.5.14 - 4.4.16 - 4.5.14 - 0.3.0 - 0.3.0 - 3.6.5 - 1.54h - 1.2.6 - 2.0.4 - 0.2.0 - 6.0.2 - 1.2.1 - 0.7.5 - 0.1.2 - 0.8.1 - 0.7.1 - 1.0.0-5.6 - 1.0.0-5.6 - 0.1.3 - 2.0.0 - 0.1.1 - 0.8.1 - 0.3.1 - 0.3.2 - 0.3.3 - 0.8.4 - 0.2.0 - 1.1.7 - 0.3.1 - 1.0.1 - 1.0.1 - 2.15.0 - 1.54h - 2.15.0 - 0.2.1 - 0.3.1 - 0.14.0 - 1.0.0-beta-17 - 2.0.1 - 2.0.0 - 0.12.0 - 4.0.1 - 0.14.1 - 1.0.0 - 6.3.0 - 1.9.0 - 4.7.5 - 1.62.2 - 0.3.0 - 4.1.1 - 0.6.1 - 0.2.2 - 1.1.1 - 0.3.1 - 0.9.0 - 0.17.1 - 0.46.0 - 5.5.13.3 - 2.5.2 - 2.8 - 1.6.0-scijava-2 - 1.6.0-scijava-2 - 2.21.22 - 2.16.1 - 2.16.1 - 2.16.1 - 2.16.1 - 2.16.1 - 2.16.1 - 0.8.11 - 1.1.3 - 1.1.3 - 1.1.3 - 1.0.3 - 1.7.2 - 1.7.2 - 1.6.0-scijava-2 - 1.5.10 - 1.5.10 - - - 8.8.3 - 3.30.2-GA - 2.0.SP1 - 1.1.3 - 1.0.1 - 1.7.36 - 1.0.58 - 2.0.6.1 - 2.4.2 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 1.3.13 - 1.5.4 - 3.4.3 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 4.2.2 - 19.04.1 - 0.14 - 3.0.4 - 3.0.4 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 2.14.6 - 2.14.6 - 2.14.6 - 3.25.1 - 1.37 - 1.37 - 1.37 - 1.49 - 5.14.0 - 5.14.0 - 0.10.4 - 2.2.16 - 3.1.19 - 2.5.0 - 2.0.5 - 2.12.7 - 2.12.7 - 1.7.2 - 2.5.0 - 2.5.0 - 2.5.0 - 1.10.5 - 2.2.1 - 2.80b11 - 2.80b11 - 0.2.1 - 0.1.55 - 1.4 - 20240205 - 0.7.4-scijava - 5.10.2 - 5.10.2 - 5.10.2 - 5.10.2 - 5.10.2 - 5.10.2 - 4.13.2 - 4.13.2 - 0.2.4 - 0.2.4 - 2.7.3 - 2.7.3 - 1.1.3 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.8.0 - 1.8.0 - 1.8.0 - 5.6.0 - 0.1.17 - 0.3.11 - 3.3.0 - 1.1.10 - 1.84.1-1.5.10 - 1.0.2 - 1.12.0 - 1.12.0 - 1.12.0 - 2.4.0 - N/A - **/script_templates/** - N/A - This POM provides a parent from which participating projects can declare their build configurations. It ensures that projects all use a compatible build environment, including Java version, as well as versions of dependencies and plugins. - 2.20.0 - 2.20.0 - 2.20.0 - 1.2.12 - 1.2.12 - 1.2.12 - 1.8.0 - - 3.1.0 - 3.1.0 - 0.13.1 - 3.6.0 - 3.3.2 - 3.3.2 - 3.8.1 - 3.9.6 - 3.6.1 - 3.1.1 - 3.4.1 - 3.2.5 - 3.1.0 - 1.45 - 3.4.0 - 3.1.1 - 3.6.0 - 3.3.0 - 3.6.3 - 3.11.0 - 3.11.0 - 3.5.0 - 3.0.1 - 3.3.1 - 3.5.2 - 3.12.1 - 3.3.0 - 3.2.5 - yyyy-MM-dd'T'HH:mm:ssZ - 8 - 8 - 8 - 8 - 8 - false - 5.3.6 - 5.3 - 5.3 - 5.3 - 5.3 - 20151125 - 2.2.2 - 1.3.1 - 2.19.0 - 2.19.0 - 1.5.0 - 1.5.0 - 1.5.0 - 1.5.0 - 3.2.7 - 0.2.0 - 4.0.2 - 1.1.1 - 4.0.0 - 2.1.0 - 4.0.2 - 7.0.0 - 1.3.2 - 6.0.1 - 1.2.1 - 1.0.2 - 3.1.3 - 2.5.0 - 1.2.7 - 0.4.8 - 2.2.10 - 2.5.0.1 - 1.8.1.1 - 2.3.0.4 - 2.5.1.4 - 2.5.3.1 - 1.9.0.1 - 0.32.1.1 - 0.32.2.0 - 1.54h - 1.2.6 - 2.0.4 - 0.2.0 - 6.0.2 - 1.2.1 - 0.7.5 - 0.1.2 - 0.8.1 - 0.7.1 - 1.0.0-5.6 - 1.0.0-5.6 - 0.1.3 - 2.0.0 - 0.1.1 - 0.8.1 - 0.3.1 - 0.3.2 - 0.3.3 - 0.8.4 - 0.2.0 - 1.1.7 - 0.3.1 - 1.0.1 - 1.0.1 - 2.15.0 - 0.1.4 - 0.2.1 - 0.3.1 - 0.14.0 - 1.0.0-beta-17 - 2.0.1 - 2.0.0 - 0.12.0 - 4.0.1 - 0.14.1 - 1.0.0 - 6.3.0 - 5.14.0 - 5.14.0 - 1.2.10 - 3.2.7 - 0.2.0 - 3.0.3 - 1.6.13 - 3.9.6 - 3.3 - 45.1.1 - 4.12.0 - 3.8.0 - 1.0.1 - 6.0.21 - 5.3.8 - 6.3.4 - 7.2.0 - 7.2.0 - 7.2.0 - 7.2.0 - 7.2.0 - 0.2.4 - 5.7.2 - 5.6.4 - 5.5.2 - 5.9.0 - 5.6.13 - 5.5.15 - 5.7.5 - 5.6.10 - 0.1.4 - 0.3.26-1.5.10 - 5.9 - 4.9.0-1.5.10 - 4.3.4 - 3.5.3 - 3.5.3 - 4.11.1 - 4.11.1 - 1.10.14 - 1.10.14 - 4.4 - 1.26.0 - 1.10.0 - 3.14.0 - 3.6.1 - 2.12.0 - 1.11.0 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.5.14 - 4.4.16 - 4.5.14 - 2.5.2 - 2.21.22 - 2.20.0 - 2.20.0 - 3.9.6 - 3.11.0 - 0.13.1 - 3.3.2 - 5.2.5 - 5.2.5 - 5.2.5 - 5.2.5 - 5.2.5 - 5.2.5 - 2.4.8 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 2.9 - 7.0.18 - 7.0.18 - 7.0.18 - 7.0.18 - 7.0.18 - 6.1.1-1.5.10 - 1.14.3-1.5.10 - 1.5.10 - 1.5.10 - 1.84.1-1.5.10 - 0.3.26-1.5.10 - 4.9.0-1.5.10 - 5.3.4-1.5.10 - 3.42.0 - 2.2.0 - 4.0.0 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 0.41 - 1.1.5 - 1.0.2 - 4.0.2 - 1.1.1 - 4.0.0 - 2.1.0 - 4.0.2 - 7.0.0 - 1.3.2 - 6.0.1 - 1.2.1 - 3.1.3 - 3.30.2-GA - 2.0.6.1 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.8.0 - 1.8.0 - 1.5.4 - 3.4.3 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 0.14 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 1.49 - 2.0.5 - 2.5.0 - 2.5.0 - 1.7.2 - 1.7.2 - 1.7.2 - 2.5.0 - 2.5.0 - 2.5.0 - 2.5.0 - 1.10.5 - 2.80b11 - 1.0.58 - 2.2.1 - 20240205 - 5.10.2 - 5.10.2 - 5.10.2 - 5.10.2 - 5.10.2 - 5.10.2 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 1.0.1 - 1.8.0 - 3.1.0 - 2.19.0 - 4.2.1 - 3.3 - 45.1.1 - 1.37 - 1.37 - 5.3.6 - 1.0.1 - 6.0.21 - 5.3.8 - 6.3.4 - 5.7.2 - 5.6.4 - 5.5.2 - 5.9.0 - 5.6.13 - 5.5.15 - 5.7.5 - 5.6.10 - 9.6 - 9.6 - 9.6 - 9.6 - 9.6 - 42.7.2 - 2.7.3 - 0.4.2 - 1.6.0-scijava-2 - 1.6.0-scijava-2 - 2.4.2 - 0.7.4-scijava - 2.2.2 - 2.5.0 - 3.1.0 - 0.1.2 - 2.98.0 - 2.0.3 - 0.1.2 - 0.3.0 - 0.1.0 - 1.0.0-beta-3 - 1.0.6 - 1.0.1 - 0.2.0 - 0.2.4 - 0.3.1 - 0.1.3 - 0.1.4 - 2.0.4 - 1.0.2 - 0.1.7 - 1.0.1 - 1.1.0 - 0.2.1 - 1.0.0 - 0.4.1 - 0.1.6 - 1.0.0 - 0.4.1 - 1.0.0 - 0.3.1 - 1.0.1 - 0.2.1 - 0.5.3 - 0.3.0 - 0.2.3 - 0.3.2 - 1.0.2 - 2.0.8 - 1.6.0-scijava-2 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 0.2.1 - 2.7 - 2.6.0 - 2.6.0 - 3.2.9.RELEASE - 3.2.9.RELEASE - 3.2.9.RELEASE - 1.12.0 - 1.12.0 - 1.12.0 - 1.12.0 - 1.12.0 - 1.6.8 - 1.9 - 2.2 - ${package-guess} - 2.0.1 - 3.0.2 - 3.0.2 - 3.1.0 - 4.7.5 - 2.2.0 - 4.0.0 - 5.2.5 - 5.2.5 - 5.2.5 - 5.2.5 - 5.2.5 - 5.2.5 - 42.7.2 - - UTF-8 - UTF-8 - 2.34.0 - 1.29.0 - 1.12.0 - 3.23.0 - 3.23.0 - 3.23.0 - 3.23.0 - 1.7 - 1.11.9 - 3.0.8 - 2.0.1 - sonatype-oss-release - 1.2.25 - 0.28.1 - 0.15.0 - 3.4.0 - 3.0.2 - 2.0.1 - 4.0.5 - 3.4.2 - 2.0.1 - 0.5.4 - 2.0.2 - 1.11.0 - 1.18.0 - 3.0.1 - 3.0.1 - 2.1.1 - 2.0.2 - 2.0.1 - 3.0.0 - 3.0.6 - 2.0.7 - 2.5.0 - 3.0.3 - 2.1.0 - 1.0.6 - 2.1.8 - 2.1.2 - 2.3.0 - 2.0.4 - 2.0.3 - 2.0.1 - 2.0.8 - 2.1.1 - 3.1.3 - 2.0.1 - 2.0.1 - 1.0.2 - 2.3.5 - 1.1.1 - 2.0.2 - 2.0.1 - 4.2.2 - 2.0.2 - 3.0.1 - 3.0.1 - 2.0.1 - 2.0.0 - 2.0.1 - 3.0.0 - 4.1.2 - 4.1.2 - 2.0.2 - 2.0.1 - 5.0.0 - 5.0.0 - 2.0.1 - 2.0.1 - 7.1.1 - 2.1.1 - 3.0.1 - 2.0.0 - 2.0.0 - 1.1.2 - 2.0.2 - 2.0.5 - 2.0.2 - 5.0.25 - 2.0.3 - 2.0.1 - 3.1.10 - 1.0.5 - 2.1.1 - 2.0.2 - 2.1.2 - 2.0.1 - 3.1.9 - 1.7-fiji4 - 1.1.4 - 1.1.4 - 2.0.1 - 2.1.1 - 2.1.0 - 25.0.2 - 2.0.1 - 3.1.4 - 0.1.2 - 1.2.5 - 1.4.0 - 1.2.1 - 3.2.0 - 2.0.1 - 1.2.1 - 1.3.1 - 7.11.1 - 3.3.4 - 1.3.10 - 2.0.4 - 2.2.0 - 3.0.4 - 2.0.3 - 1.0.3 - 2.0.3 - 2.0.1 - 2.5.0 - 2.0.3 - 2.01.4 - 2.6.13 - 10.4.13 - 3.1.2 - 1.0.0-beta-34 - 6.2.4 - 9.1.0 - 1.0.0 - 2.1.4 - 2.1.3 - 2.15.0 - 0.1.17 - 0.3.11 - 1.1.10 - 1.0.2 - 2.0.1 - 3.0.2 - 3.0.8 - 2.0.1 - 2.2.7 - 1.0.1 - 2.0.0 - 2.1.1 - 1.1.2 - 4.1.1 - 0.6.1 - 0.2.2 - 1.1.1 - 0.3.1 - 0.9.0 - 0.17.1 - 0.46.0 - 0.1.2 - 2.1.1 - 2.98.0 - 2.0.3 - 0.1.2 - 0.3.0 - 0.1.0 - 1.0.0-beta-3 - 1.0.6 - 3.0.0 - 1.0.1 - 0.2.0 - 0.2.4 - 0.3.1 - 0.1.3 - 0.1.4 - 2.0.4 - 1.0.2 - 0.1.7 - 1.0.1 - com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* - scijava - **/script_templates/** - java - org.scijava,net.imagej,net.imglib2,io.scif,sc.fiji - https://javadoc.scijava.org/Java8/ - https://javadoc.scijava.org/JavaFX8/ - [1.8.0-101,) - 8 - 8 - 3.6.3 - natives-linux_64 - linux-x86_64 - natives-linux-amd64 - linux-x86_64 - linux-x86_64 - natives-linux-amd64 - natives-linux-amd64 - natives-linux-amd64 - natives-linux-amd64 - linux-x86_64 - linux-x86_64 - linux-x86_64 - linux-x86_64 - 64 - x86_64 - amd64 - linux - linux - linux - linux - - founder,lead,developer,debugger,reviewer,support,maintainer - 1.1.0 - 0.2.1 - 1.0.0 - 0.4.1 - 0.1.6 - 1.0.0 - 0.4.1 - 1.0.0 - 0.3.1 - 1.0.1 - 0.2.1 - 0.5.3 - 0.3.0 - 0.2.3 - 0.3.2 - 2.6.0 - 2.6.0 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 2.7 - 2.2 - 3.10.0.2594 - https://s01.oss.sonatype.org - 2.4.8 - 2.4.8 - 2.2.7 - 3.2.9.RELEASE - 3.2.9.RELEASE - 3.2.9.RELEASE - 3.2.9.RELEASE - 1.0.2 - 1.12.0 - 5.3.4-1.5.10 - 0.12.0 - 1.6.8 - 1.2.0 - 1.0.1 - 2.0.0 - 3.0.3 - all - 2.0.8 - 1.6.0-scijava-2 - 1.7 - 2.16.2 - 1.0 - 2.1.1 - 3.9.6 - 3.9.6 - 2.9 - 1.9 - 1.1.2 - 1.5.5-11 - - - - - org.scijava - batch-processor - 0.4.2 - - - org.scijava - minimaven - 2.2.2 - - - org.scijava - native-lib-loader - 2.5.0 - - - org.scijava - parsington - 3.1.0 - - - org.scijava - scijava-cache - 0.1.2 - - - org.scijava - scijava-common - 2.98.0 - - - org.scijava - scijava-config - 2.0.3 - - - org.scijava - scijava-grab - 0.1.2 - - - org.scijava - scijava-io-http - 0.3.0 - - - org.scijava - scijava-java3d - 0.1.0 - - - org.scijava - scijava-listeners - 1.0.0-beta-3 - - - org.scijava - scijava-log-slf4j - 1.0.6 - - - org.scijava - scijava-optional - 1.0.1 - - - org.scijava - scijava-plot - 0.2.0 - - - org.scijava - scijava-plugins-commands - 0.2.4 - - - org.scijava - scijava-plugins-platforms - 0.3.1 - - - org.scijava - scijava-plugins-text-markdown - 0.1.3 - - - org.scijava - scijava-plugins-text-plain - 0.1.4 - - - org.scijava - scijava-search - 2.0.4 - - - org.scijava - scijava-table - 1.0.2 - - - org.scijava - scijava-ui-awt - 0.1.7 - - - org.scijava - scijava-ui-swing - 1.0.1 - - - org.scijava - script-editor - 1.0.0 - - - org.scijava - script-editor-jython - 1.1.0 - - - org.scijava - script-editor-scala - 0.2.1 - - - org.scijava - scripting-beanshell - 0.4.1 - - - org.scijava - scripting-clojure - 0.1.6 - - - org.scijava - scripting-groovy - 1.0.0 - - - org.scijava - scripting-java - 0.4.1 - - - org.scijava - scripting-javascript - 1.0.0 - - - org.scijava - scripting-jruby - 0.3.1 - - - org.scijava - scripting-jython - 1.0.1 - - - org.scijava - scripting-kotlin - 0.2.1 - - - org.scijava - scripting-matlab - 0.5.3 - - - org.scijava - scripting-python - 0.3.0 - - - org.scijava - scripting-renjin - 0.2.3 - - - org.scijava - scripting-scala - 0.3.2 - - - org.scijava - swing-checkbox-tree - 1.0.2 - - - org.scijava - ui-behaviour - 2.0.8 - - - net.imagej - imagej - 2.15.0 - - - net.imagej - ij - 1.54h - - - com.sun - tools - - - - - net.imagej - ij1-patcher - 1.2.6 - - - net.imagej - imagej-common - 2.0.4 - - - net.imagej - imagej-deprecated - 0.2.0 - - - net.imagej - imagej-launcher - 6.0.2 - - - net.imagej - imagej-legacy - 1.2.1 - - - net.imagej - imagej-matlab - 0.7.5 - - - net.imagej - imagej-mesh - 0.8.1 - - - net.imagej - imagej-mesh-io - 0.1.2 - - - net.imagej - imagej-notebook - 0.7.1 - - - net.imagej - imagej-omero - 1.0.0-5.6 - - - net.imagej - imagej-omero-legacy - 1.0.0-5.6 - - - net.imagej - imagej-opencv - 0.1.3 - - - net.imagej - imagej-ops - 2.0.0 - - - net.imagej - imagej-plugins-batch - 0.1.1 - - - net.imagej - imagej-plugins-commands - 0.8.1 - - - net.imagej - imagej-plugins-tools - 0.3.1 - - - net.imagej - imagej-plugins-uploader-ssh - 0.3.2 - - - net.imagej - imagej-plugins-uploader-webdav - 0.3.3 - - - net.imagej - imagej-scripting - 0.8.4 - - - net.imagej - imagej-server - 0.2.0 - - - net.imagej - imagej-tensorflow - 1.1.7 - - - net.imagej - imagej-ui-awt - 0.3.1 - - - net.imagej - imagej-ui-swing - 1.0.1 - - - net.imagej - imagej-updater - 1.0.1 - - - net.imagej - op-finder - 0.1.4 - - - net.imglib2 - imglib2 - 6.3.0 - - - net.imglib2 - imglib2-algorithm - 0.14.0 - - - net.imglib2 - imglib2-algorithm-fft - 0.2.1 - - - net.imglib2 - imglib2-algorithm-gpl - 0.3.1 - - - net.imglib2 - imglib2-cache - 1.0.0-beta-17 - - - net.imglib2 - imglib2-ij - 2.0.1 - - - net.imglib2 - imglib2-imglyb - 2.0.0 - - - net.imglib2 - imglib2-realtransform - 4.0.1 - - - net.imglib2 - imglib2-roi - 0.14.1 - - - net.imglib2 - imglib2-unsafe - 1.0.0 - - - io.scif - scifio - 0.46.0 - - - io.scif - scifio-bf-compat - 4.1.1 - - - io.scif - scifio-cli - 0.6.1 - - - io.scif - scifio-hdf5 - 0.2.2 - - - io.scif - scifio-jai-imageio - 1.1.1 - - - io.scif - scifio-labeling - 0.3.1 - - - io.scif - scifio-lifesci - 0.9.0 - - - io.scif - scifio-ome-xml - 0.17.1 - - - sc.fiji - fiji - 2.15.0 - - - sc.fiji - 3D_Blob_Segmentation - 3.0.2 - - - sc.fiji - 3D_Objects_Counter - 2.0.1 - - - sc.fiji - 3D_Viewer - 4.0.5 - - - sc.fiji - AnalyzeSkeleton_ - 3.4.2 - - - sc.fiji - Anisotropic_Diffusion_2D - 2.0.1 - - - sc.fiji - Archipelago_Plugins - 0.5.4 - - - sc.fiji - Arrow_ - 2.0.2 - - - sc.fiji - Auto_Local_Threshold - 1.11.0 - - - sc.fiji - Auto_Threshold - 1.18.0 - - - sc.fiji - BalloonSegmentation_ - 3.0.1 - - - sc.fiji - Bug_Submitter - 2.1.1 - - - sc.fiji - CPU_Meter - 2.0.2 - - - sc.fiji - Calculator_Plus - 2.0.1 - - - sc.fiji - Cell_Counter - 3.0.0 - - - sc.fiji - Colocalisation_Analysis - 3.0.6 - - - sc.fiji - Color_Histogram - 2.0.7 - - - sc.fiji - Color_Inspector_3D - 2.5.0 - - - sc.fiji - Colour_Deconvolution - 3.0.3 - - - sc.fiji - CorrectBleach_ - 2.1.0 - - - sc.fiji - Correct_3D_Drift - 1.0.6 - - - sc.fiji - Descriptor_based_registration - 2.1.8 - - - sc.fiji - Dichromacy_ - 2.1.2 - - - sc.fiji - Directionality_ - 2.3.0 - - - sc.fiji - FS_Align_TrakEM2 - 2.0.4 - - - sc.fiji - Feature_Detection - 2.0.3 - - - sc.fiji - Fiji_Archipelago - 2.0.1 - - - sc.fiji - Fiji_Developer - 2.0.8 - - - sc.fiji - Fiji_Package_Maker - 2.1.1 - - - sc.fiji - Fiji_Plugins - 3.1.3 - - - sc.fiji - FilamentDetector - 2.0.1 - - - sc.fiji - FlowJ_ - 2.0.1 - - - sc.fiji - Graph_Cut - 1.0.2 - - - sc.fiji - Gray_Morphology - 2.3.5 - - - org.janelia - H5J_Loader_Plugin - 1.1.5 - - - sc.fiji - HDF5_Vibez - 1.1.1 - - - sc.fiji - Helmholtz_Analysis - 2.0.2 - - - sc.fiji - IJ_Robot - 2.0.1 - - - sc.fiji - IO_ - 4.2.2 - - - sc.fiji - Image_5D - 2.0.2 - - - sc.fiji - Image_Expression_Parser - 3.0.1 - - - sc.fiji - Interactive_3D_Surface_Plot - 3.0.1 - - - sc.fiji - IsoData_Classifier - 2.0.1 - - - sc.fiji - Kappa - 2.0.0 - - - sc.fiji - Kuwahara_Filter - 2.0.1 - - - sc.fiji - KymographBuilder - 3.0.0 - - - sc.fiji - LSM_Reader - 4.1.2 - - - sc.fiji - LSM_Toolbox - 4.1.2 - - - sc.fiji - Lasso_and_Blow_Tool - 2.0.2 - - - sc.fiji - Linear_Kuwahara - 2.0.1 - - - sc.fiji - LocalThickness_ - 5.0.0 - - - sc.fiji - MTrack2_ - 2.0.1 - - - sc.fiji - M_I_P - 2.0.1 - - - sc.fiji - Manual_Tracking - 2.1.1 - - - sc.fiji - Multi_Kymograph - 3.0.1 - - - sc.fiji - OMEVisual - 2.0.0 - - - sc.fiji - PIV_analyser - 2.0.0 - - - sc.fiji - QuickPALM_ - 1.1.2 - - - sc.fiji - RATS_ - 2.0.2 - - - sc.fiji - Reconstruct_Reader - 2.0.5 - - - sc.fiji - SPIM_Opener - 2.0.2 - - - sc.fiji - SPIM_Registration - 5.0.25 - - - sc.fiji - Samples_ - 2.0.3 - - - sc.fiji - Series_Labeler - 2.0.1 - - - sc.fiji - Siox_Segmentation - 1.0.5 - - - sc.fiji - Skeletonize3D_ - 2.1.1 - - - sc.fiji - SplineDeformationGenerator_ - 2.0.2 - - - sc.fiji - Stack_Manipulation - 2.1.2 - - - sc.fiji - Statistical_Region_Merging - 2.0.1 - - - sc.fiji - Stitching_ - 3.1.9 - - - sc.fiji - Sync_Win - 1.7-fiji4 - - - sc.fiji - Thread_Killer - 2.0.1 - - - sc.fiji - Time_Lapse - 2.1.1 - - - sc.fiji - Time_Stamper - 2.1.0 - - - sc.fiji - ToAST_ - 25.0.2 - - - sc.fiji - TopoJ_ - 2.0.1 - - - sc.fiji - Trainable_Segmentation - 3.3.4 - - - sc.fiji - TrakEM2_Archipelago - 2.0.4 - - - sc.fiji - VIB-lib - 2.2.0 - - - sc.fiji - VIB_ - 3.0.4 - - - sc.fiji - Vaa3d_Reader - 2.0.3 - - - sc.fiji - Vaa3d_Writer - 1.0.3 - - - sc.fiji - Video_Editing - 2.0.1 - - - sc.fiji - View5D_ - 2.5.0 - - - sc.fiji - Volume_Calculator - 2.0.3 - - - sc.fiji - Volume_Viewer - 2.01.4 - - - sc.fiji - bUnwarpJ_ - 2.6.13 - - - sc.fiji - bij - 1.0.0 - - - sc.fiji - blockmatching_ - 2.1.4 - - - sc.fiji - fiji-lib - 2.1.3 - - - sc.fiji - legacy-imglib1 - 1.1.10 - - - sc.fiji - level_sets - 1.0.2 - - - sc.fiji - pal-optimization - 2.0.1 - - - sc.fiji - panorama_ - 3.0.2 - - - sc.fiji - register_virtual_stack_slices - 3.0.8 - - - sc.fiji - registration_3d - 2.0.1 - - - sc.fiji - weave_jy2java - 2.1.1 - - - jitk - jitk-tps - 3.0.4 - - - sc.fiji - bigwarp_fiji - 9.1.0 - - - com.googlecode.efficient-java-matrix-library - ejml - - - - - mpicbg - mpicbg - 1.5.0 - - - mpicbg - mpicbg_ - 1.5.0 - - - sc.fiji - trakem2_tps - 2.0.0 - - - sc.fiji - z_spacing - 1.1.2 - - - sc.fiji - bigdataviewer-core - 10.4.13 - - - sc.fiji - bigdataviewer-server - 3.1.2 - - - sc.fiji - bigdataviewer-vistools - 1.0.0-beta-34 - - - sc.fiji - bigdataviewer_fiji - 6.2.4 - - - sc.fiji - spim_data - 2.2.7 - - - sc.fiji - TrackMate - 7.11.1 - - - sc.fiji - TrackMate-Cellpose - 0.1.2 - - - sc.fiji - TrackMate-CSVImporter - 3.1.4 - - - sc.fiji - TrackMate-ExTrack - 1.2.5 - - - sc.fiji - TrackMate-Ilastik - 1.4.0 - - - sc.fiji - TrackMate-MorphoLibJ - 1.2.1 - - - sc.fiji - TrackMate-Oneat - 3.2.0 - - - sc.fiji - TrackMate-Skeleton - 2.0.1 - - - sc.fiji - TrackMate-StarDist - 1.2.1 - - - sc.fiji - TrackMate-Weka - 1.3.1 - - - sc.fiji - T2-NIT - 1.1.4 - - - sc.fiji - T2-TreelineGraph - 1.1.4 - - - sc.fiji - TrakEM2_ - 1.3.10 - - - sc.fiji - VectorString - 2.0.3 - - - sc.fiji - trakem2-transform - 1.0.1 - - - net.imglib2 - imglib2-label-multisets - 0.12.0 - - - org.janelia.saalfeldlab - n5 - 3.1.3 - - - org.janelia.saalfeldlab - n5-aws-s3 - 4.0.2 - - - org.janelia.saalfeldlab - n5-blosc - 1.1.1 - - - org.janelia.saalfeldlab - n5-google-cloud - 4.0.0 - - - org.janelia.saalfeldlab - n5-hdf5 - 2.1.0 - - - org.janelia.saalfeldlab - n5-ij - 4.0.2 - - - org.janelia.saalfeldlab - n5-imglib2 - 7.0.0 - - - org.janelia.saalfeldlab - n5-universe - 1.3.2 - - - org.janelia.saalfeldlab - n5-viewer_fiji - 6.0.1 - - - org.janelia.saalfeldlab - n5-zarr - 1.2.1 - - - fr.inra.ijpb - MorphoLibJ_ - 1.6.2 - - - net.haesleinhuepf - clij_ - 1.9.0.1 - - - net.haesleinhuepf - clij-core - 1.8.1.1 - - - net.haesleinhuepf - clij-coremem - 2.3.0.4 - - - net.haesleinhuepf - clij-clearcl - 2.5.0.1 - - - net.haesleinhuepf - clij2_ - 2.5.3.1 - - - net.haesleinhuepf - clij2-assistant_ - 2.5.1.4 - - - net.haesleinhuepf - clijx_ - 0.32.2.0 - - - net.haesleinhuepf - clijx-weka_ - 0.32.1.1 - - - net.preibisch - BigStitcher - 1.2.10 - - - net.preibisch - multiview-reconstruction - 3.2.7 - - - net.preibisch - multiview-simulation - 0.2.0 - - - org.bonej - bonej-plugins - 7.0.18 - - - org.bonej - bonej-ops - 7.0.18 - - - org.bonej - bonej-legacy-plugins_ - 7.0.18 - - - org.bonej - bonej-legacy-util_ - 7.0.18 - - - org.bonej - bonej-utilities - 7.0.18 - - - org.morphonets - SNT - 4.2.1 - - - org.jzy3d - jzy3d-emul-gl - - - org.jzy3d - jGL - - - - - sc.fiji - MaMuT - 7.1.1 - - - sc.fiji - labkit-pixel-classification - 0.1.17 - - - sc.fiji - labkit-ui - 0.3.11 - - - com.zeroc - glacier2 - 3.6.5 - - - com.zeroc - ice - 3.6.5 - - - org.openmicroscopy - metakit - 5.3.6 - - - ch.qos.logback - logback-classic - - - - - org.openmicroscopy - ome-codecs - 1.0.1 - - - org.openmicroscopy - ome-common - 6.0.21 - - - ch.qos.logback - logback-classic - - - xalan - serializer - - - xalan - xalan - - - - - org.openmicroscopy - ome-poi - 5.3.8 - - - org.openmicroscopy - ome-xml - 6.3.4 - - - ome - jxrlib-all - 0.2.4 - - - ome - bio-formats-tools - 7.2.0 - - - xalan - serializer - - - xalan - xalan - - - - - ome - bio-formats_plugins - 7.2.0 - - - ch.qos.logback - logback-classic - - - - - ome - formats-api - 7.2.0 - - - xalan - serializer - - - xalan - xalan - - - - - ome - formats-bsd - 7.2.0 - - - xalan - serializer - - - xalan - xalan - - - - - ome - formats-gpl - 7.2.0 - - - org.openmicroscopy - omero-blitz - 5.7.2 - - - com.sun.activation - javax.activation - - - org.apache.xmlgraphics - batik-all - - - - - org.openmicroscopy - omero-common - 5.6.4 - - - ch.qos.logback - logback-classic - - - - - org.openmicroscopy - omero-dsl-plugin - 5.5.2 - - - org.openmicroscopy - omero-gateway - 5.9.0 - - - org.openmicroscopy - omero-model - 5.6.13 - - - javax.transaction - jta - - - org.apache.solr - solr-commons-csv - - - - - org.openmicroscopy - omero-renderer - 5.5.15 - - - c3p0 - c3p0 - - - - - org.openmicroscopy - omero-romio - 5.7.5 - - - org.openmicroscopy - omero-server - 5.6.10 - - - c3p0 - c3p0 - - - com.sun.mail - javax.mail - - - javax.activation - activation - - - org.apache.xmlgraphics - batik-all - - - - - net.clearcontrol - coremem - 0.4.8 - - - com.google.android.tools - dx - - - - - net.clearvolume - cleargl - 2.2.10 - - - org.jogamp.gluegen - gluegen-rt-main - - - org.jogamp.jogl - jogl-all-main - - - - - net.algart - algart-tiff - 1.2.7 - - - com.amazonaws - aws-java-sdk-core - 1.12.667 - - - com.amazonaws - aws-java-sdk-s3 - 1.12.667 - - - antlr - antlr - 2.7.7 - - - org.antlr - ST4 - 4.3.4 - - - org.antlr - antlr - 3.5.3 - - - org.antlr - antlr-runtime - 3.5.3 - - - org.apache.ant - ant - 1.10.14 - - - org.apache.ant - ant-launcher - 1.10.14 - - - org.apache.groovy - groovy - 4.0.18 - - - org.apache.groovy - groovy-ant - 4.0.18 - - - org.apache.groovy - groovy-astbuilder - 4.0.18 - - - org.apache.groovy - groovy-cli-commons - 4.0.18 - - - org.apache.groovy - groovy-cli-picocli - 4.0.18 - - - org.apache.groovy - groovy-console - 4.0.18 - - - org.apache.groovy - groovy-contracts - 4.0.18 - - - org.apache.groovy - groovy-datetime - 4.0.18 - - - org.apache.groovy - groovy-dateutil - 4.0.18 - - - org.apache.groovy - groovy-docgenerator - 4.0.18 - - - org.apache.groovy - groovy-ginq - 4.0.18 - - - org.apache.groovy - groovy-groovydoc - 4.0.18 - - - org.apache.groovy - groovy-groovysh - 4.0.18 - - - org.apache.groovy - groovy-jmx - 4.0.18 - - - org.apache.groovy - groovy-json - 4.0.18 - - - org.apache.groovy - groovy-jsr223 - 4.0.18 - - - org.apache.groovy - groovy-macro - 4.0.18 - - - org.apache.groovy - groovy-macro-library - 4.0.18 - - - org.apache.groovy - groovy-nio - 4.0.18 - - - org.apache.groovy - groovy-servlet - 4.0.18 - - - org.apache.groovy - groovy-sql - 4.0.18 - - - org.apache.groovy - groovy-swing - 4.0.18 - - - org.apache.groovy - groovy-templates - 4.0.18 - - - org.apache.groovy - groovy-test - 4.0.18 - - - org.apache.groovy - groovy-test-junit5 - 4.0.18 - - - org.apache.groovy - groovy-testng - 4.0.18 - - - org.apache.groovy - groovy-toml - 4.0.18 - - - org.apache.groovy - groovy-typecheckers - 4.0.18 - - - org.apache.groovy - groovy-xml - 4.0.18 - - - org.apache.groovy - groovy-yaml - 4.0.18 - - - org.apache.ivy - ivy - 2.5.2 - - - org.apache.logging.log4j - log4j-api - 2.20.0 - - - org.apache.logging.log4j - log4j-core - 2.20.0 - - - org.apache.maven.shared - maven-artifact-transfer - 0.13.1 - - - org.apache.maven.shared - maven-common-artifact-filters - 3.3.2 - - - org.apache.maven - maven-core - 3.9.6 - - - org.apache.maven.plugin-tools - maven-plugin-tools-api - 3.11.0 - - - org.codehaus.plexus - plexus-component-annotations - 2.2.0 - - - org.codehaus.plexus - plexus-utils - 4.0.0 - - - org.sonatype.sisu - sisu-inject-bean - 2.6.0 - - - org.sonatype.sisu - sisu-inject-plexus - 2.6.0 - - - org.apache.poi - poi - 5.2.5 - - - org.apache.poi - poi-examples - 5.2.5 - - - org.apache.poi - poi-excelant - 5.2.5 - - - org.apache.poi - poi-ooxml - 5.2.5 - - - org.apache.poi - poi-ooxml-lite - 5.2.5 - - - org.apache.poi - poi-scratchpad - 5.2.5 - - - org.apache.spark - spark-core_2.11 - 2.4.8 - - - com.sun.jersey - jersey-core - - - commons-beanutils - commons-beanutils-core - - - io.netty - netty-all - - - - - org.apache.httpcomponents - httpclient - 4.5.14 - - - org.apache.httpcomponents - httpcore - 4.4.16 - - - org.apache.httpcomponents - httpmime - 4.5.14 - - - args4j - args4j - 2.33 - - - org.ow2.asm - asm - 9.6 - - - org.ow2.asm - asm-analysis - 9.6 - - - org.ow2.asm - asm-commons - 9.6 - - - org.ow2.asm - asm-tree - 9.6 - - - org.ow2.asm - asm-util - 9.6 - - - org.apache.xmlgraphics - batik-anim - 1.17 - - - org.apache.xmlgraphics - batik-awt-util - 1.17 - - - org.apache.xmlgraphics - batik-bridge - 1.17 - - - xalan - xalan - - - - - org.apache.xmlgraphics - batik-codec - 1.17 - - - org.apache.xmlgraphics - batik-constants - 1.17 - - - org.apache.xmlgraphics - batik-css - 1.17 - - - org.apache.xmlgraphics - batik-dom - 1.17 - - - xalan - xalan - - - - - org.apache.xmlgraphics - batik-ext - 1.17 - - - org.apache.xmlgraphics - batik-extension - 1.17 - - - org.apache.xmlgraphics - batik-gui-util - 1.17 - - - org.apache.xmlgraphics - batik-gvt - 1.17 - - - org.apache.xmlgraphics - batik-i18n - 1.17 - - - org.apache.xmlgraphics - batik-parser - 1.17 - - - org.apache.xmlgraphics - batik-rasterizer - 1.17 - - - org.apache.xmlgraphics - batik-rasterizer-ext - 1.17 - - - org.apache.xmlgraphics - batik-extensions - - - - - org.apache.xmlgraphics - batik-script - 1.17 - - - org.apache.xmlgraphics - batik-slideshow - 1.17 - - - org.apache.xmlgraphics - batik-squiggle - 1.17 - - - org.apache.xmlgraphics - batik-squiggle-ext - 1.17 - - - org.apache.xmlgraphics - batik-extensions - - - - - org.apache.xmlgraphics - batik-svg-dom - 1.17 - - - org.apache.xmlgraphics - batik-svggen - 1.17 - - - org.apache.xmlgraphics - batik-svgpp - 1.17 - - - org.apache.xmlgraphics - batik-swing - 1.17 - - - org.apache.xmlgraphics - batik-transcoder - 1.17 - - - org.apache.xmlgraphics - batik-ttf2svg - 1.17 - - - org.apache.xmlgraphics - batik-util - 1.17 - - - org.apache.xmlgraphics - batik-xml - 1.17 - - - org.apache.xmlgraphics - xmlgraphics-commons - 2.9 - - - org.lasersonlab - jblosc - 1.0.1 - - - com.nativelibs4java - bridj - 0.7.0 - - - com.google.android.tools - dx - - - - - javax.enterprise - cdi-api - 2.0.SP1 - - - org.checkerframework - checker-qual - 3.42.0 - - - commons-beanutils - commons-beanutils - 1.9.4 - - - commons-cli - commons-cli - 1.6.0 - - - commons-codec - commons-codec - 1.16.1 - - - commons-collections - commons-collections - 3.2.2 - - - org.apache.commons - commons-collections4 - 4.4 - - - org.apache.commons - commons-compress - 1.26.0 - - - org.apache.commons - commons-csv - 1.10.0 - - - commons-io - commons-io - 2.15.1 - - - commons-lang - commons-lang - 2.6 - - - org.apache.commons - commons-lang3 - 3.14.0 - - - commons-logging - commons-logging - 1.3.0 - - - org.apache.commons - commons-math3 - 3.6.1 - - - org.apache.commons - commons-pool2 - 2.12.0 - - - org.apache.commons - commons-text - 1.11.0 - - - cglib - cglib - 3.3.0 - - - dev.dirs - directories - 26 - - - org.eclipse.collections - eclipse-collections - 11.1.0 - - - org.eclipse.collections - eclipse-collections-api - 11.1.0 - - - org.eclipse.collections - eclipse-collections-forkjoin - 11.1.0 - - - org.eclipse.collections - eclipse-collections-testutils - 11.1.0 - - - org.eclipse.swt - org.eclipse.swt.cocoa.macosx - 4.3 - - - org.eclipse.swt - org.eclipse.swt.cocoa.macosx.x86_64 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.aix.ppc - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.aix.ppc64 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.hpux.ia64 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.ppc - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.ppc64 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.s390 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.s390x - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.x86 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.x86_64 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.solaris.sparc - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.solaris.x86 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.win32.win32.x86 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.win32.win32.x86_64 - 4.3 - - - org.ejml - ejml-all - 0.41 - - - com.google.errorprone - error_prone_annotations - 2.25.0 - - - com.formdev - flatlaf - 3.4 - - - com.formdev - flatlaf-fonts-jetbrains-mono - 2.304 - - - com.google.api-client - google-api-client - 2.3.0 - - - com.google.api-client - google-api-client-android - 2.3.0 - - - com.google.api-client - google-api-client-appengine - 2.3.0 - - - com.google.api-client - google-api-client-gson - 2.3.0 - - - com.google.api-client - google-api-client-jackson2 - 2.3.0 - - - com.google.api-client - google-api-client-protobuf - 2.3.0 - - - com.google.api-client - google-api-client-servlet - 2.3.0 - - - javax.servlet - servlet-api - - - - - com.google.api-client - google-api-client-xml - 2.3.0 - - - com.google.api - api-common - 2.26.0 - - - com.google.api - gax - 2.43.0 - - - com.google.api - gax-grpc - 2.43.0 - - - com.google.api - gax-httpjson - 2.43.0 - - - com.google.api.grpc - proto-google-common-protos - 2.34.0 - - - com.google.api.grpc - proto-google-iam-v1 - 1.29.0 - - - com.google.auth - google-auth-library-appengine - 1.23.0 - - - com.google.auth - google-auth-library-credentials - 1.23.0 - - - com.google.auth - google-auth-library-oauth2-http - 1.23.0 - - - com.google.auto.value - auto-value - 1.10.4 - - - com.google.auto.value - auto-value-annotations - 1.10.4 - - - com.google.cloud - google-cloud-core - 2.33.0 - - - com.google.cloud - google-cloud-core-http - 2.33.0 - - - com.google.cloud - google-cloud-nio - 0.127.13 - - - com.google.cloud - google-cloud-resourcemanager - 1.38.0 - - - com.google.cloud - google-cloud-storage - 2.34.0 - - - com.google.http-client - google-http-client - 1.44.1 - - - com.google.http-client - google-http-client-apache-v2 - 1.44.1 - - - com.google.http-client - google-http-client-appengine - 1.44.1 - - - com.google.http-client - google-http-client-gson - 1.44.1 - - - com.google.http-client - google-http-client-jackson2 - 1.44.1 - - - com.google.http-client - google-http-client-xml - 1.44.1 - - - io.grpc - grpc-context - 1.62.2 - - - com.google.code.gson - gson - 2.10.1 - - - com.google.guava - guava - 33.0.0-jre - - - io.humble - humble-video-all - 0.3.0 - - - hsqldb - hsqldb - 1.8.0.10 - - - com.itextpdf - itextpdf - 5.5.13.3 - - - com.google.j2objc - j2objc-annotations - 2.8 - - - org.apache.jackrabbit - jackrabbit-webdav - 2.21.22 - - - org.slf4j - jcl-over-slf4j - - - - - com.fasterxml.jackson.core - jackson-annotations - 2.16.1 - - - com.fasterxml.jackson.core - jackson-core - 2.16.1 - - - com.fasterxml.jackson.core - jackson-databind - 2.16.1 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - 2.16.1 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - 2.16.1 - - - com.sun.media - jai-codec - 1.1.3 - - - javax.media - jai-core - 1.1.3 - - - gov.nist.math - jama - 1.0.3 - - - org.scijava - j3dcore - 1.6.0-scijava-2 - - - org.scijava - j3dutils - 1.6.0-scijava-2 - - - org.scijava - vecmath - 1.6.0-scijava-2 - - - org.bytedeco - javacpp - 1.5.10 - - - org.bytedeco - javacv - 1.5.10 - - - org.bytedeco - ffmpeg - 6.1.1-1.5.10 - - - org.bytedeco - hdf5 - 1.14.3-1.5.10 - - - org.bytedeco - leptonica - 1.84.1-1.5.10 - - - org.bytedeco - openblas - 0.3.26-1.5.10 - - - org.bytedeco - opencv - 4.9.0-1.5.10 - - - org.bytedeco - tesseract - 5.3.4-1.5.10 - - - org.bytedeco - ffmpeg - 6.1.1-1.5.10 - linux-x86_64 - - - org.bytedeco - hdf5 - 1.14.3-1.5.10 - linux-x86_64 - - - org.bytedeco - leptonica - 1.84.1-1.5.10 - linux-x86_64 - - - org.bytedeco - openblas - 0.3.26-1.5.10 - linux-x86_64 - - - org.bytedeco - opencv - 4.9.0-1.5.10 - linux-x86_64 - - - org.bytedeco - tesseract - 5.3.4-1.5.10 - linux-x86_64 - - - org.javassist - javassist - 3.30.2-GA - - - org.jruby.jcodings - jcodings - 1.0.58 - - - org.jdom - jdom2 - 2.0.6.1 - - - org.scijava - jep - 2.4.2 - - - org.eclipse.jetty - jetty-annotations - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-client - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-continuation - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-deploy - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-http - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-http-spi - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-io - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-jaspi - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-jmx - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-jndi - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-nosql - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-plus - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-proxy - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-rewrite - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-security - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-server - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-servlet - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-servlets - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-spring - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-start - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-util - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-util-ajax - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-webapp - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-xml - 9.4.54.v20240208 - - - org.jfree - jfreechart - 1.5.4 - - - org.jfree - jfreesvg - 3.4.3 - - - org.jgrapht - jgrapht-core - 1.4.0 - - - org.jgrapht - jgrapht-demo - 1.4.0 - - - org.jgrapht - jgrapht-ext - 1.4.0 - - - org.jgrapht - jgrapht-guava - 1.4.0 - - - org.jgrapht - jgrapht-io - 1.4.0 - - - org.jgrapht - jgrapht-opt - 1.4.0 - - - it.unimi.dsi - fastutil - - - - - com.github.vlsi.mxgraph - jgraphx - 4.2.2 - - - cisd - jhdf5 - 19.04.1 - - - org.jheaps - jheaps - 0.14 - - - jline - jline - 2.14.6 - - - org.jline - jline-builtins - 3.25.1 - - - org.jline - jline-console - 3.25.1 - - - org.jline - jline-reader - 3.25.1 - - - org.jline - jline-remote-ssh - 3.25.1 - - - org.jline - jline-remote-telnet - 3.25.1 - - - org.jline - jline-style - 3.25.1 - - - org.jline - jline-terminal - 3.25.1 - - - org.jline - jline-terminal-jna - 3.25.1 - - - net.java.dev.jna - jna - 5.14.0 - - - net.java.dev.jna - jna-platform - 5.14.0 - - - com.github.jnr - jffi - 1.3.13 - - - com.github.jnr - jffi - 1.3.13 - native - - - com.github.jnr - jnr-constants - 0.10.4 - - - com.github.jnr - jnr-ffi - 2.2.16 - - - com.github.jnr - jnr-posix - 3.1.19 - - - joda-time - joda-time - 2.12.7 - - - org.jocl - jocl - 2.0.5 - - - org.jogamp.gluegen - gluegen - 2.5.0 - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - - - org.jogamp.joal - joal - 2.5.0 - - - org.jogamp.jocl - jocl - 2.5.0 - - - org.jogamp.jogl - jogl-all - 2.5.0 - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - natives-android-aarch64 - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - natives-linux-aarch64 - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - natives-linux-amd64 - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - natives-linux-armv6hf - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - natives-windows-amd64 - - - org.jogamp.joal - joal - 2.5.0 - natives-android-aarch64 - - - org.jogamp.joal - joal - 2.5.0 - natives-linux-aarch64 - - - org.jogamp.joal - joal - 2.5.0 - natives-linux-amd64 - - - org.jogamp.joal - joal - 2.5.0 - natives-linux-armv6hf - - - org.jogamp.joal - joal - 2.5.0 - natives-macosx-universal - - - org.jogamp.joal - joal - 2.5.0 - natives-windows-amd64 - - - org.jogamp.jocl - jocl - 2.5.0 - natives-android-aarch64 - - - org.jogamp.jocl - jocl - 2.5.0 - natives-linux-aarch64 - - - org.jogamp.jocl - jocl - 2.5.0 - natives-linux-amd64 - - - org.jogamp.jocl - jocl - 2.5.0 - natives-linux-armv6hf - - - org.jogamp.jocl - jocl - 2.5.0 - natives-macosx-universal - - - org.jogamp.jocl - jocl - 2.5.0 - natives-windows-amd64 - - - org.jogamp.jogl - jogl-all - 2.5.0 - natives-android-aarch64 - - - org.jogamp.jogl - jogl-all - 2.5.0 - natives-linux-aarch64 - - - org.jogamp.jogl - jogl-all - 2.5.0 - natives-linux-amd64 - - - org.jogamp.jogl - jogl-all - 2.5.0 - natives-linux-armv6hf - - - org.jogamp.jogl - jogl-all - 2.5.0 - natives-macosx-universal - - - org.jogamp.jogl - jogl-all - 2.5.0 - natives-windows-amd64 - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - natives-android-aarch64 - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - natives-linux-aarch64 - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - natives-linux-amd64 - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - natives-linux-armv6hf - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - natives-macosx-universal - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - natives-windows-amd64 - - - org.jogamp.java3d - java3d-core - 1.7.2 - - - org.jogamp.java3d - java3d-utils - 1.7.2 - - - org.jogamp.java3d - vecmath - 1.7.2 - - - org.joml - joml - 1.10.5 - - - org.jruby.joni - joni - 2.2.1 - - - org.jpedal - jpedalSTD - 2.80b11 - - - org.smurn - jply - 0.2.1 - - - com.jcraft - jsch - 0.1.55 - - - org.json - json - 20240205 - - - org.python - jython-slim - 2.7.3 - - - com.jcraft - jzlib - 1.1.3 - - - org.jzy3d - jzy3d-core - 2.2.1 - - - org.jzy3d - jzy3d-core-awt - 2.2.1 - - - org.jzy3d - jzy3d-emul-gl-awt - 2.2.1 - - - org.jzy3d - jzy3d-jGL-awt - 2.2.1 - - - org.jzy3d - jzy3d-jdt-core - 2.2.1 - - - org.jzy3d - jzy3d-native-jogl-awt - 2.2.1 - - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt-natives-linux-aarch64 - - - org.jogamp.gluegen - gluegen-rt-natives-linux-amd64 - - - org.jogamp.gluegen - gluegen-rt-natives-linux-armv6hf - - - org.jogamp.gluegen - gluegen-rt-natives-linux-i586 - - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt-natives-windows-amd64 - - - org.jogamp.gluegen - gluegen-rt-natives-windows-i586 - - - org.jogamp.jogl - jogl-all-natives-linux-aarch64 - - - org.jogamp.jogl - jogl-all-natives-linux-amd64 - - - org.jogamp.jogl - jogl-all-natives-linux-armv6hf - - - org.jogamp.jogl - jogl-all-natives-linux-i586 - - - org.jogamp.jogl - jogl-all-natives-macosx-universal - - - org.jogamp.jogl - jogl-all-natives-windows-amd64 - - - org.jogamp.jogl - jogl-all-natives-windows-i586 - - - - - org.jzy3d - jzy3d-native-jogl-core - 2.2.1 - - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt-natives-linux-aarch64 - - - org.jogamp.gluegen - gluegen-rt-natives-linux-amd64 - - - org.jogamp.gluegen - gluegen-rt-natives-linux-armv6hf - - - org.jogamp.gluegen - gluegen-rt-natives-linux-i586 - - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt-natives-windows-amd64 - - - org.jogamp.gluegen - gluegen-rt-natives-windows-i586 - - - org.jogamp.jogl - jogl-all-natives-linux-aarch64 - - - org.jogamp.jogl - jogl-all-natives-linux-amd64 - - - org.jogamp.jogl - jogl-all-natives-linux-armv6hf - - - org.jogamp.jogl - jogl-all-natives-linux-i586 - - - org.jogamp.jogl - jogl-all-natives-macosx-universal - - - org.jogamp.jogl - jogl-all-natives-windows-amd64 - - - org.jogamp.jogl - jogl-all-natives-windows-i586 - - - - - org.jzy3d - jzy3d-native-jogl-swing - 2.2.1 - - - com.miglayout - miglayout - - - - - org.jzy3d - jzy3d-tester - 2.2.1 - - - org.jetbrains.kotlin - kotlin-compiler-embeddable - 1.9.22 - - - org.jetbrains.kotlin - kotlin-daemon-embeddable - 1.9.22 - - - org.jetbrains.kotlin - kotlin-reflect - 1.9.22 - - - org.jetbrains.kotlin - kotlin-script-runtime - 1.9.22 - - - org.jetbrains.kotlin - kotlin-scripting-common - 1.9.22 - - - org.jetbrains.kotlin - kotlin-scripting-compiler-embeddable - 1.9.22 - - - org.jetbrains.kotlin - kotlin-scripting-jsr223 - 1.9.22 - - - org.jetbrains.kotlin - kotlin-scripting-jvm - 1.9.22 - - - org.jetbrains.kotlin - kotlin-stdlib - 1.9.22 - - - org.jetbrains.kotlin - kotlin-stdlib-common - 1.9.22 - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - 1.9.22 - - - org.jetbrains.kotlinx - kotlinx-coroutines-core - 1.8.0 - - - org.jetbrains.kotlinx - kotlinx-coroutines-core-jvm - 1.8.0 - - - com.esotericsoftware - kryo - 5.6.0 - - - com.esotericsoftware - minlog - 1.3.1 - - - com.esotericsoftware - reflectasm - 1.11.9 - - - ch.qos.logback - logback-classic - 1.2.12 - - - javax.activation - activation - - - - - ch.qos.logback - logback-core - 1.2.12 - - - org.lz4 - lz4-java - 1.8.0 - - - org.mapdb - mapdb - 3.1.0 - - - net.jpountz.lz4 - lz4 - - - - - com.miglayout - miglayout-core - 5.3 - - - com.miglayout - miglayout-swing - 5.3 - - - com.miglayout - miglayout-swt - 5.3 - - - edu.mines - mines-jtk - 20151125 - - - org.objenesis - objenesis - 3.3 - - - com.squareup.okhttp3 - okhttp - 4.12.0 - - - com.squareup.okio - okio - 3.8.0 - - - org.ojalgo - ojalgo - 45.1.1 - - - com.opencsv - opencsv - 5.9 - - - info.picocli - picocli - 4.7.5 - - - org.postgresql - postgresql - 42.7.2 - - - com.google.protobuf - protobuf-java - 3.23.0 - - - com.google.protobuf - protobuf-java-util - 3.23.0 - - - com.google.protobuf - protobuf-kotlin - 3.23.0 - - - com.google.re2j - re2j - 1.7 - - - ch.qos.reload4j - reload4j - 1.2.25 - - - com.fifesoft - rsyntaxtextarea - 3.4.0 - - - com.fifesoft - autocomplete - 3.3.1 - - - com.fifesoft - languagesupport - 3.3.0 - - - org.slf4j - slf4j-api - 1.7.36 - - - org.slf4j - slf4j-ext - 1.7.36 - - - org.slf4j - slf4j-jcl - 1.7.36 - - - org.slf4j - slf4j-jdk14 - 1.7.36 - - - org.slf4j - slf4j-nop - 1.7.36 - - - org.slf4j - slf4j-simple - 1.7.36 - - - org.slf4j - jcl-over-slf4j - 1.7.36 - - - org.yaml - snakeyaml - 2.2 - - - org.snakeyaml - snakeyaml-engine - 2.7 - - - org.springframework - spring-aop - 3.2.9.RELEASE - - - org.springframework - spring-beans - 3.2.9.RELEASE - - - org.springframework - spring-core - 3.2.9.RELEASE - - - org.tensorflow - tensorflow - 1.12.0 - - - org.tensorflow - libtensorflow - 1.12.0 - - - org.tensorflow - libtensorflow_jni - 1.12.0 - - - org.tensorflow - libtensorflow_jni_gpu - 1.12.0 - - - org.tensorflow - proto - 1.12.0 - - - org.threeten - threetenbp - 1.6.8 - - - net.sf.trove4j - trove4j - 3.0.3 - - - nz.ac.waikato.cms.weka - weka-dev - 3.9.6 - - - com.github.fommil.netlib - all - - - com.github.vbmacher - java-cup-runtime - - - com.googlecode.netlib-java - netlib-java - - - com.sun.activation - jakarta.activation - - - nz.ac.waikato.cms.weka.thirdparty - java-cup-11b - - - nz.ac.waikato.cms.weka.thirdparty - java-cup-11b-runtime - - - net.sourceforge.f2j - arpack_combined_all - - - - - org.tukaani - xz - 1.9 - - - com.github.luben - zstd-jni - 1.5.5-11 - - - org.scijava - scijava-common - 2.98.0 - tests - test - - - net.imagej - imagej-legacy - 1.2.1 - tests - test - - - net.imagej - imagej-ops - 2.0.0 - tests - test - - - net.imagej - imagej-updater - 1.0.1 - tests - test - - - net.imglib2 - imglib2 - 6.3.0 - tests - test - - - org.janelia.saalfeldlab - n5 - 3.1.3 - tests - test - - - junit - junit - 4.13.2 - test - - - org.junit.jupiter - junit-jupiter-api - 5.10.2 - test - - - org.junit.jupiter - junit-jupiter-engine - 5.10.2 - test - - - org.junit.jupiter - junit-jupiter-migrationsupport - 5.10.2 - test - - - org.junit.jupiter - junit-jupiter-params - 5.10.2 - test - - - org.junit.vintage - junit-vintage-engine - 5.10.2 - test - - - org.scijava - junit-benchmarks - 0.7.4-scijava - test - - - org.jmockit - jmockit - 1.49 - test - - - org.mockito - mockito-core - 2.19.0 - test - - - org.openjdk.jmh - jmh-core - 1.37 - test - - - org.openjdk.jmh - jmh-generator-annprocess - 1.37 - test - - - - - - - false - - central - Central Repository - https://repo.maven.apache.org/maven2 - - - - - - never - - - false - - central - Central Repository - https://repo.maven.apache.org/maven2 - - - - /home/elect/IdeaProjects/pom-scijava/src/main/java - /home/elect/IdeaProjects/pom-scijava/src/main/scripts - /home/elect/IdeaProjects/pom-scijava/src/test/java - /home/elect/IdeaProjects/pom-scijava/target/classes - /home/elect/IdeaProjects/pom-scijava/target/test-classes - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 1.0 - - - install - - - /home/elect/IdeaProjects/pom-scijava/src/main/resources - - - - - /home/elect/IdeaProjects/pom-scijava/src/test/resources - - - /home/elect/IdeaProjects/pom-scijava/target - pom-scijava-38.0.0-SNAPSHOT - - - - maven-antrun-plugin - 3.1.0 - - - maven-assembly-plugin - 3.6.0 - - - maven-clean-plugin - 3.3.2 - - - maven-compiler-plugin - 3.8.1 - - - maven-dependency-plugin - 3.6.1 - - - maven-deploy-plugin - 3.1.1 - - - maven-enforcer-plugin - 3.4.1 - - - org.codehaus.mojo - extra-enforcer-rules - 1.7.0 - compile - - - org.scijava - scijava-maven-plugin - 3.0.0 - compile - - - - - maven-failsafe-plugin - 3.2.5 - - - - integration-test - verify - - - - - - maven-gpg-plugin - 3.1.0 - - - sign-artifacts - verify - - sign - - - true - - - - - true - - - - maven-help-plugin - 3.4.0 - - - maven-install-plugin - 3.1.1 - - - maven-jar-plugin - 3.3.0 - - - - test-jar - - - - - true - true - true - - ${package-guess} - - - - ${buildNumber} - 2024-03-03T16:51:20+0000 - ${package-guess} - - - true - - - - - - - true - true - true - - ${package-guess} - - - - ${buildNumber} - 2024-03-03T16:51:20+0000 - ${package-guess} - - - true - - - - maven-javadoc-plugin - 3.6.3 - - 1024m - - https://javadoc.scijava.org/Java8/ - https://javadoc.scijava.org/JavaFX8/ - https://javadoc.scijava.org/SciJava/ - https://javadoc.scijava.org/Alida/ - https://javadoc.scijava.org/Bio-Formats/ - https://javadoc.scijava.org/FLIMLib/ - https://javadoc.scijava.org/Fiji/ - https://javadoc.scijava.org/Icy/ - https://javadoc.scijava.org/ImageJ/ - https://javadoc.scijava.org/ImageJ1/ - https://javadoc.scijava.org/ImgLib2/ - https://javadoc.scijava.org/Java3D/ - https://javadoc.scijava.org/KNIME/ - https://javadoc.scijava.org/LOCI/ - https://javadoc.scijava.org/MiToBo/ - https://javadoc.scijava.org/Micro-Manager-Core/ - https://javadoc.scijava.org/Micro-Manager-Studio/ - https://javadoc.scijava.org/MorphoLibJ/ - https://javadoc.scijava.org/OMERO/ - https://javadoc.scijava.org/SCIFIO/ - https://javadoc.scijava.org/Apache-Commons-IO/ - https://javadoc.scijava.org/Apache-Commons-Lang/ - https://javadoc.scijava.org/Apache-Commons-Math/ - https://javadoc.scijava.org/Apache-Commons-Text/ - https://javadoc.scijava.org/BoneJ/ - https://javadoc.scijava.org/Eclipse/ - https://javadoc.scijava.org/Guava/ - https://javadoc.scijava.org/JAMA/ - https://javadoc.scijava.org/JFreeChart/ - https://javadoc.scijava.org/JGraphT/ - https://javadoc.scijava.org/JHotDraw/ - https://javadoc.scijava.org/JOML/ - https://javadoc.scijava.org/Javassist/ - https://javadoc.scijava.org/MigLayout/ - https://javadoc.scijava.org/NetBeans/ - https://javadoc.scijava.org/Pivot/ - https://javadoc.scijava.org/VisAD/ - https://javadoc.scijava.org/Weka/ - https://javadoc.scijava.org/ojAlgo/ - - - - - maven-plugin-plugin - 3.11.0 - - - maven-project-info-reports-plugin - 3.5.0 - - - maven-release-plugin - 3.0.1 - - - maven-resources-plugin - 3.3.1 - - - maven-shade-plugin - 3.5.2 - - - maven-site-plugin - 3.12.1 - - - maven-source-plugin - 3.3.0 - - - attach-sources - none - - - attach-sources-jar - - jar - - - - - - maven-surefire-plugin - 3.2.5 - - @{argLine} -Xms512m -Xmx512m -Dapple.awt.UIElement=true - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.5.0 - - - sanitize-version - - regex-property - - - sanitizedVersion - 38.0.0-SNAPSHOT - ^([0-9]+)\.([0-9]+)\.([0-9]+).*$ - $1.$2.$3 - false - - - - guess-package - - regex-property - - - package-guess - org.scijava.pom-scijava - [^a-z0-9_.]+ - _ - false - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 3.2.0 - - - validate - - create - - - true - UNKNOWN - - - - - - net.java.dev.jna - platform - 3.5.2 - compile - - - - true - UNKNOWN - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - html - xml - - - - - org.codehaus.mojo - exec-maven-plugin - 3.2.0 - - - org.codehaus.mojo - license-maven-plugin - 2.4.0 - - false - true - true - - java - properties - java - - - - - org.codehaus.mojo - tidy-maven-plugin - 1.2.0 - - - org.codehaus.mojo - versions-maven-plugin - 2.16.2 - - - org.scijava - scijava-maven-plugin - 3.0.0 - - - set-rootdir - validate - - set-rootdir - - - - - - com.zenjava - javafx-maven-plugin - 8.8.3 - - SciJava Parent POM - SciJava Parent POM - SciJava Parent POM.jar - - ${sanitizedVersion} - true - - - - net.revelc.code - impsort-maven-plugin - 1.9.0 - - - none - - java.,javax.,com.,net.,org. - java,* - true - - - - - java.,javax.,com.,net.,org. - java,* - true - - - - net.revelc.code.formatter - formatter-maven-plugin - 2.23.0 - - - org.scijava - scijava-coding-style - 2.1.1 - compile - - - - eclipse-formatter-settings/scijava-coding-style.xml - - - - org.fusesource.mvnplugins - maven-graph-plugin - 1.45 - - provided,runtime,system,test - true - - /home/elect/IdeaProjects/pom-scijava/target/dependency-graph.dot - - - - org.honton.chas - exists-maven-plugin - 0.12.0 - - - - remote - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.11 - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - - - org.revapi - revapi-maven-plugin - 0.15.0 - - - org.revapi - revapi-java - 0.28.1 - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.10.0.2594 - - - - - - maven-enforcer-plugin - 3.4.1 - - - enforce-rules - - enforce - - - - - 3.6.3 - - - Plugins need to be versioned! - - - [1.8.0-101,) - - - No Duplicate Classes Allowed! -- For duplicate transitive dependencies, add dependency exclusions. -- For duplications between direct dependencies, resolve or add - ignored classes to this rule's configuration. - true - com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* - - - founder,lead,developer,debugger,reviewer,support,maintainer - - - founder,lead,developer,debugger,reviewer,support,maintainer - - - 8 - - com.headius:invokebinder - com.sun:tools - - - module-info - - - test - - - - - name - description - url - inceptionYear - organization - licenses - developers - contributors - mailingLists - scm - issueManagement - ciManagement - properties//license.licenseName - properties//license.copyrightOwners - - - - org.scijava,net.imagej,net.imglib2,io.scif,sc.fiji - - - - - - - - org.codehaus.mojo - extra-enforcer-rules - 1.7.0 - compile - - - org.scijava - scijava-maven-plugin - 3.0.0 - compile - - - - - - 3.6.3 - - - Plugins need to be versioned! - - - [1.8.0-101,) - - - No Duplicate Classes Allowed! -- For duplicate transitive dependencies, add dependency exclusions. -- For duplications between direct dependencies, resolve or add - ignored classes to this rule's configuration. - true - com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* - - - founder,lead,developer,debugger,reviewer,support,maintainer - - - founder,lead,developer,debugger,reviewer,support,maintainer - - - 8 - - com.headius:invokebinder - com.sun:tools - - - module-info - - - test - - - - - name - description - url - inceptionYear - organization - licenses - developers - contributors - mailingLists - scm - issueManagement - ciManagement - properties//license.licenseName - properties//license.copyrightOwners - - - - org.scijava,net.imagej,net.imglib2,io.scif,sc.fiji - - - - - - maven-failsafe-plugin - 3.2.5 - - - - integration-test - verify - - - - - - maven-source-plugin - 3.3.0 - - - attach-sources - none - - - attach-sources-jar - - jar - - - - - - maven-surefire-plugin - 3.2.5 - - @{argLine} -Xms512m -Xmx512m -Dapple.awt.UIElement=true - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.5.0 - - - sanitize-version - - regex-property - - - sanitizedVersion - 38.0.0-SNAPSHOT - ^([0-9]+)\.([0-9]+)\.([0-9]+).*$ - $1.$2.$3 - false - - - - guess-package - - regex-property - - - package-guess - org.scijava.pom-scijava - [^a-z0-9_.]+ - _ - false - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 3.2.0 - - - validate - - create - - - true - UNKNOWN - - - - - - net.java.dev.jna - platform - 3.5.2 - compile - - - - true - UNKNOWN - - - - org.scijava - scijava-maven-plugin - 3.0.0 - - - set-rootdir - validate - - set-rootdir - - - older - - - - populate-app - install - - populate-app - - - older - - - - - older - - - - com.zenjava - javafx-maven-plugin - 8.8.3 - - SciJava Parent POM - SciJava Parent POM - SciJava Parent POM.jar - - ${sanitizedVersion} - true - - - - net.revelc.code - impsort-maven-plugin - 1.9.0 - - - none - - java.,javax.,com.,net.,org. - java,* - true - - - - - java.,javax.,com.,net.,org. - java,* - true - - - - net.revelc.code.formatter - formatter-maven-plugin - 2.23.0 - - - org.scijava - scijava-coding-style - 2.1.1 - compile - - - - eclipse-formatter-settings/scijava-coding-style.xml - - - - org.fusesource.mvnplugins - maven-graph-plugin - 1.45 - - provided,runtime,system,test - true - - /home/elect/IdeaProjects/pom-scijava/target/dependency-graph.dot - - - - org.jacoco - jacoco-maven-plugin - 0.8.11 - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - - - maven-javadoc-plugin - 3.6.3 - - /usr/lib/jvm/jdk-19/bin/javadoc - 1024m - - https://javadoc.scijava.org/Java8/ - https://javadoc.scijava.org/JavaFX8/ - https://javadoc.scijava.org/SciJava/ - https://javadoc.scijava.org/Alida/ - https://javadoc.scijava.org/Bio-Formats/ - https://javadoc.scijava.org/FLIMLib/ - https://javadoc.scijava.org/Fiji/ - https://javadoc.scijava.org/Icy/ - https://javadoc.scijava.org/ImageJ/ - https://javadoc.scijava.org/ImageJ1/ - https://javadoc.scijava.org/ImgLib2/ - https://javadoc.scijava.org/Java3D/ - https://javadoc.scijava.org/KNIME/ - https://javadoc.scijava.org/LOCI/ - https://javadoc.scijava.org/MiToBo/ - https://javadoc.scijava.org/Micro-Manager-Core/ - https://javadoc.scijava.org/Micro-Manager-Studio/ - https://javadoc.scijava.org/MorphoLibJ/ - https://javadoc.scijava.org/OMERO/ - https://javadoc.scijava.org/SCIFIO/ - https://javadoc.scijava.org/Apache-Commons-IO/ - https://javadoc.scijava.org/Apache-Commons-Lang/ - https://javadoc.scijava.org/Apache-Commons-Math/ - https://javadoc.scijava.org/Apache-Commons-Text/ - https://javadoc.scijava.org/BoneJ/ - https://javadoc.scijava.org/Eclipse/ - https://javadoc.scijava.org/Guava/ - https://javadoc.scijava.org/JAMA/ - https://javadoc.scijava.org/JFreeChart/ - https://javadoc.scijava.org/JGraphT/ - https://javadoc.scijava.org/JHotDraw/ - https://javadoc.scijava.org/JOML/ - https://javadoc.scijava.org/Javassist/ - https://javadoc.scijava.org/MigLayout/ - https://javadoc.scijava.org/NetBeans/ - https://javadoc.scijava.org/Pivot/ - https://javadoc.scijava.org/VisAD/ - https://javadoc.scijava.org/Weka/ - https://javadoc.scijava.org/ojAlgo/ - - - - - maven-clean-plugin - 3.3.2 - - - default-clean - clean - - clean - - - - - - maven-install-plugin - 3.1.1 - - - default-install - install - - install - - - - - - maven-deploy-plugin - 3.1.1 - - - default-deploy - deploy - - deploy - - - - - - maven-site-plugin - 3.12.1 - - - default-site - site - - site - - - /home/elect/IdeaProjects/pom-scijava/target/site - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - - - - default-deploy - site-deploy - - deploy - - - /home/elect/IdeaProjects/pom-scijava/target/site - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - - - - - /home/elect/IdeaProjects/pom-scijava/target/site - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - - - - - - /home/elect/IdeaProjects/pom-scijava/target/site - - - maven-javadoc-plugin - - - - diff --git a/gradle/catalog/gradle/wrapper/gradle-wrapper.jar b/gradle/catalog/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/gradle/catalog/gradle/wrapper/gradle-wrapper.properties b/gradle/catalog/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..b82aa23a --- /dev/null +++ b/gradle/catalog/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradle/catalog/gradlew b/gradle/catalog/gradlew new file mode 100755 index 00000000..1aa94a42 --- /dev/null +++ b/gradle/catalog/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradle/catalog/gradlew.bat b/gradle/catalog/gradlew.bat new file mode 100644 index 00000000..93e3f59f --- /dev/null +++ b/gradle/catalog/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/gradle/enforcer/.gitattributes b/gradle/enforcer/.gitattributes new file mode 100644 index 00000000..097f9f98 --- /dev/null +++ b/gradle/enforcer/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/gradle/enforcer/.gitignore b/gradle/enforcer/.gitignore new file mode 100644 index 00000000..1b6985c0 --- /dev/null +++ b/gradle/enforcer/.gitignore @@ -0,0 +1,5 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/gradle/enforcer/build.gradle.kts b/gradle/enforcer/build.gradle.kts new file mode 100644 index 00000000..bd68245a --- /dev/null +++ b/gradle/enforcer/build.gradle.kts @@ -0,0 +1,63 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Gradle plugin project to get you started. + * For more details on writing Custom Plugins, please refer to https://docs.gradle.org/8.6/userguide/custom_plugins.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the Java Gradle plugin development plugin to add support for developing Gradle plugins + `java-gradle-plugin` + + // Apply the Kotlin JVM plugin to add support for Kotlin. + alias(libs.plugins.jvm) +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +testing { + suites { + // Configure the built-in test suite + val test by getting(JvmTestSuite::class) { + // Use Kotlin Test test framework + useKotlinTest("1.9.20") + } + + // Create a new test suite + val functionalTest by registering(JvmTestSuite::class) { + // Use Kotlin Test test framework + useKotlinTest("1.9.20") + + dependencies { + // functionalTest test suite depends on the production code in tests + implementation(project()) + } + + targets { + all { + // This test suite should run after the built-in test suite has run its tests + testTask.configure { shouldRunAfter(test) } + } + } + } + } +} + +gradlePlugin { + // Define the plugin + val greeting by plugins.creating { + id = "org.example.greeting" + implementationClass = "org.example.EnforcerPlugin" + } +} + +gradlePlugin.testSourceSets.add(sourceSets["functionalTest"]) + +tasks.named("check") { + // Include functionalTest as part of the check lifecycle + dependsOn(testing.suites.named("functionalTest")) +} diff --git a/gradle/enforcer/gradle.properties b/gradle/enforcer/gradle.properties new file mode 100644 index 00000000..18f452c7 --- /dev/null +++ b/gradle/enforcer/gradle.properties @@ -0,0 +1,6 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.parallel=true +org.gradle.caching=true + diff --git a/gradle/enforcer/gradle/libs.versions.toml b/gradle/enforcer/gradle/libs.versions.toml new file mode 100644 index 00000000..387b04dd --- /dev/null +++ b/gradle/enforcer/gradle/libs.versions.toml @@ -0,0 +1,5 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[plugins] +jvm = { id = "org.jetbrains.kotlin.jvm", version = "1.9.20" } diff --git a/gradle/enforcer/gradle/wrapper/gradle-wrapper.jar b/gradle/enforcer/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/gradle/enforcer/gradle/wrapper/gradle-wrapper.properties b/gradle/enforcer/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..a80b22ce --- /dev/null +++ b/gradle/enforcer/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradle/enforcer/gradlew b/gradle/enforcer/gradlew new file mode 100755 index 00000000..1aa94a42 --- /dev/null +++ b/gradle/enforcer/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradle/enforcer/gradlew.bat b/gradle/enforcer/gradlew.bat new file mode 100644 index 00000000..25da30db --- /dev/null +++ b/gradle/enforcer/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/gradle/enforcer/src/functionalTest/kotlin/org/example/EnforcerPluginFunctionalTest.kt b/gradle/enforcer/src/functionalTest/kotlin/org/example/EnforcerPluginFunctionalTest.kt new file mode 100644 index 00000000..a4e5eb8e --- /dev/null +++ b/gradle/enforcer/src/functionalTest/kotlin/org/example/EnforcerPluginFunctionalTest.kt @@ -0,0 +1,43 @@ +/* + * This Kotlin source file was generated by the Gradle 'init' task. + */ +package org.example + +import java.io.File +import kotlin.test.assertTrue +import kotlin.test.Test +import org.gradle.testkit.runner.GradleRunner +import org.junit.jupiter.api.io.TempDir + +/** + * A simple functional test for the 'org.example.greeting' plugin. + */ +class EnforcerPluginFunctionalTest { + + @field:TempDir + lateinit var projectDir: File + + private val buildFile by lazy { projectDir.resolve("build.gradle") } + private val settingsFile by lazy { projectDir.resolve("settings.gradle") } + + @Test fun `can run task`() { + // Set up the test build + settingsFile.writeText("") + buildFile.writeText(""" + plugins { + id('org.example.greeting') + } + """.trimIndent()) + + // Run the build + val runner = GradleRunner.create() + runner.forwardOutput() + runner.withPluginClasspath() + runner.withArguments("greeting") + runner.withProjectDir(projectDir) + val result = runner.build() + + // Verify the result + assertTrue(result.output.contains("Hello from plugin 'org.example.greeting'")) + } +} diff --git a/gradle/enforcer/src/main/kotlin/org/example/EnforcerPlugin.kt b/gradle/enforcer/src/main/kotlin/org/example/EnforcerPlugin.kt new file mode 100644 index 00000000..666de90b --- /dev/null +++ b/gradle/enforcer/src/main/kotlin/org/example/EnforcerPlugin.kt @@ -0,0 +1,22 @@ +/* + * This Kotlin source file was generated by the Gradle 'init' task. + */ +package org.example + +import org.gradle.api.Project +import org.gradle.api.Plugin + +/** + * A simple 'hello world' plugin. + */ +class EnforcerPlugin: Plugin { + override fun apply(project: Project) { + // Register a task +// project.tasks.register("greeting") { task -> +// task.doLast { +// println("Hello from plugin 'org.example.greeting'") +// } +// } +// project.extensions.cr + } +} diff --git a/gradle/enforcer/src/test/kotlin/org/example/EnforcerPluginTest.kt b/gradle/enforcer/src/test/kotlin/org/example/EnforcerPluginTest.kt new file mode 100644 index 00000000..cfba71b7 --- /dev/null +++ b/gradle/enforcer/src/test/kotlin/org/example/EnforcerPluginTest.kt @@ -0,0 +1,22 @@ +/* + * This Kotlin source file was generated by the Gradle 'init' task. + */ +package org.example + +import org.gradle.testfixtures.ProjectBuilder +import kotlin.test.Test +import kotlin.test.assertNotNull + +/** + * A simple unit test for the 'org.example.greeting' plugin. + */ +class EnforcerPluginTest { + @Test fun `plugin registers task`() { + // Create a test project and apply the plugin + val project = ProjectBuilder.builder().build() + project.plugins.apply("org.example.greeting") + + // Verify the result + assertNotNull(project.tasks.findByName("greeting")) + } +} diff --git a/gradle/gradle.properties b/gradle/gradle.properties new file mode 100644 index 00000000..18f452c7 --- /dev/null +++ b/gradle/gradle.properties @@ -0,0 +1,6 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties + +org.gradle.parallel=true +org.gradle.caching=true + diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle/gradle/wrapper/gradle-wrapper.properties index 17655d0e..48c0a02c 100644 --- a/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/manifest-dependencies/build.gradle.kts b/gradle/manifest-dependencies/build.gradle.kts new file mode 100644 index 00000000..0080f910 --- /dev/null +++ b/gradle/manifest-dependencies/build.gradle.kts @@ -0,0 +1,65 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Gradle plugin project to get you started. + * For more details on writing Custom Plugins, please refer to https://docs.gradle.org/8.7/userguide/custom_plugins.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + // Apply the Java Gradle plugin development plugin to add support for developing Gradle plugins + `java-gradle-plugin` + + // Apply the Kotlin JVM plugin to add support for Kotlin. + embeddedKotlin("jvm") + + `kotlin-dsl` +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +testing { + suites { + // Configure the built-in test suite + val test by getting(JvmTestSuite::class) { + // Use Kotlin Test test framework + useKotlinTest(embeddedKotlinVersion) + } + + // Create a new test suite + val functionalTest by registering(JvmTestSuite::class) { + // Use Kotlin Test test framework + useKotlinTest(embeddedKotlinVersion) + + dependencies { + // functionalTest test suite depends on the production code in tests + implementation(project()) + } + + targets { + all { + // This test suite should run after the built-in test suite has run its tests + testTask.configure { shouldRunAfter(test) } + } + } + } + } +} + +gradlePlugin { + // Define the plugin + val greeting by plugins.creating { + id = "org.example.base" + implementationClass = "org.example.GradleBasePlugin" + } +} + +gradlePlugin.testSourceSets.add(sourceSets["functionalTest"]) + +tasks.named("check") { + // Include functionalTest as part of the check lifecycle + dependsOn(testing.suites.named("functionalTest")) +} diff --git a/gradle/manifest-dependencies/settings.gradle.kts b/gradle/manifest-dependencies/settings.gradle.kts new file mode 100644 index 00000000..23cdc1e6 --- /dev/null +++ b/gradle/manifest-dependencies/settings.gradle.kts @@ -0,0 +1,10 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.7/userguide/multi_project_builds.html in the Gradle documentation. + * This project uses @Incubating APIs which are subject to change. + */ + +rootProject.name = "gradle-manifest-dependencies" +include("plugin") diff --git a/gradle/manifest-dependencies/src/functionalTest/kotlin/org/example/GradleBasePluginFunctionalTest.kt b/gradle/manifest-dependencies/src/functionalTest/kotlin/org/example/GradleBasePluginFunctionalTest.kt new file mode 100644 index 00000000..228c8ffd --- /dev/null +++ b/gradle/manifest-dependencies/src/functionalTest/kotlin/org/example/GradleBasePluginFunctionalTest.kt @@ -0,0 +1,43 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example + +import java.io.File +import kotlin.test.assertTrue +import kotlin.test.Test +import org.gradle.testkit.runner.GradleRunner +import org.junit.jupiter.api.io.TempDir + +/** + * A simple functional test for the 'org.example.greeting' plugin. + */ +class GradleBasePluginFunctionalTest { + + @field:TempDir + lateinit var projectDir: File + + private val buildFile by lazy { projectDir.resolve("build.gradle") } + private val settingsFile by lazy { projectDir.resolve("settings.gradle") } + + @Test fun `can run task`() { + // Set up the test build + settingsFile.writeText("") + buildFile.writeText(""" + plugins { + id('org.example.greeting') + } + """.trimIndent()) + + // Run the build + val runner = GradleRunner.create() + runner.forwardOutput() + runner.withPluginClasspath() + runner.withArguments("greeting") + runner.withProjectDir(projectDir) + val result = runner.build() + + // Verify the result + assertTrue(result.output.contains("Hello from plugin 'org.example.greeting'")) + } +} diff --git a/gradle/manifest-dependencies/src/main/kotlin/org/example/GradleBasePlugin.kt b/gradle/manifest-dependencies/src/main/kotlin/org/example/GradleBasePlugin.kt new file mode 100644 index 00000000..7161680f --- /dev/null +++ b/gradle/manifest-dependencies/src/main/kotlin/org/example/GradleBasePlugin.kt @@ -0,0 +1,37 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example + +import org.gradle.api.Project +import org.gradle.api.Plugin +import org.gradle.configurationcache.extensions.capitalized +import org.gradle.jvm.tasks.Jar +import org.gradle.kotlin.dsl.attributes +import org.gradle.kotlin.dsl.get +import org.gradle.kotlin.dsl.getByName +import org.gradle.kotlin.dsl.named + +/** + * A simple 'hello world' plugin. + */ +class GradleBasePlugin : Plugin { + override fun apply(project: Project) { + project.tasks.named("jar") { + // https://docs.gradle.org/current/userguide/java_plugin.html#tab:configurations + val main = listOf("compileClasspath", "runtimeClasspath") + // val test = listOf("testCompileClasspath", "testRuntimeClasspath") + doFirst { + manifest { + project.configurations.filter { it.name in main }.forEach { c -> + val name = "Dependencies-" + c.name.substringBefore("Classpath").capitalized() + val deps = c.resolvedConfiguration.resolvedArtifacts + .map { a -> a.moduleVersion.id.toString() + a.classifier?.let { ":$it" }.orEmpty() } + .sorted().joinToString(";") + attributes(name to deps) + } + } + } + } + } +} diff --git a/gradle/manifest-dependencies/src/test/kotlin/org/example/GradleBasePluginTest.kt b/gradle/manifest-dependencies/src/test/kotlin/org/example/GradleBasePluginTest.kt new file mode 100644 index 00000000..a0c50778 --- /dev/null +++ b/gradle/manifest-dependencies/src/test/kotlin/org/example/GradleBasePluginTest.kt @@ -0,0 +1,22 @@ +/* + * This source file was generated by the Gradle 'init' task + */ +package org.example + +import org.gradle.testfixtures.ProjectBuilder +import kotlin.test.Test +import kotlin.test.assertNotNull + +/** + * A simple unit test for the 'org.example.greeting' plugin. + */ +class GradleBasePluginTest { + @Test fun `plugin registers task`() { + // Create a test project and apply the plugin + val project = ProjectBuilder.builder().build() + project.plugins.apply("org.example.greeting") + + // Verify the result + assertNotNull(project.tasks.findByName("greeting")) + } +} diff --git a/gradle/platform/build.gradle.kts b/gradle/platform/build.gradle.kts index 8f58774b..4e13a3a5 100644 --- a/gradle/platform/build.gradle.kts +++ b/gradle/platform/build.gradle.kts @@ -1,53 +1,76 @@ -import groovy.xml.XmlSlurper -import groovy.xml.slurpersupport.GPathResult -import groovy.xml.slurpersupport.NodeChild -import org.gradle.internal.impldep.org.junit.experimental.categories.Categories.CategoryFilter.exclude - plugins { `java-platform` publish -// id("org.gradlex.java-ecosystem-capabilities-base") // only rules -// id("org.gradlex.logging-capabilities") // logging extension + // id("org.gradlex.java-ecosystem-capabilities-base") // only rules + // id("org.gradlex.logging-capabilities") // logging extension } group = "org.scijava" version = "0.13" //(effXml / "version").toString() -operator fun GPathResult.div(child: String) = children().find { (it!! as NodeChild).name() == child } as GPathResult +//operator fun GPathResult.div(child: String) = children().find { (it!! as NodeChild).name() == child } as GPathResult -val effXml = XmlSlurper().parse(projectDir.resolve("eff.xml")) +//val effXml = XmlSlurper().parse(projectDir.resolve("eff.xml")) javaPlatform { allowDependencies() } -val runtimeDeps = listOf("xalan:serializer", "xalan:xalan") +val runtimeDeps = listOf("org.antlr:antlr-runtime", + "xalan:serializer", + "xalan:xalan", + "com.github.vbmacher:java-cup-runtime", + "nz.ac.waikato.cms.weka.thirdparty:java-cup-11b-runtime", + "org.jogamp.gluegen:gluegen-rt-main", + "org.jogamp.gluegen:gluegen-rt", + "org.jogamp.joal:joal", + "org.jogamp.jocl:jocl", + "org.jogamp.jogl:jogl-all-main", + "org.jogamp.jogl:jogl-all", + "org.jogamp.jogl:jogl-all-noawt", + "com.nativelibs4java:bridj", + "org.bytedeco:ffmpeg", + "org.bytedeco:hdf5", + "org.bytedeco:leptonica", + "org.bytedeco:openblas", + "org.bytedeco:opencv", + "org.bytedeco:tesseract", + "org.jline:jline-native", + "com.github.jnr:jffi", + "org.jzy3d:jzy3d-native-jogl-awt", + "org.jzy3d:jzy3d-native-jogl-swing") + +val jogampNatives = listOf("org.jogamp.gluegen:gluegen-rt-natives-", + "org.jogamp.jogl:jogl-all-natives-", + "org.jogamp.gluegen:gluegen-rt-natives-", + "org.jogamp.jogl:jogl-all-natives-") dependencies { - val deps = effXml / "dependencyManagement" / "dependencies" + // val deps = effXml / "dependencyManagement" / "dependencies" constraints { - deps.children().forEach { - val node = it!! as NodeChild - val g = node / "groupId" - val a = node / "artifactId" - val v = node / "version" - if ("$g:$a" in runtimeDeps) - runtime("$g:$a:$v") - else - api("$g:$a:$v") - // println("$g:$a:$v") + // deps.children().forEach { + // val node = it!! as NodeChild + // val g = node / "groupId" + // val a = node / "artifactId" + // val v = node / "version" + // } + versionCatalogs.forEach { versionCatalog -> + // println("catalog ${versionCatalog.name}") + versionCatalog.libraryAliases.forEach { lib -> + val dep = versionCatalog.findLibrary(lib).get().get() + val ga = dep.module.run { "$group:$name" } + // println(dep) + if (ga in runtimeDeps || jogampNatives.any { it.startsWith(ga) }) + runtime(dep) //.also { println("runtime($dep)") } + else + api(dep) //.also{ println("api($dep)") } + } } } -// versionCatalogs.forEach { versionCatalog -> -// println("catalog ${versionCatalog.name}") -// versionCatalog.libraryAliases.forEach { -// println(versionCatalog.findLibrary(it).get().get()) -// } -// } -// println(libs.groovy.core.get()) - api(platform("com.fasterxml.jackson:jackson-bom:" + libs.com.fasterxml.jackson.core.jacksonCore.get().version)) + // println(libs.my.lib.get()) + // api(platform("com.fasterxml.jackson:jackson-bom:" + libs.com.fasterxml.jackson.core.jacksonCore.get().version)) api(platform("jakarta.platform:jakarta.jakartaee-bom:10.0.0")) // api(platform("com.google.api-client:google-api-client-bom:" + libs.com.google.api.client.googleApiClient.get().version)) // api(platform("com.google.api:gax-bom:" + libs.com.google.api.gax.get().version)) diff --git a/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts b/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts index 1ae16b3c..ece9665f 100644 --- a/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts +++ b/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts @@ -7,18 +7,16 @@ publishing { repositories { maven { name = "sciJava" - credentials(PasswordCredentials::class) - url = uri("https://maven.scijava.org/content/repositories/releases") +// credentials(PasswordCredentials::class) +// url = uri("https://maven.scijava.org/content/repositories/releases") + url = uri("repo") } } create("sciJavaPlatform") { from(components["javaPlatform"]) groupId = "org.scijava" - println(groupId) artifactId = "gradle-platform" - println(artifactId) version = "0.13" - println(version) /*pom.withXml { val nodes = Stack() diff --git a/gradle/platform/gradle/wrapper/gradle-wrapper.jar b/gradle/platform/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..d64cd4917707c1f8861d8cb53dd15194d4248596 GIT binary patch literal 43462 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 literal 0 HcmV?d00001 diff --git a/gradle/platform/gradle/wrapper/gradle-wrapper.properties b/gradle/platform/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..b82aa23a --- /dev/null +++ b/gradle/platform/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradle/platform/gradlew b/gradle/platform/gradlew new file mode 100755 index 00000000..1aa94a42 --- /dev/null +++ b/gradle/platform/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradle/platform/gradlew.bat b/gradle/platform/gradlew.bat new file mode 100644 index 00000000..93e3f59f --- /dev/null +++ b/gradle/platform/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/gradle/platform/settings.gradle.kts b/gradle/platform/settings.gradle.kts index 162f20ac..bb66fc7a 100644 --- a/gradle/platform/settings.gradle.kts +++ b/gradle/platform/settings.gradle.kts @@ -13,12 +13,15 @@ dependencyResolutionManagement { // repositories { .. } versionCatalogs { - create("libs").from("org.scijava:gradle-catalog") +// create("libs") { +// from("org.scijava:gradle-catalog:0.11") +// library("my-lib", "com.mycompany:mylib:1.2") +// } // maybeCreate("libs").version("groovy", "3.0.9") // maybeCreate("libs").library("groovy-core", "org.codehaus.groovy:groovy:2.4.15") // fails with "Could not resolve all artifacts for configuration 'incomingCatalogForLibs0'." -// create("libs").from(files("../catalog/build/version-catalog/libs.versions.toml")) + create("libs").from(files("../catalog/build/version-catalog/libs.versions.toml")) } includeBuild("../catalog") diff --git a/gradle/settings.gradle.kts b/gradle/settings.gradle.kts index 6a0ad4b9..2a15aec5 100644 --- a/gradle/settings.gradle.kts +++ b/gradle/settings.gradle.kts @@ -5,7 +5,8 @@ rootProject.name = "gradle" includeBuild("catalog") includeBuild("platform") -includeBuild("playground") -includeBuild("enforcer") +includeBuild("manifest-dependencies") +//includeBuild("playground") +//includeBuild("enforcer") enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3184a274..f173dc93 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,10 @@ + + + + + 4.0.0 @@ -6870,4 +6875,83 @@ + + + + gradle-catalog + + + + gradle/platform + + + + + + org.codehaus.mojo + exec-maven-plugin + + + generate-gradle-catalog + generate-sources + + exec + + + ../gradlew + gradle/catalog + + generateCatalogAsToml + + + + + generate-gradle-platform + generate-sources + + exec + + + ../gradlew + gradle/platform + + generateMetadataFileForSciJavaPlatformPublication + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-gradle-catalog + + package + + + attach-artifact + + + + + gradle/catalog/build/version-catalog/libs.versions.toml + toml + + + gradle/platform/build/publications/sciJavaPlatform/module.json + + module + + + + + + + + + + From 69fc630f85a3a60c0c0565cccb12563cbb936caa Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Thu, 25 Apr 2024 11:50:55 +0200 Subject: [PATCH 722/996] commented for the moment any bom dependency --- gradle/platform/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/platform/build.gradle.kts b/gradle/platform/build.gradle.kts index 4e13a3a5..08c00de9 100644 --- a/gradle/platform/build.gradle.kts +++ b/gradle/platform/build.gradle.kts @@ -71,7 +71,7 @@ dependencies { // println(libs.my.lib.get()) // api(platform("com.fasterxml.jackson:jackson-bom:" + libs.com.fasterxml.jackson.core.jacksonCore.get().version)) - api(platform("jakarta.platform:jakarta.jakartaee-bom:10.0.0")) +// api(platform("jakarta.platform:jakarta.jakartaee-bom:10.0.0")) // api(platform("com.google.api-client:google-api-client-bom:" + libs.com.google.api.client.googleApiClient.get().version)) // api(platform("com.google.api:gax-bom:" + libs.com.google.api.gax.get().version)) // api(platform("com.google.api:gapic-generator-java-bom:" + libs.com.google.api.grpc.protoGoogleCommonProtos.get().version)) From d261125db6eee095ccb40028b7c80aefacadb4fa Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Fri, 26 Apr 2024 12:54:03 +0200 Subject: [PATCH 723/996] playing around with re-adapted early-prototype declarative Gradle --- .idea/compiler.xml | 6 +- .idea/gradle.xml | 44 +++++--- .idea/modules.xml | 1 + .../buildSrc/declarative.buildSrc.main.iml | 8 ++ gradle/declarative/build.gradle.kts | 9 ++ gradle/declarative/buildSrc/build.gradle.kts | 7 ++ .../declarative/buildSrc/settings.gradle.kts | 1 + .../common/ApplicationDependencies.kt | 15 +++ .../common/LibraryDependencies.kt | 19 ++++ .../api/experimental/java/JavaApplication.kt | 11 ++ .../api/experimental/java/JavaLibrary.kt | 22 ++++ .../java/StandaloneJavaApplicationPlugin.kt | 30 +++++ .../java/StandaloneJavaLibraryPlugin.kt | 28 +++++ .../api/experimental/jvm/HasJavaTarget.kt | 13 +++ .../api/experimental/jvm/HasJavaTargets.kt | 18 +++ .../api/experimental/jvm/HasJvmApplication.kt | 23 ++++ .../api/experimental/jvm/HasJvmLibrary.kt | 19 ++++ .../gradle/api/experimental/jvm/JavaTarget.kt | 7 ++ .../api/experimental/jvm/JvmApplication.kt | 6 + .../experimental/jvm/JvmEcosystemPlugin.kt | 15 +++ .../gradle/api/experimental/jvm/JvmLibrary.kt | 9 ++ .../gradle/api/experimental/jvm/JvmTarget.kt | 17 +++ .../experimental/jvm/JvmTargetContainer.kt | 33 ++++++ .../jvm/StandaloneJvmApplicationPlugin.kt | 46 ++++++++ .../jvm/StandaloneJvmLibraryPlugin.kt | 50 +++++++++ .../jvm/internal/JvmPluginSupport.kt | 106 ++++++++++++++++++ .../software/RegistersSoftwareTypes.kt | 37 ++++++ .../internal/plugins/software/SoftwareType.kt | 44 ++++++++ .../dsl/model/annotations/Adding.kt | 22 ++++ .../dsl/model/annotations/Configuring.kt | 22 ++++ .../dsl/model/annotations/Restricted.kt | 8 ++ gradle/declarative/settings.gradle.kts | 6 + gradle/settings.gradle.kts | 1 + 33 files changed, 686 insertions(+), 17 deletions(-) create mode 100644 .idea/modules/declarative/buildSrc/declarative.buildSrc.main.iml create mode 100644 gradle/declarative/build.gradle.kts create mode 100644 gradle/declarative/buildSrc/build.gradle.kts create mode 100644 gradle/declarative/buildSrc/settings.gradle.kts create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/common/ApplicationDependencies.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/common/LibraryDependencies.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/JavaApplication.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/JavaLibrary.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaApplicationPlugin.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaLibraryPlugin.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTarget.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTargets.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmApplication.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmLibrary.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JavaTarget.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmApplication.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmEcosystemPlugin.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmLibrary.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTarget.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTargetContainer.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmApplicationPlugin.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmLibraryPlugin.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/experimental/jvm/internal/JvmPluginSupport.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/internal/plugins/software/RegistersSoftwareTypes.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/api/internal/plugins/software/SoftwareType.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Adding.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Configuring.kt create mode 100644 gradle/declarative/buildSrc/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Restricted.kt create mode 100644 gradle/declarative/settings.gradle.kts diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 34d49353..44b21298 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,14 +2,12 @@ + + - - - - diff --git a/.idea/gradle.xml b/.idea/gradle.xml index f2b130e0..fada2394 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,35 +3,53 @@

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 diff --git a/gradle/catalog/gradle/wrapper/gradle-wrapper.properties b/gradle/catalog/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index b82aa23a..00000000 --- a/gradle/catalog/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradle/catalog/gradlew b/gradle/catalog/gradlew deleted file mode 100755 index 1aa94a42..00000000 --- a/gradle/catalog/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradle/catalog/gradlew.bat b/gradle/catalog/gradlew.bat deleted file mode 100644 index 93e3f59f..00000000 --- a/gradle/catalog/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/gradle/catalog/settings.gradle.kts b/gradle/catalog/settings.gradle.kts deleted file mode 100644 index 8d995569..00000000 --- a/gradle/catalog/settings.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user manual at https://docs.gradle.org/7.2/userguide/multi_project_builds.html - */ - -rootProject.name = "gradle-catalog" - -enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file diff --git a/gradle/declarative-playground/build.gradle.kts b/gradle/declarative-playground/build.gradle.kts deleted file mode 100644 index 060936a0..00000000 --- a/gradle/declarative-playground/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - embeddedKotlin("jvm").apply(false) -} - -repositories { - mavenCentral() -} \ No newline at end of file diff --git a/gradle/declarative-playground/java-util/build.gradle.kts b/gradle/declarative-playground/java-util/build.gradle.kts deleted file mode 100644 index bf9a4813..00000000 --- a/gradle/declarative-playground/java-util/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - id("org.scijava.library") -} - -javaLibrary { - javaVersion = 11 -} diff --git a/gradle/declarative-playground/java-util/src/main/java/com/example/utils/Utils.java b/gradle/declarative-playground/java-util/src/main/java/com/example/utils/Utils.java deleted file mode 100644 index 56680ead..00000000 --- a/gradle/declarative-playground/java-util/src/main/java/com/example/utils/Utils.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.utils; - -public class Utils { - public String getWelcome() { - return "Welcome to the java-utils library!"; - } -} diff --git a/gradle/declarative-playground/kotlin-jvm-util/build.gradle.kts b/gradle/declarative-playground/kotlin-jvm-util/build.gradle.kts deleted file mode 100644 index cb20a37e..00000000 --- a/gradle/declarative-playground/kotlin-jvm-util/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -plugins { - id("org.scijava.kotlin-library") -} - -kotlinJvmLibrary { - javaVersion = 21 -} \ No newline at end of file diff --git a/gradle/declarative-playground/kotlin-jvm-util/src/main/kotlin/com/example/utils/Utils.kt b/gradle/declarative-playground/kotlin-jvm-util/src/main/kotlin/com/example/utils/Utils.kt deleted file mode 100644 index 0cd7fb66..00000000 --- a/gradle/declarative-playground/kotlin-jvm-util/src/main/kotlin/com/example/utils/Utils.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.utils - -class Utils { - val welcome: String - get() = "Welcome to the kotlin-jvm-utils library!" -} \ No newline at end of file diff --git a/gradle/declarative-playground/settings.gradle.kts b/gradle/declarative-playground/settings.gradle.kts deleted file mode 100644 index ae155b73..00000000 --- a/gradle/declarative-playground/settings.gradle.kts +++ /dev/null @@ -1,17 +0,0 @@ -rootProject.name = "declarative-playground" - -rootDir.list()!!.forEach { - if ("java" in it || "kotlin" in it) - include(it) -} -includeBuild("../declarative") - -dependencyResolutionManagement { - repositories { - mavenCentral() - } -} - -pluginManagement { - repositories { mavenCentral() } -} \ No newline at end of file diff --git a/gradle/declarative-playground/testbed-java-application/build.gradle.kts b/gradle/declarative-playground/testbed-java-application/build.gradle.kts deleted file mode 100644 index 93590649..00000000 --- a/gradle/declarative-playground/testbed-java-application/build.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -plugins { - id("org.scijava.application") -} - -javaApplication { - javaVersion = 21 - mainClass = "com.example.App" - - dependencies { - implementation(project(":java-util")) - implementation("com.google.guava:guava:32.1.3-jre") - } -} diff --git a/gradle/declarative-playground/testbed-java-application/src/main/java/com/example/App.java b/gradle/declarative-playground/testbed-java-application/src/main/java/com/example/App.java deleted file mode 100644 index 4df68009..00000000 --- a/gradle/declarative-playground/testbed-java-application/src/main/java/com/example/App.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.example; - -import com.example.utils.Utils; -import com.google.common.collect.ImmutableList; - -public class App { - public static void main(String[] args) { - // Verify that Guava is available - ImmutableList.Builder builder = ImmutableList.builder(); - builder.add("Hello from Java " + System.getProperty("java.version")); - - // Verify that the Java library is available - Utils utils = new Utils(); - builder.add(utils.getWelcome()); - - ImmutableList messages = builder.build(); - messages.forEach(System.out::println); - } -} \ No newline at end of file diff --git a/gradle/declarative-playground/testbed-java-library/build.gradle.kts b/gradle/declarative-playground/testbed-java-library/build.gradle.kts deleted file mode 100644 index da3e24bb..00000000 --- a/gradle/declarative-playground/testbed-java-library/build.gradle.kts +++ /dev/null @@ -1,12 +0,0 @@ -plugins { - id("org.scijava.library") -} - -javaLibrary { - javaVersion = 21 - - dependencies { - implementation(project(":java-util")) - implementation("com.google.guava:guava:32.1.3-jre") - } -} diff --git a/gradle/declarative-playground/testbed-java-library/src/main/java/com/example/lib/Library.java b/gradle/declarative-playground/testbed-java-library/src/main/java/com/example/lib/Library.java deleted file mode 100644 index cb4ee331..00000000 --- a/gradle/declarative-playground/testbed-java-library/src/main/java/com/example/lib/Library.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.example.lib; - -import com.example.utils.Utils; -import com.google.common.collect.ImmutableList; - -public class Library { - public Iterable getMessages() { - // Verify that Guava is available - ImmutableList.Builder builder = ImmutableList.builder(); - builder.add("Hello from Java " + System.getProperty("java.version")); - - // Verify that the Java library is available - Utils utils = new Utils(); - builder.add(utils.getWelcome()); - - return builder.build(); - } -} diff --git a/gradle/declarative-playground/testbed-kotlin-jvm-application/build.gradle.kts b/gradle/declarative-playground/testbed-kotlin-jvm-application/build.gradle.kts deleted file mode 100644 index 10dda1b4..00000000 --- a/gradle/declarative-playground/testbed-kotlin-jvm-application/build.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -plugins { - id("org.scijava.kotlin-application") -} - -kotlinJvmApplication { - javaVersion = 21 - mainClass = "com.example.AppKt" - - dependencies { - implementation(project(":kotlin-jvm-util")) - implementation("com.google.guava:guava:32.1.3-jre") - } -} diff --git a/gradle/declarative-playground/testbed-kotlin-jvm-application/src/main/kotlin/com/example/App.kt b/gradle/declarative-playground/testbed-kotlin-jvm-application/src/main/kotlin/com/example/App.kt deleted file mode 100644 index 66721b2b..00000000 --- a/gradle/declarative-playground/testbed-kotlin-jvm-application/src/main/kotlin/com/example/App.kt +++ /dev/null @@ -1,17 +0,0 @@ -package com.example - -import com.example.utils.Utils -import com.google.common.collect.ImmutableList - -fun main() { - // Verify that Guava is available - val builder = ImmutableList.builder() - builder.add("Hello from Kotlin on JVM ${System.getProperty("java.version")}") - - // Verify that the Kotlin JVM library is available - val utils = Utils() - builder.add(utils.welcome) - - val messages = builder.build() - messages.forEach(::println) -} \ No newline at end of file diff --git a/gradle/declarative/build.gradle.kts b/gradle/declarative/build.gradle.kts deleted file mode 100644 index c61514d5..00000000 --- a/gradle/declarative/build.gradle.kts +++ /dev/null @@ -1,63 +0,0 @@ -//import org.gradle.api.experimental.java.javaLibrary - -plugins { - `kotlin-dsl` - id("com.gradle.plugin-publish") version "1.2.1" -} - -repositories { mavenCentral() } - -//javaLibrary { -// javaVersion = 11 -//} - -dependencies { -// implementation(kotlin("multiplatform", embeddedKotlinVersion)) - implementation("org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:$embeddedKotlinVersion") -// implementation(kotlin("jvm")) -} - -gradlePlugin { - plugins { -// create("jvm-library") { -// id = "org.gradle.experimental.jvm-library" -// implementationClass = "org.gradle.api.experimental.jvm.StandaloneJvmLibraryPlugin" -// tags = setOf("declarative-gradle", "java", "jvm") -// } -// create("java-library") { -// id = "org.gradle.experimental.java-library" -// implementationClass = "org.gradle.api.experimental.java.StandaloneJavaLibraryPlugin" -// tags = setOf("declarative-gradle", "java", "jvm") -// } - create("scijava.library") { - id = "org.$name" - implementationClass = "org.scijava.SciJavaLibraryPlugin" - tags = setOf("declarative-gradle", "scijava", "java", "jvm") - } - create("scijava.application") { - id = "org.$name" - implementationClass = "org.scijava.SciJavaApplicationPlugin" - tags = setOf("declarative-gradle", "scijava", "java", "jvm") - } - create("scijava.kotlin-library") { - id = "org.$name" - implementationClass = "org.scijava.SciJavaKotlinLibraryPlugin" - tags = setOf("declarative-gradle", "scijava", "java", "kotlin", "jvm") - } - create("scijava.kotlin-application") { - id = "org.$name" - implementationClass = "org.scijava.SciJavaKotlinApplicationPlugin" - tags = setOf("declarative-gradle", "scijava", "java", "kotlin", "jvm") - } -// create("java-application") { -// id = "org.gradle.experimental.java-application" -// implementationClass = "org.gradle.api.experimental.java.StandaloneJavaApplicationPlugin" -// tags = setOf("declarative-gradle", "java", "jvm") -// } -// create("jvm-ecosystem") { -// id = "org.gradle.experimental.jvm-ecosystem" -// implementationClass = "org.gradle.api.experimental.jvm.JvmEcosystemPlugin" -// tags = setOf("declarative-gradle", "java", "jvm") -// } - } -} diff --git a/gradle/declarative/settings.gradle.kts b/gradle/declarative/settings.gradle.kts deleted file mode 100644 index e4f87df3..00000000 --- a/gradle/declarative/settings.gradle.kts +++ /dev/null @@ -1,6 +0,0 @@ -// This is an empty umbrella build including all the component builds. -// This build is not necessarily needed. The component builds work independently. - -rootProject.name = "declarative" - -enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/common/ApplicationDependencies.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/common/ApplicationDependencies.kt deleted file mode 100644 index c1ce39d4..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/common/ApplicationDependencies.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.gradle.api.experimental.common - -import org.gradle.api.artifacts.dsl.Dependencies -import org.gradle.api.artifacts.dsl.DependencyCollector -import org.gradle.declarative.dsl.model.annotations.Restricted - -/** - * The declarative dependencies DSL block for an application. - */ -@Restricted -interface ApplicationDependencies : Dependencies { - val implementation: DependencyCollector - val runtimeOnly: DependencyCollector - val compileOnly: DependencyCollector -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/common/LibraryDependencies.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/common/LibraryDependencies.kt deleted file mode 100644 index 21ed088c..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/common/LibraryDependencies.kt +++ /dev/null @@ -1,19 +0,0 @@ -package org.gradle.api.experimental.common - -import org.gradle.api.artifacts.dsl.Dependencies -import org.gradle.api.artifacts.dsl.DependencyCollector -import org.gradle.declarative.dsl.model.annotations.Restricted - -/** - * The declarative dependencies DSL block for a library. - */ -@Restricted -interface LibraryDependencies : Dependencies { - val api: DependencyCollector - val implementation: DependencyCollector - val runtimeOnly: DependencyCollector - val compileOnly: DependencyCollector - // CompileOnlyApi is not included here, since both Android and KMP do not support it. - // Does that mean we should also reconsider if we should support it? Or, should we - // talk to Android and KMP about adding support -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/java/JavaApplication.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/java/JavaApplication.kt deleted file mode 100644 index 19fac4d8..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/java/JavaApplication.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.gradle.api.experimental.java - -import org.gradle.api.experimental.jvm.HasJavaTarget -import org.gradle.api.experimental.jvm.HasJvmApplication -import org.gradle.api.experimental.jvm.HasJvmLibrary -import org.gradle.declarative.dsl.model.annotations.Restricted -import org.scijava.Fine - -/** - * An application implemented using a single version of Java. - */ -@Restricted -interface JavaApplication : HasJavaTarget, HasJvmApplication \ No newline at end of file diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/java/JavaLibrary.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/java/JavaLibrary.kt deleted file mode 100644 index 26c31583..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/java/JavaLibrary.kt +++ /dev/null @@ -1,20 +0,0 @@ -package org.gradle.api.experimental.java - -import org.gradle.api.experimental.jvm.HasJavaTarget -import org.gradle.api.experimental.jvm.HasJvmLibrary -import org.gradle.declarative.dsl.model.annotations.Restricted - -/** - * A library implemented using a single version of Java. - */ -@Restricted -interface JavaLibrary : HasJavaTarget, HasJvmLibrary - -//inline fun javaLibrary(block: JavaLibrary.() -> Unit): JavaLibrary { -// return object : JavaLibrary{ -// override val javaVersion: Property = Property -// override val dependencies: LibraryDependencies -// get() = TODO("Not yet implemented") -// -// }.also(block) -//} \ No newline at end of file diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaApplicationPlugin.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaApplicationPlugin.kt deleted file mode 100644 index c518498a..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaApplicationPlugin.kt +++ /dev/null @@ -1,36 +0,0 @@ -package org.gradle.api.experimental.java - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.experimental.jvm.internal.JvmPluginSupport -import org.gradle.api.plugins.ApplicationPlugin -import org.gradle.kotlin.dsl.create -import org.scijava.ValidationApplication - -/** - * Creates a declarative [JavaApplication] DSL model, applies the official Java application plugin, - * and links the declarative model to the official plugin. - */ -abstract class StandaloneJavaApplicationPlugin : Plugin, ValidationApplication { -// @get:SoftwareType(name = "javaApplication", modelPublicType = JavaApplication::class) -// abstract val application: JavaApplication - - override val extensionName = "javaApplication" - - override fun apply(project: Project) { - val application = project.extensions.create(extensionName) - val dslModel = application - - project.plugins.apply(ApplicationPlugin::class.java) - - linkDslModelToPlugin(project, dslModel) - - project.validate() - } - - private fun linkDslModelToPlugin(project: Project, dslModel: JavaApplication) { - JvmPluginSupport.linkJavaVersion(project, dslModel) - JvmPluginSupport.linkApplicationMainClass(project, dslModel) - JvmPluginSupport.linkMainSourceSourceSetDependencies(project, dslModel.dependencies) - } -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaLibraryPlugin.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaLibraryPlugin.kt deleted file mode 100644 index 657b6972..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/java/StandaloneJavaLibraryPlugin.kt +++ /dev/null @@ -1,35 +0,0 @@ -package org.gradle.api.experimental.java - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.experimental.jvm.internal.JvmPluginSupport -import org.gradle.api.plugins.JavaLibraryPlugin -import org.gradle.kotlin.dsl.create -import org.scijava.ValidationLibrary - -/** - * Creates a declarative [JavaLibrary] DSL model, applies the official Java library plugin, - * and links the declarative model to the official plugin. - */ -abstract class StandaloneJavaLibraryPlugin : Plugin, ValidationLibrary { - // @get:SoftwareType(name = "javaLibrary", modelPublicType = JavaLibrary::class) - // abstract val library: JavaLibrary - - override val extensionName = "javaLibrary" - - override fun apply(project: Project) { - val javaLibrary = project.extensions.create("javaLibrary") - val dslModel = javaLibrary - - project.plugins.apply(JavaLibraryPlugin::class.java) - - linkDslModelToPlugin(project, dslModel) - - project.validate() - } - - private fun linkDslModelToPlugin(project: Project, dslModel: JavaLibrary) { - JvmPluginSupport.linkJavaVersion(project, dslModel) - JvmPluginSupport.linkMainSourceSourceSetDependencies(project, dslModel.dependencies) - } -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTarget.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTarget.kt deleted file mode 100644 index 5f6b9164..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTarget.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.gradle.api.experimental.jvm - -import org.gradle.api.provider.Property -import org.gradle.declarative.dsl.model.annotations.Restricted - -/** - * A component that is built for a single Java version. - */ -@Restricted -interface HasJavaTarget { - @get:Restricted - val javaVersion: Property -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTargets.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTargets.kt deleted file mode 100644 index aab13575..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/HasJavaTargets.kt +++ /dev/null @@ -1,18 +0,0 @@ -package org.gradle.api.experimental.jvm - -import org.gradle.api.Action -import org.gradle.api.tasks.Nested -import org.gradle.declarative.dsl.model.annotations.Configuring -import org.gradle.declarative.dsl.model.annotations.Restricted - -/** - * A component that is built for multiple Java versions. - */ -@Restricted -interface HasJavaTargets { - @get:Nested - val targets: JvmTargetContainer - - @Configuring - fun targets(action: Action) = action.execute(targets) -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmApplication.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmApplication.kt deleted file mode 100644 index c084e9c6..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmApplication.kt +++ /dev/null @@ -1,23 +0,0 @@ -package org.gradle.api.experimental.jvm - -import org.gradle.api.Action -import org.gradle.api.experimental.common.ApplicationDependencies -import org.gradle.api.provider.Property -import org.gradle.api.tasks.Nested -import org.gradle.declarative.dsl.model.annotations.Configuring -import org.gradle.declarative.dsl.model.annotations.Restricted - -/** - * Represents an application that runs on the JVM. - */ -@Restricted -interface HasJvmApplication { - @get:Restricted - val mainClass: Property - - @get:Nested - val dependencies: ApplicationDependencies - - @Configuring - fun dependencies(action: Action) = action.execute(dependencies) -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmLibrary.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmLibrary.kt deleted file mode 100644 index 8c761d79..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/HasJvmLibrary.kt +++ /dev/null @@ -1,20 +0,0 @@ -package org.gradle.api.experimental.jvm - -import org.gradle.api.Action -import org.gradle.api.experimental.common.LibraryDependencies -import org.gradle.api.tasks.Nested -import org.gradle.declarative.dsl.model.annotations.Configuring -import org.gradle.declarative.dsl.model.annotations.Restricted -import org.scijava.Fine - -/** - * Represents a library that runs on the JVM. - */ -@Restricted -interface HasJvmLibrary { - @get:Nested - val dependencies: LibraryDependencies - - @Configuring - fun dependencies(action: Action) = action.execute(dependencies) -} \ No newline at end of file diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JavaTarget.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JavaTarget.kt deleted file mode 100644 index 6fc18619..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JavaTarget.kt +++ /dev/null @@ -1,7 +0,0 @@ -package org.gradle.api.experimental.jvm - -import org.gradle.api.Named - -abstract class JavaTarget(val javaVersion: Int) : JvmTarget, Named { - override fun getName(): String = "java$javaVersion" -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmApplication.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmApplication.kt deleted file mode 100644 index 19ad8d73..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmApplication.kt +++ /dev/null @@ -1,6 +0,0 @@ -package org.gradle.api.experimental.jvm - -/** - * An application that runs on the JVM and that is implemented using one or more versions of Java. - */ -interface JvmApplication : HasJavaTargets, HasJvmApplication diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmEcosystemPlugin.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmEcosystemPlugin.kt deleted file mode 100644 index f33b20f6..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmEcosystemPlugin.kt +++ /dev/null @@ -1,15 +0,0 @@ -package org.gradle.api.experimental.jvm - -import org.gradle.api.Plugin -import org.gradle.api.experimental.java.StandaloneJavaApplicationPlugin -import org.gradle.api.experimental.java.StandaloneJavaLibraryPlugin -import org.gradle.api.initialization.Settings -import org.gradle.api.internal.plugins.software.RegistersSoftwareTypes - -@RegistersSoftwareTypes(StandaloneJavaApplicationPlugin::class, - StandaloneJavaLibraryPlugin::class, - StandaloneJvmLibraryPlugin::class, - StandaloneJvmApplicationPlugin::class) -class JvmEcosystemPlugin : Plugin { - override fun apply(target: Settings) {} -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmLibrary.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmLibrary.kt deleted file mode 100644 index 2ea96379..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmLibrary.kt +++ /dev/null @@ -1,9 +0,0 @@ -package org.gradle.api.experimental.jvm - -import org.gradle.declarative.dsl.model.annotations.Restricted - -/** - * A library that runs on the JVM and that is implemented using one or more versions of Java. - */ -@Restricted -interface JvmLibrary : HasJavaTargets, HasJvmLibrary diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTarget.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTarget.kt deleted file mode 100644 index 14ea67ee..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTarget.kt +++ /dev/null @@ -1,17 +0,0 @@ -package org.gradle.api.experimental.jvm - -import org.gradle.api.Action -import org.gradle.api.Named -import org.gradle.api.experimental.common.LibraryDependencies -import org.gradle.api.tasks.Nested -import org.gradle.declarative.dsl.model.annotations.Configuring -import org.gradle.declarative.dsl.model.annotations.Restricted - -@Restricted -interface JvmTarget : Named { - @get:Nested - val dependencies: LibraryDependencies - - @Configuring - fun dependencies(action: Action) = action.execute(dependencies) -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTargetContainer.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTargetContainer.kt deleted file mode 100644 index 2925de79..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/JvmTargetContainer.kt +++ /dev/null @@ -1,33 +0,0 @@ -package org.gradle.api.experimental.jvm - -import org.gradle.api.Action -import org.gradle.api.internal.CollectionCallbackActionDecorator -import org.gradle.api.internal.DefaultNamedDomainObjectSet -import org.gradle.declarative.dsl.model.annotations.Adding -import org.gradle.declarative.dsl.model.annotations.Restricted -import org.gradle.internal.instantiation.InstantiatorFactory -import org.gradle.internal.reflect.Instantiator -import org.gradle.internal.service.ServiceRegistry -import javax.inject.Inject - -@Restricted -class JvmTargetContainer -@Inject -constructor(instantiator: Instantiator, - instantiatorFactory: InstantiatorFactory, - serviceRegistry: ServiceRegistry, callbackDecorator: CollectionCallbackActionDecorator) - : DefaultNamedDomainObjectSet(JvmTarget::class.java, instantiator, callbackDecorator) { - - private val elementInstantiator: Instantiator = instantiatorFactory.decorateLenient(serviceRegistry) - - @Adding - fun java(version: Int): JvmTarget = java(version) {} - - @Adding - fun java(version: Int, action: Action): JvmTarget { - val element = elementInstantiator.newInstance(JavaTarget::class.java, version) - add(element) - action.execute(element) - return element - } -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmApplicationPlugin.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmApplicationPlugin.kt deleted file mode 100644 index 798b5d66..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmApplicationPlugin.kt +++ /dev/null @@ -1,46 +0,0 @@ -package org.gradle.api.experimental.jvm - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.experimental.jvm.internal.JvmPluginSupport -import org.gradle.api.experimental.jvm.internal.JvmPluginSupport.createTargetSourceSet -import org.gradle.api.experimental.jvm.internal.JvmPluginSupport.linkApplicationMainClass -import org.gradle.api.experimental.jvm.internal.JvmPluginSupport.setupCommonSourceSet -import org.gradle.api.internal.plugins.software.SoftwareType -import org.gradle.api.plugins.ApplicationPlugin -import org.gradle.jvm.toolchain.JavaToolchainService -import org.gradle.kotlin.dsl.withType -import javax.inject.Inject - -/** - * Creates a declarative [JvmApplication] DSL model, applies the official Jvm plugin, - * and links the declarative model to the official plugin. - */ -abstract class StandaloneJvmApplicationPlugin : Plugin { - @get:SoftwareType(name = "jvmApplication", modelPublicType = JvmApplication::class) - abstract val jvmApplication: JvmApplication - - override fun apply(project: Project) { - val dslModel = jvmApplication - - project.plugins.apply(ApplicationPlugin::class.java) - - linkDslModelToPlugin(project, dslModel) - } - - @get:Inject - protected abstract val javaToolchainService: JavaToolchainService - - private fun linkDslModelToPlugin(project: Project, dslModel: JvmApplication) { - val commonSources = setupCommonSourceSet(project) - JvmPluginSupport.linkSourceSetToDependencies(project, commonSources, dslModel.dependencies) - - JvmPluginSupport.linkJavaVersion(project, dslModel) - linkApplicationMainClass(project, dslModel) - dslModel.targets.withType().all { - val sourceSet = createTargetSourceSet(project, this, commonSources, javaToolchainService) - // Link dependencies to DSL - JvmPluginSupport.linkSourceSetToDependencies(project, sourceSet, dependencies) - } - } -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmLibraryPlugin.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmLibraryPlugin.kt deleted file mode 100644 index 1e28d544..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/StandaloneJvmLibraryPlugin.kt +++ /dev/null @@ -1,50 +0,0 @@ -package org.gradle.api.experimental.jvm - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.experimental.jvm.internal.JvmPluginSupport -import org.gradle.api.experimental.jvm.internal.JvmPluginSupport.createTargetSourceSet -import org.gradle.api.experimental.jvm.internal.JvmPluginSupport.setupCommonSourceSet -import org.gradle.api.internal.plugins.software.SoftwareType -import org.gradle.api.plugins.JavaLibraryPlugin -import org.gradle.jvm.toolchain.JavaToolchainService -import org.gradle.kotlin.dsl.get -import org.gradle.kotlin.dsl.withType -import javax.inject.Inject - -/** - * Creates a declarative [JvmLibrary] DSL model, applies the official Jvm plugin, - * and links the declarative model to the official plugin. - */ -abstract class StandaloneJvmLibraryPlugin : Plugin { - @get:SoftwareType(name = "jvmLibrary", modelPublicType = JvmLibrary::class) - abstract val jvmLibrary: JvmLibrary - - override fun apply(project: Project) { - val dslModel = jvmLibrary - - project.plugins.apply(JavaLibraryPlugin::class.java) - - linkDslModelToPlugin(project, dslModel) - } - - @get:Inject - protected abstract val javaToolchainService: JavaToolchainService? - - private fun linkDslModelToPlugin(project: Project, dslModel: JvmLibrary) { - val commonSources = setupCommonSourceSet(project) - JvmPluginSupport.linkSourceSetToDependencies(project, commonSources, dslModel.dependencies) - - JvmPluginSupport.linkJavaVersion(project, dslModel) - - dslModel.targets.withType().all { - val sourceSet = createTargetSourceSet(project, this, commonSources, javaToolchainService!!) - // Link dependencies to DSL - JvmPluginSupport.linkSourceSetToDependencies(project, sourceSet, dependencies) - - // Extend common dependencies - project.configurations[sourceSet.apiConfigurationName] - .extendsFrom(project.configurations[commonSources.apiConfigurationName]) - } - } -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/internal/JvmPluginSupport.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/internal/JvmPluginSupport.kt deleted file mode 100644 index c902919c..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/jvm/internal/JvmPluginSupport.kt +++ /dev/null @@ -1,103 +0,0 @@ -package org.gradle.api.experimental.jvm.internal - -import org.gradle.api.Project -import org.gradle.api.Task -import org.gradle.api.experimental.common.ApplicationDependencies -import org.gradle.api.experimental.common.LibraryDependencies -import org.gradle.api.experimental.jvm.HasJavaTarget -import org.gradle.api.experimental.jvm.HasJavaTargets -import org.gradle.api.experimental.jvm.HasJvmApplication -import org.gradle.api.experimental.jvm.JavaTarget -import org.gradle.api.plugins.JavaApplication -import org.gradle.api.plugins.JavaPluginExtension -import org.gradle.api.plugins.internal.JavaPluginHelper -import org.gradle.api.tasks.SourceSet -import org.gradle.api.tasks.compile.JavaCompile -import org.gradle.jvm.toolchain.JavaLanguageVersion -import org.gradle.jvm.toolchain.JavaToolchainService -import org.gradle.kotlin.dsl.* - -object JvmPluginSupport { - fun linkSourceSetToDependencies(project: Project, sourceSet: SourceSet, dependencies: LibraryDependencies) { - project.configurations[sourceSet.implementationConfigurationName] - .dependencies.addAllLater(dependencies.implementation.dependencies) - project.configurations[sourceSet.compileOnlyConfigurationName] - .dependencies.addAllLater(dependencies.compileOnly.dependencies) - project.configurations[sourceSet.runtimeOnlyConfigurationName] - .dependencies.addAllLater(dependencies.runtimeOnly.dependencies) - project.configurations[sourceSet.apiConfigurationName] - .dependencies.addAllLater(dependencies.api.dependencies) - } - - fun linkSourceSetToDependencies(project: Project, sourceSet: SourceSet, dependencies: ApplicationDependencies) { - project.configurations[sourceSet.implementationConfigurationName] - .dependencies.addAllLater(dependencies.implementation.dependencies) - project.configurations[sourceSet.compileOnlyConfigurationName] - .dependencies.addAllLater(dependencies.compileOnly.dependencies) - project.configurations[sourceSet.runtimeOnlyConfigurationName] - .dependencies.addAllLater(dependencies.runtimeOnly.dependencies) - } - - fun linkMainSourceSourceSetDependencies(project: Project, dependencies: LibraryDependencies) { - val java = project.extensions.getByType() - linkSourceSetToDependencies(project, java.sourceSets["main"], dependencies) - } - - fun linkMainSourceSourceSetDependencies(project: Project, dependencies: ApplicationDependencies) { - val java = project.extensions.getByType() - linkSourceSetToDependencies(project, java.sourceSets["main"], dependencies) - } - - fun linkJavaVersion(project: Project, dslModel: HasJavaTarget) { - val java = project.extensions.getByType() - java.toolchain.languageVersion = dslModel.javaVersion.map(JavaLanguageVersion::of) - } - - fun linkJavaVersion(project: Project, dslModel: HasJavaTargets) { - val java = project.extensions.getByType() - java.toolchain.languageVersion = project.provider { JavaLanguageVersion.of(dslModel.targets.withType().minOf(JavaTarget::javaVersion)) } - } - - fun linkApplicationMainClass(project: Project, application: HasJvmApplication) { - val app = project.extensions.getByType() - app.mainClass = application.mainClass - } - - fun setupCommonSourceSet(project: Project): SourceSet { - val commonSources = JavaPluginHelper.getJavaComponent(project).mainFeature.sourceSet - val srcDir = project.layout.projectDirectory.dir("src").dir("common").dir("java") - commonSources.java.setSrcDirs(setOf(srcDir)) - return commonSources - } - - fun createTargetSourceSet(project: Project, - target: JavaTarget, - commonSources: SourceSet, - javaToolchainService: JavaToolchainService): SourceSet { - val java = project.extensions.getByType() - val sourceSet = java.sourceSets.create("java${target.javaVersion}") - java.registerFeature("java" + target.javaVersion) { usingSourceSet(sourceSet) } - - // Link properties - project.tasks.named(sourceSet.compileJavaTaskName) { - javaCompiler = javaToolchainService.compilerFor { languageVersion = JavaLanguageVersion.of(target.javaVersion) } - } - - // Depend on common sources - project.configurations[sourceSet.implementationConfigurationName] - .dependencies += project.dependencies.create(commonSources.output) - - // Extend common dependencies - project.configurations[sourceSet.implementationConfigurationName] - .extendsFrom(project.configurations[commonSources.implementationConfigurationName]) - project.configurations[sourceSet.compileOnlyConfigurationName] - .extendsFrom(project.configurations[commonSources.compileOnlyConfigurationName]) - project.configurations[sourceSet.runtimeOnlyConfigurationName] - .extendsFrom(project.configurations[commonSources.runtimeOnlyConfigurationName]) - - // Assemble includes all targets - project.tasks["assemble"].configure { dependsOn(sourceSet.output) } - - return sourceSet - } -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kmp/internal/KotlinPluginSupport.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kmp/internal/KotlinPluginSupport.kt deleted file mode 100644 index 8b1c647b..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kmp/internal/KotlinPluginSupport.kt +++ /dev/null @@ -1,16 +0,0 @@ -package org.gradle.api.experimental.kmp.internal - -import org.gradle.api.Project -import org.gradle.api.Transformer -import org.gradle.api.experimental.jvm.HasJavaTarget -import org.gradle.jvm.toolchain.JavaLanguageVersion -import org.gradle.kotlin.dsl.assign -import org.gradle.kotlin.dsl.getByType -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension - -object KotlinPluginSupport { - fun linkJavaVersion(project: Project, dslModel: HasJavaTarget) { - val kotlin = project.extensions.getByType() - kotlin.jvmToolchain { languageVersion = dslModel.javaVersion.map(JavaLanguageVersion::of) } - } -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kotlin/KotlinJvmApplication.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kotlin/KotlinJvmApplication.kt deleted file mode 100644 index 03e655e9..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kotlin/KotlinJvmApplication.kt +++ /dev/null @@ -1,11 +0,0 @@ -package org.gradle.api.experimental.kotlin - -import org.gradle.api.experimental.jvm.HasJavaTarget -import org.gradle.api.experimental.jvm.HasJvmApplication -import org.gradle.declarative.dsl.model.annotations.Restricted - -/** - * An application implemented using Kotlin and that targets a single JVM version. - */ -@Restricted -interface KotlinJvmApplication : HasJavaTarget, HasJvmApplication diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kotlin/KotlinJvmLibrary.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kotlin/KotlinJvmLibrary.kt deleted file mode 100644 index 0f0db9dc..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kotlin/KotlinJvmLibrary.kt +++ /dev/null @@ -1,11 +0,0 @@ -package org.gradle.api.experimental.kotlin - -import org.gradle.api.experimental.jvm.HasJavaTarget -import org.gradle.api.experimental.jvm.HasJvmLibrary -import org.gradle.declarative.dsl.model.annotations.Restricted - -/** - * A library implemented using Kotlin and that targets a single JVM version. - */ -@Restricted -interface KotlinJvmLibrary : HasJavaTarget, HasJvmLibrary diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kotlin/StandaloneKotlinJvmApplicationPlugin.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kotlin/StandaloneKotlinJvmApplicationPlugin.kt deleted file mode 100644 index c29271f3..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kotlin/StandaloneKotlinJvmApplicationPlugin.kt +++ /dev/null @@ -1,38 +0,0 @@ -package org.gradle.api.experimental.kotlin - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.experimental.jvm.internal.JvmPluginSupport -import org.gradle.api.experimental.kmp.internal.KotlinPluginSupport -import org.gradle.api.plugins.ApplicationPlugin -import org.gradle.kotlin.dsl.create -import org.scijava.ValidationApplication - -/** - * Creates a declarative [KotlinJvmApplication] DSL model, applies the official Kotlin and application plugin, - * and links the declarative model to the official plugin. - */ -abstract class StandaloneKotlinJvmApplicationPlugin : Plugin, ValidationApplication { -// @get:SoftwareType(name = "kotlinJvmApplication", modelPublicType = KotlinJvmApplication::class) -// abstract val application: KotlinJvmApplication - - override val extensionName = "kotlinJvmApplication" - - override fun apply(project: Project) { - val application = project.extensions.create(extensionName) - val dslModel = application - - project.plugins.apply(ApplicationPlugin::class.java) - project.plugins.apply("org.jetbrains.kotlin.jvm") - - linkDslModelToPlugin(project, dslModel) - - project.validate() - } - - private fun linkDslModelToPlugin(project: Project, dslModel: KotlinJvmApplication) { - KotlinPluginSupport.linkJavaVersion(project, dslModel) - JvmPluginSupport.linkApplicationMainClass(project, dslModel) - JvmPluginSupport.linkMainSourceSourceSetDependencies(project, dslModel.dependencies) - } -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kotlin/StandaloneKotlinJvmLibraryPlugin.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kotlin/StandaloneKotlinJvmLibraryPlugin.kt deleted file mode 100644 index 9dbb94a1..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/experimental/kotlin/StandaloneKotlinJvmLibraryPlugin.kt +++ /dev/null @@ -1,36 +0,0 @@ -package org.gradle.api.experimental.kotlin - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.experimental.jvm.internal.JvmPluginSupport.linkMainSourceSourceSetDependencies -import org.gradle.api.experimental.kmp.internal.KotlinPluginSupport.linkJavaVersion -import org.gradle.api.internal.plugins.software.SoftwareType -import org.gradle.kotlin.dsl.create -import org.scijava.ValidationLibrary - -/** - * Creates a declarative [KotlinJvmApplication] DSL model, applies the official Kotlin and application plugin, - * and links the declarative model to the official plugin. - */ -abstract class StandaloneKotlinJvmLibraryPlugin : Plugin, ValidationLibrary { -// @get:SoftwareType(name = "kotlinJvmLibrary", modelPublicType = KotlinJvmLibrary::class) -// abstract val library: KotlinJvmLibrary - - override val extensionName = "kotlinJvmLibrary" - - override fun apply(project: Project) { - val library = project.extensions.create(extensionName) - val dslModel = library - - project.plugins.apply("org.jetbrains.kotlin.jvm") - - linkDslModelToPlugin(project, dslModel) - - project.validate() - } - - private fun linkDslModelToPlugin(project: Project, dslModel: KotlinJvmLibrary) { - linkJavaVersion(project, dslModel) - linkMainSourceSourceSetDependencies(project, dslModel.dependencies) - } -} diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/internal/plugins/software/RegistersSoftwareTypes.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/internal/plugins/software/RegistersSoftwareTypes.kt deleted file mode 100644 index 85690baa..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/internal/plugins/software/RegistersSoftwareTypes.kt +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2024 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.gradle.api.internal.plugins.software - -import org.gradle.api.Incubating -import org.gradle.api.Plugin -import org.gradle.api.Project -import kotlin.reflect.KClass - -/** - * Marks a Settings plugin as registering one or more software types. - * - * @since 8.9 - */ -@Incubating -@Target(AnnotationTarget.CLASS) -@Retention(AnnotationRetention.RUNTIME) -annotation class RegistersSoftwareTypes( - /** - * The [Project] plugins that provide the software types. - * - * @since 8.9 - */ - vararg val value: KClass>) diff --git a/gradle/declarative/src/main/kotlin/org/gradle/api/internal/plugins/software/SoftwareType.kt b/gradle/declarative/src/main/kotlin/org/gradle/api/internal/plugins/software/SoftwareType.kt deleted file mode 100644 index 3abc7079..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/api/internal/plugins/software/SoftwareType.kt +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2024 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.gradle.api.internal.plugins.software - -import org.gradle.api.Incubating -import kotlin.reflect.KClass - -/** - * Marks a method as exposing a software type. This should be used in plugin classes to communicate which software types they provide. - * - * @since 8.9 - */ -@Incubating -@Target(AnnotationTarget.FUNCTION, - AnnotationTarget.PROPERTY_GETTER, - AnnotationTarget.PROPERTY_SETTER) -@Retention(AnnotationRetention.RUNTIME) -annotation class SoftwareType( - /** - * The name of the software type. This will correspond to the DSL element that is exposed to configure the software type. - * - * @since 8.9 - */ - val name: String, - /** - * The model type used to configure the software type. Note that this class should be the same type or a super type of the return type - * of the method that this annotation is applied to. - * - * @since 8.9 - */ - val modelPublicType: KClass<*>) \ No newline at end of file diff --git a/gradle/declarative/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Adding.kt b/gradle/declarative/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Adding.kt deleted file mode 100644 index 65418b5c..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Adding.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2024 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.gradle.declarative.dsl.model.annotations - -@Target(AnnotationTarget.FUNCTION, - AnnotationTarget.PROPERTY_GETTER, - AnnotationTarget.PROPERTY_SETTER) -@Retention(AnnotationRetention.RUNTIME) -annotation class Adding diff --git a/gradle/declarative/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Configuring.kt b/gradle/declarative/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Configuring.kt deleted file mode 100644 index e1e62904..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Configuring.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2024 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.gradle.declarative.dsl.model.annotations - -@Target(AnnotationTarget.FUNCTION, - AnnotationTarget.PROPERTY_GETTER, - AnnotationTarget.PROPERTY_SETTER) -@Retention(AnnotationRetention.RUNTIME) -annotation class Configuring(val propertyName: String = "") diff --git a/gradle/declarative/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Restricted.kt b/gradle/declarative/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Restricted.kt deleted file mode 100644 index 14fc4f9b..00000000 --- a/gradle/declarative/src/main/kotlin/org/gradle/declarative/dsl/model/annotations/Restricted.kt +++ /dev/null @@ -1,8 +0,0 @@ -package org.gradle.declarative.dsl.model.annotations - -@Target(AnnotationTarget.CLASS, - AnnotationTarget.FUNCTION, - AnnotationTarget.PROPERTY_GETTER, - AnnotationTarget.PROPERTY_SETTER) -@Retention(AnnotationRetention.RUNTIME) -annotation class Restricted \ No newline at end of file diff --git a/gradle/declarative/src/main/kotlin/org/scijava/SciJavaApplicationPlugin.kt b/gradle/declarative/src/main/kotlin/org/scijava/SciJavaApplicationPlugin.kt deleted file mode 100644 index 1cf94fa6..00000000 --- a/gradle/declarative/src/main/kotlin/org/scijava/SciJavaApplicationPlugin.kt +++ /dev/null @@ -1,11 +0,0 @@ -package org.scijava - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.experimental.java.StandaloneJavaApplicationPlugin - -class SciJavaApplicationPlugin : Plugin { - override fun apply(project: Project) { - project.plugins.apply(StandaloneJavaApplicationPlugin::class.java) - } -} \ No newline at end of file diff --git a/gradle/declarative/src/main/kotlin/org/scijava/SciJavaKotlinApplicationPlugin.kt b/gradle/declarative/src/main/kotlin/org/scijava/SciJavaKotlinApplicationPlugin.kt deleted file mode 100644 index 94bf2308..00000000 --- a/gradle/declarative/src/main/kotlin/org/scijava/SciJavaKotlinApplicationPlugin.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.scijava - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.experimental.java.StandaloneJavaApplicationPlugin -import org.gradle.api.experimental.kotlin.StandaloneKotlinJvmApplicationPlugin - -class SciJavaKotlinApplicationPlugin : Plugin { - override fun apply(project: Project) { - project.plugins.apply(StandaloneKotlinJvmApplicationPlugin::class.java) - } -} \ No newline at end of file diff --git a/gradle/declarative/src/main/kotlin/org/scijava/SciJavaKotlinLibraryPlugin.kt b/gradle/declarative/src/main/kotlin/org/scijava/SciJavaKotlinLibraryPlugin.kt deleted file mode 100644 index 882cc64a..00000000 --- a/gradle/declarative/src/main/kotlin/org/scijava/SciJavaKotlinLibraryPlugin.kt +++ /dev/null @@ -1,12 +0,0 @@ -package org.scijava - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.experimental.java.StandaloneJavaLibraryPlugin -import org.gradle.api.experimental.kotlin.StandaloneKotlinJvmLibraryPlugin - -class SciJavaKotlinLibraryPlugin : Plugin { - override fun apply(project: Project) { - project.plugins.apply(StandaloneKotlinJvmLibraryPlugin::class.java) - } -} \ No newline at end of file diff --git a/gradle/declarative/src/main/kotlin/org/scijava/SciJavaLibraryPlugin.kt b/gradle/declarative/src/main/kotlin/org/scijava/SciJavaLibraryPlugin.kt deleted file mode 100644 index ebbc1a80..00000000 --- a/gradle/declarative/src/main/kotlin/org/scijava/SciJavaLibraryPlugin.kt +++ /dev/null @@ -1,11 +0,0 @@ -package org.scijava - -import org.gradle.api.Plugin -import org.gradle.api.Project -import org.gradle.api.experimental.java.StandaloneJavaLibraryPlugin - -class SciJavaLibraryPlugin : Plugin { - override fun apply(project: Project) { - project.plugins.apply(StandaloneJavaLibraryPlugin::class.java) - } -} \ No newline at end of file diff --git a/gradle/declarative/src/main/kotlin/org/scijava/validation.kt b/gradle/declarative/src/main/kotlin/org/scijava/validation.kt deleted file mode 100644 index 9c2ed9de..00000000 --- a/gradle/declarative/src/main/kotlin/org/scijava/validation.kt +++ /dev/null @@ -1,78 +0,0 @@ -package org.scijava - -import org.gradle.api.Project - -internal interface ValidationApplication : ValidationLibrary -internal interface ExtensionName { - val extensionName: String -} - -internal interface ValidationLibrary : ExtensionName { - - fun Project.validate() { - - val lineIterator = buildFile.readText().lines().filter { it.isNotBlank() && !it.startsWith("//") } - .map(String::trim).toMutableList().listIterator() - while (lineIterator.hasNext()) { - var line = lineIterator.next() - reformatIfNeeded(line, lineIterator) - when (line) { - "plugins {" -> - while (true) { - line = lineIterator.next() - if (line == "}") break - check(line.startsWith("id(\"")) - } - "$extensionName {" -> validate(lineIterator) - else -> error("forbidden code `$line`") - } - } - println("build script verification passed!") - // while (lineIterator.hasPrevious()) - // lineIterator.previous() - // println(lineIterator.asSequence().joinToString("\n")) - } - - private fun reformatIfNeeded(line: String, lineIterator: MutableListIterator) { - if ('}' in line) - if ('{' in line) { // ie `repositories { mavenCentral() }` - check(line.last() == '}') - val second = line.dropLast(1).substringAfter('{') - val first = line.substringBefore('{') - lineIterator.apply { - set("$first {") - add(second) - add("}") - } - } else // ie `whatever}` - lineIterator.apply { - set(line.dropLast(1)) - add("}") - } - } - - infix fun validate(lineIterator: MutableListIterator) { - while (true) { - var line = lineIterator.next() - if (line == "}") break - when { - line.startsWith("javaVersion =") -> Fine - // line.startsWith("repositories {") -> Fine - line.startsWith("dependencies {") -> { - val configurations = listOf("api", "implementation", "runtimeOnly", "compileOnly") - while (true) { - line = lineIterator.next() - if (line == "}") break - check(configurations.any(line::startsWith)) - } - } - else -> when { - line.startsWith("mainClass =") && this is ValidationApplication -> Fine - else -> error("forbidden code in `$line`") - } - } - } - } -} - -typealias Fine = Unit \ No newline at end of file diff --git a/gradle/enforcer/.gitattributes b/gradle/enforcer/.gitattributes deleted file mode 100644 index 097f9f98..00000000 --- a/gradle/enforcer/.gitattributes +++ /dev/null @@ -1,9 +0,0 @@ -# -# https://help.github.com/articles/dealing-with-line-endings/ -# -# Linux start script should use lf -/gradlew text eol=lf - -# These are Windows script files and should use crlf -*.bat text eol=crlf - diff --git a/gradle/enforcer/.gitignore b/gradle/enforcer/.gitignore deleted file mode 100644 index 1b6985c0..00000000 --- a/gradle/enforcer/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Ignore Gradle project-specific cache directory -.gradle - -# Ignore Gradle build output directory -build diff --git a/gradle/enforcer/build.gradle.kts b/gradle/enforcer/build.gradle.kts deleted file mode 100644 index bd68245a..00000000 --- a/gradle/enforcer/build.gradle.kts +++ /dev/null @@ -1,63 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * This generated file contains a sample Gradle plugin project to get you started. - * For more details on writing Custom Plugins, please refer to https://docs.gradle.org/8.6/userguide/custom_plugins.html in the Gradle documentation. - * This project uses @Incubating APIs which are subject to change. - */ - -plugins { - // Apply the Java Gradle plugin development plugin to add support for developing Gradle plugins - `java-gradle-plugin` - - // Apply the Kotlin JVM plugin to add support for Kotlin. - alias(libs.plugins.jvm) -} - -repositories { - // Use Maven Central for resolving dependencies. - mavenCentral() -} - -testing { - suites { - // Configure the built-in test suite - val test by getting(JvmTestSuite::class) { - // Use Kotlin Test test framework - useKotlinTest("1.9.20") - } - - // Create a new test suite - val functionalTest by registering(JvmTestSuite::class) { - // Use Kotlin Test test framework - useKotlinTest("1.9.20") - - dependencies { - // functionalTest test suite depends on the production code in tests - implementation(project()) - } - - targets { - all { - // This test suite should run after the built-in test suite has run its tests - testTask.configure { shouldRunAfter(test) } - } - } - } - } -} - -gradlePlugin { - // Define the plugin - val greeting by plugins.creating { - id = "org.example.greeting" - implementationClass = "org.example.EnforcerPlugin" - } -} - -gradlePlugin.testSourceSets.add(sourceSets["functionalTest"]) - -tasks.named("check") { - // Include functionalTest as part of the check lifecycle - dependsOn(testing.suites.named("functionalTest")) -} diff --git a/gradle/enforcer/gradle.properties b/gradle/enforcer/gradle.properties deleted file mode 100644 index 18f452c7..00000000 --- a/gradle/enforcer/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file was generated by the Gradle 'init' task. -# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties - -org.gradle.parallel=true -org.gradle.caching=true - diff --git a/gradle/enforcer/gradle/libs.versions.toml b/gradle/enforcer/gradle/libs.versions.toml deleted file mode 100644 index 387b04dd..00000000 --- a/gradle/enforcer/gradle/libs.versions.toml +++ /dev/null @@ -1,5 +0,0 @@ -# This file was generated by the Gradle 'init' task. -# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format - -[plugins] -jvm = { id = "org.jetbrains.kotlin.jvm", version = "1.9.20" } diff --git a/gradle/enforcer/gradle/wrapper/gradle-wrapper.jar b/gradle/enforcer/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index d64cd4917707c1f8861d8cb53dd15194d4248596..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43462 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 diff --git a/gradle/enforcer/gradle/wrapper/gradle-wrapper.properties b/gradle/enforcer/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index a80b22ce..00000000 --- a/gradle/enforcer/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradle/enforcer/gradlew b/gradle/enforcer/gradlew deleted file mode 100755 index 1aa94a42..00000000 --- a/gradle/enforcer/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradle/enforcer/gradlew.bat b/gradle/enforcer/gradlew.bat deleted file mode 100644 index 25da30db..00000000 --- a/gradle/enforcer/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/gradle/enforcer/settings.gradle.kts b/gradle/enforcer/settings.gradle.kts deleted file mode 100644 index 562e10ef..00000000 --- a/gradle/enforcer/settings.gradle.kts +++ /dev/null @@ -1,9 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.6/userguide/multi_project_builds.html in the Gradle documentation. - * This project uses @Incubating APIs which are subject to change. - */ - -rootProject.name = "gradle-enforcer" diff --git a/gradle/enforcer/src/functionalTest/kotlin/org/example/EnforcerPluginFunctionalTest.kt b/gradle/enforcer/src/functionalTest/kotlin/org/example/EnforcerPluginFunctionalTest.kt deleted file mode 100644 index a4e5eb8e..00000000 --- a/gradle/enforcer/src/functionalTest/kotlin/org/example/EnforcerPluginFunctionalTest.kt +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This Kotlin source file was generated by the Gradle 'init' task. - */ -package org.example - -import java.io.File -import kotlin.test.assertTrue -import kotlin.test.Test -import org.gradle.testkit.runner.GradleRunner -import org.junit.jupiter.api.io.TempDir - -/** - * A simple functional test for the 'org.example.greeting' plugin. - */ -class EnforcerPluginFunctionalTest { - - @field:TempDir - lateinit var projectDir: File - - private val buildFile by lazy { projectDir.resolve("build.gradle") } - private val settingsFile by lazy { projectDir.resolve("settings.gradle") } - - @Test fun `can run task`() { - // Set up the test build - settingsFile.writeText("") - buildFile.writeText(""" - plugins { - id('org.example.greeting') - } - """.trimIndent()) - - // Run the build - val runner = GradleRunner.create() - runner.forwardOutput() - runner.withPluginClasspath() - runner.withArguments("greeting") - runner.withProjectDir(projectDir) - val result = runner.build() - - // Verify the result - assertTrue(result.output.contains("Hello from plugin 'org.example.greeting'")) - } -} diff --git a/gradle/enforcer/src/main/kotlin/org/example/EnforcerPlugin.kt b/gradle/enforcer/src/main/kotlin/org/example/EnforcerPlugin.kt deleted file mode 100644 index 666de90b..00000000 --- a/gradle/enforcer/src/main/kotlin/org/example/EnforcerPlugin.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This Kotlin source file was generated by the Gradle 'init' task. - */ -package org.example - -import org.gradle.api.Project -import org.gradle.api.Plugin - -/** - * A simple 'hello world' plugin. - */ -class EnforcerPlugin: Plugin { - override fun apply(project: Project) { - // Register a task -// project.tasks.register("greeting") { task -> -// task.doLast { -// println("Hello from plugin 'org.example.greeting'") -// } -// } -// project.extensions.cr - } -} diff --git a/gradle/enforcer/src/test/kotlin/org/example/EnforcerPluginTest.kt b/gradle/enforcer/src/test/kotlin/org/example/EnforcerPluginTest.kt deleted file mode 100644 index cfba71b7..00000000 --- a/gradle/enforcer/src/test/kotlin/org/example/EnforcerPluginTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This Kotlin source file was generated by the Gradle 'init' task. - */ -package org.example - -import org.gradle.testfixtures.ProjectBuilder -import kotlin.test.Test -import kotlin.test.assertNotNull - -/** - * A simple unit test for the 'org.example.greeting' plugin. - */ -class EnforcerPluginTest { - @Test fun `plugin registers task`() { - // Create a test project and apply the plugin - val project = ProjectBuilder.builder().build() - project.plugins.apply("org.example.greeting") - - // Verify the result - assertNotNull(project.tasks.findByName("greeting")) - } -} diff --git a/gradle/generate-catalog.sh b/gradle/generate-catalog.sh deleted file mode 100755 index 12b067c1..00000000 --- a/gradle/generate-catalog.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -dir=$(dirname "$0") -pom="$dir/../pom.xml" -mvn -B -f "$pom" help:effective-pom | - grep -A9999999 '^' > eff.xml -"$dir/catalog.kts" eff.xml -rm eff.xml diff --git a/gradle/gradle.properties b/gradle/gradle.properties deleted file mode 100644 index 18f452c7..00000000 --- a/gradle/gradle.properties +++ /dev/null @@ -1,6 +0,0 @@ -# This file was generated by the Gradle 'init' task. -# https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties - -org.gradle.parallel=true -org.gradle.caching=true - diff --git a/gradle/gradlew.bat b/gradle/gradlew.bat deleted file mode 100644 index 107acd32..00000000 --- a/gradle/gradlew.bat +++ /dev/null @@ -1,89 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/gradle/manifest-dependencies/build.gradle.kts b/gradle/manifest-dependencies/build.gradle.kts deleted file mode 100644 index 0080f910..00000000 --- a/gradle/manifest-dependencies/build.gradle.kts +++ /dev/null @@ -1,65 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * This generated file contains a sample Gradle plugin project to get you started. - * For more details on writing Custom Plugins, please refer to https://docs.gradle.org/8.7/userguide/custom_plugins.html in the Gradle documentation. - * This project uses @Incubating APIs which are subject to change. - */ - -plugins { - // Apply the Java Gradle plugin development plugin to add support for developing Gradle plugins - `java-gradle-plugin` - - // Apply the Kotlin JVM plugin to add support for Kotlin. - embeddedKotlin("jvm") - - `kotlin-dsl` -} - -repositories { - // Use Maven Central for resolving dependencies. - mavenCentral() -} - -testing { - suites { - // Configure the built-in test suite - val test by getting(JvmTestSuite::class) { - // Use Kotlin Test test framework - useKotlinTest(embeddedKotlinVersion) - } - - // Create a new test suite - val functionalTest by registering(JvmTestSuite::class) { - // Use Kotlin Test test framework - useKotlinTest(embeddedKotlinVersion) - - dependencies { - // functionalTest test suite depends on the production code in tests - implementation(project()) - } - - targets { - all { - // This test suite should run after the built-in test suite has run its tests - testTask.configure { shouldRunAfter(test) } - } - } - } - } -} - -gradlePlugin { - // Define the plugin - val greeting by plugins.creating { - id = "org.example.base" - implementationClass = "org.example.GradleBasePlugin" - } -} - -gradlePlugin.testSourceSets.add(sourceSets["functionalTest"]) - -tasks.named("check") { - // Include functionalTest as part of the check lifecycle - dependsOn(testing.suites.named("functionalTest")) -} diff --git a/gradle/manifest-dependencies/settings.gradle.kts b/gradle/manifest-dependencies/settings.gradle.kts deleted file mode 100644 index 23cdc1e6..00000000 --- a/gradle/manifest-dependencies/settings.gradle.kts +++ /dev/null @@ -1,10 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.7/userguide/multi_project_builds.html in the Gradle documentation. - * This project uses @Incubating APIs which are subject to change. - */ - -rootProject.name = "gradle-manifest-dependencies" -include("plugin") diff --git a/gradle/manifest-dependencies/src/functionalTest/kotlin/org/example/GradleBasePluginFunctionalTest.kt b/gradle/manifest-dependencies/src/functionalTest/kotlin/org/example/GradleBasePluginFunctionalTest.kt deleted file mode 100644 index 228c8ffd..00000000 --- a/gradle/manifest-dependencies/src/functionalTest/kotlin/org/example/GradleBasePluginFunctionalTest.kt +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This source file was generated by the Gradle 'init' task - */ -package org.example - -import java.io.File -import kotlin.test.assertTrue -import kotlin.test.Test -import org.gradle.testkit.runner.GradleRunner -import org.junit.jupiter.api.io.TempDir - -/** - * A simple functional test for the 'org.example.greeting' plugin. - */ -class GradleBasePluginFunctionalTest { - - @field:TempDir - lateinit var projectDir: File - - private val buildFile by lazy { projectDir.resolve("build.gradle") } - private val settingsFile by lazy { projectDir.resolve("settings.gradle") } - - @Test fun `can run task`() { - // Set up the test build - settingsFile.writeText("") - buildFile.writeText(""" - plugins { - id('org.example.greeting') - } - """.trimIndent()) - - // Run the build - val runner = GradleRunner.create() - runner.forwardOutput() - runner.withPluginClasspath() - runner.withArguments("greeting") - runner.withProjectDir(projectDir) - val result = runner.build() - - // Verify the result - assertTrue(result.output.contains("Hello from plugin 'org.example.greeting'")) - } -} diff --git a/gradle/manifest-dependencies/src/main/kotlin/org/example/GradleBasePlugin.kt b/gradle/manifest-dependencies/src/main/kotlin/org/example/GradleBasePlugin.kt deleted file mode 100644 index 7161680f..00000000 --- a/gradle/manifest-dependencies/src/main/kotlin/org/example/GradleBasePlugin.kt +++ /dev/null @@ -1,37 +0,0 @@ -/* - * This source file was generated by the Gradle 'init' task - */ -package org.example - -import org.gradle.api.Project -import org.gradle.api.Plugin -import org.gradle.configurationcache.extensions.capitalized -import org.gradle.jvm.tasks.Jar -import org.gradle.kotlin.dsl.attributes -import org.gradle.kotlin.dsl.get -import org.gradle.kotlin.dsl.getByName -import org.gradle.kotlin.dsl.named - -/** - * A simple 'hello world' plugin. - */ -class GradleBasePlugin : Plugin { - override fun apply(project: Project) { - project.tasks.named("jar") { - // https://docs.gradle.org/current/userguide/java_plugin.html#tab:configurations - val main = listOf("compileClasspath", "runtimeClasspath") - // val test = listOf("testCompileClasspath", "testRuntimeClasspath") - doFirst { - manifest { - project.configurations.filter { it.name in main }.forEach { c -> - val name = "Dependencies-" + c.name.substringBefore("Classpath").capitalized() - val deps = c.resolvedConfiguration.resolvedArtifacts - .map { a -> a.moduleVersion.id.toString() + a.classifier?.let { ":$it" }.orEmpty() } - .sorted().joinToString(";") - attributes(name to deps) - } - } - } - } - } -} diff --git a/gradle/manifest-dependencies/src/test/kotlin/org/example/GradleBasePluginTest.kt b/gradle/manifest-dependencies/src/test/kotlin/org/example/GradleBasePluginTest.kt deleted file mode 100644 index a0c50778..00000000 --- a/gradle/manifest-dependencies/src/test/kotlin/org/example/GradleBasePluginTest.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This source file was generated by the Gradle 'init' task - */ -package org.example - -import org.gradle.testfixtures.ProjectBuilder -import kotlin.test.Test -import kotlin.test.assertNotNull - -/** - * A simple unit test for the 'org.example.greeting' plugin. - */ -class GradleBasePluginTest { - @Test fun `plugin registers task`() { - // Create a test project and apply the plugin - val project = ProjectBuilder.builder().build() - project.plugins.apply("org.example.greeting") - - // Verify the result - assertNotNull(project.tasks.findByName("greeting")) - } -} diff --git a/gradle/platform/build.gradle.kts b/gradle/platform/build.gradle.kts deleted file mode 100644 index 08c00de9..00000000 --- a/gradle/platform/build.gradle.kts +++ /dev/null @@ -1,98 +0,0 @@ -plugins { - `java-platform` - publish - // id("org.gradlex.java-ecosystem-capabilities-base") // only rules - // id("org.gradlex.logging-capabilities") // logging extension -} - -group = "org.scijava" -version = "0.13" //(effXml / "version").toString() - -//operator fun GPathResult.div(child: String) = children().find { (it!! as NodeChild).name() == child } as GPathResult - -//val effXml = XmlSlurper().parse(projectDir.resolve("eff.xml")) - -javaPlatform { - allowDependencies() -} - -val runtimeDeps = listOf("org.antlr:antlr-runtime", - "xalan:serializer", - "xalan:xalan", - "com.github.vbmacher:java-cup-runtime", - "nz.ac.waikato.cms.weka.thirdparty:java-cup-11b-runtime", - "org.jogamp.gluegen:gluegen-rt-main", - "org.jogamp.gluegen:gluegen-rt", - "org.jogamp.joal:joal", - "org.jogamp.jocl:jocl", - "org.jogamp.jogl:jogl-all-main", - "org.jogamp.jogl:jogl-all", - "org.jogamp.jogl:jogl-all-noawt", - "com.nativelibs4java:bridj", - "org.bytedeco:ffmpeg", - "org.bytedeco:hdf5", - "org.bytedeco:leptonica", - "org.bytedeco:openblas", - "org.bytedeco:opencv", - "org.bytedeco:tesseract", - "org.jline:jline-native", - "com.github.jnr:jffi", - "org.jzy3d:jzy3d-native-jogl-awt", - "org.jzy3d:jzy3d-native-jogl-swing") - -val jogampNatives = listOf("org.jogamp.gluegen:gluegen-rt-natives-", - "org.jogamp.jogl:jogl-all-natives-", - "org.jogamp.gluegen:gluegen-rt-natives-", - "org.jogamp.jogl:jogl-all-natives-") - -dependencies { - - // val deps = effXml / "dependencyManagement" / "dependencies" - constraints { - // deps.children().forEach { - // val node = it!! as NodeChild - // val g = node / "groupId" - // val a = node / "artifactId" - // val v = node / "version" - // } - versionCatalogs.forEach { versionCatalog -> - // println("catalog ${versionCatalog.name}") - versionCatalog.libraryAliases.forEach { lib -> - val dep = versionCatalog.findLibrary(lib).get().get() - val ga = dep.module.run { "$group:$name" } - // println(dep) - if (ga in runtimeDeps || jogampNatives.any { it.startsWith(ga) }) - runtime(dep) //.also { println("runtime($dep)") } - else - api(dep) //.also{ println("api($dep)") } - } - } - } - - // println(libs.my.lib.get()) - // api(platform("com.fasterxml.jackson:jackson-bom:" + libs.com.fasterxml.jackson.core.jacksonCore.get().version)) -// api(platform("jakarta.platform:jakarta.jakartaee-bom:10.0.0")) - // api(platform("com.google.api-client:google-api-client-bom:" + libs.com.google.api.client.googleApiClient.get().version)) - // api(platform("com.google.api:gax-bom:" + libs.com.google.api.gax.get().version)) - // api(platform("com.google.api:gapic-generator-java-bom:" + libs.com.google.api.grpc.protoGoogleCommonProtos.get().version)) - // api(platform("com.google.auth:google-auth-library-bom:" + libs.com.google.auth.googleAuthLibraryAppengine.get().version)) - // // no google auto-value bom - // api(platform("com.google.cloud:google-cloud-core-bom:" + libs.com.google.cloud.googleCloudCore.get().version)) -} - - - - -tasks { - // named("generatePomFileForSciJavaPlatformPublication") { - // pom.withXml { - // asNode().appendNode("parent").apply { - // appendNode("groupId", group) - // appendNode("artifactId", project.name) - // appendNode("version", version) - // appendNode("relativePath") - // } - // println(asNode().name()) - // } - // } -} \ No newline at end of file diff --git a/gradle/platform/buildSrc/build.gradle.kts b/gradle/platform/buildSrc/build.gradle.kts deleted file mode 100644 index 790460f9..00000000 --- a/gradle/platform/buildSrc/build.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ - -plugins { - `kotlin-dsl` -} - -repositories { - mavenCentral() -// gradlePluginPortal() -} - -//dependencies { -// implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.9.10") -//} \ No newline at end of file diff --git a/gradle/platform/buildSrc/settings.gradle.kts b/gradle/platform/buildSrc/settings.gradle.kts deleted file mode 100644 index 8ae9b3a4..00000000 --- a/gradle/platform/buildSrc/settings.gradle.kts +++ /dev/null @@ -1,4 +0,0 @@ -// This is an empty umbrella build including all the component builds. -// This build is not necessarily needed. The component builds work independently. - -rootProject.name = "buildSrc" \ No newline at end of file diff --git a/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts b/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts deleted file mode 100644 index ece9665f..00000000 --- a/gradle/platform/buildSrc/src/main/kotlin/publish.gradle.kts +++ /dev/null @@ -1,235 +0,0 @@ -plugins { - `maven-publish` -} - -publishing { - publications { - repositories { - maven { - name = "sciJava" -// credentials(PasswordCredentials::class) -// url = uri("https://maven.scijava.org/content/repositories/releases") - url = uri("repo") - } - } - create("sciJavaPlatform") { - from(components["javaPlatform"]) - groupId = "org.scijava" - artifactId = "gradle-platform" - version = "0.13" - /*pom.withXml { - val nodes = Stack() - - nodes += asNode() - fun parent() = nodes.peek() - // Definition of `groupId` is redundant, because it's inherited from the parent - run { - val list = parent().children() as NodeList - require(list.removeIf { (it as Node).name().toString().substringAfter("{http://maven.apache.org/POM/4.0.0}") == "groupId" }) - } - - var i = 1 // 4.0.0 is first - - operator fun String.invoke(vararg values: Any?) { - for (value in values) { - val node = when (value) { - null -> parent().appendNode(this) - else -> parent().appendNode(this, value) - } - if (nodes.size == 1) { // only at `project` level - val list = parent().value() as NodeList - list.removeLast() - list.add(i++, node) - } - } - } - - // operator fun String.compareTo(value: Any): Int { - // return 0 - // } - - operator fun String.invoke(block: () -> Unit) { - val node = parent() - nodes += node.appendNode(this) - block() - if (nodes.size == 2) { // only as `project` child - val list = node.value() as NodeList - list.removeLast() - list.add(i++, parent()) - } - nodes.pop() - } - - // fun comment(text: String) { - // val builder = asString() - // builder.insert(builder.lastIndex - "".length, text.trimMargin()) - // } - - "parent" { - "groupId"(group) - "artifactId"(project.name) - "version"(version) - "relativePath"() - } - // - // - // - i += 3 - "name"("SciJava Parent POM") - "description"("This POM provides a parent from which participating projects can declare their build configurations. It ensures that projects all use a compatible build environment, including Java version, as well as versions of dependencies and plugins.") - "url"("https://scijava.org/") - "inceptionYear"("2011") - "organization" { - "name"("SciJava") - "url"("https://scijava.org/") - } - "licenses" { - "license" { - "name"("Unlicense") - "url"("https://unlicense.org/") - "distribution"("repo") - } - } - "developers" { - "developer" { - "id"("ctrueden") - "name"("Curtis Rueden") - "url"("https://imagej.net/people/ctrueden") - "roles" { - "role"("founder", "lead", "developer", "debugger", "reviewer", "support", "maintainer") - } - } - } - "contributors" { - operator fun String.minus(id: String) = "contributor" { - "name"(this) - "url"("https://imagej.net/people/$id") - "properties" { "id"(id) } - } - "Mark Hiner" - "hinerm" - "Johannes Schindelin" - "dscho" - "Sébastien Besson" - "sbesson" - "John Bogovic" - "bogovicj" - "Nicolas Chiaruttini" - "NicoKiaru" - "Barry DeZonia" - "bdezonia" - "Richard Domander" - "rimadoma" - "Karl Duderstadt" - "karlduderstadt" - "Jan Eglinger" - "imagejan" - "Gabriel Einsdorf" - "gab1one" - "Tiago Ferreira" - "tferr" - "contributor" { - "name"("David Gault") - "properties" { "id"("dgault") } - } - "Ulrik Günther" - "skalarproduktraum" - "Philipp Hanslovsky" - "hanslovsky" - "Stefan Helfrich" - "stelfrich" - "Cameron Lloyd" - "camlloyd" - "Hadrien Mary" - "hadim" - "Tobias Pietzsch" - "tpietzsch" - "Stephan Preibisch" - "StephanPreibisch" - "Stephan Saalfeld" - "axtimwalde" - "Deborah Schmidt" - "frauzufall" - "Lorenzo Scianatico" - "LoreScianatico" - "Jean - Yves Tinevez" - "tinevez" - "Christian Tischer" - "tischi" - "Gabriella Turek" - "turekg" - "contributor" { - "name"("Giuseppe Barbieri") - "properties" { "id"("elect") } - } - } - "mailingLists" { - "mailingList" { - "name"("SciJava") - "subscribe"("https://groups.google.com/group/scijava") - "unsubscribe"("https://groups.google.com/group/scijava") - "post"("scijava@googlegroups.com") - "archive"("https://groups.google.com/group/scijava") - } - } - "scm" { - "connection"("scm:git:https://github.com/scijava/pom-scijava") - "developerConnection"("scm:git:git@github.com:scijava/pom-scijava") - "tag"("HEAD") - "url"("https://github.com/scijava/pom-scijava") - } - "issueManagement" { - "system"("GitHub Issues") - "url"("https://github.com/scijava/pom-scijava/issues") - } - "ciManagement" { - "system"("GitHub Actions") - "url"("https: //github.com/scijava/pom-scijava/actions") - } - "properties" { - // HACK: The following list of allowed-to-be-duplicated classes - // facilitates intended combinations of artifacts: - // == - // Classes: com.google.inject.* - // Part of: com.google.inject:guice:no_aop - // Also in: org.sonatype.sisu:sisu-guice - // Enables: - // org.apache.maven:maven-core (guice) + - // org.apache.maven.shared:maven-common-artifact-filters (sisu-guice) - // == - // Class: javax.xml.namespace.QName - // Part of: Java Runtime Environment - // Also in: xml-apis:xml-apis, xpp3:xpp3 - // Enables: xml-apis:xml-apis + xpp3:xpp3 - // == - // TEMP: Until scijava/scripting-jruby#5 is resolved. - // Classes: jnr.ffi.* - // Part of: com.github.jnr:jnr-ffi - // Also in: org.jruby:jruby-core - // Enables: org.jruby:jruby-core + org.python:jython-slim (jnr-ffi) - // == - // Classes: org.apache.hadoop.yarn.*.package-info - // Part of: org.apache.hadoop:hadoop-yarn-* - // Enables: - // org.apache.hadoop:hadoop-yarn- + - // org.apache.hadoop:hadoop-yarn- - // == - // Classes: org.apache.spark.unused.UnusedStubClass - // Part of: org.apache.spark:spark-* - // Enables: org.apache.spark:spark-core_2.11 (spark-*) - // == - // Classes: org.eclipse.aether.* - // Part of: - // org.apache.maven.resolver:maven-resolver-api - // org.apache.maven.resolver:maven-resolver-util - // org.apache.maven.shared:maven-artifact-transfer - // org.eclipse.aether:aether-api - // org.eclipse.aether:aether-util - // Enables: dependence on Apache Maven libraries - // == - // Classes: org.hibernate.stat.ConcurrentStatisticsImpl - // Part of: org.hibernate:hibernate-core - // Also in: org.openmicroscopy:omero-blitz - // Enables: - // org.openmicroscopy:omero-blitz + - // org.openmicroscopy:omero-model (hibernate-core) - // == - // Classes: org.junit.runner.Runner - // Part of: junit:junit - // Also in: org.jmockit:jmockit - // Enables: junit:junit + org.jmockit:jmockit - // == - // Classes: org.jzy3d.plot3d.pipelines.* - // Part of: org.jzy3d:jzy3d-core, org.jzy3d:jzy3d-native-jogl-awt - // Enables: org.jzy3d:jzy3d-core + org.jzy3d:jzy3d-native-jogl-awt - "scijava.allowedDuplicateClasses"("com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.*") - // NB: The scijava.allowedDuplicateClasses property above makes it easier to - // append to the list of allowed duplicate classes in downstream projects. - // Simply override the property in your POM with something like this: - // "allowedDuplicateClasses"("\${scijava.allowedDuplicateClasses},com.example.AnotherDuplicate") - "allowedDuplicateClasses"("\${scijava.allowedDuplicateClasses}") - // NB: We override these properties to make the enforcer happy. - // You will need to override them in your POM, too... to valid values. - "license.licenseName"("N/A") - "license.copyrightOwners"("N/A") - } - }*/ - } - } -} \ No newline at end of file diff --git a/gradle/platform/eff.xml b/gradle/platform/eff.xml deleted file mode 100644 index 1bb3642d..00000000 --- a/gradle/platform/eff.xml +++ /dev/null @@ -1,6379 +0,0 @@ - - - - - - - - - - - - - - - 4.0.0 - - org.scijava - pom-scijava-base - 19.0.0 - - - org.scijava - pom-scijava - 38.0.0-SNAPSHOT - pom - SciJava Parent POM - This POM provides a parent from which participating projects can declare their build configurations. It ensures that projects all use a compatible build environment, including Java version, as well as versions of dependencies and plugins. - https://scijava.org/ - 2011 - - SciJava - https://scijava.org/ - - - - Unlicense - https://unlicense.org/ - repo - - - - - ctrueden - Curtis Rueden - https://imagej.net/people/ctrueden - - founder - lead - developer - debugger - reviewer - support - maintainer - - - - - - Mark Hiner - https://imagej.net/people/hinerm - - hinerm - - - - Johannes Schindelin - https://imagej.net/people/dscho - - dscho - - - - Sébastien Besson - https://imagej.net/people/sbesson - - sbesson - - - - John Bogovic - https://imagej.net/people/bogovicj - - bogovicj - - - - Nicolas Chiaruttini - https://imagej.net/people/NicoKiaru - - NicoKiaru - - - - Barry DeZonia - https://imagej.net/people/bdezonia - - bdezonia - - - - Richard Domander - https://imagej.net/people/rimadoma - - rimadoma - - - - Karl Duderstadt - https://imagej.net/people/karlduderstadt - - karlduderstadt - - - - Jan Eglinger - https://imagej.net/people/imagejan - - imagejan - - - - Gabriel Einsdorf - https://imagej.net/people/gab1one - - gab1one - - - - Tiago Ferreira - https://imagej.net/people/tferr - - tferr - - - - David Gault - - dgault - - - - Ulrik Günther - https://imagej.net/people/skalarproduktraum - - skalarproduktraum - - - - Philipp Hanslovsky - https://imagej.net/people/hanslovsky - - hanslovsky - - - - Stefan Helfrich - https://imagej.net/people/stelfrich - - stelfrich - - - - Cameron Lloyd - https://imagej.net/people/camlloyd - - camlloyd - - - - Hadrien Mary - https://imagej.net/people/hadim - - hadim - - - - Tobias Pietzsch - https://imagej.net/people/tpietzsch - - tpietzsch - - - - Stephan Preibisch - https://imagej.net/people/StephanPreibisch - - StephanPreibisch - - - - Stephan Saalfeld - https://imagej.net/people/axtimwalde - - axtimwalde - - - - Deborah Schmidt - https://imagej.net/people/frauzufall - - frauzufall - - - - Lorenzo Scianatico - https://imagej.net/people/LoreScianatico - - LoreScianatico - - - - Jean-Yves Tinevez - https://imagej.net/people/tinevez - - tinevez - - - - Christian Tischer - https://imagej.net/people/tischi - - tischi - - - - Gabriella Turek - https://imagej.net/people/turekg - - turekg - - - - - - SciJava - https://groups.google.com/group/scijava - https://groups.google.com/group/scijava - scijava@googlegroups.com - https://groups.google.com/group/scijava - - - - scm:git:https://github.com/scijava/pom-scijava - scm:git:git@github.com:scijava/pom-scijava - https://github.com/scijava/pom-scijava - - - GitHub Issues - https://github.com/scijava/pom-scijava/issues - - - GitHub Actions - https://github.com/scijava/pom-scijava/actions - - - 3.4.2 - 3.4.2 - 2.0.1 - 0.5.4 - 2.0.2 - 2.0.2 - 1.11.0 - 1.18.0 - 3.0.1 - 3.0.1 - 1.2.10 - 2.1.1 - 2.0.2 - 2.0.1 - 3.0.0 - 3.0.6 - 2.0.7 - 2.5.0 - 3.0.3 - 2.1.0 - 2.1.0 - 1.0.6 - 2.1.8 - 2.1.2 - 2.1.2 - 2.3.0 - 2.3.0 - 2.0.4 - 2.0.3 - 2.0.1 - 2.0.8 - 2.1.1 - 3.1.3 - 2.0.1 - 2.0.1 - 2.0.1 - 1.0.2 - 2.3.5 - 1.1.5 - 1.1.1 - 2.0.2 - 2.0.1 - 4.2.2 - 4.2.2 - 2.0.2 - 3.0.1 - 3.0.1 - 2.0.1 - 2.0.0 - 2.0.1 - 3.0.0 - 4.1.2 - 4.1.2 - 2.0.2 - 2.0.1 - 5.0.0 - 5.0.0 - 2.0.1 - 2.0.1 - 2.0.1 - 7.1.1 - 2.1.1 - 1.6.2 - 1.6.2 - 3.0.1 - 2.0.0 - 2.0.0 - 1.1.2 - 1.1.2 - 2.0.2 - 2.0.2 - 2.0.5 - 4.2.1 - 2.0.2 - 5.0.25 - 4.3.4 - 2.0.3 - 2.0.3 - 2.0.1 - 3.1.10 - 1.0.5 - 2.1.1 - 2.1.1 - 2.0.2 - 2.0.2 - 2.1.2 - 2.0.1 - 3.1.9 - 3.1.9 - 1.7-fiji4 - 1.1.4 - 1.1.4 - 2.0.1 - 2.1.1 - 2.1.0 - 25.0.2 - 25.0.2 - 2.0.1 - 2.0.1 - 3.1.4 - 0.1.2 - 1.2.5 - 1.4.0 - 1.2.1 - 3.2.0 - 2.0.1 - 1.2.1 - 1.3.1 - 7.11.1 - 3.3.4 - 1.3.10 - 1.3.10 - 2.0.4 - 2.2.0 - 3.0.4 - 3.0.4 - 2.0.3 - 1.0.3 - 2.0.3 - 2.0.1 - 2.5.0 - 2.5.0 - 2.0.3 - 2.01.4 - <_3D_Blob_Segmentation.version>3.0.2 - <_3D_Objects_Counter.version>2.0.1 - <_3D_Viewer.version>4.0.5 - 1.2.7 - com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* - 1.10.14 - 1.10.14 - 3.5.3 - 2.7.7 - 3.5.3 - 2.7.7 - 3.5.3 - 4.11.1 - 4.11.1 - 2.26.0 - 2.33 - 2.33 - 9.6 - 9.6 - 9.6 - 9.6 - 9.6 - 1.10.4 - 1.10.4 - 3.3.1 - ${package-guess} - 1.12.667 - 1.12.667 - 1.12.667 - 2.6.13 - 2.6.13 - 0.4.2 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 10.4.13 - 3.1.2 - 1.0.0-beta-34 - 6.2.4 - 9.1.0 - 9.1.0 - 1.0.0 - 7.2.0 - 7.2.0 - 7.2.0 - 2.1.4 - 2.1.4 - 7.0.18 - 7.0.18 - 7.0.18 - 7.0.18 - 7.0.18 - 7.0.18 - 0.7.0 - 3.5.0 - 3.2.0 - 2.0.SP1 - 3.3.0 - 3.3.0 - 1.2.12 - 1.2.12 - 1.2.25 - 3.42.0 - 19.04.1 - 2.2.10 - 2.5.0.1 - 1.8.1.1 - 2.3.0.4 - 2.5.1.4 - 2.5.3.1 - 1.9.0.1 - 0.32.1.1 - 0.32.2.0 - 2.7 - 1.12.667 - 1.12.667 - 5.6.0 - 1.3.1 - 1.11.9 - 2.16.1 - 2.16.1 - 2.16.1 - 2.16.1 - 2.16.1 - 3.3.1 - 3.3.0 - 3.4.0 - 2.304 - 3.4 - 1.3.13 - 0.10.4 - 2.2.16 - 3.1.19 - 1.5.5-11 - 0.12.0 - 4.2.2 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.26.0 - 2.43.0 - 2.43.0 - 2.43.0 - 2.34.0 - 1.29.0 - 1.23.0 - 1.23.0 - 1.23.0 - 1.10.4 - 1.10.4 - 2.33.0 - 2.33.0 - 0.127.13 - 1.38.0 - 2.34.0 - 2.10.1 - 2.25.0 - 33.0.0-jre - 1.44.1 - 1.44.1 - 1.44.1 - 1.44.1 - 1.44.1 - 1.44.1 - 2.8 - 3.23.0 - 3.23.0 - 3.23.0 - 1.7 - 5.5.13.3 - 0.1.55 - 1.1.3 - 5.3 - 5.3 - 5.3 - 0.7.0 - 5.9 - 4.12.0 - 3.8.0 - 1.1.3 - 3.6.5 - 3.6.5 - 1.9.4 - 1.9.4 - 1.6.0 - 1.6.0 - 1.16.1 - 1.16.1 - 3.2.2 - 3.2.2 - 4.4 - 1.26.0 - 1.10.0 - 2.15.1 - 2.15.1 - 2.6 - 2.6 - 3.14.0 - 1.3.0 - 1.3.0 - 3.6.1 - 2.12.0 - 1.11.0 - 0.4.8 - 26 - 26 - 1.9.10 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 - 4.3 - 20151125 - 0.41 - 2.25.0 - 2.25.0 - 3.2.0 - - 0.12.0 - 1.7.0 - 6.1.1-1.5.10 - 2.1.3 - 2.15.0 - 2.304 - 3.4 - 7.2.0 - 7.2.0 - 7.2.0 - 2.23.0 - 1.6.2 - 2.43.0 - 2.43.0 - 2.43.0 - 3.6.5 - 2.5.0 - 2.5.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 2.3.0 - 1.23.0 - 1.23.0 - 1.23.0 - 1.23.0 - 2.33.0 - 2.33.0 - 0.127.13 - 1.38.0 - 2.34.0 - 1.44.1 - 1.44.1 - 1.44.1 - 1.44.1 - 1.44.1 - 1.44.1 - 1.0.3 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 1.5 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 1.62.2 - 1.62.2 - 2.10.1 - 33.0.0-jre - 1.14.3-1.5.10 - 1.8.0.10 - 1.8.0.10 - 4.5.14 - 4.4.16 - 4.5.14 - 0.3.0 - 0.3.0 - 3.6.5 - 1.54h - 1.2.6 - 2.0.4 - 0.2.0 - 6.0.2 - 1.2.1 - 0.7.5 - 0.1.2 - 0.8.1 - 0.7.1 - 1.0.0-5.6 - 1.0.0-5.6 - 0.1.3 - 2.0.0 - 0.1.1 - 0.8.1 - 0.3.1 - 0.3.2 - 0.3.3 - 0.8.4 - 0.2.0 - 1.1.7 - 0.3.1 - 1.0.1 - 1.0.1 - 2.15.0 - 1.54h - 2.15.0 - 0.2.1 - 0.3.1 - 0.14.0 - 1.0.0-beta-17 - 2.0.1 - 2.0.0 - 0.12.0 - 4.0.1 - 0.14.1 - 1.0.0 - 6.3.0 - 1.9.0 - 4.7.5 - 1.62.2 - 0.3.0 - 4.1.1 - 0.6.1 - 0.2.2 - 1.1.1 - 0.3.1 - 0.9.0 - 0.17.1 - 0.46.0 - 5.5.13.3 - 2.5.2 - 2.8 - 1.6.0-scijava-2 - 1.6.0-scijava-2 - 2.21.22 - 2.16.1 - 2.16.1 - 2.16.1 - 2.16.1 - 2.16.1 - 2.16.1 - 0.8.11 - 1.1.3 - 1.1.3 - 1.1.3 - 1.0.3 - 1.7.2 - 1.7.2 - 1.6.0-scijava-2 - 1.5.10 - 1.5.10 - - - 8.8.3 - 3.30.2-GA - 2.0.SP1 - 1.1.3 - 1.0.1 - 1.7.36 - 1.0.58 - 2.0.6.1 - 2.4.2 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 1.3.13 - 1.5.4 - 3.4.3 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 4.2.2 - 19.04.1 - 0.14 - 3.0.4 - 3.0.4 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 2.14.6 - 2.14.6 - 2.14.6 - 3.25.1 - 1.37 - 1.37 - 1.37 - 1.49 - 5.14.0 - 5.14.0 - 0.10.4 - 2.2.16 - 3.1.19 - 2.5.0 - 2.0.5 - 2.12.7 - 2.12.7 - 1.7.2 - 2.5.0 - 2.5.0 - 2.5.0 - 1.10.5 - 2.2.1 - 2.80b11 - 2.80b11 - 0.2.1 - 0.1.55 - 1.4 - 20240205 - 0.7.4-scijava - 5.10.2 - 5.10.2 - 5.10.2 - 5.10.2 - 5.10.2 - 5.10.2 - 4.13.2 - 4.13.2 - 0.2.4 - 0.2.4 - 2.7.3 - 2.7.3 - 1.1.3 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.8.0 - 1.8.0 - 1.8.0 - 5.6.0 - 0.1.17 - 0.3.11 - 3.3.0 - 1.1.10 - 1.84.1-1.5.10 - 1.0.2 - 1.12.0 - 1.12.0 - 1.12.0 - 2.4.0 - N/A - **/script_templates/** - N/A - This POM provides a parent from which participating projects can declare their build configurations. It ensures that projects all use a compatible build environment, including Java version, as well as versions of dependencies and plugins. - 2.20.0 - 2.20.0 - 2.20.0 - 1.2.12 - 1.2.12 - 1.2.12 - 1.8.0 - - 3.1.0 - 3.1.0 - 0.13.1 - 3.6.0 - 3.3.2 - 3.3.2 - 3.8.1 - 3.9.6 - 3.6.1 - 3.1.1 - 3.4.1 - 3.2.5 - 3.1.0 - 1.45 - 3.4.0 - 3.1.1 - 3.6.0 - 3.3.0 - 3.6.3 - 3.11.0 - 3.11.0 - 3.5.0 - 3.0.1 - 3.3.1 - 3.5.2 - 3.12.1 - 3.3.0 - 3.2.5 - yyyy-MM-dd'T'HH:mm:ssZ - 8 - 8 - 8 - 8 - 8 - false - 5.3.6 - 5.3 - 5.3 - 5.3 - 5.3 - 20151125 - 2.2.2 - 1.3.1 - 2.19.0 - 2.19.0 - 1.5.0 - 1.5.0 - 1.5.0 - 1.5.0 - 3.2.7 - 0.2.0 - 4.0.2 - 1.1.1 - 4.0.0 - 2.1.0 - 4.0.2 - 7.0.0 - 1.3.2 - 6.0.1 - 1.2.1 - 1.0.2 - 3.1.3 - 2.5.0 - 1.2.7 - 0.4.8 - 2.2.10 - 2.5.0.1 - 1.8.1.1 - 2.3.0.4 - 2.5.1.4 - 2.5.3.1 - 1.9.0.1 - 0.32.1.1 - 0.32.2.0 - 1.54h - 1.2.6 - 2.0.4 - 0.2.0 - 6.0.2 - 1.2.1 - 0.7.5 - 0.1.2 - 0.8.1 - 0.7.1 - 1.0.0-5.6 - 1.0.0-5.6 - 0.1.3 - 2.0.0 - 0.1.1 - 0.8.1 - 0.3.1 - 0.3.2 - 0.3.3 - 0.8.4 - 0.2.0 - 1.1.7 - 0.3.1 - 1.0.1 - 1.0.1 - 2.15.0 - 0.1.4 - 0.2.1 - 0.3.1 - 0.14.0 - 1.0.0-beta-17 - 2.0.1 - 2.0.0 - 0.12.0 - 4.0.1 - 0.14.1 - 1.0.0 - 6.3.0 - 5.14.0 - 5.14.0 - 1.2.10 - 3.2.7 - 0.2.0 - 3.0.3 - 1.6.13 - 3.9.6 - 3.3 - 45.1.1 - 4.12.0 - 3.8.0 - 1.0.1 - 6.0.21 - 5.3.8 - 6.3.4 - 7.2.0 - 7.2.0 - 7.2.0 - 7.2.0 - 7.2.0 - 0.2.4 - 5.7.2 - 5.6.4 - 5.5.2 - 5.9.0 - 5.6.13 - 5.5.15 - 5.7.5 - 5.6.10 - 0.1.4 - 0.3.26-1.5.10 - 5.9 - 4.9.0-1.5.10 - 4.3.4 - 3.5.3 - 3.5.3 - 4.11.1 - 4.11.1 - 1.10.14 - 1.10.14 - 4.4 - 1.26.0 - 1.10.0 - 3.14.0 - 3.6.1 - 2.12.0 - 1.11.0 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.0.18 - 4.5.14 - 4.4.16 - 4.5.14 - 2.5.2 - 2.21.22 - 2.20.0 - 2.20.0 - 3.9.6 - 3.11.0 - 0.13.1 - 3.3.2 - 5.2.5 - 5.2.5 - 5.2.5 - 5.2.5 - 5.2.5 - 5.2.5 - 2.4.8 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 1.17 - 2.9 - 7.0.18 - 7.0.18 - 7.0.18 - 7.0.18 - 7.0.18 - 6.1.1-1.5.10 - 1.14.3-1.5.10 - 1.5.10 - 1.5.10 - 1.84.1-1.5.10 - 0.3.26-1.5.10 - 4.9.0-1.5.10 - 5.3.4-1.5.10 - 3.42.0 - 2.2.0 - 4.0.0 - 11.1.0 - 11.1.0 - 11.1.0 - 11.1.0 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 9.4.54.v20240208 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 4.3 - 0.41 - 1.1.5 - 1.0.2 - 4.0.2 - 1.1.1 - 4.0.0 - 2.1.0 - 4.0.2 - 7.0.0 - 1.3.2 - 6.0.1 - 1.2.1 - 3.1.3 - 3.30.2-GA - 2.0.6.1 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.9.22 - 1.8.0 - 1.8.0 - 1.5.4 - 3.4.3 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 1.4.0 - 0.14 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 3.25.1 - 1.49 - 2.0.5 - 2.5.0 - 2.5.0 - 1.7.2 - 1.7.2 - 1.7.2 - 2.5.0 - 2.5.0 - 2.5.0 - 2.5.0 - 1.10.5 - 2.80b11 - 1.0.58 - 2.2.1 - 20240205 - 5.10.2 - 5.10.2 - 5.10.2 - 5.10.2 - 5.10.2 - 5.10.2 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 2.2.1 - 1.0.1 - 1.8.0 - 3.1.0 - 2.19.0 - 4.2.1 - 3.3 - 45.1.1 - 1.37 - 1.37 - 5.3.6 - 1.0.1 - 6.0.21 - 5.3.8 - 6.3.4 - 5.7.2 - 5.6.4 - 5.5.2 - 5.9.0 - 5.6.13 - 5.5.15 - 5.7.5 - 5.6.10 - 9.6 - 9.6 - 9.6 - 9.6 - 9.6 - 42.7.2 - 2.7.3 - 0.4.2 - 1.6.0-scijava-2 - 1.6.0-scijava-2 - 2.4.2 - 0.7.4-scijava - 2.2.2 - 2.5.0 - 3.1.0 - 0.1.2 - 2.98.0 - 2.0.3 - 0.1.2 - 0.3.0 - 0.1.0 - 1.0.0-beta-3 - 1.0.6 - 1.0.1 - 0.2.0 - 0.2.4 - 0.3.1 - 0.1.3 - 0.1.4 - 2.0.4 - 1.0.2 - 0.1.7 - 1.0.1 - 1.1.0 - 0.2.1 - 1.0.0 - 0.4.1 - 0.1.6 - 1.0.0 - 0.4.1 - 1.0.0 - 0.3.1 - 1.0.1 - 0.2.1 - 0.5.3 - 0.3.0 - 0.2.3 - 0.3.2 - 1.0.2 - 2.0.8 - 1.6.0-scijava-2 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 0.2.1 - 2.7 - 2.6.0 - 2.6.0 - 3.2.9.RELEASE - 3.2.9.RELEASE - 3.2.9.RELEASE - 1.12.0 - 1.12.0 - 1.12.0 - 1.12.0 - 1.12.0 - 1.6.8 - 1.9 - 2.2 - ${package-guess} - 2.0.1 - 3.0.2 - 3.0.2 - 3.1.0 - 4.7.5 - 2.2.0 - 4.0.0 - 5.2.5 - 5.2.5 - 5.2.5 - 5.2.5 - 5.2.5 - 5.2.5 - 42.7.2 - - UTF-8 - UTF-8 - 2.34.0 - 1.29.0 - 1.12.0 - 3.23.0 - 3.23.0 - 3.23.0 - 3.23.0 - 1.7 - 1.11.9 - 3.0.8 - 2.0.1 - sonatype-oss-release - 1.2.25 - 0.28.1 - 0.15.0 - 3.4.0 - 3.0.2 - 2.0.1 - 4.0.5 - 3.4.2 - 2.0.1 - 0.5.4 - 2.0.2 - 1.11.0 - 1.18.0 - 3.0.1 - 3.0.1 - 2.1.1 - 2.0.2 - 2.0.1 - 3.0.0 - 3.0.6 - 2.0.7 - 2.5.0 - 3.0.3 - 2.1.0 - 1.0.6 - 2.1.8 - 2.1.2 - 2.3.0 - 2.0.4 - 2.0.3 - 2.0.1 - 2.0.8 - 2.1.1 - 3.1.3 - 2.0.1 - 2.0.1 - 1.0.2 - 2.3.5 - 1.1.1 - 2.0.2 - 2.0.1 - 4.2.2 - 2.0.2 - 3.0.1 - 3.0.1 - 2.0.1 - 2.0.0 - 2.0.1 - 3.0.0 - 4.1.2 - 4.1.2 - 2.0.2 - 2.0.1 - 5.0.0 - 5.0.0 - 2.0.1 - 2.0.1 - 7.1.1 - 2.1.1 - 3.0.1 - 2.0.0 - 2.0.0 - 1.1.2 - 2.0.2 - 2.0.5 - 2.0.2 - 5.0.25 - 2.0.3 - 2.0.1 - 3.1.10 - 1.0.5 - 2.1.1 - 2.0.2 - 2.1.2 - 2.0.1 - 3.1.9 - 1.7-fiji4 - 1.1.4 - 1.1.4 - 2.0.1 - 2.1.1 - 2.1.0 - 25.0.2 - 2.0.1 - 3.1.4 - 0.1.2 - 1.2.5 - 1.4.0 - 1.2.1 - 3.2.0 - 2.0.1 - 1.2.1 - 1.3.1 - 7.11.1 - 3.3.4 - 1.3.10 - 2.0.4 - 2.2.0 - 3.0.4 - 2.0.3 - 1.0.3 - 2.0.3 - 2.0.1 - 2.5.0 - 2.0.3 - 2.01.4 - 2.6.13 - 10.4.13 - 3.1.2 - 1.0.0-beta-34 - 6.2.4 - 9.1.0 - 1.0.0 - 2.1.4 - 2.1.3 - 2.15.0 - 0.1.17 - 0.3.11 - 1.1.10 - 1.0.2 - 2.0.1 - 3.0.2 - 3.0.8 - 2.0.1 - 2.2.7 - 1.0.1 - 2.0.0 - 2.1.1 - 1.1.2 - 4.1.1 - 0.6.1 - 0.2.2 - 1.1.1 - 0.3.1 - 0.9.0 - 0.17.1 - 0.46.0 - 0.1.2 - 2.1.1 - 2.98.0 - 2.0.3 - 0.1.2 - 0.3.0 - 0.1.0 - 1.0.0-beta-3 - 1.0.6 - 3.0.0 - 1.0.1 - 0.2.0 - 0.2.4 - 0.3.1 - 0.1.3 - 0.1.4 - 2.0.4 - 1.0.2 - 0.1.7 - 1.0.1 - com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* - scijava - **/script_templates/** - java - org.scijava,net.imagej,net.imglib2,io.scif,sc.fiji - https://javadoc.scijava.org/Java8/ - https://javadoc.scijava.org/JavaFX8/ - [1.8.0-101,) - 8 - 8 - 3.6.3 - natives-linux_64 - linux-x86_64 - natives-linux-amd64 - linux-x86_64 - linux-x86_64 - natives-linux-amd64 - natives-linux-amd64 - natives-linux-amd64 - natives-linux-amd64 - linux-x86_64 - linux-x86_64 - linux-x86_64 - linux-x86_64 - 64 - x86_64 - amd64 - linux - linux - linux - linux - - founder,lead,developer,debugger,reviewer,support,maintainer - 1.1.0 - 0.2.1 - 1.0.0 - 0.4.1 - 0.1.6 - 1.0.0 - 0.4.1 - 1.0.0 - 0.3.1 - 1.0.1 - 0.2.1 - 0.5.3 - 0.3.0 - 0.2.3 - 0.3.2 - 2.6.0 - 2.6.0 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 1.7.36 - 2.7 - 2.2 - 3.10.0.2594 - https://s01.oss.sonatype.org - 2.4.8 - 2.4.8 - 2.2.7 - 3.2.9.RELEASE - 3.2.9.RELEASE - 3.2.9.RELEASE - 3.2.9.RELEASE - 1.0.2 - 1.12.0 - 5.3.4-1.5.10 - 0.12.0 - 1.6.8 - 1.2.0 - 1.0.1 - 2.0.0 - 3.0.3 - all - 2.0.8 - 1.6.0-scijava-2 - 1.7 - 2.16.2 - 1.0 - 2.1.1 - 3.9.6 - 3.9.6 - 2.9 - 1.9 - 1.1.2 - 1.5.5-11 - - - - - org.scijava - batch-processor - 0.4.2 - - - org.scijava - minimaven - 2.2.2 - - - org.scijava - native-lib-loader - 2.5.0 - - - org.scijava - parsington - 3.1.0 - - - org.scijava - scijava-cache - 0.1.2 - - - org.scijava - scijava-common - 2.98.0 - - - org.scijava - scijava-config - 2.0.3 - - - org.scijava - scijava-grab - 0.1.2 - - - org.scijava - scijava-io-http - 0.3.0 - - - org.scijava - scijava-java3d - 0.1.0 - - - org.scijava - scijava-listeners - 1.0.0-beta-3 - - - org.scijava - scijava-log-slf4j - 1.0.6 - - - org.scijava - scijava-optional - 1.0.1 - - - org.scijava - scijava-plot - 0.2.0 - - - org.scijava - scijava-plugins-commands - 0.2.4 - - - org.scijava - scijava-plugins-platforms - 0.3.1 - - - org.scijava - scijava-plugins-text-markdown - 0.1.3 - - - org.scijava - scijava-plugins-text-plain - 0.1.4 - - - org.scijava - scijava-search - 2.0.4 - - - org.scijava - scijava-table - 1.0.2 - - - org.scijava - scijava-ui-awt - 0.1.7 - - - org.scijava - scijava-ui-swing - 1.0.1 - - - org.scijava - script-editor - 1.0.0 - - - org.scijava - script-editor-jython - 1.1.0 - - - org.scijava - script-editor-scala - 0.2.1 - - - org.scijava - scripting-beanshell - 0.4.1 - - - org.scijava - scripting-clojure - 0.1.6 - - - org.scijava - scripting-groovy - 1.0.0 - - - org.scijava - scripting-java - 0.4.1 - - - org.scijava - scripting-javascript - 1.0.0 - - - org.scijava - scripting-jruby - 0.3.1 - - - org.scijava - scripting-jython - 1.0.1 - - - org.scijava - scripting-kotlin - 0.2.1 - - - org.scijava - scripting-matlab - 0.5.3 - - - org.scijava - scripting-python - 0.3.0 - - - org.scijava - scripting-renjin - 0.2.3 - - - org.scijava - scripting-scala - 0.3.2 - - - org.scijava - swing-checkbox-tree - 1.0.2 - - - org.scijava - ui-behaviour - 2.0.8 - - - net.imagej - imagej - 2.15.0 - - - net.imagej - ij - 1.54h - - - com.sun - tools - - - - - net.imagej - ij1-patcher - 1.2.6 - - - net.imagej - imagej-common - 2.0.4 - - - net.imagej - imagej-deprecated - 0.2.0 - - - net.imagej - imagej-launcher - 6.0.2 - - - net.imagej - imagej-legacy - 1.2.1 - - - net.imagej - imagej-matlab - 0.7.5 - - - net.imagej - imagej-mesh - 0.8.1 - - - net.imagej - imagej-mesh-io - 0.1.2 - - - net.imagej - imagej-notebook - 0.7.1 - - - net.imagej - imagej-omero - 1.0.0-5.6 - - - net.imagej - imagej-omero-legacy - 1.0.0-5.6 - - - net.imagej - imagej-opencv - 0.1.3 - - - net.imagej - imagej-ops - 2.0.0 - - - net.imagej - imagej-plugins-batch - 0.1.1 - - - net.imagej - imagej-plugins-commands - 0.8.1 - - - net.imagej - imagej-plugins-tools - 0.3.1 - - - net.imagej - imagej-plugins-uploader-ssh - 0.3.2 - - - net.imagej - imagej-plugins-uploader-webdav - 0.3.3 - - - net.imagej - imagej-scripting - 0.8.4 - - - net.imagej - imagej-server - 0.2.0 - - - net.imagej - imagej-tensorflow - 1.1.7 - - - net.imagej - imagej-ui-awt - 0.3.1 - - - net.imagej - imagej-ui-swing - 1.0.1 - - - net.imagej - imagej-updater - 1.0.1 - - - net.imagej - op-finder - 0.1.4 - - - net.imglib2 - imglib2 - 6.3.0 - - - net.imglib2 - imglib2-algorithm - 0.14.0 - - - net.imglib2 - imglib2-algorithm-fft - 0.2.1 - - - net.imglib2 - imglib2-algorithm-gpl - 0.3.1 - - - net.imglib2 - imglib2-cache - 1.0.0-beta-17 - - - net.imglib2 - imglib2-ij - 2.0.1 - - - net.imglib2 - imglib2-imglyb - 2.0.0 - - - net.imglib2 - imglib2-realtransform - 4.0.1 - - - net.imglib2 - imglib2-roi - 0.14.1 - - - net.imglib2 - imglib2-unsafe - 1.0.0 - - - io.scif - scifio - 0.46.0 - - - io.scif - scifio-bf-compat - 4.1.1 - - - io.scif - scifio-cli - 0.6.1 - - - io.scif - scifio-hdf5 - 0.2.2 - - - io.scif - scifio-jai-imageio - 1.1.1 - - - io.scif - scifio-labeling - 0.3.1 - - - io.scif - scifio-lifesci - 0.9.0 - - - io.scif - scifio-ome-xml - 0.17.1 - - - sc.fiji - fiji - 2.15.0 - - - sc.fiji - 3D_Blob_Segmentation - 3.0.2 - - - sc.fiji - 3D_Objects_Counter - 2.0.1 - - - sc.fiji - 3D_Viewer - 4.0.5 - - - sc.fiji - AnalyzeSkeleton_ - 3.4.2 - - - sc.fiji - Anisotropic_Diffusion_2D - 2.0.1 - - - sc.fiji - Archipelago_Plugins - 0.5.4 - - - sc.fiji - Arrow_ - 2.0.2 - - - sc.fiji - Auto_Local_Threshold - 1.11.0 - - - sc.fiji - Auto_Threshold - 1.18.0 - - - sc.fiji - BalloonSegmentation_ - 3.0.1 - - - sc.fiji - Bug_Submitter - 2.1.1 - - - sc.fiji - CPU_Meter - 2.0.2 - - - sc.fiji - Calculator_Plus - 2.0.1 - - - sc.fiji - Cell_Counter - 3.0.0 - - - sc.fiji - Colocalisation_Analysis - 3.0.6 - - - sc.fiji - Color_Histogram - 2.0.7 - - - sc.fiji - Color_Inspector_3D - 2.5.0 - - - sc.fiji - Colour_Deconvolution - 3.0.3 - - - sc.fiji - CorrectBleach_ - 2.1.0 - - - sc.fiji - Correct_3D_Drift - 1.0.6 - - - sc.fiji - Descriptor_based_registration - 2.1.8 - - - sc.fiji - Dichromacy_ - 2.1.2 - - - sc.fiji - Directionality_ - 2.3.0 - - - sc.fiji - FS_Align_TrakEM2 - 2.0.4 - - - sc.fiji - Feature_Detection - 2.0.3 - - - sc.fiji - Fiji_Archipelago - 2.0.1 - - - sc.fiji - Fiji_Developer - 2.0.8 - - - sc.fiji - Fiji_Package_Maker - 2.1.1 - - - sc.fiji - Fiji_Plugins - 3.1.3 - - - sc.fiji - FilamentDetector - 2.0.1 - - - sc.fiji - FlowJ_ - 2.0.1 - - - sc.fiji - Graph_Cut - 1.0.2 - - - sc.fiji - Gray_Morphology - 2.3.5 - - - org.janelia - H5J_Loader_Plugin - 1.1.5 - - - sc.fiji - HDF5_Vibez - 1.1.1 - - - sc.fiji - Helmholtz_Analysis - 2.0.2 - - - sc.fiji - IJ_Robot - 2.0.1 - - - sc.fiji - IO_ - 4.2.2 - - - sc.fiji - Image_5D - 2.0.2 - - - sc.fiji - Image_Expression_Parser - 3.0.1 - - - sc.fiji - Interactive_3D_Surface_Plot - 3.0.1 - - - sc.fiji - IsoData_Classifier - 2.0.1 - - - sc.fiji - Kappa - 2.0.0 - - - sc.fiji - Kuwahara_Filter - 2.0.1 - - - sc.fiji - KymographBuilder - 3.0.0 - - - sc.fiji - LSM_Reader - 4.1.2 - - - sc.fiji - LSM_Toolbox - 4.1.2 - - - sc.fiji - Lasso_and_Blow_Tool - 2.0.2 - - - sc.fiji - Linear_Kuwahara - 2.0.1 - - - sc.fiji - LocalThickness_ - 5.0.0 - - - sc.fiji - MTrack2_ - 2.0.1 - - - sc.fiji - M_I_P - 2.0.1 - - - sc.fiji - Manual_Tracking - 2.1.1 - - - sc.fiji - Multi_Kymograph - 3.0.1 - - - sc.fiji - OMEVisual - 2.0.0 - - - sc.fiji - PIV_analyser - 2.0.0 - - - sc.fiji - QuickPALM_ - 1.1.2 - - - sc.fiji - RATS_ - 2.0.2 - - - sc.fiji - Reconstruct_Reader - 2.0.5 - - - sc.fiji - SPIM_Opener - 2.0.2 - - - sc.fiji - SPIM_Registration - 5.0.25 - - - sc.fiji - Samples_ - 2.0.3 - - - sc.fiji - Series_Labeler - 2.0.1 - - - sc.fiji - Siox_Segmentation - 1.0.5 - - - sc.fiji - Skeletonize3D_ - 2.1.1 - - - sc.fiji - SplineDeformationGenerator_ - 2.0.2 - - - sc.fiji - Stack_Manipulation - 2.1.2 - - - sc.fiji - Statistical_Region_Merging - 2.0.1 - - - sc.fiji - Stitching_ - 3.1.9 - - - sc.fiji - Sync_Win - 1.7-fiji4 - - - sc.fiji - Thread_Killer - 2.0.1 - - - sc.fiji - Time_Lapse - 2.1.1 - - - sc.fiji - Time_Stamper - 2.1.0 - - - sc.fiji - ToAST_ - 25.0.2 - - - sc.fiji - TopoJ_ - 2.0.1 - - - sc.fiji - Trainable_Segmentation - 3.3.4 - - - sc.fiji - TrakEM2_Archipelago - 2.0.4 - - - sc.fiji - VIB-lib - 2.2.0 - - - sc.fiji - VIB_ - 3.0.4 - - - sc.fiji - Vaa3d_Reader - 2.0.3 - - - sc.fiji - Vaa3d_Writer - 1.0.3 - - - sc.fiji - Video_Editing - 2.0.1 - - - sc.fiji - View5D_ - 2.5.0 - - - sc.fiji - Volume_Calculator - 2.0.3 - - - sc.fiji - Volume_Viewer - 2.01.4 - - - sc.fiji - bUnwarpJ_ - 2.6.13 - - - sc.fiji - bij - 1.0.0 - - - sc.fiji - blockmatching_ - 2.1.4 - - - sc.fiji - fiji-lib - 2.1.3 - - - sc.fiji - legacy-imglib1 - 1.1.10 - - - sc.fiji - level_sets - 1.0.2 - - - sc.fiji - pal-optimization - 2.0.1 - - - sc.fiji - panorama_ - 3.0.2 - - - sc.fiji - register_virtual_stack_slices - 3.0.8 - - - sc.fiji - registration_3d - 2.0.1 - - - sc.fiji - weave_jy2java - 2.1.1 - - - jitk - jitk-tps - 3.0.4 - - - sc.fiji - bigwarp_fiji - 9.1.0 - - - com.googlecode.efficient-java-matrix-library - ejml - - - - - mpicbg - mpicbg - 1.5.0 - - - mpicbg - mpicbg_ - 1.5.0 - - - sc.fiji - trakem2_tps - 2.0.0 - - - sc.fiji - z_spacing - 1.1.2 - - - sc.fiji - bigdataviewer-core - 10.4.13 - - - sc.fiji - bigdataviewer-server - 3.1.2 - - - sc.fiji - bigdataviewer-vistools - 1.0.0-beta-34 - - - sc.fiji - bigdataviewer_fiji - 6.2.4 - - - sc.fiji - spim_data - 2.2.7 - - - sc.fiji - TrackMate - 7.11.1 - - - sc.fiji - TrackMate-Cellpose - 0.1.2 - - - sc.fiji - TrackMate-CSVImporter - 3.1.4 - - - sc.fiji - TrackMate-ExTrack - 1.2.5 - - - sc.fiji - TrackMate-Ilastik - 1.4.0 - - - sc.fiji - TrackMate-MorphoLibJ - 1.2.1 - - - sc.fiji - TrackMate-Oneat - 3.2.0 - - - sc.fiji - TrackMate-Skeleton - 2.0.1 - - - sc.fiji - TrackMate-StarDist - 1.2.1 - - - sc.fiji - TrackMate-Weka - 1.3.1 - - - sc.fiji - T2-NIT - 1.1.4 - - - sc.fiji - T2-TreelineGraph - 1.1.4 - - - sc.fiji - TrakEM2_ - 1.3.10 - - - sc.fiji - VectorString - 2.0.3 - - - sc.fiji - trakem2-transform - 1.0.1 - - - net.imglib2 - imglib2-label-multisets - 0.12.0 - - - org.janelia.saalfeldlab - n5 - 3.1.3 - - - org.janelia.saalfeldlab - n5-aws-s3 - 4.0.2 - - - org.janelia.saalfeldlab - n5-blosc - 1.1.1 - - - org.janelia.saalfeldlab - n5-google-cloud - 4.0.0 - - - org.janelia.saalfeldlab - n5-hdf5 - 2.1.0 - - - org.janelia.saalfeldlab - n5-ij - 4.0.2 - - - org.janelia.saalfeldlab - n5-imglib2 - 7.0.0 - - - org.janelia.saalfeldlab - n5-universe - 1.3.2 - - - org.janelia.saalfeldlab - n5-viewer_fiji - 6.0.1 - - - org.janelia.saalfeldlab - n5-zarr - 1.2.1 - - - fr.inra.ijpb - MorphoLibJ_ - 1.6.2 - - - net.haesleinhuepf - clij_ - 1.9.0.1 - - - net.haesleinhuepf - clij-core - 1.8.1.1 - - - net.haesleinhuepf - clij-coremem - 2.3.0.4 - - - net.haesleinhuepf - clij-clearcl - 2.5.0.1 - - - net.haesleinhuepf - clij2_ - 2.5.3.1 - - - net.haesleinhuepf - clij2-assistant_ - 2.5.1.4 - - - net.haesleinhuepf - clijx_ - 0.32.2.0 - - - net.haesleinhuepf - clijx-weka_ - 0.32.1.1 - - - net.preibisch - BigStitcher - 1.2.10 - - - net.preibisch - multiview-reconstruction - 3.2.7 - - - net.preibisch - multiview-simulation - 0.2.0 - - - org.bonej - bonej-plugins - 7.0.18 - - - org.bonej - bonej-ops - 7.0.18 - - - org.bonej - bonej-legacy-plugins_ - 7.0.18 - - - org.bonej - bonej-legacy-util_ - 7.0.18 - - - org.bonej - bonej-utilities - 7.0.18 - - - org.morphonets - SNT - 4.2.1 - - - org.jzy3d - jzy3d-emul-gl - - - org.jzy3d - jGL - - - - - sc.fiji - MaMuT - 7.1.1 - - - sc.fiji - labkit-pixel-classification - 0.1.17 - - - sc.fiji - labkit-ui - 0.3.11 - - - com.zeroc - glacier2 - 3.6.5 - - - com.zeroc - ice - 3.6.5 - - - org.openmicroscopy - metakit - 5.3.6 - - - ch.qos.logback - logback-classic - - - - - org.openmicroscopy - ome-codecs - 1.0.1 - - - org.openmicroscopy - ome-common - 6.0.21 - - - ch.qos.logback - logback-classic - - - xalan - serializer - - - xalan - xalan - - - - - org.openmicroscopy - ome-poi - 5.3.8 - - - org.openmicroscopy - ome-xml - 6.3.4 - - - ome - jxrlib-all - 0.2.4 - - - ome - bio-formats-tools - 7.2.0 - - - xalan - serializer - - - xalan - xalan - - - - - ome - bio-formats_plugins - 7.2.0 - - - ch.qos.logback - logback-classic - - - - - ome - formats-api - 7.2.0 - - - xalan - serializer - - - xalan - xalan - - - - - ome - formats-bsd - 7.2.0 - - - xalan - serializer - - - xalan - xalan - - - - - ome - formats-gpl - 7.2.0 - - - org.openmicroscopy - omero-blitz - 5.7.2 - - - com.sun.activation - javax.activation - - - org.apache.xmlgraphics - batik-all - - - - - org.openmicroscopy - omero-common - 5.6.4 - - - ch.qos.logback - logback-classic - - - - - org.openmicroscopy - omero-dsl-plugin - 5.5.2 - - - org.openmicroscopy - omero-gateway - 5.9.0 - - - org.openmicroscopy - omero-model - 5.6.13 - - - javax.transaction - jta - - - org.apache.solr - solr-commons-csv - - - - - org.openmicroscopy - omero-renderer - 5.5.15 - - - c3p0 - c3p0 - - - - - org.openmicroscopy - omero-romio - 5.7.5 - - - org.openmicroscopy - omero-server - 5.6.10 - - - c3p0 - c3p0 - - - com.sun.mail - javax.mail - - - javax.activation - activation - - - org.apache.xmlgraphics - batik-all - - - - - net.clearcontrol - coremem - 0.4.8 - - - com.google.android.tools - dx - - - - - net.clearvolume - cleargl - 2.2.10 - - - org.jogamp.gluegen - gluegen-rt-main - - - org.jogamp.jogl - jogl-all-main - - - - - net.algart - algart-tiff - 1.2.7 - - - com.amazonaws - aws-java-sdk-core - 1.12.667 - - - com.amazonaws - aws-java-sdk-s3 - 1.12.667 - - - antlr - antlr - 2.7.7 - - - org.antlr - ST4 - 4.3.4 - - - org.antlr - antlr - 3.5.3 - - - org.antlr - antlr-runtime - 3.5.3 - - - org.apache.ant - ant - 1.10.14 - - - org.apache.ant - ant-launcher - 1.10.14 - - - org.apache.groovy - groovy - 4.0.18 - - - org.apache.groovy - groovy-ant - 4.0.18 - - - org.apache.groovy - groovy-astbuilder - 4.0.18 - - - org.apache.groovy - groovy-cli-commons - 4.0.18 - - - org.apache.groovy - groovy-cli-picocli - 4.0.18 - - - org.apache.groovy - groovy-console - 4.0.18 - - - org.apache.groovy - groovy-contracts - 4.0.18 - - - org.apache.groovy - groovy-datetime - 4.0.18 - - - org.apache.groovy - groovy-dateutil - 4.0.18 - - - org.apache.groovy - groovy-docgenerator - 4.0.18 - - - org.apache.groovy - groovy-ginq - 4.0.18 - - - org.apache.groovy - groovy-groovydoc - 4.0.18 - - - org.apache.groovy - groovy-groovysh - 4.0.18 - - - org.apache.groovy - groovy-jmx - 4.0.18 - - - org.apache.groovy - groovy-json - 4.0.18 - - - org.apache.groovy - groovy-jsr223 - 4.0.18 - - - org.apache.groovy - groovy-macro - 4.0.18 - - - org.apache.groovy - groovy-macro-library - 4.0.18 - - - org.apache.groovy - groovy-nio - 4.0.18 - - - org.apache.groovy - groovy-servlet - 4.0.18 - - - org.apache.groovy - groovy-sql - 4.0.18 - - - org.apache.groovy - groovy-swing - 4.0.18 - - - org.apache.groovy - groovy-templates - 4.0.18 - - - org.apache.groovy - groovy-test - 4.0.18 - - - org.apache.groovy - groovy-test-junit5 - 4.0.18 - - - org.apache.groovy - groovy-testng - 4.0.18 - - - org.apache.groovy - groovy-toml - 4.0.18 - - - org.apache.groovy - groovy-typecheckers - 4.0.18 - - - org.apache.groovy - groovy-xml - 4.0.18 - - - org.apache.groovy - groovy-yaml - 4.0.18 - - - org.apache.ivy - ivy - 2.5.2 - - - org.apache.logging.log4j - log4j-api - 2.20.0 - - - org.apache.logging.log4j - log4j-core - 2.20.0 - - - org.apache.maven.shared - maven-artifact-transfer - 0.13.1 - - - org.apache.maven.shared - maven-common-artifact-filters - 3.3.2 - - - org.apache.maven - maven-core - 3.9.6 - - - org.apache.maven.plugin-tools - maven-plugin-tools-api - 3.11.0 - - - org.codehaus.plexus - plexus-component-annotations - 2.2.0 - - - org.codehaus.plexus - plexus-utils - 4.0.0 - - - org.sonatype.sisu - sisu-inject-bean - 2.6.0 - - - org.sonatype.sisu - sisu-inject-plexus - 2.6.0 - - - org.apache.poi - poi - 5.2.5 - - - org.apache.poi - poi-examples - 5.2.5 - - - org.apache.poi - poi-excelant - 5.2.5 - - - org.apache.poi - poi-ooxml - 5.2.5 - - - org.apache.poi - poi-ooxml-lite - 5.2.5 - - - org.apache.poi - poi-scratchpad - 5.2.5 - - - org.apache.spark - spark-core_2.11 - 2.4.8 - - - com.sun.jersey - jersey-core - - - commons-beanutils - commons-beanutils-core - - - io.netty - netty-all - - - - - org.apache.httpcomponents - httpclient - 4.5.14 - - - org.apache.httpcomponents - httpcore - 4.4.16 - - - org.apache.httpcomponents - httpmime - 4.5.14 - - - args4j - args4j - 2.33 - - - org.ow2.asm - asm - 9.6 - - - org.ow2.asm - asm-analysis - 9.6 - - - org.ow2.asm - asm-commons - 9.6 - - - org.ow2.asm - asm-tree - 9.6 - - - org.ow2.asm - asm-util - 9.6 - - - org.apache.xmlgraphics - batik-anim - 1.17 - - - org.apache.xmlgraphics - batik-awt-util - 1.17 - - - org.apache.xmlgraphics - batik-bridge - 1.17 - - - xalan - xalan - - - - - org.apache.xmlgraphics - batik-codec - 1.17 - - - org.apache.xmlgraphics - batik-constants - 1.17 - - - org.apache.xmlgraphics - batik-css - 1.17 - - - org.apache.xmlgraphics - batik-dom - 1.17 - - - xalan - xalan - - - - - org.apache.xmlgraphics - batik-ext - 1.17 - - - org.apache.xmlgraphics - batik-extension - 1.17 - - - org.apache.xmlgraphics - batik-gui-util - 1.17 - - - org.apache.xmlgraphics - batik-gvt - 1.17 - - - org.apache.xmlgraphics - batik-i18n - 1.17 - - - org.apache.xmlgraphics - batik-parser - 1.17 - - - org.apache.xmlgraphics - batik-rasterizer - 1.17 - - - org.apache.xmlgraphics - batik-rasterizer-ext - 1.17 - - - org.apache.xmlgraphics - batik-extensions - - - - - org.apache.xmlgraphics - batik-script - 1.17 - - - org.apache.xmlgraphics - batik-slideshow - 1.17 - - - org.apache.xmlgraphics - batik-squiggle - 1.17 - - - org.apache.xmlgraphics - batik-squiggle-ext - 1.17 - - - org.apache.xmlgraphics - batik-extensions - - - - - org.apache.xmlgraphics - batik-svg-dom - 1.17 - - - org.apache.xmlgraphics - batik-svggen - 1.17 - - - org.apache.xmlgraphics - batik-svgpp - 1.17 - - - org.apache.xmlgraphics - batik-swing - 1.17 - - - org.apache.xmlgraphics - batik-transcoder - 1.17 - - - org.apache.xmlgraphics - batik-ttf2svg - 1.17 - - - org.apache.xmlgraphics - batik-util - 1.17 - - - org.apache.xmlgraphics - batik-xml - 1.17 - - - org.apache.xmlgraphics - xmlgraphics-commons - 2.9 - - - org.lasersonlab - jblosc - 1.0.1 - - - com.nativelibs4java - bridj - 0.7.0 - - - com.google.android.tools - dx - - - - - javax.enterprise - cdi-api - 2.0.SP1 - - - org.checkerframework - checker-qual - 3.42.0 - - - commons-beanutils - commons-beanutils - 1.9.4 - - - commons-cli - commons-cli - 1.6.0 - - - commons-codec - commons-codec - 1.16.1 - - - commons-collections - commons-collections - 3.2.2 - - - org.apache.commons - commons-collections4 - 4.4 - - - org.apache.commons - commons-compress - 1.26.0 - - - org.apache.commons - commons-csv - 1.10.0 - - - commons-io - commons-io - 2.15.1 - - - commons-lang - commons-lang - 2.6 - - - org.apache.commons - commons-lang3 - 3.14.0 - - - commons-logging - commons-logging - 1.3.0 - - - org.apache.commons - commons-math3 - 3.6.1 - - - org.apache.commons - commons-pool2 - 2.12.0 - - - org.apache.commons - commons-text - 1.11.0 - - - cglib - cglib - 3.3.0 - - - dev.dirs - directories - 26 - - - org.eclipse.collections - eclipse-collections - 11.1.0 - - - org.eclipse.collections - eclipse-collections-api - 11.1.0 - - - org.eclipse.collections - eclipse-collections-forkjoin - 11.1.0 - - - org.eclipse.collections - eclipse-collections-testutils - 11.1.0 - - - org.eclipse.swt - org.eclipse.swt.cocoa.macosx - 4.3 - - - org.eclipse.swt - org.eclipse.swt.cocoa.macosx.x86_64 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.aix.ppc - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.aix.ppc64 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.hpux.ia64 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.ppc - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.ppc64 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.s390 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.s390x - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.x86 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.linux.x86_64 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.solaris.sparc - 4.3 - - - org.eclipse.swt - org.eclipse.swt.gtk.solaris.x86 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.win32.win32.x86 - 4.3 - - - org.eclipse.swt - org.eclipse.swt.win32.win32.x86_64 - 4.3 - - - org.ejml - ejml-all - 0.41 - - - com.google.errorprone - error_prone_annotations - 2.25.0 - - - com.formdev - flatlaf - 3.4 - - - com.formdev - flatlaf-fonts-jetbrains-mono - 2.304 - - - com.google.api-client - google-api-client - 2.3.0 - - - com.google.api-client - google-api-client-android - 2.3.0 - - - com.google.api-client - google-api-client-appengine - 2.3.0 - - - com.google.api-client - google-api-client-gson - 2.3.0 - - - com.google.api-client - google-api-client-jackson2 - 2.3.0 - - - com.google.api-client - google-api-client-protobuf - 2.3.0 - - - com.google.api-client - google-api-client-servlet - 2.3.0 - - - javax.servlet - servlet-api - - - - - com.google.api-client - google-api-client-xml - 2.3.0 - - - com.google.api - api-common - 2.26.0 - - - com.google.api - gax - 2.43.0 - - - com.google.api - gax-grpc - 2.43.0 - - - com.google.api - gax-httpjson - 2.43.0 - - - com.google.api.grpc - proto-google-common-protos - 2.34.0 - - - com.google.api.grpc - proto-google-iam-v1 - 1.29.0 - - - com.google.auth - google-auth-library-appengine - 1.23.0 - - - com.google.auth - google-auth-library-credentials - 1.23.0 - - - com.google.auth - google-auth-library-oauth2-http - 1.23.0 - - - com.google.auto.value - auto-value - 1.10.4 - - - com.google.auto.value - auto-value-annotations - 1.10.4 - - - com.google.cloud - google-cloud-core - 2.33.0 - - - com.google.cloud - google-cloud-core-http - 2.33.0 - - - com.google.cloud - google-cloud-nio - 0.127.13 - - - com.google.cloud - google-cloud-resourcemanager - 1.38.0 - - - com.google.cloud - google-cloud-storage - 2.34.0 - - - com.google.http-client - google-http-client - 1.44.1 - - - com.google.http-client - google-http-client-apache-v2 - 1.44.1 - - - com.google.http-client - google-http-client-appengine - 1.44.1 - - - com.google.http-client - google-http-client-gson - 1.44.1 - - - com.google.http-client - google-http-client-jackson2 - 1.44.1 - - - com.google.http-client - google-http-client-xml - 1.44.1 - - - io.grpc - grpc-context - 1.62.2 - - - com.google.code.gson - gson - 2.10.1 - - - com.google.guava - guava - 33.0.0-jre - - - io.humble - humble-video-all - 0.3.0 - - - hsqldb - hsqldb - 1.8.0.10 - - - com.itextpdf - itextpdf - 5.5.13.3 - - - com.google.j2objc - j2objc-annotations - 2.8 - - - org.apache.jackrabbit - jackrabbit-webdav - 2.21.22 - - - org.slf4j - jcl-over-slf4j - - - - - com.fasterxml.jackson.core - jackson-annotations - 2.16.1 - - - com.fasterxml.jackson.core - jackson-core - 2.16.1 - - - com.fasterxml.jackson.core - jackson-databind - 2.16.1 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-cbor - 2.16.1 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - 2.16.1 - - - com.sun.media - jai-codec - 1.1.3 - - - javax.media - jai-core - 1.1.3 - - - gov.nist.math - jama - 1.0.3 - - - org.scijava - j3dcore - 1.6.0-scijava-2 - - - org.scijava - j3dutils - 1.6.0-scijava-2 - - - org.scijava - vecmath - 1.6.0-scijava-2 - - - org.bytedeco - javacpp - 1.5.10 - - - org.bytedeco - javacv - 1.5.10 - - - org.bytedeco - ffmpeg - 6.1.1-1.5.10 - - - org.bytedeco - hdf5 - 1.14.3-1.5.10 - - - org.bytedeco - leptonica - 1.84.1-1.5.10 - - - org.bytedeco - openblas - 0.3.26-1.5.10 - - - org.bytedeco - opencv - 4.9.0-1.5.10 - - - org.bytedeco - tesseract - 5.3.4-1.5.10 - - - org.bytedeco - ffmpeg - 6.1.1-1.5.10 - linux-x86_64 - - - org.bytedeco - hdf5 - 1.14.3-1.5.10 - linux-x86_64 - - - org.bytedeco - leptonica - 1.84.1-1.5.10 - linux-x86_64 - - - org.bytedeco - openblas - 0.3.26-1.5.10 - linux-x86_64 - - - org.bytedeco - opencv - 4.9.0-1.5.10 - linux-x86_64 - - - org.bytedeco - tesseract - 5.3.4-1.5.10 - linux-x86_64 - - - org.javassist - javassist - 3.30.2-GA - - - org.jruby.jcodings - jcodings - 1.0.58 - - - org.jdom - jdom2 - 2.0.6.1 - - - org.scijava - jep - 2.4.2 - - - org.eclipse.jetty - jetty-annotations - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-client - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-continuation - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-deploy - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-http - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-http-spi - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-io - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-jaspi - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-jmx - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-jndi - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-nosql - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-plus - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-proxy - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-rewrite - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-security - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-server - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-servlet - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-servlets - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-spring - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-start - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-util - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-util-ajax - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-webapp - 9.4.54.v20240208 - - - org.eclipse.jetty - jetty-xml - 9.4.54.v20240208 - - - org.jfree - jfreechart - 1.5.4 - - - org.jfree - jfreesvg - 3.4.3 - - - org.jgrapht - jgrapht-core - 1.4.0 - - - org.jgrapht - jgrapht-demo - 1.4.0 - - - org.jgrapht - jgrapht-ext - 1.4.0 - - - org.jgrapht - jgrapht-guava - 1.4.0 - - - org.jgrapht - jgrapht-io - 1.4.0 - - - org.jgrapht - jgrapht-opt - 1.4.0 - - - it.unimi.dsi - fastutil - - - - - com.github.vlsi.mxgraph - jgraphx - 4.2.2 - - - cisd - jhdf5 - 19.04.1 - - - org.jheaps - jheaps - 0.14 - - - jline - jline - 2.14.6 - - - org.jline - jline-builtins - 3.25.1 - - - org.jline - jline-console - 3.25.1 - - - org.jline - jline-reader - 3.25.1 - - - org.jline - jline-remote-ssh - 3.25.1 - - - org.jline - jline-remote-telnet - 3.25.1 - - - org.jline - jline-style - 3.25.1 - - - org.jline - jline-terminal - 3.25.1 - - - org.jline - jline-terminal-jna - 3.25.1 - - - net.java.dev.jna - jna - 5.14.0 - - - net.java.dev.jna - jna-platform - 5.14.0 - - - com.github.jnr - jffi - 1.3.13 - - - com.github.jnr - jffi - 1.3.13 - native - - - com.github.jnr - jnr-constants - 0.10.4 - - - com.github.jnr - jnr-ffi - 2.2.16 - - - com.github.jnr - jnr-posix - 3.1.19 - - - joda-time - joda-time - 2.12.7 - - - org.jocl - jocl - 2.0.5 - - - org.jogamp.gluegen - gluegen - 2.5.0 - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - - - org.jogamp.joal - joal - 2.5.0 - - - org.jogamp.jocl - jocl - 2.5.0 - - - org.jogamp.jogl - jogl-all - 2.5.0 - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - natives-android-aarch64 - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - natives-linux-aarch64 - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - natives-linux-amd64 - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - natives-linux-armv6hf - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt - 2.5.0 - natives-windows-amd64 - - - org.jogamp.joal - joal - 2.5.0 - natives-android-aarch64 - - - org.jogamp.joal - joal - 2.5.0 - natives-linux-aarch64 - - - org.jogamp.joal - joal - 2.5.0 - natives-linux-amd64 - - - org.jogamp.joal - joal - 2.5.0 - natives-linux-armv6hf - - - org.jogamp.joal - joal - 2.5.0 - natives-macosx-universal - - - org.jogamp.joal - joal - 2.5.0 - natives-windows-amd64 - - - org.jogamp.jocl - jocl - 2.5.0 - natives-android-aarch64 - - - org.jogamp.jocl - jocl - 2.5.0 - natives-linux-aarch64 - - - org.jogamp.jocl - jocl - 2.5.0 - natives-linux-amd64 - - - org.jogamp.jocl - jocl - 2.5.0 - natives-linux-armv6hf - - - org.jogamp.jocl - jocl - 2.5.0 - natives-macosx-universal - - - org.jogamp.jocl - jocl - 2.5.0 - natives-windows-amd64 - - - org.jogamp.jogl - jogl-all - 2.5.0 - natives-android-aarch64 - - - org.jogamp.jogl - jogl-all - 2.5.0 - natives-linux-aarch64 - - - org.jogamp.jogl - jogl-all - 2.5.0 - natives-linux-amd64 - - - org.jogamp.jogl - jogl-all - 2.5.0 - natives-linux-armv6hf - - - org.jogamp.jogl - jogl-all - 2.5.0 - natives-macosx-universal - - - org.jogamp.jogl - jogl-all - 2.5.0 - natives-windows-amd64 - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - natives-android-aarch64 - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - natives-linux-aarch64 - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - natives-linux-amd64 - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - natives-linux-armv6hf - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - natives-macosx-universal - - - org.jogamp.jogl - jogl-all-noawt - 2.5.0 - natives-windows-amd64 - - - org.jogamp.java3d - java3d-core - 1.7.2 - - - org.jogamp.java3d - java3d-utils - 1.7.2 - - - org.jogamp.java3d - vecmath - 1.7.2 - - - org.joml - joml - 1.10.5 - - - org.jruby.joni - joni - 2.2.1 - - - org.jpedal - jpedalSTD - 2.80b11 - - - org.smurn - jply - 0.2.1 - - - com.jcraft - jsch - 0.1.55 - - - org.json - json - 20240205 - - - org.python - jython-slim - 2.7.3 - - - com.jcraft - jzlib - 1.1.3 - - - org.jzy3d - jzy3d-core - 2.2.1 - - - org.jzy3d - jzy3d-core-awt - 2.2.1 - - - org.jzy3d - jzy3d-emul-gl-awt - 2.2.1 - - - org.jzy3d - jzy3d-jGL-awt - 2.2.1 - - - org.jzy3d - jzy3d-jdt-core - 2.2.1 - - - org.jzy3d - jzy3d-native-jogl-awt - 2.2.1 - - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt-natives-linux-aarch64 - - - org.jogamp.gluegen - gluegen-rt-natives-linux-amd64 - - - org.jogamp.gluegen - gluegen-rt-natives-linux-armv6hf - - - org.jogamp.gluegen - gluegen-rt-natives-linux-i586 - - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt-natives-windows-amd64 - - - org.jogamp.gluegen - gluegen-rt-natives-windows-i586 - - - org.jogamp.jogl - jogl-all-natives-linux-aarch64 - - - org.jogamp.jogl - jogl-all-natives-linux-amd64 - - - org.jogamp.jogl - jogl-all-natives-linux-armv6hf - - - org.jogamp.jogl - jogl-all-natives-linux-i586 - - - org.jogamp.jogl - jogl-all-natives-macosx-universal - - - org.jogamp.jogl - jogl-all-natives-windows-amd64 - - - org.jogamp.jogl - jogl-all-natives-windows-i586 - - - - - org.jzy3d - jzy3d-native-jogl-core - 2.2.1 - - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt-natives-linux-aarch64 - - - org.jogamp.gluegen - gluegen-rt-natives-linux-amd64 - - - org.jogamp.gluegen - gluegen-rt-natives-linux-armv6hf - - - org.jogamp.gluegen - gluegen-rt-natives-linux-i586 - - - org.jogamp.gluegen - gluegen-rt-natives-macosx-universal - - - org.jogamp.gluegen - gluegen-rt-natives-windows-amd64 - - - org.jogamp.gluegen - gluegen-rt-natives-windows-i586 - - - org.jogamp.jogl - jogl-all-natives-linux-aarch64 - - - org.jogamp.jogl - jogl-all-natives-linux-amd64 - - - org.jogamp.jogl - jogl-all-natives-linux-armv6hf - - - org.jogamp.jogl - jogl-all-natives-linux-i586 - - - org.jogamp.jogl - jogl-all-natives-macosx-universal - - - org.jogamp.jogl - jogl-all-natives-windows-amd64 - - - org.jogamp.jogl - jogl-all-natives-windows-i586 - - - - - org.jzy3d - jzy3d-native-jogl-swing - 2.2.1 - - - com.miglayout - miglayout - - - - - org.jzy3d - jzy3d-tester - 2.2.1 - - - org.jetbrains.kotlin - kotlin-compiler-embeddable - 1.9.22 - - - org.jetbrains.kotlin - kotlin-daemon-embeddable - 1.9.22 - - - org.jetbrains.kotlin - kotlin-reflect - 1.9.22 - - - org.jetbrains.kotlin - kotlin-script-runtime - 1.9.22 - - - org.jetbrains.kotlin - kotlin-scripting-common - 1.9.22 - - - org.jetbrains.kotlin - kotlin-scripting-compiler-embeddable - 1.9.22 - - - org.jetbrains.kotlin - kotlin-scripting-jsr223 - 1.9.22 - - - org.jetbrains.kotlin - kotlin-scripting-jvm - 1.9.22 - - - org.jetbrains.kotlin - kotlin-stdlib - 1.9.22 - - - org.jetbrains.kotlin - kotlin-stdlib-common - 1.9.22 - - - org.jetbrains.kotlin - kotlin-stdlib-jdk8 - 1.9.22 - - - org.jetbrains.kotlinx - kotlinx-coroutines-core - 1.8.0 - - - org.jetbrains.kotlinx - kotlinx-coroutines-core-jvm - 1.8.0 - - - com.esotericsoftware - kryo - 5.6.0 - - - com.esotericsoftware - minlog - 1.3.1 - - - com.esotericsoftware - reflectasm - 1.11.9 - - - ch.qos.logback - logback-classic - 1.2.12 - - - javax.activation - activation - - - - - ch.qos.logback - logback-core - 1.2.12 - - - org.lz4 - lz4-java - 1.8.0 - - - org.mapdb - mapdb - 3.1.0 - - - net.jpountz.lz4 - lz4 - - - - - com.miglayout - miglayout-core - 5.3 - - - com.miglayout - miglayout-swing - 5.3 - - - com.miglayout - miglayout-swt - 5.3 - - - edu.mines - mines-jtk - 20151125 - - - org.objenesis - objenesis - 3.3 - - - com.squareup.okhttp3 - okhttp - 4.12.0 - - - com.squareup.okio - okio - 3.8.0 - - - org.ojalgo - ojalgo - 45.1.1 - - - com.opencsv - opencsv - 5.9 - - - info.picocli - picocli - 4.7.5 - - - org.postgresql - postgresql - 42.7.2 - - - com.google.protobuf - protobuf-java - 3.23.0 - - - com.google.protobuf - protobuf-java-util - 3.23.0 - - - com.google.protobuf - protobuf-kotlin - 3.23.0 - - - com.google.re2j - re2j - 1.7 - - - ch.qos.reload4j - reload4j - 1.2.25 - - - com.fifesoft - rsyntaxtextarea - 3.4.0 - - - com.fifesoft - autocomplete - 3.3.1 - - - com.fifesoft - languagesupport - 3.3.0 - - - org.slf4j - slf4j-api - 1.7.36 - - - org.slf4j - slf4j-ext - 1.7.36 - - - org.slf4j - slf4j-jcl - 1.7.36 - - - org.slf4j - slf4j-jdk14 - 1.7.36 - - - org.slf4j - slf4j-nop - 1.7.36 - - - org.slf4j - slf4j-simple - 1.7.36 - - - org.slf4j - jcl-over-slf4j - 1.7.36 - - - org.yaml - snakeyaml - 2.2 - - - org.snakeyaml - snakeyaml-engine - 2.7 - - - org.springframework - spring-aop - 3.2.9.RELEASE - - - org.springframework - spring-beans - 3.2.9.RELEASE - - - org.springframework - spring-core - 3.2.9.RELEASE - - - org.tensorflow - tensorflow - 1.12.0 - - - org.tensorflow - libtensorflow - 1.12.0 - - - org.tensorflow - libtensorflow_jni - 1.12.0 - - - org.tensorflow - libtensorflow_jni_gpu - 1.12.0 - - - org.tensorflow - proto - 1.12.0 - - - org.threeten - threetenbp - 1.6.8 - - - net.sf.trove4j - trove4j - 3.0.3 - - - nz.ac.waikato.cms.weka - weka-dev - 3.9.6 - - - com.github.fommil.netlib - all - - - com.github.vbmacher - java-cup-runtime - - - com.googlecode.netlib-java - netlib-java - - - com.sun.activation - jakarta.activation - - - nz.ac.waikato.cms.weka.thirdparty - java-cup-11b - - - nz.ac.waikato.cms.weka.thirdparty - java-cup-11b-runtime - - - net.sourceforge.f2j - arpack_combined_all - - - - - org.tukaani - xz - 1.9 - - - com.github.luben - zstd-jni - 1.5.5-11 - - - org.scijava - scijava-common - 2.98.0 - tests - test - - - net.imagej - imagej-legacy - 1.2.1 - tests - test - - - net.imagej - imagej-ops - 2.0.0 - tests - test - - - net.imagej - imagej-updater - 1.0.1 - tests - test - - - net.imglib2 - imglib2 - 6.3.0 - tests - test - - - org.janelia.saalfeldlab - n5 - 3.1.3 - tests - test - - - junit - junit - 4.13.2 - test - - - org.junit.jupiter - junit-jupiter-api - 5.10.2 - test - - - org.junit.jupiter - junit-jupiter-engine - 5.10.2 - test - - - org.junit.jupiter - junit-jupiter-migrationsupport - 5.10.2 - test - - - org.junit.jupiter - junit-jupiter-params - 5.10.2 - test - - - org.junit.vintage - junit-vintage-engine - 5.10.2 - test - - - org.scijava - junit-benchmarks - 0.7.4-scijava - test - - - org.jmockit - jmockit - 1.49 - test - - - org.mockito - mockito-core - 2.19.0 - test - - - org.openjdk.jmh - jmh-core - 1.37 - test - - - org.openjdk.jmh - jmh-generator-annprocess - 1.37 - test - - - - - - - false - - central - Central Repository - https://repo.maven.apache.org/maven2 - - - - - - never - - - false - - central - Central Repository - https://repo.maven.apache.org/maven2 - - - - /home/elect/IdeaProjects/pom-scijava/src/main/java - /home/elect/IdeaProjects/pom-scijava/src/main/scripts - /home/elect/IdeaProjects/pom-scijava/src/test/java - /home/elect/IdeaProjects/pom-scijava/target/classes - /home/elect/IdeaProjects/pom-scijava/target/test-classes - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - 1.0 - - - install - - - /home/elect/IdeaProjects/pom-scijava/src/main/resources - - - - - /home/elect/IdeaProjects/pom-scijava/src/test/resources - - - /home/elect/IdeaProjects/pom-scijava/target - pom-scijava-38.0.0-SNAPSHOT - - - - maven-antrun-plugin - 3.1.0 - - - maven-assembly-plugin - 3.6.0 - - - maven-clean-plugin - 3.3.2 - - - maven-compiler-plugin - 3.8.1 - - - maven-dependency-plugin - 3.6.1 - - - maven-deploy-plugin - 3.1.1 - - - maven-enforcer-plugin - 3.4.1 - - - org.codehaus.mojo - extra-enforcer-rules - 1.7.0 - compile - - - org.scijava - scijava-maven-plugin - 3.0.0 - compile - - - - - maven-failsafe-plugin - 3.2.5 - - - - integration-test - verify - - - - - - maven-gpg-plugin - 3.1.0 - - - sign-artifacts - verify - - sign - - - true - - - - - true - - - - maven-help-plugin - 3.4.0 - - - maven-install-plugin - 3.1.1 - - - maven-jar-plugin - 3.3.0 - - - - test-jar - - - - - true - true - true - - ${package-guess} - - - - ${buildNumber} - 2024-03-03T16:51:20+0000 - ${package-guess} - - - true - - - - - - - true - true - true - - ${package-guess} - - - - ${buildNumber} - 2024-03-03T16:51:20+0000 - ${package-guess} - - - true - - - - maven-javadoc-plugin - 3.6.3 - - 1024m - - https://javadoc.scijava.org/Java8/ - https://javadoc.scijava.org/JavaFX8/ - https://javadoc.scijava.org/SciJava/ - https://javadoc.scijava.org/Alida/ - https://javadoc.scijava.org/Bio-Formats/ - https://javadoc.scijava.org/FLIMLib/ - https://javadoc.scijava.org/Fiji/ - https://javadoc.scijava.org/Icy/ - https://javadoc.scijava.org/ImageJ/ - https://javadoc.scijava.org/ImageJ1/ - https://javadoc.scijava.org/ImgLib2/ - https://javadoc.scijava.org/Java3D/ - https://javadoc.scijava.org/KNIME/ - https://javadoc.scijava.org/LOCI/ - https://javadoc.scijava.org/MiToBo/ - https://javadoc.scijava.org/Micro-Manager-Core/ - https://javadoc.scijava.org/Micro-Manager-Studio/ - https://javadoc.scijava.org/MorphoLibJ/ - https://javadoc.scijava.org/OMERO/ - https://javadoc.scijava.org/SCIFIO/ - https://javadoc.scijava.org/Apache-Commons-IO/ - https://javadoc.scijava.org/Apache-Commons-Lang/ - https://javadoc.scijava.org/Apache-Commons-Math/ - https://javadoc.scijava.org/Apache-Commons-Text/ - https://javadoc.scijava.org/BoneJ/ - https://javadoc.scijava.org/Eclipse/ - https://javadoc.scijava.org/Guava/ - https://javadoc.scijava.org/JAMA/ - https://javadoc.scijava.org/JFreeChart/ - https://javadoc.scijava.org/JGraphT/ - https://javadoc.scijava.org/JHotDraw/ - https://javadoc.scijava.org/JOML/ - https://javadoc.scijava.org/Javassist/ - https://javadoc.scijava.org/MigLayout/ - https://javadoc.scijava.org/NetBeans/ - https://javadoc.scijava.org/Pivot/ - https://javadoc.scijava.org/VisAD/ - https://javadoc.scijava.org/Weka/ - https://javadoc.scijava.org/ojAlgo/ - - - - - maven-plugin-plugin - 3.11.0 - - - maven-project-info-reports-plugin - 3.5.0 - - - maven-release-plugin - 3.0.1 - - - maven-resources-plugin - 3.3.1 - - - maven-shade-plugin - 3.5.2 - - - maven-site-plugin - 3.12.1 - - - maven-source-plugin - 3.3.0 - - - attach-sources - none - - - attach-sources-jar - - jar - - - - - - maven-surefire-plugin - 3.2.5 - - @{argLine} -Xms512m -Xmx512m -Dapple.awt.UIElement=true - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.5.0 - - - sanitize-version - - regex-property - - - sanitizedVersion - 38.0.0-SNAPSHOT - ^([0-9]+)\.([0-9]+)\.([0-9]+).*$ - $1.$2.$3 - false - - - - guess-package - - regex-property - - - package-guess - org.scijava.pom-scijava - [^a-z0-9_.]+ - _ - false - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 3.2.0 - - - validate - - create - - - true - UNKNOWN - - - - - - net.java.dev.jna - platform - 3.5.2 - compile - - - - true - UNKNOWN - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - html - xml - - - - - org.codehaus.mojo - exec-maven-plugin - 3.2.0 - - - org.codehaus.mojo - license-maven-plugin - 2.4.0 - - false - true - true - - java - properties - java - - - - - org.codehaus.mojo - tidy-maven-plugin - 1.2.0 - - - org.codehaus.mojo - versions-maven-plugin - 2.16.2 - - - org.scijava - scijava-maven-plugin - 3.0.0 - - - set-rootdir - validate - - set-rootdir - - - - - - com.zenjava - javafx-maven-plugin - 8.8.3 - - SciJava Parent POM - SciJava Parent POM - SciJava Parent POM.jar - - ${sanitizedVersion} - true - - - - net.revelc.code - impsort-maven-plugin - 1.9.0 - - - none - - java.,javax.,com.,net.,org. - java,* - true - - - - - java.,javax.,com.,net.,org. - java,* - true - - - - net.revelc.code.formatter - formatter-maven-plugin - 2.23.0 - - - org.scijava - scijava-coding-style - 2.1.1 - compile - - - - eclipse-formatter-settings/scijava-coding-style.xml - - - - org.fusesource.mvnplugins - maven-graph-plugin - 1.45 - - provided,runtime,system,test - true - - /home/elect/IdeaProjects/pom-scijava/target/dependency-graph.dot - - - - org.honton.chas - exists-maven-plugin - 0.12.0 - - - - remote - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.11 - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - - - org.revapi - revapi-maven-plugin - 0.15.0 - - - org.revapi - revapi-java - 0.28.1 - - - - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.10.0.2594 - - - - - - maven-enforcer-plugin - 3.4.1 - - - enforce-rules - - enforce - - - - - 3.6.3 - - - Plugins need to be versioned! - - - [1.8.0-101,) - - - No Duplicate Classes Allowed! -- For duplicate transitive dependencies, add dependency exclusions. -- For duplications between direct dependencies, resolve or add - ignored classes to this rule's configuration. - true - com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* - - - founder,lead,developer,debugger,reviewer,support,maintainer - - - founder,lead,developer,debugger,reviewer,support,maintainer - - - 8 - - com.headius:invokebinder - com.sun:tools - - - module-info - - - test - - - - - name - description - url - inceptionYear - organization - licenses - developers - contributors - mailingLists - scm - issueManagement - ciManagement - properties//license.licenseName - properties//license.copyrightOwners - - - - org.scijava,net.imagej,net.imglib2,io.scif,sc.fiji - - - - - - - - org.codehaus.mojo - extra-enforcer-rules - 1.7.0 - compile - - - org.scijava - scijava-maven-plugin - 3.0.0 - compile - - - - - - 3.6.3 - - - Plugins need to be versioned! - - - [1.8.0-101,) - - - No Duplicate Classes Allowed! -- For duplicate transitive dependencies, add dependency exclusions. -- For duplications between direct dependencies, resolve or add - ignored classes to this rule's configuration. - true - com.google.inject.*,javax.xml.namespace.QName,jnr.ffi.*,org.apache.hadoop.yarn.*.package-info,org.apache.spark.unused.UnusedStubClass,org.eclipse.aether.*,org.hibernate.stat.ConcurrentStatisticsImpl,org.junit.runner.Runner,org.jzy3d.plot3d.pipelines.* - - - founder,lead,developer,debugger,reviewer,support,maintainer - - - founder,lead,developer,debugger,reviewer,support,maintainer - - - 8 - - com.headius:invokebinder - com.sun:tools - - - module-info - - - test - - - - - name - description - url - inceptionYear - organization - licenses - developers - contributors - mailingLists - scm - issueManagement - ciManagement - properties//license.licenseName - properties//license.copyrightOwners - - - - org.scijava,net.imagej,net.imglib2,io.scif,sc.fiji - - - - - - maven-failsafe-plugin - 3.2.5 - - - - integration-test - verify - - - - - - maven-source-plugin - 3.3.0 - - - attach-sources - none - - - attach-sources-jar - - jar - - - - - - maven-surefire-plugin - 3.2.5 - - @{argLine} -Xms512m -Xmx512m -Dapple.awt.UIElement=true - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.5.0 - - - sanitize-version - - regex-property - - - sanitizedVersion - 38.0.0-SNAPSHOT - ^([0-9]+)\.([0-9]+)\.([0-9]+).*$ - $1.$2.$3 - false - - - - guess-package - - regex-property - - - package-guess - org.scijava.pom-scijava - [^a-z0-9_.]+ - _ - false - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 3.2.0 - - - validate - - create - - - true - UNKNOWN - - - - - - net.java.dev.jna - platform - 3.5.2 - compile - - - - true - UNKNOWN - - - - org.scijava - scijava-maven-plugin - 3.0.0 - - - set-rootdir - validate - - set-rootdir - - - older - - - - populate-app - install - - populate-app - - - older - - - - - older - - - - com.zenjava - javafx-maven-plugin - 8.8.3 - - SciJava Parent POM - SciJava Parent POM - SciJava Parent POM.jar - - ${sanitizedVersion} - true - - - - net.revelc.code - impsort-maven-plugin - 1.9.0 - - - none - - java.,javax.,com.,net.,org. - java,* - true - - - - - java.,javax.,com.,net.,org. - java,* - true - - - - net.revelc.code.formatter - formatter-maven-plugin - 2.23.0 - - - org.scijava - scijava-coding-style - 2.1.1 - compile - - - - eclipse-formatter-settings/scijava-coding-style.xml - - - - org.fusesource.mvnplugins - maven-graph-plugin - 1.45 - - provided,runtime,system,test - true - - /home/elect/IdeaProjects/pom-scijava/target/dependency-graph.dot - - - - org.jacoco - jacoco-maven-plugin - 0.8.11 - - - jacoco-initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - - - maven-javadoc-plugin - 3.6.3 - - /usr/lib/jvm/jdk-19/bin/javadoc - 1024m - - https://javadoc.scijava.org/Java8/ - https://javadoc.scijava.org/JavaFX8/ - https://javadoc.scijava.org/SciJava/ - https://javadoc.scijava.org/Alida/ - https://javadoc.scijava.org/Bio-Formats/ - https://javadoc.scijava.org/FLIMLib/ - https://javadoc.scijava.org/Fiji/ - https://javadoc.scijava.org/Icy/ - https://javadoc.scijava.org/ImageJ/ - https://javadoc.scijava.org/ImageJ1/ - https://javadoc.scijava.org/ImgLib2/ - https://javadoc.scijava.org/Java3D/ - https://javadoc.scijava.org/KNIME/ - https://javadoc.scijava.org/LOCI/ - https://javadoc.scijava.org/MiToBo/ - https://javadoc.scijava.org/Micro-Manager-Core/ - https://javadoc.scijava.org/Micro-Manager-Studio/ - https://javadoc.scijava.org/MorphoLibJ/ - https://javadoc.scijava.org/OMERO/ - https://javadoc.scijava.org/SCIFIO/ - https://javadoc.scijava.org/Apache-Commons-IO/ - https://javadoc.scijava.org/Apache-Commons-Lang/ - https://javadoc.scijava.org/Apache-Commons-Math/ - https://javadoc.scijava.org/Apache-Commons-Text/ - https://javadoc.scijava.org/BoneJ/ - https://javadoc.scijava.org/Eclipse/ - https://javadoc.scijava.org/Guava/ - https://javadoc.scijava.org/JAMA/ - https://javadoc.scijava.org/JFreeChart/ - https://javadoc.scijava.org/JGraphT/ - https://javadoc.scijava.org/JHotDraw/ - https://javadoc.scijava.org/JOML/ - https://javadoc.scijava.org/Javassist/ - https://javadoc.scijava.org/MigLayout/ - https://javadoc.scijava.org/NetBeans/ - https://javadoc.scijava.org/Pivot/ - https://javadoc.scijava.org/VisAD/ - https://javadoc.scijava.org/Weka/ - https://javadoc.scijava.org/ojAlgo/ - - - - - maven-clean-plugin - 3.3.2 - - - default-clean - clean - - clean - - - - - - maven-install-plugin - 3.1.1 - - - default-install - install - - install - - - - - - maven-deploy-plugin - 3.1.1 - - - default-deploy - deploy - - deploy - - - - - - maven-site-plugin - 3.12.1 - - - default-site - site - - site - - - /home/elect/IdeaProjects/pom-scijava/target/site - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - - - - default-deploy - site-deploy - - deploy - - - /home/elect/IdeaProjects/pom-scijava/target/site - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - - - - - /home/elect/IdeaProjects/pom-scijava/target/site - - - org.apache.maven.plugins - maven-javadoc-plugin - - - org.apache.maven.plugins - maven-project-info-reports-plugin - - - - - - - - /home/elect/IdeaProjects/pom-scijava/target/site - - - maven-javadoc-plugin - - - - diff --git a/gradle/platform/gradle/wrapper/gradle-wrapper.jar b/gradle/platform/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index d64cd4917707c1f8861d8cb53dd15194d4248596..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43462 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 diff --git a/gradle/platform/gradle/wrapper/gradle-wrapper.properties b/gradle/platform/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index b82aa23a..00000000 --- a/gradle/platform/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,7 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip -networkTimeout=10000 -validateDistributionUrl=true -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradle/platform/gradlew b/gradle/platform/gradlew deleted file mode 100755 index 1aa94a42..00000000 --- a/gradle/platform/gradlew +++ /dev/null @@ -1,249 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC2039,SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -# and any embedded shellness will be escaped. -# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be -# treated as '${Hostname}' itself on the command line. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/gradle/platform/gradlew.bat b/gradle/platform/gradlew.bat deleted file mode 100644 index 93e3f59f..00000000 --- a/gradle/platform/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/gradle/platform/settings.gradle.kts b/gradle/platform/settings.gradle.kts deleted file mode 100644 index dd1d7798..00000000 --- a/gradle/platform/settings.gradle.kts +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user manual at https://docs.gradle.org/7.2/userguide/multi_project_builds.html - */ - -rootProject.name = "gradle-platform" - -dependencyResolutionManagement { - - // repositories { .. } - versionCatalogs { - // create("libs") { - // from("org.scijava:gradle-catalog:0.11") - // library("my-lib", "com.mycompany:mylib:1.2") - // } - // maybeCreate("libs").version("groovy", "3.0.9") - // maybeCreate("libs").library("groovy-core", "org.codehaus.groovy:groovy:2.4.15") - - // fails with "Could not resolve all artifacts for configuration 'incomingCatalogForLibs0'." - if (file("../catalog/build/version-catalog/libs.versions.toml").exists()) - create("libs").from(files("../catalog/build/version-catalog/libs.versions.toml")) - } - - includeBuild("../catalog") -} - -enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file diff --git a/gradle/playground/build.gradle.kts b/gradle/playground/build.gradle.kts deleted file mode 100644 index b40c122e..00000000 --- a/gradle/playground/build.gradle.kts +++ /dev/null @@ -1,119 +0,0 @@ -import org.gradle.api.publish.maven.internal.publication.DefaultMavenPom - -plugins { - embeddedKotlin("jvm") - id("org.gradlex.java-ecosystem-capabilities") version "1.5.2.00" - id("dev.jacomet.logging-capabilities") version "0.11.1" - id("io.fuchs.gradle.classpath-collision-detector") version "0.3" - `maven-publish` -} - -repositories { - mavenCentral() - maven("https://maven.scijava.org/content/repositories/releases") - maven("https://maven.scijava.org/content/groups/public") -} - -// @CacheableRule is more verbose but more efficient, because the rule will be applied before the dependency get cached -// in Gradle, it will appear as this was the original downloaded metadata of the given dependency - -inline fun ComponentMetadataHandler.withModules(vararg modules: String) { - for (module in modules) withModule(module) -} - -abstract class Rule : ComponentMetadataRule { - fun ComponentMetadataContext.remove(vararg modules: String) = details.allVariants { withDependencies { removeIf { it.module.toString() in modules } } } -} -dependencies { - components { - @CacheableRule open class NoXalan : Rule() { - override fun execute(context: ComponentMetadataContext) = context.remove("xalan:serializer", "xalan:xalan") - } - withModules("org.openmicroscopy:ome-common", "ome:bio-formats-tools", "ome:formats-api", "ome:formats-bsd", - "org.apache.xmlgraphics:batik-bridge", "org.apache.xmlgraphics:batik-dom") - - @CacheableRule open class NoUeberJars : Rule() { - override fun execute(context: ComponentMetadataContext) = context.remove("org.apache.xmlgraphics:batik-all", "it.unimi.dsi:fastutil") - } - withModules("org.openmicroscopy:omero-blitz", "org.openmicroscopy:omero-server") - - @CacheableRule open class NoAndroid : Rule() { - override fun execute(context: ComponentMetadataContext) = context.remove("com.google.android.tools:dx") - } - withModules("net.clearcontrol:coremem", "com.nativelibs4java:bridj") - - @CacheableRule open class ClearGl : Rule() { - override fun execute(context: ComponentMetadataContext) = context.remove("org.jogamp.gluegen:gluegen-rt-main", "org.jogamp.jogl:jogl-all-main") - } - withModule("net.clearvolume:cleargl") - - @CacheableRule open class SparkCore211 : Rule() { - override fun execute(context: ComponentMetadataContext) = context.remove("io.netty:netty-all") - } - withModule("org.apache.spark:spark-core_2.11") - - @CacheableRule open class NoBatikExtensions : Rule() { - override fun execute(context: ComponentMetadataContext) = context.remove("org.apache.xmlgraphics:batik-extensions") - } - withModules("org.apache.xmlgraphics:batik-rasterizer-ext", "org.apache.xmlgraphics:batik-squiggle-ext") - - @CacheableRule open class NoJogampNatives : Rule() { - override fun execute(context: ComponentMetadataContext) { - // Conflicts with properly packaged jogamp native classifiers. - val libs = listOf("gluegen:gluegen-rt", "jogl:jogl-all") - val modules = listOf("linux-aarch64", "linux-amd64", "linux-armv6hf", "linux-i586", "macosx-universal", "windows-amd64", "windows-i586") - .flatMap { p -> libs.map { "org.jogamp.$it-natives-$p" } }.toTypedArray() - context.remove(*modules) - } - } - withModules("org.jzy3d:jzy3d-native-jogl-awt", "org.jzy3d:jzy3d-native-jogl-core") - - @CacheableRule open class Weka : Rule() { - val exclusions = listOf( - "com.github.fommil.netlib:all", "com.googlecode.netlib-java:netlib-java", "net.sourceforge.f2j:arpack_combined_all", - "nz.ac.waikato.cms.weka.thirdparty:java-cup-11b", "nz.ac.waikato.cms.weka.thirdparty:java-cup-11b-runtime") - - override fun execute(context: ComponentMetadataContext) { - context.details.allVariants { - withDependencies { - removeIf { it.module.toString() in exclusions } - add("runtimeClasspath", "com.github.vbmacher:java-cup-runtime") - } - } - } - } - withModule("nz.ac.waikato.cms.weka:weka-dev") - } - // implementation("org.jzy3d:jzy3d-emul-gl:+") - // implementation("org.jzy3d:jzy3d-emul-gl-awt:+") - - implementation("junit:junit:4.4") - // implementation("org.hamcrest:hamcrest-core:1.2") -} - -tasks.detectCollisions { - // detectCollisions() // to detect on configuration time - // configurations.from(project.configurations.testRuntimeClasspath) -} - -publishing { - publications.register("maven") { - pom { - this as DefaultMavenPom - println(name.orNull) - println(licenses) - this.licenses { - license { - this.name = "Nich" - url = "URL" - comments = "com" - distribution = "dis" - } - } - println(licenses[0].name.orNull) - println(licenses[0].url.orNull) - println(licenses[0].comments.orNull) - println(licenses[0].distribution.orNull) - } - } -} \ No newline at end of file diff --git a/gradle/playground/settings.gradle.kts b/gradle/playground/settings.gradle.kts deleted file mode 100644 index b4fc3041..00000000 --- a/gradle/playground/settings.gradle.kts +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user manual at https://docs.gradle.org/7.2/userguide/multi_project_builds.html - */ - -rootProject.name = "gradle-playground" - -pluginManagement.repositories { - gradlePluginPortal() - maven("https://maven.scijava.org/content/repositories/releases") -} - -dependencyResolutionManagement { - - // repositories { .. } - versionCatalogs { - create("libs").from("org.scijava:gradle-catalog") - - // fails with "Could not resolve all artifacts for configuration 'incomingCatalogForLibs0'." - // create("libs").from(files("../catalog/build/version-catalog/libs.versions.toml")) - } - - includeBuild("../catalog") - // includeBuild("../../../java-ecosystem-capabilities") -} - -enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file diff --git a/gradle/settings.gradle.kts b/gradle/settings.gradle.kts deleted file mode 100644 index 35443720..00000000 --- a/gradle/settings.gradle.kts +++ /dev/null @@ -1,14 +0,0 @@ -// This is an empty umbrella build including all the component builds. -// This build is not necessarily needed. The component builds work independently. - -rootProject.name = "gradle" - -includeBuild("catalog") -includeBuild("platform") -includeBuild("manifest-dependencies") -includeBuild("declarative") -includeBuild("declarative-playground") -//includeBuild("playground") -//includeBuild("enforcer") - -enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") \ No newline at end of file diff --git a/pom.xml b/pom.xml index f173dc93..b379f5b6 100644 --- a/pom.xml +++ b/pom.xml @@ -6875,83 +6875,57 @@ - - - - gradle-catalog - - - - gradle/platform - - - - - - org.codehaus.mojo - exec-maven-plugin - - - generate-gradle-catalog - generate-sources - - exec - - - ../gradlew - gradle/catalog - - generateCatalogAsToml - - - - - generate-gradle-platform - generate-sources - - exec - - - ../gradlew - gradle/platform - - generateMetadataFileForSciJavaPlatformPublication - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-gradle-catalog - - package - - - attach-artifact - - - - - gradle/catalog/build/version-catalog/libs.versions.toml - toml - - - gradle/platform/build/publications/sciJavaPlatform/module.json - - module - - - - - - - - - - + + + + org.codehaus.mojo + exec-maven-plugin + + + generate-gradle-catalog-and-platform + generate-sources + + exec + + + ./gradlew + gradle-scijava + + generateCatalogAndPlatform + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-gradle-catalog + + package + + + attach-artifact + + + + + target/gradle/version-catalog/libs.versions.toml + toml + + + target/gradle/publications/pomScijava/module.json + + module + + + + + + + + From 683503efb86a43e4a4478cdb8a7f759873fd60b9 Mon Sep 17 00:00:00 2001 From: Giuseppe Barbieri Date: Tue, 7 May 2024 10:24:43 +0200 Subject: [PATCH 727/996] idea files + gitignore --- .gitignore | 3 ++- .idea/misc.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3f234464..831dc366 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /.project /.settings/ /target/ -/gradle-scijava/.gradle \ No newline at end of file +/gradle-scijava/.gradle +.idea \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index a4e60c8b..48041f58 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ - + +fiji/Colocalisation_Analysis +imagej/imagej-common +imagej/imagej-legacy +imglib/imglib2-mesh +imagej/imagej-matlab +ome/bioformats +ome/ome-codecs +ome/ome-common-java +ome/ome-metakit +ome/ome-model +ome/ome-poi +ome/omero-blitz +ome/omero-common +ome/omero-dsl-plugin +ome/omero-gateway-java +ome/omero-model +ome/omero-renderer +ome/omero-romio +ome/omero-server +scijava/java3d-core None +scijava/java3d-utils None +scijava/jep None +scijava/junit-benchmarks None +scijava/minimaven +scijava/native-lib-loader +scijava/parsington +scijava/scijava-coding-style +scijava/scijava-common +scijava/scijava-config +scijava/scijava-log-slf4j +scijava/scijava-maven-plugin +scijava/script-editor-scala +scijava/swing-checkbox-tree +scijava/vecmath None +trackmate-sc/TrackMate +trackmate-sc/TrackMate-CSVImporter +trackmate-sc/TrackMate-Cellpose +trackmate-sc/TrackMate-ExTrack +trackmate-sc/TrackMate-Ilastik +trackmate-sc/TrackMate-MorphoLibJ +trackmate-sc/TrackMate-Oneat +trackmate-sc/TrackMate-Skeleton +trackmate-sc/TrackMate-StarDist +trackmate-sc/TrackMate-Weka diff --git a/footer.html b/footer.html new file mode 100644 index 00000000..4d7603b2 --- /dev/null +++ b/footer.html @@ -0,0 +1,50 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/header.html b/header.html new file mode 100644 index 00000000..16d992a7 --- /dev/null +++ b/header.html @@ -0,0 +1 @@ + diff --git a/pombast.toml b/pombast.toml index 466ac5cc..89b0e802 100644 --- a/pombast.toml +++ b/pombast.toml @@ -204,3 +204,12 @@ skip-tests = [ [components."net.imglib2:imglib2-mesh"] "java-version" = 11 + +[status] +rules = "rules.xml" +projects = "projects.txt" +badges = "ci-badges.txt" +timestamps = "timestamps.txt" +html = "index.html" +header = "header.html" +footer = "footer.html" diff --git a/projects.txt b/projects.txt new file mode 100644 index 00000000..49959fef --- /dev/null +++ b/projects.txt @@ -0,0 +1,25 @@ +mpicbg:mpicbg https://github.com/axtimwalde/mpicbg +mpicbg:mpicbg_ https://github.com/axtimwalde/mpicbg +net.imagej:ij https://github.com/imagej/ImageJ +net.imglib2:imglib2-label-multisets https://github.com/saalfeldlab/imglib2-label-multisets +ome:bio-formats_plugins https://github.com/ome/bioformats +ome:formats-api https://github.com/ome/bioformats +ome:formats-bsd https://github.com/ome/bioformats +ome:formats-gpl https://github.com/ome/bioformats +org.janelia:H5J_Loader_Plugin https://github.com/fiji/H5J_Loader_Plugin +org.openmicroscopy:metakit https://github.com/ome/ome-metakit +org.openmicroscopy:ome-common https://github.com/ome/ome-common-java +org.openmicroscopy:ome-xml https://github.com/ome/ome-model +org.openmicroscopy:omero-gateway https://github.com/ome/omero-gateway-java +org.openmicroscopy:specification https://github.com/ome/ome-model +org.scijava:j3dcore https://github.com/scijava/java3d-core +org.scijava:j3dutils https://github.com/scijava/java3d-utils +sc.fiji:T2-NIT https://github.com/trakem2/T2-NIT +sc.fiji:T2-TreelineGraph https://github.com/trakem2/T2-TreelineGraph +sc.fiji:TrakEM2_ https://github.com/trakem2/TrakEM2 +sc.fiji:VectorString https://github.com/trakem2/VectorString +sc.fiji:bigwarp_fiji https://github.com/saalfeldlab/bigwarp +sc.fiji:spim_data https://github.com/bigdataviewer/spimdata +sc.fiji:trakem2-transform https://github.com/trakem2/trakem2-transform +sc.fiji:trakem2_tps https://github.com/saalfeldlab/trakem2-tps +sc.fiji:z_spacing https://github.com/saalfeldlab/z-spacing diff --git a/timestamps.txt b/timestamps.txt new file mode 100644 index 00000000..d3b86f2f --- /dev/null +++ b/timestamps.txt @@ -0,0 +1,161 @@ +# Stable forks of third-party projects. +org.scijava:j3dcore 20180905120000 +org.scijava:j3dutils 20180905120000 +org.scijava:jep 20171225120000 +org.scijava:junit-benchmarks 20180905120000 +org.scijava:vecmath 20180905120000 + +# Newer versions break stuff... freeze for now. +hsqldb:hsqldb 20190101000000 +org.codehaus.groovy:groovy 20250101000000 +org.codehaus.groovy:groovy-ant 20250101000000 +org.codehaus.groovy:groovy-astbuilder 20250101000000 +org.codehaus.groovy:groovy-bsf 20250101000000 +org.codehaus.groovy:groovy-cli-commons 20250101000000 +org.codehaus.groovy:groovy-cli-picocli 20250101000000 +org.codehaus.groovy:groovy-console 20250101000000 +org.codehaus.groovy:groovy-datetime 20250101000000 +org.codehaus.groovy:groovy-dateutil 20250101000000 +org.codehaus.groovy:groovy-docgenerator 20250101000000 +org.codehaus.groovy:groovy-groovydoc 20250101000000 +org.codehaus.groovy:groovy-groovysh 20250101000000 +org.codehaus.groovy:groovy-jaxb 20250101000000 +org.codehaus.groovy:groovy-jmx 20250101000000 +org.codehaus.groovy:groovy-json 20250101000000 +org.codehaus.groovy:groovy-jsr223 20250101000000 +org.codehaus.groovy:groovy-macro 20250101000000 +org.codehaus.groovy:groovy-nio 20250101000000 +org.codehaus.groovy:groovy-servlet 20250101000000 +org.codehaus.groovy:groovy-sql 20250101000000 +org.codehaus.groovy:groovy-swing 20250101000000 +org.codehaus.groovy:groovy-templates 20250101000000 +org.codehaus.groovy:groovy-test 20250101000000 +org.codehaus.groovy:groovy-test-junit5 20250101000000 +org.codehaus.groovy:groovy-testng 20250101000000 +org.codehaus.groovy:groovy-xml 20250101000000 +org.codehaus.groovy:groovy-yaml 20250101000000 +org.mockito:mockito-core 20250101000000 +org.ojalgo:ojalgo 20250101000000 +org.python:jython-slim 20230309000000 +org.springframework:spring-aop 20250101000000 +org.springframework:spring-beans 20250101000000 +org.springframework:spring-core 20250101000000 +org.tensorflow:libtensorflow 20200701000000 +org.tensorflow:libtensorflow_jni 20200701000000 +org.tensorflow:libtensorflow_jni_gpu 20200701000000 +org.tensorflow:proto 20200701000000 +org.tensorflow:tensorflow 20200701000000 + +# Not maintaining ImageJ Server currently... +net.imagej:imagej-server 20250101000000 + +# SciJava projects with only CI+POM changes. +io.scif:scifio-cli 20230309000000 +io.scif:scifio-hdf5 20230309000000 +io.scif:scifio-jai-imageio 20230309000000 +io.scif:scifio-labeling 20230309000000 +io.scif:scifio-lifesci 20230309000000 +net.imagej:imagej-deprecated 20230309000000 +net.imagej:imagej-mesh 20230309000000 +net.imagej:imagej-mesh-io 20230309000000 +net.imagej:imagej-notebook 20230309000000 +net.imagej:imagej-plugins-batch 20230309000000 +net.imagej:imagej-plugins-commands 20230309000000 +net.imagej:imagej-plugins-tools 20230309000000 +net.imagej:imagej-plugins-uploader-ssh 20230309000000 +net.imagej:imagej-ui-awt 20230309000000 +net.imagej:op-finder 20230309000000 +net.imglib2:imglib2-algorithm-fft 20230309000000 +net.imglib2:imglib2-algorithm-gpl 20230309000000 +net.imglib2:imglib2-unsafe 20230309000000 +org.scijava:minimaven 20230309000000 +org.scijava:native-lib-loader 20230309000000 +org.scijava:scijava-cache 20230309000000 +org.scijava:scijava-grab 20230309000000 +org.scijava:scijava-io-http 20230309000000 +org.scijava:scijava-java3d 20230309000000 +org.scijava:scijava-listeners 20211021000000 +org.scijava:scijava-maven-plugin 20230309000000 +org.scijava:scijava-optional 20230309000000 +org.scijava:scijava-plot 20230309000000 +org.scijava:scijava-plugins-platforms 20230309000000 +org.scijava:scijava-plugins-text-markdown 20230309000000 +org.scijava:scijava-ui-awt 20230309000000 +org.scijava:scripting-clojure 20230309000000 +org.scijava:scripting-java 20230309000000 +org.scijava:scripting-jruby 20230309000000 +org.scijava:scripting-matlab 20230309000000 +org.scijava:scripting-scala 20230309000000 +org.scijava:swing-checkbox-tree 20230309000000 +sc.fiji:3D_Objects_Counter 20230313000000 +sc.fiji:3D_Viewer 20230313000000 +sc.fiji:AnalyzeSkeleton_ 20230309000000 +sc.fiji:Anisotropic_Diffusion_2D 20230309000000 +sc.fiji:Archipelago_Plugins 20230309000000 +sc.fiji:Arrow_ 20230309000000 +sc.fiji:Auto_Local_Threshold 20230309000000 +sc.fiji:BalloonSegmentation_ 20230309000000 +sc.fiji:Bug_Submitter 20230309000000 +sc.fiji:Calculator_Plus 20230309000000 +sc.fiji:Cell_Counter 20230309000000 +sc.fiji:Colocalisation_Analysis 20230309000000 +sc.fiji:Color_Histogram 20230309000000 +sc.fiji:Color_Inspector_3D 20230309000000 +sc.fiji:Colour_Deconvolution 20230309000000 +sc.fiji:Correct_3D_Drift 20230309000000 +sc.fiji:Dichromacy_ 20230309000000 +sc.fiji:Directionality_ 20230309000000 +sc.fiji:Fiji_Archipelago 20230309000000 +sc.fiji:Fiji_Package_Maker 20230309000000 +sc.fiji:FlowJ_ 20230309000000 +sc.fiji:Graph_Cut 20230309000000 +sc.fiji:Gray_Morphology 20230309000000 +sc.fiji:Helmholtz_Analysis 20230309000000 +sc.fiji:IJ_Robot 20230309000000 +sc.fiji:Image_5D 20230309000000 +sc.fiji:Image_Expression_Parser 20230309000000 +sc.fiji:Interactive_3D_Surface_Plot 20230309000000 +sc.fiji:IsoData_Classifier 20230309000000 +sc.fiji:Kappa 20230309000000 +sc.fiji:Kuwahara_Filter 20230309000000 +sc.fiji:LSM_Reader 20230309000000 +sc.fiji:LSM_Toolbox 20230309000000 +sc.fiji:Lasso_and_Blow_Tool 20230309000000 +sc.fiji:Linear_Kuwahara 20230309000000 +sc.fiji:LocalThickness_ 20230309000000 +sc.fiji:MTrack2_ 20230309000000 +sc.fiji:M_I_P 20230309000000 +sc.fiji:Manual_Tracking 20230309000000 +sc.fiji:Multi_Kymograph 20230309000000 +sc.fiji:OMEVisual 20230309000000 +sc.fiji:PIV_analyser 20230309000000 +sc.fiji:QuickPALM_ 20230309000000 +sc.fiji:RATS_ 20230309000000 +sc.fiji:SPIM_Opener 20230309000000 +sc.fiji:Samples_ 20230309000000 +sc.fiji:Series_Labeler 20230309000000 +sc.fiji:Siox_Segmentation 20230309000000 +sc.fiji:Skeletonize3D_ 20230309000000 +sc.fiji:SplineDeformationGenerator_ 20230309000000 +sc.fiji:Stack_Manipulation 20230309000000 +sc.fiji:Statistical_Region_Merging 20230309000000 +sc.fiji:Sync_Win 20230309000000 +sc.fiji:Thread_Killer 20230309000000 +sc.fiji:Time_Lapse 20230309000000 +sc.fiji:Time_Stamper 20230309000000 +sc.fiji:ToAST_ 20230309000000 +sc.fiji:TopoJ_ 20230309000000 +sc.fiji:VIB-lib 20230309000000 +sc.fiji:Vaa3d_Reader 20230309000000 +sc.fiji:Vaa3d_Writer 20230309000000 +sc.fiji:Video_Editing 20230309000000 +sc.fiji:bUnwarpJ_ 20230309000000 +sc.fiji:bij 20230309000000 +sc.fiji:fiji-lib 20230309000000 +sc.fiji:level_sets 20230309000000 +sc.fiji:pal-optimization 20230309000000 +sc.fiji:panorama_ 20230309000000 +sc.fiji:registration_3d 20230309000000 +sc.fiji:spimdata 20230309000000 +sc.fiji:trakem2-transform 20230309000000 +sc.fiji:weave_jy2java 20230309000000 From 9abe43da627cf99830bed4da58e79c4e0e0dbda0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 19 May 2026 18:49:53 -0500 Subject: [PATCH 914/996] CI: try another way of deleting the cache --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c2298d4a..1a9a5e49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,8 @@ on: jobs: build: runs-on: ubuntu-latest + permissions: + actions: write steps: - uses: actions/checkout@v4 @@ -52,7 +54,7 @@ jobs: run: | gh api --method DELETE -H "Accept: application/vnd.github+json" /repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-cache || true env: - GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Save the melting-pot cache if: env.cacheChanged == 'true' From 01ac4baa6ec574483e4de1bffd1e55315a5270bb Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 19 May 2026 18:55:46 -0500 Subject: [PATCH 915/996] pombast: move status section up --- pombast.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pombast.toml b/pombast.toml index 89b0e802..a21e2b9f 100644 --- a/pombast.toml +++ b/pombast.toml @@ -2,6 +2,15 @@ default-java-version = 8 repositories = ["scijava.public=https://maven.scijava.org/content/groups/public"] +[status] +rules = "rules.xml" +projects = "projects.txt" +badges = "ci-badges.txt" +timestamps = "timestamps.txt" +html = "index.html" +header = "header.html" +footer = "footer.html" + [melt] java-version = 11 template = "tests/mega-melt-template.xml" @@ -204,12 +213,3 @@ skip-tests = [ [components."net.imglib2:imglib2-mesh"] "java-version" = 11 - -[status] -rules = "rules.xml" -projects = "projects.txt" -badges = "ci-badges.txt" -timestamps = "timestamps.txt" -html = "index.html" -header = "header.html" -footer = "footer.html" From 39b82bfb1410fa5abd74c85c25b28975211ce386 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 19 May 2026 18:56:06 -0500 Subject: [PATCH 916/996] pombast: remove unneeded quotes --- pombast.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pombast.toml b/pombast.toml index a21e2b9f..0f0868a3 100644 --- a/pombast.toml +++ b/pombast.toml @@ -209,7 +209,7 @@ skip-tests = [ "sc.fiji:labkit-ui" = ["sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest"] [components."net.imagej:ij"] -"java-version" = 11 +java-version = 11 [components."net.imglib2:imglib2-mesh"] -"java-version" = 11 +java-version = 11 From 9c68a60dbe45973548a03c079f82132daedc8324 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 19 May 2026 18:56:12 -0500 Subject: [PATCH 917/996] pombast: note BoneJ components needing Java 11+ --- pombast.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pombast.toml b/pombast.toml index 0f0868a3..07a86529 100644 --- a/pombast.toml +++ b/pombast.toml @@ -213,3 +213,9 @@ java-version = 11 [components."net.imglib2:imglib2-mesh"] java-version = 11 + +[components."org.bonej:bonej-legacy-plugins_"] +java-version = 11 + +[components."org.bonej:bonej-ops"] +java-version = 11 From b44a74b8af9abd09b0d6db51ec3bf118195109c6 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 19 May 2026 19:21:28 -0500 Subject: [PATCH 918/996] Overhaul CI to use pombast smelt/status instead of melting-pot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit build.yml: - Replace old tests/run.sh (melting-pot) with pombast smelt - Drop the melting-pot cache restore/save/delete steps and exit.sh trick - Add astral-sh/setup-uv and webfactory/ssh-agent (master push only) - On master push: publish smelt.json to status.scijava.org gh-pages New status.yml: - Runs daily (and on master push) to regenerate status.scijava.org index.html - Lives in pom-scijava to avoid GitHub's 60-day dormancy kill of scheduled jobs - Installs pombast, runs pombast status --config pombast.toml, publishes index.html release.yml: - Use release-setup.sh (no apt packages -- only needed for smelt builds) - Use simplified build.sh (no melting-pot logic) Script renames and new files: - setup.sh → build-setup.sh (drops libxml2-utils, keeps smelt native deps) - new release-setup.sh (ci-setup-github-actions.sh only) - build.sh stripped to just ci-build.sh (no release detection, no melting-pot) - new smelt.sh (installs pombast, runs smelt, writes smelt.json) - new status.sh (installs pombast, runs status, publishes index.html) - new publish.sh (shared helper: commit a file to status.scijava.org gh-pages) - exit.sh deleted (no longer needed) pombast.toml: - Add nexus-base to [status] section Co-Authored-By: Claude Sonnet 4.6 --- .github/build-setup.sh | 10 +++++++ .github/build.sh | 56 ++--------------------------------- .github/exit.sh | 8 ----- .github/publish.sh | 25 ++++++++++++++++ .github/release-setup.sh | 3 ++ .github/setup.sh | 11 ------- .github/smelt.sh | 3 ++ .github/status.sh | 5 ++++ .github/workflows/build.yml | 46 ++++++++++------------------ .github/workflows/release.yml | 7 ++--- .github/workflows/status.yml | 26 ++++++++++++++++ pombast.toml | 1 + 12 files changed, 94 insertions(+), 107 deletions(-) create mode 100755 .github/build-setup.sh delete mode 100755 .github/exit.sh create mode 100755 .github/publish.sh create mode 100755 .github/release-setup.sh delete mode 100755 .github/setup.sh create mode 100755 .github/smelt.sh create mode 100755 .github/status.sh create mode 100644 .github/workflows/status.yml diff --git a/.github/build-setup.sh b/.github/build-setup.sh new file mode 100755 index 00000000..64b4c955 --- /dev/null +++ b/.github/build-setup.sh @@ -0,0 +1,10 @@ +#!/bin/sh +curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh +sh ci-setup-github-actions.sh + +# Install native libraries needed to build and test smelt components. +pkgs="libxcb-shape0" # org.janelia:H5J_Loader_Plugin +pkgs="$pkgs libgtk2.0-0" # net.imagej:imagej-opencv +pkgs="$pkgs libblosc1" # org.janelia.saalfeldlab:n5-blosc +sudo apt-get update +sudo apt-get -y install $pkgs diff --git a/.github/build.sh b/.github/build.sh index ba5e7a29..523abeb8 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -1,55 +1,3 @@ #!/bin/sh - -# Discern whether this is a release build. -releasing= -if [ -f release.properties ]; then - releasing=1 -fi - -# Run the SciJava CI build script. -curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-build.sh && -sh ci-build.sh || { echo "Maven build failed. Skipping melting pot tests."; exit 1; } - -# Skip melting pot if cutting a release. -if [ "$releasing" ]; then - exit 0 -fi - -# Helper method to get the last cache modified date as seconds since epoch -last_cache_modified() { - find "$HOME/.cache/scijava/melting-pot" -type f | while read f - do - stat -c '%Y' "$f" - done | sort -nr 2>/dev/null | head -n1 -} - -# Record the last time of cache modification before running melting-pot -cache_modified_pre=0 -cache_modified_post=0 - -if [ -d "$HOME/.cache/scijava/melting-pot" ]; then - cache_modified_pre=$(last_cache_modified) -fi - -# run melting-pot -tests/run.sh -meltResult=$? - -# Record the last time of cache modification after running melting-pot -if [ -d "$HOME/.cache/scijava/melting-pot" ]; then - cache_modified_post=$(last_cache_modified) -fi - -# Determine if cache needs to be re-generated -echo "cache_modified_pre=$cache_modified_pre" -echo "cache_modified_post=$cache_modified_post" -if [ "$cache_modified_post" -gt "$cache_modified_pre" ]; then - echo "cacheChanged=true" - echo "cacheChanged=true" >> $GITHUB_ENV -else - echo "cacheChanged=false" - echo "cacheChanged=false" >> $GITHUB_ENV -fi - -# NB: This script exits 0, but saves the exit code for a later build step. -echo $meltResult > exit-code +curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-build.sh +sh ci-build.sh diff --git a/.github/exit.sh b/.github/exit.sh deleted file mode 100755 index b5ab4d19..00000000 --- a/.github/exit.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -test -f exit-code || { - echo "[ERROR] No build exit code was saved!" - exit 255 -} -exitCode=$(cat exit-code) -rm -f exit-code -exit $exitCode diff --git a/.github/publish.sh b/.github/publish.sh new file mode 100755 index 00000000..ac79edb3 --- /dev/null +++ b/.github/publish.sh @@ -0,0 +1,25 @@ +#!/bin/sh +# Commit a file to the status.scijava.org gh-pages branch. +# Usage: publish.sh [commit-message] +# Requires SSH agent to be running with write access to status.scijava.org. +set -e +file=$1 +message=${2:-"Update $(basename "$file")"} +test -f "$file" || { echo "File not found: $file" >&2; exit 1; } +dest=$(basename "$file") + +git config --global user.name github-actions +git config --global user.email github-actions@github.com + +git clone --depth=1 --branch=gh-pages git@github.com:scijava/status.scijava.org site-publish +cp "$file" "site-publish/$dest" +cd site-publish +if git diff --quiet "$dest" +then + echo "== No changes to $dest ==" +else + echo "== Committing $dest ==" + git add "$dest" + git commit -m "$message" + git push +fi diff --git a/.github/release-setup.sh b/.github/release-setup.sh new file mode 100755 index 00000000..a03464be --- /dev/null +++ b/.github/release-setup.sh @@ -0,0 +1,3 @@ +#!/bin/sh +curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh +sh ci-setup-github-actions.sh diff --git a/.github/setup.sh b/.github/setup.sh deleted file mode 100755 index 6f254a7e..00000000 --- a/.github/setup.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh -sh ci-setup-github-actions.sh - -# Install needed packages. -pkgs="libxml2-utils" # needed for melting pot -pkgs="$pkgs libxcb-shape0" # org.janelia:H5J_Loader_Plugin (fiji/H5J_Loader_Plugin@d026a1bb) -pkgs="$pkgs libgtk2.0-0" # net.imagej:imagej-opencv (imagej/imagej-opencv@21113e08) -pkgs="$pkgs libblosc1" # org.janelia.saalfeldlab:n5-blosc -sudo apt-get update -sudo apt-get -y install $(echo "$pkgs") diff --git a/.github/smelt.sh b/.github/smelt.sh new file mode 100755 index 00000000..1a92a196 --- /dev/null +++ b/.github/smelt.sh @@ -0,0 +1,3 @@ +#!/bin/sh +uv tool install "git+https://github.com/scijava/pombast.git@66a1e3abff431846a900703f7450e0c21f1456cc" +pombast smelt --config pombast.toml --json smelt.json . diff --git a/.github/status.sh b/.github/status.sh new file mode 100755 index 00000000..f94d572e --- /dev/null +++ b/.github/status.sh @@ -0,0 +1,5 @@ +#!/bin/sh +uv tool install "git+https://github.com/scijava/pombast.git@66a1e3abff431846a900703f7450e0c21f1456cc" +pombast status --config pombast.toml --html index.html . +commitNote="$(TZ=UTC date +'%Y-%m-%d %H:%M:%S UTC')" +.github/publish.sh index.html "Update component table ($commitNote)" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1a9a5e49..197a336c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,16 +8,16 @@ on: branches: - master schedule: - - cron: "4 5 * * 0" # every Sunday at 0405, to keep cache alive + # Run weekly on Sunday to keep the Maven cache alive. + - cron: '4 5 * * 0' jobs: build: runs-on: ubuntu-latest - permissions: - actions: write steps: - uses: actions/checkout@v4 + - name: Set up Java uses: actions/setup-java@v4 with: @@ -26,18 +26,17 @@ jobs: distribution: 'zulu' cache: 'maven' - - name: Set up CI environment - run: .github/setup.sh + - uses: astral-sh/setup-uv@v6 - - name: Restore the melting-pot cache - id: restore-cache - uses: actions/cache/restore@v3 + - uses: webfactory/ssh-agent@v0.9.0 + if: github.ref == 'refs/heads/master' && github.event_name == 'push' with: - path: ~/.cache/scijava/melting-pot - key: ${{ runner.os }}-cache + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + + - name: Set up build environment + run: .github/build-setup.sh - - name: Execute the build - id: execute-build + - name: Maven CI build run: .github/build.sh env: GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }} @@ -48,22 +47,9 @@ jobs: CENTRAL_PASS: ${{ secrets.CENTRAL_PASS }} SIGNING_ASC: ${{ secrets.SIGNING_ASC }} - - name: Delete the melting-pot cache - if: env.cacheChanged == 'true' - id: delete-cache - run: | - gh api --method DELETE -H "Accept: application/vnd.github+json" /repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-cache || true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Save the melting-pot cache - if: env.cacheChanged == 'true' - id: save-cache - uses: actions/cache/save@v3 - with: - path: ~/.cache/scijava/melting-pot - key: ${{ runner.os }}-cache + - name: Smelt components + run: .github/smelt.sh - - name: Return the exit code - id: exit-build - run: .github/exit.sh + - name: Publish smelt results + if: always() && github.ref == 'refs/heads/master' && github.event_name == 'push' + run: .github/publish.sh smelt.json "Update smelt results" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1848a199..046834ad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,11 +19,10 @@ jobs: distribution: 'zulu' cache: 'maven' - - name: Set up CI environment - run: .github/setup.sh + - name: Set up release environment + run: .github/release-setup.sh - - name: Execute the build - id: execute-build + - name: Execute the release run: .github/build.sh env: GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }} diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml new file mode 100644 index 00000000..9826cdb9 --- /dev/null +++ b/.github/workflows/status.yml @@ -0,0 +1,26 @@ +name: status + +on: + schedule: + # Run daily at 0500 UTC. + - cron: '0 5 * * *' + push: + branches: + - master + workflow_dispatch: + +jobs: + status: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - uses: astral-sh/setup-uv@v6 + + - uses: webfactory/ssh-agent@v0.9.0 + with: + ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + + - name: Generate and publish status page + run: .github/status.sh diff --git a/pombast.toml b/pombast.toml index 07a86529..c83f285b 100644 --- a/pombast.toml +++ b/pombast.toml @@ -10,6 +10,7 @@ timestamps = "timestamps.txt" html = "index.html" header = "header.html" footer = "footer.html" +nexus-base = "https://maven.scijava.org" [melt] java-version = 11 From 55c5d4e4f203f4f4ec7198d48f1398f0a79971a7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 19 May 2026 19:25:29 -0500 Subject: [PATCH 919/996] CI: declare bash shell In case we ever run any of these jobs on Windows. --- .github/workflows/build.yml | 4 ++++ .github/workflows/release.yml | 2 ++ .github/workflows/status.yml | 1 + 3 files changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 197a336c..e7c4d77b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,9 +35,11 @@ jobs: - name: Set up build environment run: .github/build-setup.sh + shell: bash - name: Maven CI build run: .github/build.sh + shell: bash env: GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} @@ -49,7 +51,9 @@ jobs: - name: Smelt components run: .github/smelt.sh + shell: bash - name: Publish smelt results if: always() && github.ref == 'refs/heads/master' && github.event_name == 'push' run: .github/publish.sh smelt.json "Update smelt results" + shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 046834ad..00302b65 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,9 +21,11 @@ jobs: - name: Set up release environment run: .github/release-setup.sh + shell: bash - name: Execute the release run: .github/build.sh + shell: bash env: GPG_KEY_NAME: ${{ secrets.GPG_KEY_NAME }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml index 9826cdb9..d3cf85e2 100644 --- a/.github/workflows/status.yml +++ b/.github/workflows/status.yml @@ -24,3 +24,4 @@ jobs: - name: Generate and publish status page run: .github/status.sh + shell: bash From dd2f51a9fd3ebd5d5823e9a157b771d4f2b2f20d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 20 May 2026 12:57:14 -0500 Subject: [PATCH 920/996] CI: restore pombast cache across smelt runs Adds restore/delete/save steps for ~/.cache/pombast around the smelt step, matching the pattern used for the old melting-pot cache. Cache must be deleted before re-saving because GitHub Actions does not allow overwriting an existing cache key. Both delete and save run unconditionally (if: always()) so the cache is preserved even when smelt has failures. Co-Authored-By: Claude Sonnet 4.6 --- .github/{build-setup.sh => setup-build.sh} | 4 +-- .../{release-setup.sh => setup-release.sh} | 0 .github/workflows/build.yml | 26 ++++++++++++++++++- .github/workflows/release.yml | 2 +- .github/workflows/status.yml | 1 - 5 files changed, 28 insertions(+), 5 deletions(-) rename .github/{build-setup.sh => setup-build.sh} (72%) rename .github/{release-setup.sh => setup-release.sh} (100%) diff --git a/.github/build-setup.sh b/.github/setup-build.sh similarity index 72% rename from .github/build-setup.sh rename to .github/setup-build.sh index 64b4c955..ff44a365 100755 --- a/.github/build-setup.sh +++ b/.github/setup-build.sh @@ -3,8 +3,8 @@ curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-set sh ci-setup-github-actions.sh # Install native libraries needed to build and test smelt components. -pkgs="libxcb-shape0" # org.janelia:H5J_Loader_Plugin +pkgs="libxcb-shape0" # org.janelia:H5J_Loader_Plugin pkgs="$pkgs libgtk2.0-0" # net.imagej:imagej-opencv -pkgs="$pkgs libblosc1" # org.janelia.saalfeldlab:n5-blosc +pkgs="$pkgs libblosc1" # org.janelia.saalfeldlab:n5-blosc sudo apt-get update sudo apt-get -y install $pkgs diff --git a/.github/release-setup.sh b/.github/setup-release.sh similarity index 100% rename from .github/release-setup.sh rename to .github/setup-release.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7c4d77b..909668a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,6 +14,8 @@ on: jobs: build: runs-on: ubuntu-latest + permissions: + actions: write # needed to delete and re-save the pombast cache steps: - uses: actions/checkout@v4 @@ -34,7 +36,7 @@ jobs: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - name: Set up build environment - run: .github/build-setup.sh + run: .github/setup-build.sh shell: bash - name: Maven CI build @@ -49,10 +51,32 @@ jobs: CENTRAL_PASS: ${{ secrets.CENTRAL_PASS }} SIGNING_ASC: ${{ secrets.SIGNING_ASC }} + - name: Restore pombast cache + uses: actions/cache/restore@v4 + with: + path: ~/.cache/pombast + key: ${{ runner.os }}-pombast-cache + - name: Smelt components run: .github/smelt.sh shell: bash + - name: Delete old pombast cache + if: always() + run: | + gh api --method DELETE \ + -H "Accept: application/vnd.github+json" \ + "/repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-pombast-cache" || true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Save pombast cache + if: always() + uses: actions/cache/save@v4 + with: + path: ~/.cache/pombast + key: ${{ runner.os }}-pombast-cache + - name: Publish smelt results if: always() && github.ref == 'refs/heads/master' && github.event_name == 'push' run: .github/publish.sh smelt.json "Update smelt results" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 00302b65..27edfcb2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: cache: 'maven' - name: Set up release environment - run: .github/release-setup.sh + run: .github/setup-release.sh shell: bash - name: Execute the release diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml index d3cf85e2..b74a2746 100644 --- a/.github/workflows/status.yml +++ b/.github/workflows/status.yml @@ -7,7 +7,6 @@ on: push: branches: - master - workflow_dispatch: jobs: status: From 0239160f156db7754f293e37118c06523b09699f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 20 May 2026 13:04:34 -0500 Subject: [PATCH 921/996] CI: cache pombast timestamps in status workflow Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/status.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml index b74a2746..c9eceeec 100644 --- a/.github/workflows/status.yml +++ b/.github/workflows/status.yml @@ -21,6 +21,19 @@ jobs: with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + - name: Restore pombast cache + uses: actions/cache/restore@v4 + with: + path: ~/.cache/pombast/pom-timestamps + restore-keys: ${{ runner.os }}-pombast-status- + - name: Generate and publish status page run: .github/status.sh shell: bash + + - name: Save pombast cache + if: always() + uses: actions/cache/save@v4 + with: + path: ~/.cache/pombast/pom-timestamps + key: ${{ runner.os }}-pombast-status-${{ github.run_id }} From f590b0ef3592dc680b29c3813507c1dfe2641b24 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 20 May 2026 17:30:25 -0500 Subject: [PATCH 922/996] CI: also run the pombast *melt* command --- .github/melt.sh | 4 ++++ .github/setup-build.sh | 2 +- .github/smelt.sh | 3 --- .github/status.sh | 2 +- .github/workflows/build.yml | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) create mode 100755 .github/melt.sh delete mode 100755 .github/smelt.sh diff --git a/.github/melt.sh b/.github/melt.sh new file mode 100755 index 00000000..0785de67 --- /dev/null +++ b/.github/melt.sh @@ -0,0 +1,4 @@ +#!/bin/sh +uv tool install "git+https://github.com/scijava/pombast.git" +pombast melt . || true +pombast smelt --json smelt.json . diff --git a/.github/setup-build.sh b/.github/setup-build.sh index ff44a365..bdc2ff72 100755 --- a/.github/setup-build.sh +++ b/.github/setup-build.sh @@ -2,7 +2,7 @@ curl -fsLO https://raw.githubusercontent.com/scijava/scijava-scripts/main/ci-setup-github-actions.sh sh ci-setup-github-actions.sh -# Install native libraries needed to build and test smelt components. +# Install native libraries needed to smelt components. pkgs="libxcb-shape0" # org.janelia:H5J_Loader_Plugin pkgs="$pkgs libgtk2.0-0" # net.imagej:imagej-opencv pkgs="$pkgs libblosc1" # org.janelia.saalfeldlab:n5-blosc diff --git a/.github/smelt.sh b/.github/smelt.sh deleted file mode 100755 index 1a92a196..00000000 --- a/.github/smelt.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -uv tool install "git+https://github.com/scijava/pombast.git@66a1e3abff431846a900703f7450e0c21f1456cc" -pombast smelt --config pombast.toml --json smelt.json . diff --git a/.github/status.sh b/.github/status.sh index f94d572e..86500ccf 100755 --- a/.github/status.sh +++ b/.github/status.sh @@ -1,5 +1,5 @@ #!/bin/sh uv tool install "git+https://github.com/scijava/pombast.git@66a1e3abff431846a900703f7450e0c21f1456cc" -pombast status --config pombast.toml --html index.html . +pombast status . commitNote="$(TZ=UTC date +'%Y-%m-%d %H:%M:%S UTC')" .github/publish.sh index.html "Update component table ($commitNote)" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 909668a8..b55033b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,8 +57,8 @@ jobs: path: ~/.cache/pombast key: ${{ runner.os }}-pombast-cache - - name: Smelt components - run: .github/smelt.sh + - name: Run pombast melt+smelt commands + run: .github/melt.sh shell: bash - name: Delete old pombast cache From 3600df85ab54a4bb1a96d22c267ae31e5a336637 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 22 May 2026 17:43:48 -0500 Subject: [PATCH 923/996] CI: publish pombast team reports, improve caching Co-authored-by: Claude Sonnet 4.6 --- .github/publish.sh | 39 ++++++++++++++++++++---------- .github/status.sh | 6 ++--- .github/workflows/build.yml | 2 +- .github/workflows/status.yml | 46 ++++++++++++++++++++++++++++++++---- 4 files changed, 72 insertions(+), 21 deletions(-) diff --git a/.github/publish.sh b/.github/publish.sh index ac79edb3..be5b0745 100755 --- a/.github/publish.sh +++ b/.github/publish.sh @@ -1,25 +1,40 @@ #!/bin/sh # Commit a file to the status.scijava.org gh-pages branch. -# Usage: publish.sh [commit-message] # Requires SSH agent to be running with write access to status.scijava.org. set -e -file=$1 -message=${2:-"Update $(basename "$file")"} -test -f "$file" || { echo "File not found: $file" >&2; exit 1; } -dest=$(basename "$file") + +test $# -gt 1 || { + echo "Usage: publish.sh \"Commit message\" file1 [file2 ...]" + exit 2 +} + +datestamp="$(TZ=UTC date +'%Y-%m-%d %H:%M:%S UTC')" +message="$1 ($datestamp)" +shift git config --global user.name github-actions git config --global user.email github-actions@github.com -git clone --depth=1 --branch=gh-pages git@github.com:scijava/status.scijava.org site-publish -cp "$file" "site-publish/$dest" -cd site-publish -if git diff --quiet "$dest" +dest_dir=site-publish + +git clone --depth=1 --branch=gh-pages git@github.com:scijava/status.scijava.org "$dest_dir" + +while [ $# -gt 0 ] +do + file=$1 + shift + test -f "$file" || { echo "File not found: $file" >&2; exit 1; } + dest=$(basename "$file") + cp "$file" "$dest_dir/$dest" + (cd "$dest_dir" && git add "$dest") +done + +cd "$dest_dir" +if git diff --quiet . then - echo "== No changes to $dest ==" + echo "== No changes ==" else - echo "== Committing $dest ==" - git add "$dest" + echo "== Committing changes ==" git commit -m "$message" git push fi diff --git a/.github/status.sh b/.github/status.sh index 86500ccf..d06ecd1d 100755 --- a/.github/status.sh +++ b/.github/status.sh @@ -1,5 +1,5 @@ #!/bin/sh -uv tool install "git+https://github.com/scijava/pombast.git@66a1e3abff431846a900703f7450e0c21f1456cc" +uv tool install "git+https://github.com/scijava/pombast.git@1cece3cab4d9be78fe06203db6f9b87d4db99f2f" pombast status . -commitNote="$(TZ=UTC date +'%Y-%m-%d %H:%M:%S UTC')" -.github/publish.sh index.html "Update component table ($commitNote)" +pombast team . --html team.html +.github/publish.sh "Update status reports" index.html team.html diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b55033b7..6b8cd558 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,5 +79,5 @@ jobs: - name: Publish smelt results if: always() && github.ref == 'refs/heads/master' && github.event_name == 'push' - run: .github/publish.sh smelt.json "Update smelt results" + run: .github/publish.sh "Update smelt results" smelt.json shell: bash diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml index c9eceeec..6809dd19 100644 --- a/.github/workflows/status.yml +++ b/.github/workflows/status.yml @@ -11,6 +11,8 @@ on: jobs: status: runs-on: ubuntu-latest + permissions: + actions: write # needed to delete and re-save caches steps: - uses: actions/checkout@v4 @@ -24,16 +26,50 @@ jobs: - name: Restore pombast cache uses: actions/cache/restore@v4 with: - path: ~/.cache/pombast/pom-timestamps - restore-keys: ${{ runner.os }}-pombast-status- + path: ~/.cache/pombast + key: ${{ runner.os }}-pombast-status + restore-keys: ${{ runner.os }}-pombast-cache - - name: Generate and publish status page + - name: Restore monoqueue cache + uses: actions/cache/restore@v4 + with: + path: ~/.cache/monoqueue + key: ${{ runner.os }}-monoqueue-status + + - name: Generate and publish status and team pages run: .github/status.sh shell: bash + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Delete old pombast status cache + if: always() + run: | + gh api --method DELETE \ + -H "Accept: application/vnd.github+json" \ + "/repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-pombast-status" || true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Save pombast cache if: always() uses: actions/cache/save@v4 with: - path: ~/.cache/pombast/pom-timestamps - key: ${{ runner.os }}-pombast-status-${{ github.run_id }} + path: ~/.cache/pombast + key: ${{ runner.os }}-pombast-status + + - name: Delete old monoqueue cache + if: always() + run: | + gh api --method DELETE \ + -H "Accept: application/vnd.github+json" \ + "/repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-monoqueue-status" || true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Save monoqueue cache + if: always() + uses: actions/cache/save@v4 + with: + path: ~/.cache/monoqueue + key: ${{ runner.os }}-monoqueue-status From f755ca31c98ede0846288777f59ebeb2238f6738 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 23 May 2026 08:39:10 -0500 Subject: [PATCH 924/996] CI: further improve caching --- .github/delete-cache.sh | 5 +++++ .github/workflows/build.yml | 10 ++++------ .github/workflows/status.yml | 14 +++++--------- 3 files changed, 14 insertions(+), 15 deletions(-) create mode 100755 .github/delete-cache.sh diff --git a/.github/delete-cache.sh b/.github/delete-cache.sh new file mode 100755 index 00000000..6c3dbb9c --- /dev/null +++ b/.github/delete-cache.sh @@ -0,0 +1,5 @@ +#!/bin/sh +test "$1" || { echo "Usage: delete-cache.sh cache-key"; exit 1; } +gh api --method DELETE \ + -H "Accept: application/vnd.github+json" \ + "/repos/scijava/pom-scijava/actions/caches?key=$1" || true diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b8cd558..a29e656c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: uses: actions/cache/restore@v4 with: path: ~/.cache/pombast - key: ${{ runner.os }}-pombast-cache + key: ${{ runner.os }}-pombast-build - name: Run pombast melt+smelt commands run: .github/melt.sh @@ -63,10 +63,8 @@ jobs: - name: Delete old pombast cache if: always() - run: | - gh api --method DELETE \ - -H "Accept: application/vnd.github+json" \ - "/repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-pombast-cache" || true + run: .github/delete-cache.sh "${{ runner.os }}-pombast-build" + shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -75,7 +73,7 @@ jobs: uses: actions/cache/save@v4 with: path: ~/.cache/pombast - key: ${{ runner.os }}-pombast-cache + key: ${{ runner.os }}-pombast-build - name: Publish smelt results if: always() && github.ref == 'refs/heads/master' && github.event_name == 'push' diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml index 6809dd19..c14eaf3d 100644 --- a/.github/workflows/status.yml +++ b/.github/workflows/status.yml @@ -28,8 +28,8 @@ jobs: with: path: ~/.cache/pombast key: ${{ runner.os }}-pombast-status - restore-keys: ${{ runner.os }}-pombast-cache + # The monoqueue library is used by pombast to read GitHub issues. - name: Restore monoqueue cache uses: actions/cache/restore@v4 with: @@ -44,10 +44,8 @@ jobs: - name: Delete old pombast status cache if: always() - run: | - gh api --method DELETE \ - -H "Accept: application/vnd.github+json" \ - "/repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-pombast-status" || true + run: .github/delete-cache.sh "${{ runner.os }}-pombast-status" + shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -60,10 +58,8 @@ jobs: - name: Delete old monoqueue cache if: always() - run: | - gh api --method DELETE \ - -H "Accept: application/vnd.github+json" \ - "/repos/scijava/pom-scijava/actions/caches?key=${{ runner.os }}-monoqueue-status" || true + run: .github/delete-cache.sh "${{ runner.os }}-monoqueue-status" + shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 53646cd6d13d8a99f91197b7e16c9a25d674a042 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 24 May 2026 13:29:05 -0500 Subject: [PATCH 925/996] Update component versions * scijava-common: 2.99.2 -> 2.100.1 * scijava-optional: 1.0.1 -> 1.0.2 * scijava-table: 1.0.2 -> 1.0.3 These releases support the release of imagej-server 0.2.0. --- pom.xml | 6 +++--- pombast.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 781fb597..f8dc529e 100644 --- a/pom.xml +++ b/pom.xml @@ -376,7 +376,7 @@ ${scijava-cache.version} - 2.99.2 + 2.100.1 ${scijava-common.version} @@ -408,7 +408,7 @@ ${scijava-log-slf4j.version} - 1.0.1 + 1.0.2 ${scijava-optional.version} @@ -436,7 +436,7 @@ ${scijava-search.version} - 1.0.2 + 1.0.3 ${scijava-table.version} diff --git a/pombast.toml b/pombast.toml index c83f285b..f875df8a 100644 --- a/pombast.toml +++ b/pombast.toml @@ -63,7 +63,7 @@ excludes = [ # NB: Skip closed-source artifacts. 'org.bonej:bonej-plus', # NB: The following artifacts have messy dependency trees. - # Too many problems to test as part of the mega-melt. + # Too many problems to test as part of the melt action. # See WARNING block in pom-scijava's pom.xml for details. 'net.imagej:imagej-server', 'org.apache.spark:spark-core_2.11', From 12c3fd779444c78ed1fc0d1cc039ea34589dc821 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 25 May 2026 17:34:37 -0500 Subject: [PATCH 926/996] Update SNT: 4.2.1 -> 5.0.9 --- pom.xml | 2 +- pombast.toml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f8dc529e..5877c321 100644 --- a/pom.xml +++ b/pom.xml @@ -1257,7 +1257,7 @@ ${bonej-utilities.version} - 4.2.1 + 5.0.9 ${SNT.version} diff --git a/pombast.toml b/pombast.toml index f875df8a..3108add1 100644 --- a/pombast.toml +++ b/pombast.toml @@ -220,3 +220,6 @@ java-version = 11 [components."org.bonej:bonej-ops"] java-version = 11 + +[components."org.morphonets:SNT"] +java-version = 21 From c5e9565e5b2276c0036654ca0c9f0ea0a147a5d5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 25 May 2026 17:45:27 -0500 Subject: [PATCH 927/996] Set Java version to 21 for pombast melt This lets the melt action pass -- for now. A comment explains why this is tenuous, though. --- pombast.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pombast.toml b/pombast.toml index 3108add1..724d6953 100644 --- a/pombast.toml +++ b/pombast.toml @@ -13,7 +13,13 @@ footer = "footer.html" nexus-base = "https://maven.scijava.org" [melt] -java-version = 11 +# Some managed components require Java 21+. So it makes sense to melt with that version of Java. +# Unfortunately, the scijava.jvm.version is currently set to 11 by default. +# So even though OpenJDK 21 is being used to run Maven, the enforcer plugin still +# complains when encountering any Java libraries with bytecode newer than 11. +# Setting scijava.jvm.version to 21 by default would avoid the issue, but... +# is that really a good idea? Setting to 11 seems like a nice baseline compromise right now. +java-version = 21 # Maximum Java version of all included component + deps. template = "tests/mega-melt-template.xml" excludes = [ # TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone. From 47bc3dcfabaf2d77cf4f749d2f853d3c51d80778 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 26 May 2026 14:05:40 -0500 Subject: [PATCH 928/996] CI: always use latest pombast (for now) --- .github/status.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/status.sh b/.github/status.sh index d06ecd1d..096e57c5 100755 --- a/.github/status.sh +++ b/.github/status.sh @@ -1,5 +1,5 @@ #!/bin/sh -uv tool install "git+https://github.com/scijava/pombast.git@1cece3cab4d9be78fe06203db6f9b87d4db99f2f" +uv tool install "git+https://github.com/scijava/pombast.git" pombast status . pombast team . --html team.html .github/publish.sh "Update status reports" index.html team.html From 95c2862091d426628fffd17953d874282830d26a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 26 May 2026 14:06:09 -0500 Subject: [PATCH 929/996] Exclude OME artifacts from team analysis --- pombast.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pombast.toml b/pombast.toml index 724d6953..56716c8e 100644 --- a/pombast.toml +++ b/pombast.toml @@ -12,6 +12,9 @@ header = "header.html" footer = "footer.html" nexus-base = "https://maven.scijava.org" +[team] +excludes = ["ome:*", "org.openmicroscopy:*"] + [melt] # Some managed components require Java 21+. So it makes sense to melt with that version of Java. # Unfortunately, the scijava.jvm.version is currently set to 11 by default. From 05e80c180eb739f3d9d1d2a1b702d9f667e6138c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 26 May 2026 23:44:44 -0500 Subject: [PATCH 930/996] Consolidate status sidecars into pombast.toml --- ci-badges.txt | 45 --- pombast.toml | 821 ++++++++++++++++++++++++++++++++++++++++++++++++- projects.txt | 25 -- timestamps.txt | 161 ---------- 4 files changed, 818 insertions(+), 234 deletions(-) delete mode 100644 ci-badges.txt delete mode 100644 projects.txt delete mode 100644 timestamps.txt diff --git a/ci-badges.txt b/ci-badges.txt deleted file mode 100644 index cfe892d2..00000000 --- a/ci-badges.txt +++ /dev/null @@ -1,45 +0,0 @@ -bigdataviewer/bigvolumeviewer-core -fiji/Colocalisation_Analysis -imagej/imagej-common -imagej/imagej-legacy -imglib/imglib2-mesh -imagej/imagej-matlab -ome/bioformats -ome/ome-codecs -ome/ome-common-java -ome/ome-metakit -ome/ome-model -ome/ome-poi -ome/omero-blitz -ome/omero-common -ome/omero-dsl-plugin -ome/omero-gateway-java -ome/omero-model -ome/omero-renderer -ome/omero-romio -ome/omero-server -scijava/java3d-core None -scijava/java3d-utils None -scijava/jep None -scijava/junit-benchmarks None -scijava/minimaven -scijava/native-lib-loader -scijava/parsington -scijava/scijava-coding-style -scijava/scijava-common -scijava/scijava-config -scijava/scijava-log-slf4j -scijava/scijava-maven-plugin -scijava/script-editor-scala -scijava/swing-checkbox-tree -scijava/vecmath None -trackmate-sc/TrackMate -trackmate-sc/TrackMate-CSVImporter -trackmate-sc/TrackMate-Cellpose -trackmate-sc/TrackMate-ExTrack -trackmate-sc/TrackMate-Ilastik -trackmate-sc/TrackMate-MorphoLibJ -trackmate-sc/TrackMate-Oneat -trackmate-sc/TrackMate-Skeleton -trackmate-sc/TrackMate-StarDist -trackmate-sc/TrackMate-Weka diff --git a/pombast.toml b/pombast.toml index 56716c8e..7a6fc3ef 100644 --- a/pombast.toml +++ b/pombast.toml @@ -4,9 +4,6 @@ repositories = ["scijava.public=https://maven.scijava.org/content/groups/public" [status] rules = "rules.xml" -projects = "projects.txt" -badges = "ci-badges.txt" -timestamps = "timestamps.txt" html = "index.html" header = "header.html" footer = "footer.html" @@ -15,6 +12,24 @@ nexus-base = "https://maven.scijava.org" [team] excludes = ["ome:*", "org.openmicroscopy:*"] +[badges] +includes = [ + "io.scif:*", + "de.nanoimaging:*", + "fr.inra.ijpb:*", + "mpicbg:*", + "net.imagej:*", + "net.imglib2:*", + "net.preibisch:*", + "ome:*", + "org.bonej:*", + "org.janelia*:*", + "org.morphonets:*", + "org.openmicroscopy:*", + "org.scijava:*", + "sc.fiji:*", +] + [melt] # Some managed components require Java 21+. So it makes sense to melt with that version of Java. # Unfortunately, the scijava.jvm.version is currently set to 11 by default. @@ -218,17 +233,817 @@ skip-tests = [ # at sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest.test(CalculateProbabilityMapWithLabkitIJ1PluginTest.java:65) "sc.fiji:labkit-ui" = ["sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest"] +[components."fr.inra.ijpb:MorphoLibJ"] +ci-build = "build-main" + +[components."hsqldb:hsqldb"] +last-vetted = "20190101000000" + +[components."io.scif:scifio-bf-compat"] +ci-build = "build-main" + +[components."io.scif:scifio-cli"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."io.scif:scifio-hdf5"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."io.scif:scifio-jai-imageio"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."io.scif:scifio-labeling"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."io.scif:scifio-lifesci"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."io.scif:scifio-ome-xml"] +ci-build = "build-main" + [components."net.imagej:ij"] java-version = 11 +[components."net.imagej:imagej-deprecated"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."net.imagej:imagej-mesh"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."net.imagej:imagej-mesh-io"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."net.imagej:imagej-notebook"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."net.imagej:imagej-omero"] +ci-build = "build-main" + +[components."net.imagej:imagej-omero-legacy"] +ci-build = "build-main" + +[components."net.imagej:imagej-opencv"] +ci-build = "build-main" + +[components."net.imagej:imagej-ops"] +ci-build = "build-main" + +[components."net.imagej:imagej-plugins-batch"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."net.imagej:imagej-plugins-commands"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."net.imagej:imagej-plugins-tools"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."net.imagej:imagej-plugins-uploader-ssh"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."net.imagej:imagej-plugins-uploader-webdav"] +ci-build = "build-main" + +[components."net.imagej:imagej-scripting"] +ci-build = "build-main" + +[components."net.imagej:imagej-server"] +last-vetted = "20250101000000" + +[components."net.imagej:imagej-tensorflow"] +ci-build = "build-main" + +[components."net.imagej:imagej-ui-awt"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."net.imagej:imagej-ui-swing"] +ci-build = "build-main" + +[components."net.imagej:imagej-updater"] +ci-build = "build-main" + +[components."net.imagej:op-finder"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."net.imglib2:imglib2-algorithm"] +ci-build = "build-main" + +[components."net.imglib2:imglib2-algorithm-fft"] +last-vetted = "20230309000000" + +[components."net.imglib2:imglib2-algorithm-gpl"] +last-vetted = "20230309000000" + [components."net.imglib2:imglib2-mesh"] java-version = 11 +[components."net.imglib2:imglib2-unsafe"] +last-vetted = "20230309000000" + +[components."net.preibischlab:multiview-simulation"] +ci-build = "build-main" + +[components."ome:bioformats"] +ci-build = "maven" + +[components."ome:ome-codecs"] +ci-build = "maven" + +[components."ome:ome-common-java"] +ci-build = "maven" + +[components."ome:ome-metakit"] +ci-build = "maven" + +[components."ome:ome-model"] +ci-build = "maven" + +[components."ome:ome-poi"] +ci-build = "maven" + [components."org.bonej:bonej-legacy-plugins_"] java-version = 11 +ci-build = "build-main" [components."org.bonej:bonej-ops"] java-version = 11 +ci-build = "build-main" + +[components."org.codehaus.groovy:groovy"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-ant"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-astbuilder"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-bsf"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-cli-commons"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-cli-picocli"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-console"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-datetime"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-dateutil"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-docgenerator"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-groovydoc"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-groovysh"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-jaxb"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-jmx"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-json"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-jsr223"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-macro"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-nio"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-servlet"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-sql"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-swing"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-templates"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-test"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-test-junit5"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-testng"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-xml"] +last-vetted = "20250101000000" + +[components."org.codehaus.groovy:groovy-yaml"] +last-vetted = "20250101000000" + +[components."org.janelia.saalfeldlab:jitk-tps"] +ci-build = "build-main" + +[components."org.janelia.saalfeldlab:n5-aws-s3"] +ci-build = "build-main" + +[components."org.janelia.saalfeldlab:n5-google-cloud"] +ci-build = "build-main" + +[components."org.janelia.saalfeldlab:n5-hdf5"] +ci-build = "build-main" + +[components."org.janelia.saalfeldlab:n5-ij"] +ci-build = "build-main" + +[components."org.janelia.saalfeldlab:n5-imglib2"] +ci-build = "build-main" + +[components."org.janelia.saalfeldlab:n5-universe"] +ci-build = "build-main" + +[components."org.janelia.saalfeldlab:n5-viewer"] +ci-build = "build-main" + +[components."org.janelia.saalfeldlab:trakem2-tps"] +ci-build = "build-main" + +[components."org.janelia.saalfeldlab:z-spacing"] +ci-build = "build-main" + +[components."org.mockito:mockito-core"] +last-vetted = "20250101000000" [components."org.morphonets:SNT"] java-version = 21 + +[components."org.ojalgo:ojalgo"] +last-vetted = "20250101000000" + +[components."org.openmicroscopy:omero-blitz"] +ci-build = "gradle" + +[components."org.openmicroscopy:omero-common"] +ci-build = "gradle" + +[components."org.openmicroscopy:omero-dsl-plugin"] +ci-build = "gradle" + +[components."org.openmicroscopy:omero-gateway-java"] +ci-build = "gradle" + +[components."org.openmicroscopy:omero-model"] +ci-build = "gradle" + +[components."org.openmicroscopy:omero-renderer"] +ci-build = "gradle" + +[components."org.openmicroscopy:omero-romio"] +ci-build = "gradle" + +[components."org.openmicroscopy:omero-server"] +ci-build = "gradle" + +[components."org.python:jython-slim"] +last-vetted = "20230309000000" + +[components."org.scijava:batch-processor"] +ci-build = "build-main" + +[components."org.scijava:j3dcore"] +last-vetted = "20180905120000" + +[components."org.scijava:j3dutils"] +last-vetted = "20180905120000" + +[components."org.scijava:java3d-core"] +ci-build = false + +[components."org.scijava:java3d-utils"] +ci-build = false + +[components."org.scijava:jep"] +ci-build = false +last-vetted = "20171225120000" + +[components."org.scijava:junit-benchmarks"] +ci-build = false +last-vetted = "20180905120000" + +[components."org.scijava:minimaven"] +last-vetted = "20230309000000" + +[components."org.scijava:native-lib-loader"] +last-vetted = "20230309000000" + +[components."org.scijava:scijava-cache"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."org.scijava:scijava-grab"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."org.scijava:scijava-io-http"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."org.scijava:scijava-java3d"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."org.scijava:scijava-listeners"] +last-vetted = "20211021000000" + +[components."org.scijava:scijava-maven-plugin"] +last-vetted = "20230309000000" + +[components."org.scijava:scijava-optional"] +last-vetted = "20230309000000" + +[components."org.scijava:scijava-plot"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."org.scijava:scijava-plugins-commands"] +ci-build = "build-main" + +[components."org.scijava:scijava-plugins-platforms"] +last-vetted = "20230309000000" + +[components."org.scijava:scijava-plugins-text-markdown"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."org.scijava:scijava-plugins-text-plain"] +ci-build = "build-main" + +[components."org.scijava:scijava-search"] +ci-build = "build-main" + +[components."org.scijava:scijava-table"] +ci-build = "build-main" + +[components."org.scijava:scijava-ui-awt"] +last-vetted = "20230309000000" + +[components."org.scijava:scijava-ui-swing"] +ci-build = "build-main" + +[components."org.scijava:script-editor"] +ci-build = "build-main" + +[components."org.scijava:script-editor-jython"] +ci-build = "build-main" + +[components."org.scijava:scripting-beanshell"] +ci-build = "build-main" + +[components."org.scijava:scripting-clojure"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."org.scijava:scripting-groovy"] +ci-build = "build-main" + +[components."org.scijava:scripting-java"] +last-vetted = "20230309000000" + +[components."org.scijava:scripting-javascript"] +ci-build = "build-main" + +[components."org.scijava:scripting-jruby"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."org.scijava:scripting-jython"] +ci-build = "build-main" + +[components."org.scijava:scripting-kotlin"] +ci-build = "build-main" + +[components."org.scijava:scripting-matlab"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."org.scijava:scripting-renjin"] +ci-build = "build-main" + +[components."org.scijava:scripting-scala"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."org.scijava:swing-checkbox-tree"] +last-vetted = "20230309000000" + +[components."org.scijava:ui-behaviour"] +ci-build = "build-main" + +[components."org.scijava:vecmath"] +ci-build = false +last-vetted = "20180905120000" + +[components."org.springframework:spring-aop"] +last-vetted = "20250101000000" + +[components."org.springframework:spring-beans"] +last-vetted = "20250101000000" + +[components."org.springframework:spring-core"] +last-vetted = "20250101000000" + +[components."org.tensorflow:libtensorflow"] +last-vetted = "20200701000000" + +[components."org.tensorflow:libtensorflow_jni"] +last-vetted = "20200701000000" + +[components."org.tensorflow:libtensorflow_jni_gpu"] +last-vetted = "20200701000000" + +[components."org.tensorflow:proto"] +last-vetted = "20200701000000" + +[components."org.tensorflow:tensorflow"] +last-vetted = "20200701000000" + +[components."sc.fiji:3D_Blob_Segmentation"] +ci-build = "build-main" + +[components."sc.fiji:3D_Objects_Counter"] +ci-build = "build-main" +last-vetted = "20230313000000" + +[components."sc.fiji:3D_Viewer"] +ci-build = "build-main" +last-vetted = "20230313000000" + +[components."sc.fiji:AnalyzeSkeleton"] +ci-build = "build-main" + +[components."sc.fiji:AnalyzeSkeleton_"] +last-vetted = "20230309000000" + +[components."sc.fiji:Anisotropic_Diffusion_2D"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Archipelago_Plugins"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Arrow"] +ci-build = "build-main" + +[components."sc.fiji:Arrow_"] +last-vetted = "20230309000000" + +[components."sc.fiji:Auto_Local_Threshold"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Auto_Threshold"] +ci-build = "build-main" + +[components."sc.fiji:BalloonSegmentation"] +ci-build = "build-main" + +[components."sc.fiji:BalloonSegmentation_"] +last-vetted = "20230309000000" + +[components."sc.fiji:Bug_Submitter"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:CPU_Meter"] +ci-build = "build-main" + +[components."sc.fiji:Calculator_Plus"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Cell_Counter"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Colocalisation_Analysis"] +last-vetted = "20230309000000" + +[components."sc.fiji:Color_Histogram"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Color_Inspector_3D"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Colour_Deconvolution"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:CorrectBleach"] +ci-build = "build-main" + +[components."sc.fiji:Correct_3D_Drift"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Descriptor_based_registration"] +ci-build = "build-main" + +[components."sc.fiji:Dichromacy"] +ci-build = "build-main" + +[components."sc.fiji:Dichromacy_"] +last-vetted = "20230309000000" + +[components."sc.fiji:Directionality"] +ci-build = "build-main" + +[components."sc.fiji:Directionality_"] +last-vetted = "20230309000000" + +[components."sc.fiji:FS_Align_TrakEM2"] +ci-build = "build-main" + +[components."sc.fiji:Feature_Detection"] +ci-build = "build-main" + +[components."sc.fiji:Fiji_Archipelago"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Fiji_Developer"] +ci-build = "build-main" + +[components."sc.fiji:Fiji_Package_Maker"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:FlowJ"] +ci-build = "build-main" + +[components."sc.fiji:FlowJ_"] +last-vetted = "20230309000000" + +[components."sc.fiji:Graph_Cut"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Gray_Morphology"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:H5J_Loader_Plugin"] +ci-build = "build-main" + +[components."sc.fiji:HDF5_Vibez"] +ci-build = "build-main" + +[components."sc.fiji:Helmholtz_Analysis"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:IJ_Robot"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:IO"] +ci-build = "build-main" + +[components."sc.fiji:Image_5D"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Image_Expression_Parser"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Interactive_3D_Surface_Plot"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:IsoData_Classifier"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Kappa"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Kuwahara_Filter"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:LSM_Reader"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:LSM_Toolbox"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Lasso_and_Blow_Tool"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Linear_Kuwahara"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:LocalThickness"] +ci-build = "build-main" + +[components."sc.fiji:LocalThickness_"] +last-vetted = "20230309000000" + +[components."sc.fiji:MTrack2"] +ci-build = "build-main" + +[components."sc.fiji:MTrack2_"] +last-vetted = "20230309000000" + +[components."sc.fiji:M_I_P"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:MaMuT"] +ci-build = "build-main" + +[components."sc.fiji:Manual_Tracking"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Multi_Kymograph"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:OMEVisual"] +last-vetted = "20230309000000" + +[components."sc.fiji:PIV_analyser"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:QuickPALM"] +ci-build = "build-main" + +[components."sc.fiji:QuickPALM_"] +last-vetted = "20230309000000" + +[components."sc.fiji:RATS"] +ci-build = "build-main" + +[components."sc.fiji:RATS_"] +last-vetted = "20230309000000" + +[components."sc.fiji:Reconstruct_Reader"] +ci-build = "build-main" + +[components."sc.fiji:SPIM_Opener"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:SPIM_Registration"] +ci-build = "build-main" + +[components."sc.fiji:Samples"] +ci-build = "build-main" + +[components."sc.fiji:Samples_"] +last-vetted = "20230309000000" + +[components."sc.fiji:Series_Labeler"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Siox_Segmentation"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Skeletonize3D"] +ci-build = "build-main" + +[components."sc.fiji:Skeletonize3D_"] +last-vetted = "20230309000000" + +[components."sc.fiji:SplineDeformationGenerator"] +ci-build = "build-main" + +[components."sc.fiji:SplineDeformationGenerator_"] +last-vetted = "20230309000000" + +[components."sc.fiji:Stack_Manipulation"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Statistical_Region_Merging"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Stitching"] +ci-build = "build-main" + +[components."sc.fiji:Sync_Win"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:T2-NIT"] +ci-build = "build-main" + +[components."sc.fiji:T2-TreelineGraph"] +ci-build = "build-main" + +[components."sc.fiji:Thread_Killer"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Time_Lapse"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:Time_Stamper"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:ToAST_"] +last-vetted = "20230309000000" + +[components."sc.fiji:TopoJ_"] +last-vetted = "20230309000000" + +[components."sc.fiji:VIB-lib"] +last-vetted = "20230309000000" + +[components."sc.fiji:Vaa3d_Reader"] +last-vetted = "20230309000000" + +[components."sc.fiji:Vaa3d_Writer"] +last-vetted = "20230309000000" + +[components."sc.fiji:Video_Editing"] +last-vetted = "20230309000000" + +[components."sc.fiji:bUnwarpJ_"] +last-vetted = "20230309000000" + +[components."sc.fiji:bij"] +last-vetted = "20230309000000" + +[components."sc.fiji:fiji-lib"] +last-vetted = "20230309000000" + +[components."sc.fiji:legacy-imglib1"] +ci-build = "build-main" + +[components."sc.fiji:level_sets"] +last-vetted = "20230309000000" + +[components."sc.fiji:pal-optimization"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:panorama_"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:register_virtual_stack_slices"] +ci-build = "build-main" + +[components."sc.fiji:registration_3d"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:spimdata"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:trakem2-transform"] +ci-build = "build-main" +last-vetted = "20230309000000" + +[components."sc.fiji:weave_jy2java"] +ci-build = "build-main" +last-vetted = "20230309000000" diff --git a/projects.txt b/projects.txt deleted file mode 100644 index 49959fef..00000000 --- a/projects.txt +++ /dev/null @@ -1,25 +0,0 @@ -mpicbg:mpicbg https://github.com/axtimwalde/mpicbg -mpicbg:mpicbg_ https://github.com/axtimwalde/mpicbg -net.imagej:ij https://github.com/imagej/ImageJ -net.imglib2:imglib2-label-multisets https://github.com/saalfeldlab/imglib2-label-multisets -ome:bio-formats_plugins https://github.com/ome/bioformats -ome:formats-api https://github.com/ome/bioformats -ome:formats-bsd https://github.com/ome/bioformats -ome:formats-gpl https://github.com/ome/bioformats -org.janelia:H5J_Loader_Plugin https://github.com/fiji/H5J_Loader_Plugin -org.openmicroscopy:metakit https://github.com/ome/ome-metakit -org.openmicroscopy:ome-common https://github.com/ome/ome-common-java -org.openmicroscopy:ome-xml https://github.com/ome/ome-model -org.openmicroscopy:omero-gateway https://github.com/ome/omero-gateway-java -org.openmicroscopy:specification https://github.com/ome/ome-model -org.scijava:j3dcore https://github.com/scijava/java3d-core -org.scijava:j3dutils https://github.com/scijava/java3d-utils -sc.fiji:T2-NIT https://github.com/trakem2/T2-NIT -sc.fiji:T2-TreelineGraph https://github.com/trakem2/T2-TreelineGraph -sc.fiji:TrakEM2_ https://github.com/trakem2/TrakEM2 -sc.fiji:VectorString https://github.com/trakem2/VectorString -sc.fiji:bigwarp_fiji https://github.com/saalfeldlab/bigwarp -sc.fiji:spim_data https://github.com/bigdataviewer/spimdata -sc.fiji:trakem2-transform https://github.com/trakem2/trakem2-transform -sc.fiji:trakem2_tps https://github.com/saalfeldlab/trakem2-tps -sc.fiji:z_spacing https://github.com/saalfeldlab/z-spacing diff --git a/timestamps.txt b/timestamps.txt deleted file mode 100644 index d3b86f2f..00000000 --- a/timestamps.txt +++ /dev/null @@ -1,161 +0,0 @@ -# Stable forks of third-party projects. -org.scijava:j3dcore 20180905120000 -org.scijava:j3dutils 20180905120000 -org.scijava:jep 20171225120000 -org.scijava:junit-benchmarks 20180905120000 -org.scijava:vecmath 20180905120000 - -# Newer versions break stuff... freeze for now. -hsqldb:hsqldb 20190101000000 -org.codehaus.groovy:groovy 20250101000000 -org.codehaus.groovy:groovy-ant 20250101000000 -org.codehaus.groovy:groovy-astbuilder 20250101000000 -org.codehaus.groovy:groovy-bsf 20250101000000 -org.codehaus.groovy:groovy-cli-commons 20250101000000 -org.codehaus.groovy:groovy-cli-picocli 20250101000000 -org.codehaus.groovy:groovy-console 20250101000000 -org.codehaus.groovy:groovy-datetime 20250101000000 -org.codehaus.groovy:groovy-dateutil 20250101000000 -org.codehaus.groovy:groovy-docgenerator 20250101000000 -org.codehaus.groovy:groovy-groovydoc 20250101000000 -org.codehaus.groovy:groovy-groovysh 20250101000000 -org.codehaus.groovy:groovy-jaxb 20250101000000 -org.codehaus.groovy:groovy-jmx 20250101000000 -org.codehaus.groovy:groovy-json 20250101000000 -org.codehaus.groovy:groovy-jsr223 20250101000000 -org.codehaus.groovy:groovy-macro 20250101000000 -org.codehaus.groovy:groovy-nio 20250101000000 -org.codehaus.groovy:groovy-servlet 20250101000000 -org.codehaus.groovy:groovy-sql 20250101000000 -org.codehaus.groovy:groovy-swing 20250101000000 -org.codehaus.groovy:groovy-templates 20250101000000 -org.codehaus.groovy:groovy-test 20250101000000 -org.codehaus.groovy:groovy-test-junit5 20250101000000 -org.codehaus.groovy:groovy-testng 20250101000000 -org.codehaus.groovy:groovy-xml 20250101000000 -org.codehaus.groovy:groovy-yaml 20250101000000 -org.mockito:mockito-core 20250101000000 -org.ojalgo:ojalgo 20250101000000 -org.python:jython-slim 20230309000000 -org.springframework:spring-aop 20250101000000 -org.springframework:spring-beans 20250101000000 -org.springframework:spring-core 20250101000000 -org.tensorflow:libtensorflow 20200701000000 -org.tensorflow:libtensorflow_jni 20200701000000 -org.tensorflow:libtensorflow_jni_gpu 20200701000000 -org.tensorflow:proto 20200701000000 -org.tensorflow:tensorflow 20200701000000 - -# Not maintaining ImageJ Server currently... -net.imagej:imagej-server 20250101000000 - -# SciJava projects with only CI+POM changes. -io.scif:scifio-cli 20230309000000 -io.scif:scifio-hdf5 20230309000000 -io.scif:scifio-jai-imageio 20230309000000 -io.scif:scifio-labeling 20230309000000 -io.scif:scifio-lifesci 20230309000000 -net.imagej:imagej-deprecated 20230309000000 -net.imagej:imagej-mesh 20230309000000 -net.imagej:imagej-mesh-io 20230309000000 -net.imagej:imagej-notebook 20230309000000 -net.imagej:imagej-plugins-batch 20230309000000 -net.imagej:imagej-plugins-commands 20230309000000 -net.imagej:imagej-plugins-tools 20230309000000 -net.imagej:imagej-plugins-uploader-ssh 20230309000000 -net.imagej:imagej-ui-awt 20230309000000 -net.imagej:op-finder 20230309000000 -net.imglib2:imglib2-algorithm-fft 20230309000000 -net.imglib2:imglib2-algorithm-gpl 20230309000000 -net.imglib2:imglib2-unsafe 20230309000000 -org.scijava:minimaven 20230309000000 -org.scijava:native-lib-loader 20230309000000 -org.scijava:scijava-cache 20230309000000 -org.scijava:scijava-grab 20230309000000 -org.scijava:scijava-io-http 20230309000000 -org.scijava:scijava-java3d 20230309000000 -org.scijava:scijava-listeners 20211021000000 -org.scijava:scijava-maven-plugin 20230309000000 -org.scijava:scijava-optional 20230309000000 -org.scijava:scijava-plot 20230309000000 -org.scijava:scijava-plugins-platforms 20230309000000 -org.scijava:scijava-plugins-text-markdown 20230309000000 -org.scijava:scijava-ui-awt 20230309000000 -org.scijava:scripting-clojure 20230309000000 -org.scijava:scripting-java 20230309000000 -org.scijava:scripting-jruby 20230309000000 -org.scijava:scripting-matlab 20230309000000 -org.scijava:scripting-scala 20230309000000 -org.scijava:swing-checkbox-tree 20230309000000 -sc.fiji:3D_Objects_Counter 20230313000000 -sc.fiji:3D_Viewer 20230313000000 -sc.fiji:AnalyzeSkeleton_ 20230309000000 -sc.fiji:Anisotropic_Diffusion_2D 20230309000000 -sc.fiji:Archipelago_Plugins 20230309000000 -sc.fiji:Arrow_ 20230309000000 -sc.fiji:Auto_Local_Threshold 20230309000000 -sc.fiji:BalloonSegmentation_ 20230309000000 -sc.fiji:Bug_Submitter 20230309000000 -sc.fiji:Calculator_Plus 20230309000000 -sc.fiji:Cell_Counter 20230309000000 -sc.fiji:Colocalisation_Analysis 20230309000000 -sc.fiji:Color_Histogram 20230309000000 -sc.fiji:Color_Inspector_3D 20230309000000 -sc.fiji:Colour_Deconvolution 20230309000000 -sc.fiji:Correct_3D_Drift 20230309000000 -sc.fiji:Dichromacy_ 20230309000000 -sc.fiji:Directionality_ 20230309000000 -sc.fiji:Fiji_Archipelago 20230309000000 -sc.fiji:Fiji_Package_Maker 20230309000000 -sc.fiji:FlowJ_ 20230309000000 -sc.fiji:Graph_Cut 20230309000000 -sc.fiji:Gray_Morphology 20230309000000 -sc.fiji:Helmholtz_Analysis 20230309000000 -sc.fiji:IJ_Robot 20230309000000 -sc.fiji:Image_5D 20230309000000 -sc.fiji:Image_Expression_Parser 20230309000000 -sc.fiji:Interactive_3D_Surface_Plot 20230309000000 -sc.fiji:IsoData_Classifier 20230309000000 -sc.fiji:Kappa 20230309000000 -sc.fiji:Kuwahara_Filter 20230309000000 -sc.fiji:LSM_Reader 20230309000000 -sc.fiji:LSM_Toolbox 20230309000000 -sc.fiji:Lasso_and_Blow_Tool 20230309000000 -sc.fiji:Linear_Kuwahara 20230309000000 -sc.fiji:LocalThickness_ 20230309000000 -sc.fiji:MTrack2_ 20230309000000 -sc.fiji:M_I_P 20230309000000 -sc.fiji:Manual_Tracking 20230309000000 -sc.fiji:Multi_Kymograph 20230309000000 -sc.fiji:OMEVisual 20230309000000 -sc.fiji:PIV_analyser 20230309000000 -sc.fiji:QuickPALM_ 20230309000000 -sc.fiji:RATS_ 20230309000000 -sc.fiji:SPIM_Opener 20230309000000 -sc.fiji:Samples_ 20230309000000 -sc.fiji:Series_Labeler 20230309000000 -sc.fiji:Siox_Segmentation 20230309000000 -sc.fiji:Skeletonize3D_ 20230309000000 -sc.fiji:SplineDeformationGenerator_ 20230309000000 -sc.fiji:Stack_Manipulation 20230309000000 -sc.fiji:Statistical_Region_Merging 20230309000000 -sc.fiji:Sync_Win 20230309000000 -sc.fiji:Thread_Killer 20230309000000 -sc.fiji:Time_Lapse 20230309000000 -sc.fiji:Time_Stamper 20230309000000 -sc.fiji:ToAST_ 20230309000000 -sc.fiji:TopoJ_ 20230309000000 -sc.fiji:VIB-lib 20230309000000 -sc.fiji:Vaa3d_Reader 20230309000000 -sc.fiji:Vaa3d_Writer 20230309000000 -sc.fiji:Video_Editing 20230309000000 -sc.fiji:bUnwarpJ_ 20230309000000 -sc.fiji:bij 20230309000000 -sc.fiji:fiji-lib 20230309000000 -sc.fiji:level_sets 20230309000000 -sc.fiji:pal-optimization 20230309000000 -sc.fiji:panorama_ 20230309000000 -sc.fiji:registration_3d 20230309000000 -sc.fiji:spimdata 20230309000000 -sc.fiji:trakem2-transform 20230309000000 -sc.fiji:weave_jy2java 20230309000000 From 27bf0476496e8756de6cef8dd890c0947fb15984 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 27 May 2026 15:42:46 -0500 Subject: [PATCH 931/996] Manage version of scijava-desktop The scijava-desktop component now unifies scijava-links and scijava-plugins-platforms into a single artifact, responsible for managing OS-platform-level integrations. --- pom.xml | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 5877c321..9a1d2506 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ pom-scijava - 44.0.1-SNAPSHOT + 45.0.0-SNAPSHOT pom SciJava Parent POM @@ -383,6 +383,10 @@ 2.0.3 ${scijava-config.version} + + 1.0.0 + ${scijava-desktop.version} + 0.1.2 ${scijava-grab.version} @@ -395,10 +399,6 @@ 0.1.0 ${scijava-java3d.version} - - 1.0.0 - ${scijava-links.version} - 1.0.0-beta-3 ${scijava-listeners.version} @@ -419,10 +419,6 @@ 0.2.5 ${scijava-plugins-commands.version} - - 0.3.1 - ${scijava-plugins-platforms.version} - 0.1.3 ${scijava-plugins-text-markdown.version} @@ -2651,6 +2647,13 @@ ${org.scijava.scijava-config.version} + + + org.scijava + scijava-desktop + ${org.scijava.scijava-desktop.version} + + org.scijava @@ -2672,13 +2675,6 @@ ${org.scijava.scijava-java3d.version} - - - org.scijava - scijava-links - ${org.scijava.scijava-links.version} - - org.scijava @@ -2714,13 +2710,6 @@ ${org.scijava.scijava-plugins-commands.version} - - - org.scijava - scijava-plugins-platforms - ${org.scijava.scijava-plugins-platforms.version} - - org.scijava From 8dbb21fdb7461866bc453aa7b1f118a22a8fc804 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 27 May 2026 15:47:14 -0500 Subject: [PATCH 932/996] Fix build badge locations for all components --- pombast.toml | 187 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 118 insertions(+), 69 deletions(-) diff --git a/pombast.toml b/pombast.toml index 7a6fc3ef..1ec8670d 100644 --- a/pombast.toml +++ b/pombast.toml @@ -14,9 +14,10 @@ excludes = ["ome:*", "org.openmicroscopy:*"] [badges] includes = [ - "io.scif:*", "de.nanoimaging:*", "fr.inra.ijpb:*", + "io.scif:*", + "jitk:*", "mpicbg:*", "net.imagej:*", "net.imglib2:*", @@ -233,7 +234,7 @@ skip-tests = [ # at sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest.test(CalculateProbabilityMapWithLabkitIJ1PluginTest.java:65) "sc.fiji:labkit-ui" = ["sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest"] -[components."fr.inra.ijpb:MorphoLibJ"] +[components."fr.inra.ijpb:MorphoLibJ_"] ci-build = "build-main" [components."hsqldb:hsqldb"] @@ -265,6 +266,9 @@ last-vetted = "20230309000000" [components."io.scif:scifio-ome-xml"] ci-build = "build-main" +[components."jitk:jitk-tps"] +ci-build = "build-main" + [components."net.imagej:ij"] java-version = 11 @@ -353,32 +357,35 @@ java-version = 11 [components."net.imglib2:imglib2-unsafe"] last-vetted = "20230309000000" -[components."net.preibischlab:multiview-simulation"] +[components."net.preibisch:multiview-simulation"] ci-build = "build-main" -[components."ome:bioformats"] +[components."ome:formats-api"] ci-build = "maven" -[components."ome:ome-codecs"] +[components."ome:formats-bsd"] ci-build = "maven" -[components."ome:ome-common-java"] +[components."ome:formats-gpl"] ci-build = "maven" -[components."ome:ome-metakit"] -ci-build = "maven" +[components."org.bonej:bonej-legacy-plugins_"] +java-version = 11 +ci-build = "build-main" -[components."ome:ome-model"] -ci-build = "maven" +[components."org.bonej:bonej-legacy-util_"] +java-version = 11 +ci-build = "build-main" -[components."ome:ome-poi"] -ci-build = "maven" +[components."org.bonej:bonej-ops"] +java-version = 11 +ci-build = "build-main" -[components."org.bonej:bonej-legacy-plugins_"] +[components."org.bonej:bonej-plugins"] java-version = 11 ci-build = "build-main" -[components."org.bonej:bonej-ops"] +[components."org.bonej:bonej-utilities"] java-version = 11 ci-build = "build-main" @@ -463,7 +470,7 @@ last-vetted = "20250101000000" [components."org.codehaus.groovy:groovy-yaml"] last-vetted = "20250101000000" -[components."org.janelia.saalfeldlab:jitk-tps"] +[components."org.janelia:H5J_Loader_Plugin"] ci-build = "build-main" [components."org.janelia.saalfeldlab:n5-aws-s3"] @@ -484,13 +491,7 @@ ci-build = "build-main" [components."org.janelia.saalfeldlab:n5-universe"] ci-build = "build-main" -[components."org.janelia.saalfeldlab:n5-viewer"] -ci-build = "build-main" - -[components."org.janelia.saalfeldlab:trakem2-tps"] -ci-build = "build-main" - -[components."org.janelia.saalfeldlab:z-spacing"] +[components."org.janelia.saalfeldlab:n5-viewer_fiji"] ci-build = "build-main" [components."org.mockito:mockito-core"] @@ -502,6 +503,23 @@ java-version = 21 [components."org.ojalgo:ojalgo"] last-vetted = "20250101000000" +[components."org.openmicroscopy:metakit"] +project-url = "https://github.com/ome/ome-metakit" +ci-build = "maven" + +[components."org.openmicroscopy:ome-codecs"] +ci-build = "maven" + +[components."org.openmicroscopy:ome-common"] +ci-build = "maven" + +[components."org.openmicroscopy:ome-poi"] +ci-build = "maven" + +[components."org.openmicroscopy:ome-xml"] +project-url = "https://github.com/ome/ome-model" +ci-build = "maven" + [components."org.openmicroscopy:omero-blitz"] ci-build = "gradle" @@ -511,7 +529,8 @@ ci-build = "gradle" [components."org.openmicroscopy:omero-dsl-plugin"] ci-build = "gradle" -[components."org.openmicroscopy:omero-gateway-java"] +[components."org.openmicroscopy:omero-gateway"] +project-url = "https://github.com/ome/omero-gateway-java" ci-build = "gradle" [components."org.openmicroscopy:omero-model"] @@ -526,6 +545,10 @@ ci-build = "gradle" [components."org.openmicroscopy:omero-server"] ci-build = "gradle" +[components."org.openmicroscopy:specification"] +project-url = "https://github.com/ome/ome-model" +ci-build = "maven" + [components."org.python:jython-slim"] last-vetted = "20230309000000" @@ -700,10 +723,8 @@ last-vetted = "20230313000000" ci-build = "build-main" last-vetted = "20230313000000" -[components."sc.fiji:AnalyzeSkeleton"] -ci-build = "build-main" - [components."sc.fiji:AnalyzeSkeleton_"] +ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:Anisotropic_Diffusion_2D"] @@ -714,10 +735,8 @@ last-vetted = "20230309000000" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:Arrow"] -ci-build = "build-main" - [components."sc.fiji:Arrow_"] +ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:Auto_Local_Threshold"] @@ -727,10 +746,8 @@ last-vetted = "20230309000000" [components."sc.fiji:Auto_Threshold"] ci-build = "build-main" -[components."sc.fiji:BalloonSegmentation"] -ci-build = "build-main" - [components."sc.fiji:BalloonSegmentation_"] +ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:Bug_Submitter"] @@ -763,7 +780,7 @@ last-vetted = "20230309000000" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:CorrectBleach"] +[components."sc.fiji:CorrectBleach_"] ci-build = "build-main" [components."sc.fiji:Correct_3D_Drift"] @@ -773,16 +790,12 @@ last-vetted = "20230309000000" [components."sc.fiji:Descriptor_based_registration"] ci-build = "build-main" -[components."sc.fiji:Dichromacy"] -ci-build = "build-main" - [components."sc.fiji:Dichromacy_"] -last-vetted = "20230309000000" - -[components."sc.fiji:Directionality"] ci-build = "build-main" +last-vetted = "20230309000000" [components."sc.fiji:Directionality_"] +ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:FS_Align_TrakEM2"] @@ -802,10 +815,8 @@ ci-build = "build-main" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:FlowJ"] -ci-build = "build-main" - [components."sc.fiji:FlowJ_"] +ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:Graph_Cut"] @@ -816,9 +827,6 @@ last-vetted = "20230309000000" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:H5J_Loader_Plugin"] -ci-build = "build-main" - [components."sc.fiji:HDF5_Vibez"] ci-build = "build-main" @@ -830,7 +838,7 @@ last-vetted = "20230309000000" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:IO"] +[components."sc.fiji:IO_"] ci-build = "build-main" [components."sc.fiji:Image_5D"] @@ -873,16 +881,12 @@ last-vetted = "20230309000000" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:LocalThickness"] -ci-build = "build-main" - [components."sc.fiji:LocalThickness_"] -last-vetted = "20230309000000" - -[components."sc.fiji:MTrack2"] ci-build = "build-main" +last-vetted = "20230309000000" [components."sc.fiji:MTrack2_"] +ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:M_I_P"] @@ -907,16 +911,12 @@ last-vetted = "20230309000000" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:QuickPALM"] -ci-build = "build-main" - [components."sc.fiji:QuickPALM_"] -last-vetted = "20230309000000" - -[components."sc.fiji:RATS"] ci-build = "build-main" +last-vetted = "20230309000000" [components."sc.fiji:RATS_"] +ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:Reconstruct_Reader"] @@ -929,10 +929,8 @@ last-vetted = "20230309000000" [components."sc.fiji:SPIM_Registration"] ci-build = "build-main" -[components."sc.fiji:Samples"] -ci-build = "build-main" - [components."sc.fiji:Samples_"] +ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:Series_Labeler"] @@ -943,16 +941,12 @@ last-vetted = "20230309000000" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:Skeletonize3D"] -ci-build = "build-main" - [components."sc.fiji:Skeletonize3D_"] -last-vetted = "20230309000000" - -[components."sc.fiji:SplineDeformationGenerator"] ci-build = "build-main" +last-vetted = "20230309000000" [components."sc.fiji:SplineDeformationGenerator_"] +ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:Stack_Manipulation"] @@ -963,7 +957,7 @@ last-vetted = "20230309000000" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:Stitching"] +[components."sc.fiji:Stitching_"] ci-build = "build-main" [components."sc.fiji:Sync_Win"] @@ -989,36 +983,85 @@ ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:ToAST_"] +ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:TopoJ_"] +ci-build = "build-main" last-vetted = "20230309000000" +[components."sc.fiji:Trainable_Segmentation"] +ci-build = "build-main" + +[components."sc.fiji:TrakEM2_"] +ci-build = "build-main" + +[components."sc.fiji:TrakEM2_Archipelago"] +ci-build = "build-main" + [components."sc.fiji:VIB-lib"] +ci-build = "build-main" last-vetted = "20230309000000" +[components."sc.fiji:VIB_"] +ci-build = "build-main" + [components."sc.fiji:Vaa3d_Reader"] +ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:Vaa3d_Writer"] +ci-build = "build-main" last-vetted = "20230309000000" +[components."sc.fiji:VectorString"] +ci-build = "build-main" + [components."sc.fiji:Video_Editing"] +ci-build = "build-main" last-vetted = "20230309000000" +[components."sc.fiji:Volume_Calculator"] +ci-build = "build-main" + +[components."sc.fiji:Volume_Viewer"] +ci-build = "build-main" + [components."sc.fiji:bUnwarpJ_"] +ci-build = "build-main" last-vetted = "20230309000000" +[components."sc.fiji:bigdataviewer-server"] +ci-build = "build-main" + +[components."sc.fiji:bigdataviewer-vistools"] +ci-build = "build-main" + +[components."sc.fiji:bigdataviewer_fiji"] +ci-build = "build-main" + [components."sc.fiji:bij"] +ci-build = "build-main" last-vetted = "20230309000000" +[components."sc.fiji:blockmatching_"] +ci-build = "build-main" + [components."sc.fiji:fiji-lib"] +ci-build = "build-main" last-vetted = "20230309000000" +[components."sc.fiji:labkit-pixel-classification"] +ci-build = "build-main" + +[components."sc.fiji:labkit-ui"] +ci-build = "build-main" + [components."sc.fiji:legacy-imglib1"] ci-build = "build-main" [components."sc.fiji:level_sets"] +ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:pal-optimization"] @@ -1036,7 +1079,7 @@ ci-build = "build-main" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:spimdata"] +[components."sc.fiji:spim_data"] ci-build = "build-main" last-vetted = "20230309000000" @@ -1044,6 +1087,12 @@ last-vetted = "20230309000000" ci-build = "build-main" last-vetted = "20230309000000" +[components."sc.fiji:trakem2_tps"] +ci-build = "build-main" + [components."sc.fiji:weave_jy2java"] ci-build = "build-main" last-vetted = "20230309000000" + +[components."sc.fiji:z_spacing"] +ci-build = "build-main" From 9a8855bbeb945e534dabf9a8cd50a98932f6b4d7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 27 May 2026 15:53:28 -0500 Subject: [PATCH 933/996] Include MorphoLibJ in the smelt action --- pombast.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pombast.toml b/pombast.toml index 1ec8670d..285bdb4c 100644 --- a/pombast.toml +++ b/pombast.toml @@ -134,6 +134,7 @@ excludes = [ [smelt] includes = [ "ca.mcgill:*", + "fr.inra.ijpb:*", "io.scif:*", "jitk:*", "mpicbg:*", From 7c6e49f6b8f2eae2a6ee7c6b187106cbbf68ae67 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 27 May 2026 15:53:45 -0500 Subject: [PATCH 934/996] Remove obsolete vetting timestamps --- pombast.toml | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/pombast.toml b/pombast.toml index 285bdb4c..3512af47 100644 --- a/pombast.toml +++ b/pombast.toml @@ -258,7 +258,6 @@ last-vetted = "20230309000000" [components."io.scif:scifio-labeling"] ci-build = "build-main" -last-vetted = "20230309000000" [components."io.scif:scifio-lifesci"] ci-build = "build-main" @@ -275,11 +274,9 @@ java-version = 11 [components."net.imagej:imagej-deprecated"] ci-build = "build-main" -last-vetted = "20230309000000" [components."net.imagej:imagej-mesh"] ci-build = "build-main" -last-vetted = "20230309000000" [components."net.imagej:imagej-mesh-io"] ci-build = "build-main" @@ -307,7 +304,6 @@ last-vetted = "20230309000000" [components."net.imagej:imagej-plugins-commands"] ci-build = "build-main" -last-vetted = "20230309000000" [components."net.imagej:imagej-plugins-tools"] ci-build = "build-main" @@ -323,9 +319,6 @@ ci-build = "build-main" [components."net.imagej:imagej-scripting"] ci-build = "build-main" -[components."net.imagej:imagej-server"] -last-vetted = "20250101000000" - [components."net.imagej:imagej-tensorflow"] ci-build = "build-main" @@ -349,15 +342,9 @@ ci-build = "build-main" [components."net.imglib2:imglib2-algorithm-fft"] last-vetted = "20230309000000" -[components."net.imglib2:imglib2-algorithm-gpl"] -last-vetted = "20230309000000" - [components."net.imglib2:imglib2-mesh"] java-version = 11 -[components."net.imglib2:imglib2-unsafe"] -last-vetted = "20230309000000" - [components."net.preibisch:multiview-simulation"] ci-build = "build-main" @@ -550,9 +537,6 @@ ci-build = "gradle" project-url = "https://github.com/ome/ome-model" ci-build = "maven" -[components."org.python:jython-slim"] -last-vetted = "20230309000000" - [components."org.scijava:batch-processor"] ci-build = "build-main" @@ -579,20 +563,15 @@ last-vetted = "20180905120000" [components."org.scijava:minimaven"] last-vetted = "20230309000000" -[components."org.scijava:native-lib-loader"] -last-vetted = "20230309000000" - [components."org.scijava:scijava-cache"] ci-build = "build-main" last-vetted = "20230309000000" [components."org.scijava:scijava-grab"] ci-build = "build-main" -last-vetted = "20230309000000" [components."org.scijava:scijava-io-http"] ci-build = "build-main" -last-vetted = "20230309000000" [components."org.scijava:scijava-java3d"] ci-build = "build-main" @@ -604,9 +583,6 @@ last-vetted = "20211021000000" [components."org.scijava:scijava-maven-plugin"] last-vetted = "20230309000000" -[components."org.scijava:scijava-optional"] -last-vetted = "20230309000000" - [components."org.scijava:scijava-plot"] ci-build = "build-main" last-vetted = "20230309000000" @@ -647,14 +623,10 @@ ci-build = "build-main" [components."org.scijava:scripting-clojure"] ci-build = "build-main" -last-vetted = "20230309000000" [components."org.scijava:scripting-groovy"] ci-build = "build-main" -[components."org.scijava:scripting-java"] -last-vetted = "20230309000000" - [components."org.scijava:scripting-javascript"] ci-build = "build-main" @@ -677,7 +649,6 @@ ci-build = "build-main" [components."org.scijava:scripting-scala"] ci-build = "build-main" -last-vetted = "20230309000000" [components."org.scijava:swing-checkbox-tree"] last-vetted = "20230309000000" @@ -722,7 +693,6 @@ last-vetted = "20230313000000" [components."sc.fiji:3D_Viewer"] ci-build = "build-main" -last-vetted = "20230313000000" [components."sc.fiji:AnalyzeSkeleton_"] ci-build = "build-main" @@ -766,9 +736,6 @@ last-vetted = "20230309000000" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:Colocalisation_Analysis"] -last-vetted = "20230309000000" - [components."sc.fiji:Color_Histogram"] ci-build = "build-main" last-vetted = "20230309000000" @@ -786,7 +753,6 @@ ci-build = "build-main" [components."sc.fiji:Correct_3D_Drift"] ci-build = "build-main" -last-vetted = "20230309000000" [components."sc.fiji:Descriptor_based_registration"] ci-build = "build-main" @@ -884,7 +850,6 @@ last-vetted = "20230309000000" [components."sc.fiji:LocalThickness_"] ci-build = "build-main" -last-vetted = "20230309000000" [components."sc.fiji:MTrack2_"] ci-build = "build-main" @@ -1082,7 +1047,6 @@ last-vetted = "20230309000000" [components."sc.fiji:spim_data"] ci-build = "build-main" -last-vetted = "20230309000000" [components."sc.fiji:trakem2-transform"] ci-build = "build-main" From 7b78709c255d2ca67a05bdfef2bd7c58367bb479 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 27 May 2026 17:37:15 -0500 Subject: [PATCH 935/996] Mark which components are considered cuttable A cuttable component is one for which SciJava maintainers can cut new releases. Such components are assumed to abide by SciJava development principles, particularly having a release-ready mainline branch. --- pombast.toml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pombast.toml b/pombast.toml index 3512af47..e7815278 100644 --- a/pombast.toml +++ b/pombast.toml @@ -8,6 +8,21 @@ html = "index.html" header = "header.html" footer = "footer.html" nexus-base = "https://maven.scijava.org" +cuttable = [ + "de.nanoimaging:*", + "fr.inra.ijpb:*", + "io.scif:*", + "jitk:*", + "mpicbg:*", + "net.imagej:*", + "net.imglib2:*", + "net.preibisch:*", + "org.bonej:*", + "org.janelia*:*", + "org.morphonets:*", + "org.scijava:*", + "sc.fiji:*", +] [team] excludes = ["ome:*", "org.openmicroscopy:*"] @@ -134,6 +149,7 @@ excludes = [ [smelt] includes = [ "ca.mcgill:*", + "de.nanoimaging:*", "fr.inra.ijpb:*", "io.scif:*", "jitk:*", From e2f2707cea25f0b8c2024521e7b31ff6b9da7ac4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 27 May 2026 18:04:02 -0500 Subject: [PATCH 936/996] Update View5D: 2.5.4 -> 2.5.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a1d2506..19eaad64 100644 --- a/pom.xml +++ b/pom.xml @@ -1028,7 +1028,7 @@ - 2.5.4 + 2.5.6 ${View5D.version} ${View5D_.version} From 2651956c3c3691ff148291c3ba8099be8d7d8efa Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 28 May 2026 13:06:20 -0500 Subject: [PATCH 937/996] Update status header and footer Move pom-scijava and pom-scijava-base to header from footer. Use immediate src attribute on footer images. (Otherwise nothing populates them and they remain blank.) --- footer.html | 28 ++++++++-------------------- header.html | 23 ++++++++++++++++++++++- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/footer.html b/footer.html index 4d7603b2..2227e84a 100644 --- a/footer.html +++ b/footer.html @@ -4,47 +4,35 @@ Build -scijava/pom-scijava-base - - - -scijava/pom-scijava - - - -scijava/status.scijava.org - - - scijava/incubator - + imagej/list-of-update-sites - + imagej/tutorials - + fiji/fiji-builds - + scijava/jgo - + scijava/scyjava - + imglib/imglyb - + imagej/pyimagej - + diff --git a/header.html b/header.html index 16d992a7..832e4d59 100644 --- a/header.html +++ b/header.html @@ -1 +1,22 @@ - + +

+ +
pom-scijava +
+
+ +
pom-scijava-base +
From 323c606916752e567ab4eaa2c227da79a4bdcaa0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 28 May 2026 13:07:11 -0500 Subject: [PATCH 938/996] Add includes to pombast team, to limit org search Without this, 65 orgs get searched, most of which are not under the purview of SciJava maintenance. --- pombast.toml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pombast.toml b/pombast.toml index e7815278..13b00c8b 100644 --- a/pombast.toml +++ b/pombast.toml @@ -25,7 +25,21 @@ cuttable = [ ] [team] -excludes = ["ome:*", "org.openmicroscopy:*"] +includes = [ + "de.nanoimaging:*", + "fr.inra.ijpb:*", + "io.scif:*", + "jitk:*", + "mpicbg:*", + "net.imagej:*", + "net.imglib2:*", + "net.preibisch:*", + "org.bonej:*", + "org.janelia*:*", + "org.morphonets:*", + "org.scijava:*", + "sc.fiji:*", +] [badges] includes = [ From 92181dd2135b2dd30b99357e0779f1f096ff440d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 28 May 2026 16:51:05 -0500 Subject: [PATCH 939/996] Let status and team pages share common navigation --- footer.html => footer-status.html | 3 ++ footer-team.html | 2 ++ header-status.html | 47 +++++++++++++++++++++++++++++++ header-team.html | 27 ++++++++++++++++++ header.html | 22 --------------- pombast.toml | 9 ++++-- 6 files changed, 85 insertions(+), 25 deletions(-) rename footer.html => footer-status.html (99%) create mode 100644 footer-team.html create mode 100644 header-status.html create mode 100644 header-team.html delete mode 100644 header.html diff --git a/footer.html b/footer-status.html similarity index 99% rename from footer.html rename to footer-status.html index 2227e84a..e5c038dd 100644 --- a/footer.html +++ b/footer-status.html @@ -36,3 +36,6 @@ + +
+👍 diff --git a/footer-team.html b/footer-team.html new file mode 100644 index 00000000..64db37f1 --- /dev/null +++ b/footer-team.html @@ -0,0 +1,2 @@ +
+👍 diff --git a/header-status.html b/header-status.html new file mode 100644 index 00000000..923b0e61 --- /dev/null +++ b/header-status.html @@ -0,0 +1,47 @@ + + +
+ +
pom-scijava +
+
+ +
pom-scijava-base +
diff --git a/header-team.html b/header-team.html new file mode 100644 index 00000000..41befe76 --- /dev/null +++ b/header-team.html @@ -0,0 +1,27 @@ + + diff --git a/header.html b/header.html deleted file mode 100644 index 832e4d59..00000000 --- a/header.html +++ /dev/null @@ -1,22 +0,0 @@ - -
- -
pom-scijava -
-
- -
pom-scijava-base -
diff --git a/pombast.toml b/pombast.toml index 13b00c8b..18c18895 100644 --- a/pombast.toml +++ b/pombast.toml @@ -4,9 +4,9 @@ repositories = ["scijava.public=https://maven.scijava.org/content/groups/public" [status] rules = "rules.xml" -html = "index.html" -header = "header.html" -footer = "footer.html" +html = "../status.scijava.org/index.html" +header = "header-status.html" +footer = "footer-status.html" nexus-base = "https://maven.scijava.org" cuttable = [ "de.nanoimaging:*", @@ -25,6 +25,9 @@ cuttable = [ ] [team] +html = "../status.scijava.org/team.html" +header = "header-team.html" +footer = "footer-team.html" includes = [ "de.nanoimaging:*", "fr.inra.ijpb:*", From 71be2ef092b5ea3e7e3baa70c9e1055464802b91 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 30 May 2026 12:58:03 -0500 Subject: [PATCH 940/996] CI: generate badges.json as part of status refresh --- .github/status.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/status.sh b/.github/status.sh index 096e57c5..81186a08 100755 --- a/.github/status.sh +++ b/.github/status.sh @@ -1,5 +1,6 @@ #!/bin/sh uv tool install "git+https://github.com/scijava/pombast.git" pombast status . -pombast team . --html team.html -.github/publish.sh "Update status reports" index.html team.html +pombast badges -o badges.json . +pombast team . +.github/publish.sh "Update status reports" index.html badges.json team.html From 319bf40f2b3f28be626cba40ca3cdad27df8e361 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 30 May 2026 15:46:35 -0500 Subject: [PATCH 941/996] Downgrade recommended JavaFX version to v19 This is so that the recommended/default JavaFX aligns with the recommended/default version of Java: currently version 11. When scijava.jvm.version is increased, we can/should/will also increase the recommended/default version of JavaFX. This alignment is necessary for pombast validation checks; whereas with them misaligned, the javafx components in the pombast melt dependency graph result in enforcer validation errors: [ERROR] Rule 6: org.codehaus.mojo.extraenforcer.dependencies.EnforceBytecodeVersion failed with message: [ERROR] Found Banned Dependency: org.openjfx:javafx-media:jar:linux:23.0.2 [ERROR] Found Banned Dependency: org.openjfx:javafx-swing:jar:linux:23.0.2 [ERROR] Found Banned Dependency: org.openjfx:javafx-fxml:jar:linux:23.0.2 [ERROR] Found Banned Dependency: org.openjfx:javafx-web:jar:linux:23.0.2 [ERROR] Found Banned Dependency: org.openjfx:javafx-base:jar:linux:23.0.2 [ERROR] Found Banned Dependency: org.openjfx:javafx-controls:jar:linux:23.0.2 [ERROR] Found Banned Dependency: org.openjfx:javafx-graphics:jar:linux:23.0.2 [ERROR] Use 'mvn dependency:tree' to locate the source of the banned dependencies. The reason the javafx components are part of the pombast melt's dependency graph is because several other included components (OMEVisual, FilamentDetector, multiview-reconstruction) depend on javafx, so even with javafx components excluded from the melt operation's direct dependency graph, they still come in transitively. We could alternately work around the issue by excluding all the components depending on javafx, but that would be a hacky workaround compared to just unifying expectations here. With this adjustment, errors could now surface in the "other direction": if a component Foo21 overrides scijava.jvm.version to 21 and javafx.version to v23, it will be buildable and releasable -- but if that Foo21 component is then added to the pom-scijava BOM, it will be smelted with JavaFX v19, meaning any too-new API of JavaFX v23 will not be available, and the Foo21 smelt will fail accordingly. But this is actually correct: we are asserting that all versions of components in the BOM actually work together, and if Foo21 tries to make use of a too-new JavaFX, it *would* fail at runtime if a downstream component added dependencies on Foo21 and JavaFX at the BOM's declared versions. So: working as intended! --- pom.xml | 2 +- pombast.toml | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 19eaad64..8b7d4509 100644 --- a/pom.xml +++ b/pom.xml @@ -2115,7 +2115,7 @@ 26 | 24 27 | 25 --> - 23.0.2 + 19.0.2.1 ${javafx.version} ${javafx.version} ${javafx.version} diff --git a/pombast.toml b/pombast.toml index 18c18895..5b6af95b 100644 --- a/pombast.toml +++ b/pombast.toml @@ -109,13 +109,6 @@ excludes = [ 'mpicbg:mpicbg', 'mpicbg:mpicbg_', # NB: Skip artifacts requiring minimum Java version >11. 'net.algart:algart-tiff', - 'org.openjfx:javafx-base', - 'org.openjfx:javafx-controls', - 'org.openjfx:javafx-fxml', - 'org.openjfx:javafx-graphics', - 'org.openjfx:javafx-media', - 'org.openjfx:javafx-swing', - 'org.openjfx:javafx-web', 'org.morphonets:SNT', # NB: Skip closed-source artifacts. 'org.bonej:bonej-plus', From 1b70c2a07e32803ffbe61ea6724aa57f4c8d529f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 1 Jun 2026 14:09:50 -0500 Subject: [PATCH 942/996] Tidy up the pombast/mega-melt configuration * Move pombast-specific templates into pombast subfolder. * Remove tests subfolder containing obsolete shell scripts. --- pombast.toml | 10 +- .../footer-status.html | 0 footer-team.html => pombast/footer-team.html | 0 .../header-status.html | 0 header-team.html => pombast/header-team.html | 0 {tests => pombast}/mega-melt-template.xml | 0 tests/filter-build-log.py | 48 -- tests/generate-mega-melt.py | 147 ------ tests/run.sh | 484 ------------------ 9 files changed, 5 insertions(+), 684 deletions(-) rename footer-status.html => pombast/footer-status.html (100%) rename footer-team.html => pombast/footer-team.html (100%) rename header-status.html => pombast/header-status.html (100%) rename header-team.html => pombast/header-team.html (100%) rename {tests => pombast}/mega-melt-template.xml (100%) delete mode 100644 tests/filter-build-log.py delete mode 100644 tests/generate-mega-melt.py delete mode 100755 tests/run.sh diff --git a/pombast.toml b/pombast.toml index 5b6af95b..613fd821 100644 --- a/pombast.toml +++ b/pombast.toml @@ -5,8 +5,8 @@ repositories = ["scijava.public=https://maven.scijava.org/content/groups/public" [status] rules = "rules.xml" html = "../status.scijava.org/index.html" -header = "header-status.html" -footer = "footer-status.html" +header = "pombast/header-status.html" +footer = "pombast/footer-status.html" nexus-base = "https://maven.scijava.org" cuttable = [ "de.nanoimaging:*", @@ -26,8 +26,8 @@ cuttable = [ [team] html = "../status.scijava.org/team.html" -header = "header-team.html" -footer = "footer-team.html" +header = "pombast/header-team.html" +footer = "pombast/footer-team.html" includes = [ "de.nanoimaging:*", "fr.inra.ijpb:*", @@ -71,7 +71,7 @@ includes = [ # Setting scijava.jvm.version to 21 by default would avoid the issue, but... # is that really a good idea? Setting to 11 seems like a nice baseline compromise right now. java-version = 21 # Maximum Java version of all included component + deps. -template = "tests/mega-melt-template.xml" +template = "pombast/mega-melt-template.xml" excludes = [ # TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone. 'org.bytedeco:hdf5', diff --git a/footer-status.html b/pombast/footer-status.html similarity index 100% rename from footer-status.html rename to pombast/footer-status.html diff --git a/footer-team.html b/pombast/footer-team.html similarity index 100% rename from footer-team.html rename to pombast/footer-team.html diff --git a/header-status.html b/pombast/header-status.html similarity index 100% rename from header-status.html rename to pombast/header-status.html diff --git a/header-team.html b/pombast/header-team.html similarity index 100% rename from header-team.html rename to pombast/header-team.html diff --git a/tests/mega-melt-template.xml b/pombast/mega-melt-template.xml similarity index 100% rename from tests/mega-melt-template.xml rename to pombast/mega-melt-template.xml diff --git a/tests/filter-build-log.py b/tests/filter-build-log.py deleted file mode 100644 index 4e8f1942..00000000 --- a/tests/filter-build-log.py +++ /dev/null @@ -1,48 +0,0 @@ -# -# filter-build-log.py - Cuts out cruft to focus on build failure details. -# - -# This script filters build logs down to only [WARNING] and [ERROR] lines, -# and consolidates lengthy duplicate class listings down to packages only. - -import sys - -def print_filtered_log(log): - dups = [] - parsingdups = False - atbeginning = True - for line in log: - line = line.rstrip('\n') - if line.startswith('[INFO]'): - # Filter out non-error build messages. - continue - if line.startswith('Download') or line.startswith('Progress'): - # Filter out details of remote resource queries. - continue - if atbeginning and not line.strip(): - # Filter out leading blank lines. - continue - atbeginning = False - if parsingdups: - if line.startswith(' '): - if line.find('/') >= 0: - # Strip to containing package only. - line = line[:line.rindex('/')] - dups.append(line) - else: - parsingdups = False - for dup in sorted(set(dups)): - print(dup) - print('') - dups = [] - else: - if line == ' Duplicate classes:': - print(' Duplicate packages:') - parsingdups = True - else: - print(line) - -for arg in sys.argv[1:]: - with open(arg) as f: - print_filtered_log(f) - diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py deleted file mode 100644 index fef2758d..00000000 --- a/tests/generate-mega-melt.py +++ /dev/null @@ -1,147 +0,0 @@ -# -# generate-mega-melt.py - Make a POM depending on everything in pom-scijava. -# - -import os, re, sys -from xml.dom import minidom - -def child(node, tag): - nodes = node.getElementsByTagName(tag) - return None if len(nodes) == 0 else nodes[0] - -script_dir = os.path.dirname(os.path.realpath(__file__)) if __file__ else '.' -out = minidom.parse(os.path.join(script_dir, 'mega-melt-template.xml')) -out.getElementsByTagName('project')[0].appendChild(out.createElement('dependencies')) -outDeps = out.getElementsByTagName('dependencies')[0] - -psj = minidom.parse(os.path.join(script_dir, '..', 'pom.xml')) -depMgmt = psj.getElementsByTagName('dependencyManagement')[0] -deps = depMgmt.getElementsByTagName('dependencies')[0] -depList = deps.getElementsByTagName('dependency') - -# Artifacts to exclude from the mega melt. -ignoredArtifacts = [ - # TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone. - 'hdf5', - # TEMP: The original ImageJ requires Java 9+ to compile, - # because it has a module-info.java, so skip it until the - # component collection is updated from Java 8 to Java 11. - 'ij', - # TEMP: Skip components within multi-module reactors. - # Neither melting-pot.sh nor release-version.sh understand - # multi-module repositories; release-version.sh needs to learn - # how to tag and release individual components from multi-module - # repos, so that when melting-pot.sh shallow clones the repo at - # that tag and invokes a build, it will be building only the - # released component as it does with single-component repos. - 'scijava-collections', - 'scijava-common3', - 'scijava-concurrent', - 'scijava-discovery-test', - 'scijava-discovery', - 'scijava-function', - 'scijava-legacy', - 'scijava-meta', - 'scijava-ops-api', - 'scijava-ops-benchmarks', - 'scijava-ops-engine', - 'scijava-ops-ext-parser', - 'scijava-ops-flim', - 'scijava-ops-image', - 'scijava-ops-indexer', - 'scijava-ops-opencv', - 'scijava-ops-spi', - 'scijava-ops-tutorial', - 'scijava-priority', - 'scijava-progress', - 'scijava-struct', - 'scijava-taglets', - 'scijava-testutil', - 'scijava-types', - 'mpicbg', 'mpicbg_', - # NB: Skip artifacts requiring minimum Java version >8. - 'algart-tiff', - 'javafx-base', - 'javafx-controls', - 'javafx-fxml', - 'javafx-graphics', - 'javafx-media', - 'javafx-swing', - 'javafx-web', - 'SNT', - # NB: Skip closed-source artifacts. - 'bonej-plus', - # NB: The following artifacts have messy dependency trees. - # Too many problems to test as part of the mega-melt. - # See WARNING block in pom-scijava's pom.xml for details. - 'imagej-server', - 'spark-core_2.11', - # NB: Skip scijava forks of third-party projects. - # These are very stable, with few/no dependencies, and - # don't need to be retested as pom-scijava evolves. - 'j3dcore', - 'j3dutils', - 'jep', - 'junit-benchmarks', - 'vecmath', - # NB: Skip alternate flavors of other managed components. - 'gluegen', # uberjar flavor of gluegen-rt - 'jogl-all-noawt', # slimmed down flavor of jogl-all - # NB: All the SWT platform JARs have the same classes. - # The current platform will be brought in transitively. - 'org.eclipse.swt.cocoa.macosx', - 'org.eclipse.swt.cocoa.macosx.x86_64', - 'org.eclipse.swt.gtk.aix.ppc', - 'org.eclipse.swt.gtk.aix.ppc64', - 'org.eclipse.swt.gtk.hpux.ia64', - 'org.eclipse.swt.gtk.linux.ppc', - 'org.eclipse.swt.gtk.linux.ppc64', - 'org.eclipse.swt.gtk.linux.s390', - 'org.eclipse.swt.gtk.linux.s390x', - 'org.eclipse.swt.gtk.linux.x86', - 'org.eclipse.swt.gtk.linux.x86_64', - 'org.eclipse.swt.gtk.solaris.sparc', - 'org.eclipse.swt.gtk.solaris.x86', - 'org.eclipse.swt.win32.win32.x86', - 'org.eclipse.swt.win32.win32.x86_64', - # NB: All SLF4J bindings have the same classes. - # We'll rely on logback-classic being present here. - 'slf4j-jcl', - 'slf4j-jdk14', - 'slf4j-nop', - 'slf4j-simple', - # NB: Cannot include both commons-logging and jcl-over-slf4j; - # see: http://www.slf4j.org/codes.html#jclDelegationLoop - 'jcl-over-slf4j' -] - -for dep in depList: - # Harvest relevant information (ignore exclusions and version). - groupId = child(dep, 'groupId') - artifactId = child(dep, 'artifactId') - classifier = child(dep, 'classifier') - scope = child(dep, 'scope') - - if artifactId.firstChild.data in ignoredArtifacts: - continue - - outDep = out.createElement('dependency') - outDep.appendChild(groupId) - outDep.appendChild(artifactId) - if classifier: - outDep.appendChild(classifier) - if scope: - outDep.appendChild(scope) - outDeps.appendChild(outDep) - -# Filter XML through a hacky substitution to avoid unwanted whitespace. -xml = re.sub('\n[\n\r\t]*\n', '\n', out.toprettyxml()) - -outDir = sys.argv[1] if len(sys.argv) > 1 else 'mega-melt' -try: - os.mkdir(outDir) -except: - pass - -with open(os.path.join(outDir, 'pom.xml'), 'w') as outPOM: - outPOM.write(xml) diff --git a/tests/run.sh b/tests/run.sh deleted file mode 100755 index 6ddc8716..00000000 --- a/tests/run.sh +++ /dev/null @@ -1,484 +0,0 @@ -#!/bin/sh - -# -# run.sh - Tests correctness of the pom-scijava BOM. -# - -die () { echo "$*" >&2; exit 1; } - -changed () { ! diff $@ >/dev/null; } - -sectionStart() { - startTime=$(date +%s) - echo - printf "$1... " -} - -sectionEnd() { - endTime=$(date +%s) - echo "Done! [$((endTime-startTime))s]" -} - -# Check prerequisites. - -# HACK: Work around macOS Python naming inconsistency. -if command -v python3 >/dev/null 2>&1; then - PYTHON=python3 -elif command -v python >/dev/null 2>&1; then - PYTHON=python -else - die "This script requires Python." -fi - -sectionStart 'Generating mega-melt project' - -dir=$(cd "$(dirname "$0")" && pwd) -pom="$dir/../pom.xml" -test -f "$pom" || die 'Where is pom.xml?!' - -generateMegaMeltScript="$dir/generate-mega-melt.py" -filterBuildLogScript="$dir/filter-build-log.py" - -megaMeltDir="$dir/../target/mega-melt" -megaMeltDir=$(mkdir -p "$megaMeltDir" && cd "$megaMeltDir" && pwd) -pomParent="$megaMeltDir/../pom.xml" -versionSwapLog="$megaMeltDir/version-swap.log" -dependencyTreeLog="$megaMeltDir/dependency-tree.log" -validationLog="$megaMeltDir/validation.log" -validationErrorsLog="$megaMeltDir/validation-errors.log" -megaMeltPOM="$megaMeltDir/pom.xml" -meltingPotLocal="$dir/../../scijava-scripts/melting-pot.sh" -meltingPotURL=https://raw.githubusercontent.com/scijava/scijava-scripts/main/melting-pot.sh -meltingPotScript="$megaMeltDir/melting-pot.sh" -meltingPotLog="$megaMeltDir/melting-pot.log" -meltingPotDir="$megaMeltDir/melting-pot" -skipTestsFile="$meltingPotDir/skipTests.txt" -meltScript="$meltingPotDir/melt.sh" - -# HACK: List of artifacts with known-duplicate short version properties. -shortVersionClashes=\ -'net.sourceforge.findbugs.annotations'\ -'|antlr.antlr'\ -'|org.jogamp.jocl.jocl'\ -'|net.sf.opencsv.opencsv'\ -'|org.jetbrains.intellij.deps.trove4j' - -rm -rf "$megaMeltDir" && mkdir -p "$megaMeltDir" || die "Creation of $megaMeltDir failed!" -cp "$pom" "$pomParent" && -mvn -B -f "$pomParent" versions:set -DnewVersion=999-mega-melt > "$versionSwapLog" && - mvn -B -f "$pomParent" install:install >> "$versionSwapLog" || - die "pom-scijava version update failed:\n$(cat "$versionSwapLog")" -$PYTHON "$generateMegaMeltScript" "$megaMeltDir" || die 'Generation failed!' -sectionEnd # Generating mega-melt project - -# Ensure the mega-melt dependency structure validates. -# In particular, this runs our enforcer rules: the build -# will fail if there are any snapshot dependencies, or -# any duplicate classes across artifacts on the classpath. -sectionStart 'Validating mega-melt project' -mvn -B -f "$megaMeltPOM" dependency:tree > "$dependencyTreeLog" || - die "Invalid dependency tree:\n$(cat "$dependencyTreeLog")" -mvn -B -f "$megaMeltPOM" -U clean package > "$validationLog" || { - $PYTHON "$filterBuildLogScript" "$validationLog" > "$validationErrorsLog" - die "Validation build failed!\n\nDependency tree:\n$(cat "$dependencyTreeLog")\n\nBuild log:\n$(cat "$validationErrorsLog")" -} -sectionEnd # Validating mega-melt project - -# Run mega-melt through the melting pot, with all SciJava-affiliated groupIds, -# minus excluded artifacts (see ignoredArtifacts in generate-mega-melt.py). -echo && -echo 'Generating melting pot...' && -if [ -e "$meltingPotLocal" ] -then - cp "$meltingPotLocal" "$meltingPotScript" -else - curl -fsL "$meltingPotURL" > "$meltingPotScript" -fi || - die "Failed to obtain melting pot script!" - -# Build the melting pot structure. -chmod +x "$meltingPotScript" && -"$meltingPotScript" "$megaMeltDir" \ - -r scijava.public::::https://maven.scijava.org/content/groups/public \ - -o "$meltingPotDir" \ - -i 'ca.mcgill:*' \ - -i 'io.scif:*' \ - -i 'jitk:*' \ - -i 'mpicbg:*' \ - -i 'net.imagej:*' \ - -i 'net.imglib2:*' \ - -i 'net.preibisch:*' \ - -i 'org.bonej:*' \ - -i 'org.janelia.saalfeldlab:*' \ - -i 'org.janelia:*' \ - -i 'org.morphonets:*' \ - -i 'org.scijava:*' \ - -i 'sc.fiji:*' \ - -e 'net.imagej:ij' \ - -e 'net.imglib2:imglib2-mesh' \ - -e 'org.bonej:bonej-plus' \ - -e 'org.openjfx:*' \ - -e 'org.scijava:j3dcore' \ - -e 'org.scijava:j3dutils' \ - -e 'org.scijava:jep' \ - -e 'org.scijava:junit-benchmarks' \ - -e 'org.scijava:vecmath' \ - -f -v -s $@ 2>&1 | tee "$meltingPotLog" - -# NB: The pipe to tee eats the melting-pot error code. -# Even with the POSIX-unfriendly pipefail flag set. -# So we resort to this hacky error check of the log. -test "$(grep -F "[ERROR]" "$meltingPotLog" | grep -v "using default branch")" && - die 'Melting pot generation failed!' - -buildScript="$meltingPotDir/build.sh" -versionPins="$meltingPotDir/version-pins.xml" - -echo -echo 'Hacking in any changed components...' - -# Mix in changed components. Syntax is: -# -# groupId|artifactId|path-to-remote|remote-ref -# -# Example: -# -# components=' -# org.janelia.saalfeldlab|n5-imglib2|git@github.com:saalfeldlab/n5-imglib2|pull/54/head -# sc.fiji|SPIM_Registration|git@github.com:fiji/SPIM_Registration|pull/142/head -# sc.fiji|labkit-ui|git@github.com:juglab/labkit-ui|pull/115/head -# sc.fiji|labkit-pixel-classification|git@github.com:juglab/labkit-pixel-classification|pull/12/head -# sc.fiji|z_spacing|git@github.com:saalfeldlab/z-spacing|pull/28/head -# net.imagej|imagej-common|git@github.com:imagej/imagej-common|pull/112/head -# sc.fiji|TrackMate|git@github.com:trackmate-sc/TrackMate|pull/289/head -# sc.fiji|TrackMate-Skeleton|git@github.com:trackmate-sc/TrackMate-Skeleton|pull/2/head -# sc.fiji|bigwarp_fiji|git@github.com:saalfeldlab/bigwarp|pull/170/head -# net.imagej|imagej-ops|git@github.com:imagej/imagej-ops|pull/654/head -# ' -# -# One entry per line inside the components variable declaration. -# No leading or trailing whitespace anywhere. -# -# Each component will: -# 1. Be updated to that ref (cloning as needed); -# 2. Have its version adjusted to 999 in its pom.xml and gav marker; -# 3. Be `mvn install`ed to the local repo cache at that version; -# 4. Have its version adjusted to 999 in melting pot's build.sh; -# 5. Be added to the list of components to build in melt.sh (if not already present). -components=' -' -failFile="$meltingPotDir/fail" -rm -f "$failFile" -echo "$components" | while read component -do - test "$component" || continue - - g=${component%%|*}; r=${component#*|} - a=${r%%|*}; r=${r#*|} - remote=${r%%|*}; ref=${r#*|} - test "$g" -a "$a" -a "$remote" -a "$ref" || { - touch "$failFile" - die "Invalid component line: $component" - } - d="$meltingPotDir/$g/$a" - printf "[$g:$a] " - - # Update component working copy to desired ref (cloning as needed). - mkdir -p "$d" && - echo "Log of actions for custom version of $g:$a" > "$d/surgery.log" && - echo >> "$d/surgery.log" && - test -f "$d/.git" || git init "$d" >> "$d/surgery.log" || { - touch "$failFile" - die "Failed to access or initialize repository in directory $d" - } - printf . - cd "$d" && - git remote add mega-melt "$remote" >> surgery.log && - printf . && - git fetch mega-melt --depth 1 "$ref":mega-melt >> surgery.log 2>&1 && - printf . && - git switch mega-melt >> surgery.log 2>&1 || { - touch "$failFile" - die "$g:$a: failed to fetch ref '$ref' from remote $remote" - } - printf . - - # Adjust component version to 999. - mvn versions:set -DnewVersion=999 >> surgery.log || { - touch "$failFile" - die "$g:$a: failed to adjust pom.xml version" - } - printf . - if [ -f gav ] - then - mv gav gav.prehacks - sed -E "s;:[^:]*$;:999;" gav.prehacks > gav && changed gav.prehacks gav || { - touch "$failFile" - die "$g:$a: failed to adjust gav version" - } - fi - printf . - - # Install changed component into the local repo cache. - mvn -Denforcer.skip -Dmaven.test.skip install >> surgery.log || { - touch "$failFile" - die "$g:$a: failed to build and install component" - } - printf . - - # Adjust component version to 999 in melting pot's version-pins.xml. - cd "$meltingPotDir" - test -f "$versionPins.prehacks" || cp "$versionPins" "$versionPins.prehacks" || { - touch "$failFile" - die "$g:$a: failed to back up $versionPins" - } - printf . - echo "$a" | grep -q '^[0-9]' && aa="_$a" || aa="$a" - mv -f "$versionPins" "$versionPins.tmp" && - sed -E "s;<\($g\\.$a\|$aa\)\\.version>[^<]*;<\1.version>999;g" "$versionPins.tmp" > "$versionPins" && - changed "$versionPins.tmp" "$versionPins" || - { - touch "$failFile" - die "$g:$a: failed to adjust component version in $versionPins" - } - printf . - - # Add component to the build list in melt.sh (if not already present). - grep -q "\b$g/$a\b" "$meltScript" || { - test -f "$meltScript.prehacks" || cp "$meltScript" "$meltScript.prehacks" - mv -f "$meltScript" "$meltScript.tmp" && - perl -0777 -pe 's;\n+do\n;\n '"$g/$a"' \\$&;igs' "$meltScript.tmp" > "$meltScript" - } || { - touch "$failFile" - die "$g:$a: failed to add component to the build list in $meltScript" - } - printf ".\n" -done -rm -f "$versionPins.tmp" "$meltScript.tmp" -test ! -f "$failFile" || - die "Failed to hack in changed components!" - -sectionStart 'Adjusting the melting pot: version-pins.xml configuration' - -cp "$versionPins" "$versionPins.original" && - -# HACK: Remove known-duplicate short version properties, keeping -# the short version declaration only for the more common groupId. -# E.g.: org.antlr:antlr is preferred over antlr:antlr, so we set -# antlr.version to match org.antlr:antlr, not antlr:antlr. -mv -f "$versionPins" "$versionPins.tmp" && -sed -E 's;(<('"$shortVersionClashes"')\.version>[^ ]*) <[^ ]*;\1;' "$versionPins.tmp" > "$versionPins" && - changed "$versionPins.tmp" "$versionPins" || - die 'Error adjusting melting pot version pins! [1]' - -# HACK: Add non-standard version properties used prior to -# pom-scijava 32.0.0-beta-1; see d0bf752070d96a2613c42e4e1ab86ebdd07c29ee. -mv -f "$versionPins" "$versionPins.tmp" && -sed -E 's; ([^<]*);& \1;' "$versionPins.tmp" > "$versionPins" && - changed "$versionPins.tmp" "$versionPins" && -mv -f "$versionPins" "$versionPins.tmp" && -sed -E 's; ([^<]*);& \2;' "$versionPins.tmp" > "$versionPins" && - changed "$versionPins.tmp" "$versionPins" || - die 'Error adjusting melting pot version pins! [2]' - -# HACK: Add non-standard net.imagej:ij version property used prior to -# pom-scijava 28.0.0; see 7d2cc442b107b3ac2dcb799d282f2c0b5822649d. -mv -f "$versionPins" "$versionPins.tmp" && -sed -E 's; ([^<]*);& \1;' "$versionPins.tmp" > "$versionPins" && - changed "$versionPins.tmp" "$versionPins" || - die 'Error adjusting melting pot version pins! [3]' - -rm "$versionPins.tmp" || - die 'Error adjusting melting pot version pins! [4]' - -sectionEnd # Adjusting the melting pot: version-pins.xml configuration - -sectionStart 'Adjusting the melting pot: build.sh script' - -cp "$buildScript" "$buildScript.original" && - -# HACK: Add explicit kotlin.version to match our pom-scijava-base. -# Otherwise, components built on older pom-scijava-base will have -# mismatched kotlin component versions. The sed expression avoids -# a bug in mvn's batch mode that results in [0m[0m still -# appearing as a leading ANSI sequence when echoing the property. -kotlinVersion=$( - mvn -B -U -q -Denforcer.skip=true -Dexec.executable=echo \ - -Dexec.args='${kotlin.version}' --non-recursive validate exec:exec 2>&1 | - head -n1 | sed 's;\(.\[[0-9]m\)*;;') && -# TEMP: Also fix the version of maven-enforcer-plugin, to prevent n5 from -# overriding it with a too-old version. Even though we pass enforcer.skip, -# so that the enforcer plugin does not actually do any checking, this version -# mismatch still triggers a problem: -# -# [ERROR] Failed to execute goal -# org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M3:enforce -# (enforce-rules) on project n5-blosc: Unable to parse configuration of -# mojo org.apache.maven.plugins:maven-enforcer-plugin:3.0.0-M3:enforce -# for parameter banDuplicateClasses: Cannot create instance of interface -# org.apache.maven.enforcer.rule.api.EnforcerRule: -# org.apache.maven.enforcer.rule.api.EnforcerRule.() -> [Help 1] -# -# Once n5 components stop doing that version pin, we can remove this here. -enforcerVersion=$( - mvn -B -U -q -Denforcer.skip=true -Dexec.executable=echo \ - -Dexec.args='${maven-enforcer-plugin.version}' --non-recursive validate exec:exec 2>&1 | - head -n1 | sed 's;\(.\[[0-9]m\)*;;') && -mv -f "$buildScript" "$buildScript.tmp" && -sed -E "s;mvn .*-Denforcer.skip;& -Dmaven-enforcer-plugin.version=$enforcerVersion -Dkotlin.version=$kotlinVersion;" "$buildScript.tmp" > "$buildScript" && - changed "$buildScript.tmp" "$buildScript" && - -chmod +x "$buildScript" && -rm "$buildScript.tmp" || - die 'Error adjusting melting pot build script!' - -sectionEnd # Adjusting the melting pot: build.sh script - -sectionStart 'Adjusting the melting pot: component POMs' - -# HACK: Adjust component POMs to satisfy Maven HTTPS strictness. -find "$meltingPotDir" -name pom.xml | - while read pom -do - mv "$pom" "$pom.original" && - sed -E -e 's_(https?://maven.imagej.net|http://maven.scijava.org)_https://maven.scijava.org_g' \ - -e 's_http://maven.apache.org/xsd_https://maven.apache.org/xsd_g' "$pom.original" > "$pom" || - die "Failed to adjust $pom" -done - -# HACK: Make component POMs extend the same version of pom-scijava -# being tested. This reduces dependency skew for transitively inherited -# components that were not managed at the time of that component release. -find "$meltingPotDir" -name pom.xml | while read pom -do - perl -0777 -i -pe 's/(\s*org.scijava<\/groupId>\s*pom-scijava<\/artifactId>\s*)[^\n]*/${1}999-mega-melt<\/version>/igs' "$pom" -done - -sectionEnd # Adjusting the melting pot: component POMs - -sectionStart 'Adjusting the melting pot: melt.sh script' - -# HACK: Skip tests for projects with known problems. - -mv "$meltScript" "$meltScript.original" && -sed 's_\s*"$dir/build.sh"_\ -# HACK: If project is on the skipTests list, then skip the tests.\ -buildFlags=-Djava.awt.headless=true\ -grep -qxF "$f" $dir/skipTests.txt \&\& buildFlags=-DskipTests\ -\ -& $buildFlags_' "$meltScript.original" > "$meltScript" && -chmod +x "$meltScript" || - die "Failed to adjust $meltScript" - -sectionEnd # Adjusting the melting pot: melt.sh script - -sectionStart 'Adjusting the melting pot: unit test hacks' - -# Remove flaky tests. - -# CachedOpEnvironmentTest fails intermittently. Of course, it should be -# somehow fixed in imagej-ops. But for now, let's not let it ruin the melt. -rm -f "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/cached/CachedOpEnvironmentTest.java" - -# In org.janelia.saalfeldlab.n5.metadata.ome.ngff.v04.WriteAxesTests.testXYT: -# java.util.NoSuchElementException: No value present -rm -f "$meltingPotDir/org.janelia.saalfeldlab/n5-ij/src/test/java/org/janelia/saalfeldlab/n5/metadata/ome/ngff/v04/WriteAxesTests.java" - -# Avoid notNull assertion error at -# org.janelia.saalfeldlab.n5.universe.metadata.MetadataTests.testEmptyBase(MetadataTests.java:346) -rm -f "$meltingPotDir/org.janelia.saalfeldlab/n5-universe/src/test/java/org/janelia/saalfeldlab/n5/universe/metadata/MetadataTests.java" - -# In org.janelia.saalfeldlab.n5.zarr.ZarrCachedFSTest.cacheBehaviorTest: -# arrays first differed at element [0]; expected:<[a]> but was:<[c]> -rm -f "$meltingPotDir/org.janelia.saalfeldlab/n5-zarr/src/test/java/org/janelia/saalfeldlab/n5/zarr/ZarrCachedFSTest.java" -# Note: The above test is fixed with saalfeldlab/n5-zarr@e7edcec3, -# but the fix is only available in n5-zarr 2.0.0-alpha-1, and we -# do not want to update the SciJava BOM to the alpha version. - -# In sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest.test: -# Macro Error: "probability map for blobs.tif" not found in line 4 -# selectImage ( <"probability map for blobs.tif"> ) ; -# java.lang.RuntimeException: Macro canceled -# at ij.macro.Interpreter.error(Interpreter.java:1403) -# at ij.macro.Functions.selectImage(Functions.java:3225) -# at ij.macro.Functions.doFunction(Functions.java:136) -# at ij.macro.Interpreter.doStatement(Interpreter.java:280) -# at ij.macro.Interpreter.doStatements(Interpreter.java:266) -# at ij.macro.Interpreter.run(Interpreter.java:162) -# at ij.macro.Interpreter.run(Interpreter.java:92) -# at sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest.test(CalculateProbabilityMapWithLabkitIJ1PluginTest.java:65) -rm -f "$meltingPotDir/sc.fiji/labkit-ui/src/test/java/sc/fiji/labkit/ui/plugin/CalculateProbabilityMapWithLabkitIJ1PluginTest.java" - -# Skip testing of components with non-working tests. - -# java.lang.AssertionError -# at org.scijava.minimaven.BasicTest.testClassifiers(BasicTest.java:216) -echo "org.scijava/minimaven" >> "$skipTestsFile" || - die "Failed to generate $skipTestsFile" - -# Error while checking the CLIJ2 installation: null -echo "sc.fiji/labkit-pixel-classification" >> "$skipTestsFile" || - die "Failed to generate $skipTestsFile" - -sectionEnd # Adjusting the melting pot: unit test hacks - -# Run the melting pot now, unless -s flag was given. -doMelt=t -for arg in "$@" -do - if [ "$arg" = '-s' ] || [ "$arg" = '--skipBuild' ] - then - doMelt= - fi -done -if [ "$doMelt" ] -then - echo - cd "$meltingPotDir" - sh melt.sh - meltResult=$? - - # Dump logs for failing builds and/or tests. - for d in */* - do - test -d "$d" || continue - - # Check for failing build log. - buildLog="$d/build.log" - if [ -f "$buildLog" ] - then - if grep -qF 'BUILD FAILURE' "$buildLog" - then - echo - echo "[$buildLog]" - cat "$buildLog" - fi - fi - - # Check for failing test logs. - testLogsDir="$dir/target/surefire-reports" - if [ -d "$testLogsDir" ] - then - find "$testLogsDir" -name '*.txt' | - while read report - do - if grep -qF 'FAILURE!' "$report" - then - echo - echo "[$report]" - cat "$report" - fi - done - fi - done - - # Terminate the script with same exit code if the melt failed. - test "$meltResult" -eq 0 || exit "$meltResult" -else - echo && - echo 'Melting the pot... SKIPPED' -fi - -# Complete! -echo -echo 'All checks succeeded! :-D' From fdc0b4f62210b7b93b6c3f1c4602a3bc05665c66 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 1 Jun 2026 14:58:10 -0500 Subject: [PATCH 943/996] pombast: remove overridden MaMuT badge It confirms to standard naming now. --- pombast.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pombast.toml b/pombast.toml index 613fd821..654b6b17 100644 --- a/pombast.toml +++ b/pombast.toml @@ -885,9 +885,6 @@ last-vetted = "20230309000000" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:MaMuT"] -ci-build = "build-main" - [components."sc.fiji:Manual_Tracking"] ci-build = "build-main" last-vetted = "20230309000000" From 41dc88a352c96376ec3046a61e2cf36088a10c1c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 8 Jun 2026 11:18:54 -0500 Subject: [PATCH 944/996] pombast: improve the melt action Due to some components targeting Java 21+, the scijava.jvm.version property for the aggregated melting pot also needs to be set to 21, to satisfy the enforcer's bytecode checks across all components. For melt validation, we do not need to exclude very old components or multi-module-structured components, only components containing duplicate classes that we intentionally allow within the BOM. Reasons for these allowances are commented in the TOML config. --- pombast.toml | 60 +++++++--------------------------------------------- 1 file changed, 8 insertions(+), 52 deletions(-) diff --git a/pombast.toml b/pombast.toml index 654b6b17..b3c6a36b 100644 --- a/pombast.toml +++ b/pombast.toml @@ -64,67 +64,23 @@ includes = [ ] [melt] -# Some managed components require Java 21+. So it makes sense to melt with that version of Java. -# Unfortunately, the scijava.jvm.version is currently set to 11 by default. -# So even though OpenJDK 21 is being used to run Maven, the enforcer plugin still -# complains when encountering any Java libraries with bytecode newer than 11. -# Setting scijava.jvm.version to 21 by default would avoid the issue, but... -# is that really a good idea? Setting to 11 seems like a nice baseline compromise right now. -java-version = 21 # Maximum Java version of all included component + deps. +# Some managed components require Java 21+, so we melt with that Java +# version. But pom-scijava sets scijava.jvm.version to 11 by default. +# So beyond just using OpenJDK 21 to run Maven, we also need to set the +# scijava.jvm.version property to target the right bytecode version. +# Otherwise, the enforcer complains about any Java libraries targeting >11. +java-version = 21 +properties = { "scijava.jvm.version" = "21" } + template = "pombast/mega-melt-template.xml" excludes = [ # TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone. 'org.bytedeco:hdf5', - # TEMP: Skip components within multi-module reactors. - # Neither pombast nor release-version.sh understand multi- - # module repositories; release-version.sh needs to learn how - # to tag and release individual components from multi-module - # repos, so that when pombast shallow clones the repo at that - # tag and invokes a build, it will be building only the - # released component as it does with single-component repos. - 'org.scijava:scijava-collections', - 'org.scijava:scijava-common3', - 'org.scijava:scijava-concurrent', - 'org.scijava:scijava-discovery-test', - 'org.scijava:scijava-discovery', - 'org.scijava:scijava-function', - 'org.scijava:scijava-legacy', - 'org.scijava:scijava-meta', - 'org.scijava:scijava-ops-api', - 'org.scijava:scijava-ops-benchmarks', - 'org.scijava:scijava-ops-engine', - 'org.scijava:scijava-ops-ext-parser', - 'org.scijava:scijava-ops-flim', - 'org.scijava:scijava-ops-image', - 'org.scijava:scijava-ops-indexer', - 'org.scijava:scijava-ops-opencv', - 'org.scijava:scijava-ops-spi', - 'org.scijava:scijava-ops-tutorial', - 'org.scijava:scijava-priority', - 'org.scijava:scijava-progress', - 'org.scijava:scijava-struct', - 'org.scijava:scijava-taglets', - 'org.scijava:scijava-testutil', - 'org.scijava:scijava-types', - 'mpicbg:mpicbg', 'mpicbg:mpicbg_', - # NB: Skip artifacts requiring minimum Java version >11. - 'net.algart:algart-tiff', - 'org.morphonets:SNT', - # NB: Skip closed-source artifacts. - 'org.bonej:bonej-plus', # NB: The following artifacts have messy dependency trees. # Too many problems to test as part of the melt action. # See WARNING block in pom-scijava's pom.xml for details. 'net.imagej:imagej-server', 'org.apache.spark:spark-core_2.11', - # NB: Skip scijava forks of third-party projects. - # These are very stable, with few/no dependencies, and - # don't need to be retested as pom-scijava evolves. - 'org.scijava:j3dcore', - 'org.scijava:j3dutils', - 'org.scijava:jep', - 'org.scijava:junit-benchmarks', - 'org.scijava:vecmath', # NB: Skip alternate flavors of other managed components. 'org.jogamp.gluegen:gluegen', # uberjar flavor of gluegen-rt 'org.jogamp.jogl:jogl-all-noawt', # slimmed down flavor of jogl-all From d562d382e6b37415881b35d11cf5cb1e4e926d36 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 10 Jun 2026 13:04:17 -0500 Subject: [PATCH 945/996] Sort ImageJ2 component in correct alphabetic order --- pom.xml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 8b7d4509..d31d5e88 100644 --- a/pom.xml +++ b/pom.xml @@ -513,11 +513,6 @@ - - 2.17.0 - ${imagej2.version} - ${imagej.version} - 1.54p ${imagej1.version} @@ -527,6 +522,11 @@ 2.0.0 ${ij1-patcher.version} + + 2.17.0 + ${imagej2.version} + ${imagej.version} + 2.1.1 ${imagej-common.version} @@ -2892,13 +2892,6 @@ - - - net.imagej - imagej - ${net.imagej.imagej.version} - - net.imagej @@ -2919,6 +2912,13 @@ ${net.imagej.ij1-patcher.version} + + + net.imagej + imagej + ${net.imagej.imagej.version} + + net.imagej From fc1f084d13654f7317986f1bfd8d7fb30ab6d772 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 10 Jun 2026 13:04:39 -0500 Subject: [PATCH 946/996] Manage versions of FLIMLib Java components * flimj-ops: 2.1.2 * flimj-ui: 2.0.0 * flimlib: 2.2.5 --- pom.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pom.xml b/pom.xml index d31d5e88..33fb8e22 100644 --- a/pom.xml +++ b/pom.xml @@ -1208,6 +1208,15 @@ + + 2.1.2 + 2.0.0 + 2.2.5 + ${flimj-ops.version} + ${flimj-ui.version} + ${flimlib.version} + ${scijava.natives.classifier} + 1.6.4 ${MorphoLibJ.version} @@ -3951,6 +3960,29 @@ + + + flimlib + flimj-ops + ${flimlib.flimj-ops.version} + + + flimlib + flimj-ui + ${flimlib.flimj-ui.version} + + + flimlib + flimlib + ${flimlib.flimlib.version} + + + flimlib + flimlib + ${flimlib.flimlib.version} + ${scijava.natives.classifier.flimlib} + + fr.inra.ijpb From e916952afb1202d30dd89982f2d137f36bce6952 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 10 Jun 2026 13:39:43 -0500 Subject: [PATCH 947/996] Update component versions * scijava-search: 3.0.0 -> 3.0.1 * scripting-kotlin: 0.2.1 -> 1.0.0 * imagej-tensorflow: 1.1.8 -> 1.1.9 * scifio: 0.48.0 -> 0.49.0 * FilamentDetector: 2.0.1 -> 3.0.0 * OMEVisual: 2.0.0 -> 3.0.0 * mpicbg: 1.6.5 -> 1.6.6 * bigdataviewer-server: 3.1.2 -> 4.0.0 * TrackMate: 7.14.0 -> 8.0.0 * TrackMate-Cellpose: 0.1.2 -> 1.0.1 * TrackMate-CSVImporter: 3.1.4 -> 4.0.0 * TrackMate-Ilastik: 1.4.0 -> 2.0.0 * TrackMate-MorphoLibJ: 1.2.1 -> 2.0.0 * TrackMate-Skeleton: 2.0.3 -> 3.0.0 * TrackMate-StarDist: 1.2.1 -> 2.0.0 * TrackMate-Weka: 1.3.1 -> 2.0.0 * BigStitcher: 2.5.2 -> 2.6.1 * multiview-reconstruction: 7.0.6 -> 9.0.0 * MaMuT: 7.1.1 -> 8.0.1 --- pom.xml | 38 +++++++++++++++++++------------------- pombast.toml | 8 +++++++- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/pom.xml b/pom.xml index 33fb8e22..ad79a4f7 100644 --- a/pom.xml +++ b/pom.xml @@ -428,7 +428,7 @@ ${scijava-plugins-text-plain.version} - 3.0.0 + 3.0.1 ${scijava-search.version} @@ -484,7 +484,7 @@ ${scripting-jython.version} - 0.2.1 + 1.0.0 ${scripting-kotlin.version} @@ -600,7 +600,7 @@ ${imagej-server.version} - 1.1.8 + 1.1.9 ${imagej-tensorflow.version} @@ -672,7 +672,7 @@ - 0.48.0 + 0.49.0 ${scifio.version} @@ -806,7 +806,7 @@ 3.2.0 ${Fiji_Plugins.version} - 2.0.1 + 3.0.0 ${FilamentDetector.version} 2.0.1 @@ -887,7 +887,7 @@ 3.0.1 ${Multi_Kymograph.version} - 2.0.0 + 3.0.0 ${OMEVisual.version} 2.0.0 @@ -1042,7 +1042,7 @@ ${bigwarp_fiji.version} - 1.6.5 + 1.6.6 ${mpicbg.version} ${mpicbg.version} ${mpicbg_.version} @@ -1062,7 +1062,7 @@ ${bigdataviewer-core.version} - 3.1.2 + 4.0.0 ${bigdataviewer-server.version} @@ -1088,15 +1088,15 @@ - 7.14.0 + 8.0.0 ${TrackMate.version} - 0.1.2 + 1.0.1 ${TrackMate-Cellpose.version} - 3.1.4 + 4.0.0 ${TrackMate-CSVImporter.version} @@ -1110,11 +1110,11 @@ ${TrackMate-ExTrack.version} - 1.4.0 + 2.0.0 ${TrackMate-Ilastik.version} - 1.2.1 + 2.0.0 ${TrackMate-MorphoLibJ.version} @@ -1122,15 +1122,15 @@ ${TrackMate-Oneat.version} - 2.0.3 + 3.0.0 ${TrackMate-Skeleton.version} - 1.2.1 + 2.0.0 ${TrackMate-StarDist.version} - 1.3.1 + 2.0.0 ${TrackMate-Weka.version} @@ -1241,8 +1241,8 @@ ${clijx-weka_.version} - 2.5.2 - 7.0.6 + 2.6.1 + 9.0.0 0.2.0 ${BigStitcher.version} ${multiview-reconstruction.version} @@ -1266,7 +1266,7 @@ ${SNT.version} - 7.1.1 + 8.0.1 ${MaMuT.version} diff --git a/pombast.toml b/pombast.toml index b3c6a36b..e2037118 100644 --- a/pombast.toml +++ b/pombast.toml @@ -327,6 +327,9 @@ last-vetted = "20230309000000" [components."net.imglib2:imglib2-mesh"] java-version = 11 +[components."net.preibisch:multiview-reconstruction"] +java-version = 11 + [components."net.preibisch:multiview-simulation"] ci-build = "build-main" @@ -764,6 +767,9 @@ ci-build = "build-main" ci-build = "build-main" last-vetted = "20230309000000" +[components."sc.fiji:FilamentDetector"] +java-version = 11 + [components."sc.fiji:FlowJ_"] ci-build = "build-main" last-vetted = "20230309000000" @@ -850,7 +856,7 @@ ci-build = "build-main" last-vetted = "20230309000000" [components."sc.fiji:OMEVisual"] -last-vetted = "20230309000000" +java-version = 11 [components."sc.fiji:PIV_analyser"] ci-build = "build-main" From 9a5351a2e18024021a2319c15c5f826870b307fb Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 11 Jun 2026 16:14:11 -0500 Subject: [PATCH 948/996] pombast: allow bigvolumeviewer to use of Unsafe It has a hack in its own POM to configure the maven-compiler-plugin to run in a mode that allows use of sun.misc.Unsafe. But pombast's execution does not honor the hack. Fortunately, setting maven.compiler.release to empty disables the plugin's passing of the --release flag, which is what triggers the use of ct.sym, the sealed API catalog for Java 8's public API. --- pombast.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pombast.toml b/pombast.toml index e2037118..c632fb68 100644 --- a/pombast.toml +++ b/pombast.toml @@ -991,6 +991,10 @@ ci-build = "build-main" [components."sc.fiji:bigdataviewer_fiji"] ci-build = "build-main" +[components."sc.fiji:bigvolumeviewer"] +# NOTE: Using the release flag disallows access to sun.misc.Unsafe. +properties = { "maven.compiler.release" = "" } + [components."sc.fiji:bij"] ci-build = "build-main" last-vetted = "20230309000000" From 13f9bdbc227b977e69acafc6a2b9d0331ed078b6 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 13 Jun 2026 13:07:19 -0500 Subject: [PATCH 949/996] Update jgrapht: 1.4.0 -> 1.5.2 This increases its minimum bytecode target from Java 8 to 11. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ad79a4f7..6cb47e06 100644 --- a/pom.xml +++ b/pom.xml @@ -2036,7 +2036,7 @@ ${jfreesvg.version} - 1.4.0 + 1.5.2 ${jgrapht.version} ${jgrapht.version} ${jgrapht.version} From 55ee95cec84598937c6db500bcfa8043b36fbd9a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 13 Jun 2026 13:24:09 -0500 Subject: [PATCH 950/996] CI: pass latest smelt.json to status command Co-authored-by: Claude Opus 4.8 --- .github/status.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/status.sh b/.github/status.sh index 81186a08..a5587e7b 100755 --- a/.github/status.sh +++ b/.github/status.sh @@ -1,6 +1,21 @@ #!/bin/sh uv tool install "git+https://github.com/scijava/pombast.git" -pombast status . + +# Pull the most recently published smelt results so that `pombast status` can +# classify each available version bump by its bytecode-floor blast radius +# (flat / local / cascading / excluded). This is the same smelt.json the status +# page itself fetches client-side, so the generator and the browser agree. +# +# Best-effort: if smelt.json is not published yet (or the fetch fails), status +# still runs -- just without the bytecode classification overlay. +smelt_arg="" +if curl -fsSLO https://status.scijava.org/smelt.json; then + smelt_arg="--smelt smelt.json" +else + echo "== smelt.json unavailable; running status without classification ==" +fi + +pombast status $smelt_arg . pombast badges -o badges.json . pombast team . .github/publish.sh "Update status reports" index.html badges.json team.html From c31af769376cd9f7ab1bc41e04d698a96216ccdb Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 13 Jun 2026 13:58:24 -0500 Subject: [PATCH 951/996] CI: feed smelt.json into status and cache cjdk/jgo/m2 status.sh now pulls the most recent smelt.json straight from the status.scijava.org gh-pages branch (raw.githubusercontent.com) and passes it to `pombast status --smelt`, so version bumps are classified by bytecode-floor blast radius. Reading the branch directly avoids waiting on the asynchronous GitHub Pages deploy. Best-effort: status still runs if smelt.json is absent. status.yml gains a workflow_run trigger on the build workflow, guarded to master pushes (the only builds that republish smelt.json), so the status page refreshes its classification immediately instead of waiting for the daily cron. The direct push trigger is dropped since build-then-status now covers master pushes with the freshly published smelt.json. Caching: - build.yml: add ~/.cache/cjdk (downloaded JDKs + Maven) and ~/.cache/jgo (per-artifact bytecode-scan results) to the build cache. cjdk is the big win, since smelt provisions a JDK per component. - status.yml: add ~/.cache/jgo and ~/.m2/repository so the daily bump classification stops re-downloading and re-scanning candidate JARs each run. setup-java stays: its JDK 11+fx serves the Maven CI deploy build (ci-build.sh), which is independent of pombast's cjdk-provisioned JDKs. Co-Authored-By: Claude Opus 4.8 --- .github/status.sh | 8 +++++--- .github/workflows/build.yml | 13 +++++++++++-- .github/workflows/status.yml | 30 +++++++++++++++++++++++++----- 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/.github/status.sh b/.github/status.sh index a5587e7b..4e212d33 100755 --- a/.github/status.sh +++ b/.github/status.sh @@ -3,13 +3,15 @@ uv tool install "git+https://github.com/scijava/pombast.git" # Pull the most recently published smelt results so that `pombast status` can # classify each available version bump by its bytecode-floor blast radius -# (flat / local / cascading / excluded). This is the same smelt.json the status -# page itself fetches client-side, so the generator and the browser agree. +# (flat / local / cascading / excluded). Read straight from the gh-pages branch +# rather than https://status.scijava.org/, so we pick up a freshly committed +# smelt.json immediately instead of waiting on the asynchronous Pages deploy. # # Best-effort: if smelt.json is not published yet (or the fetch fails), status # still runs -- just without the bytecode classification overlay. smelt_arg="" -if curl -fsSLO https://status.scijava.org/smelt.json; then +smelt_url=https://raw.githubusercontent.com/scijava/status.scijava.org/gh-pages/smelt.json +if curl -fsSLO "$smelt_url"; then smelt_arg="--smelt smelt.json" else echo "== smelt.json unavailable; running status without classification ==" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a29e656c..4624a368 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,7 +54,13 @@ jobs: - name: Restore pombast cache uses: actions/cache/restore@v4 with: - path: ~/.cache/pombast + # pombast: success/timestamp caches; cjdk: downloaded JDKs + Maven; + # jgo: per-artifact bytecode-scan results. (~/.m2 is cached above by + # setup-java's cache: 'maven'.) + path: | + ~/.cache/pombast + ~/.cache/cjdk + ~/.cache/jgo key: ${{ runner.os }}-pombast-build - name: Run pombast melt+smelt commands @@ -72,7 +78,10 @@ jobs: if: always() uses: actions/cache/save@v4 with: - path: ~/.cache/pombast + path: | + ~/.cache/pombast + ~/.cache/cjdk + ~/.cache/jgo key: ${{ runner.os }}-pombast-build - name: Publish smelt results diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml index c14eaf3d..02432927 100644 --- a/.github/workflows/status.yml +++ b/.github/workflows/status.yml @@ -4,13 +4,23 @@ on: schedule: # Run daily at 0500 UTC. - cron: '0 5 * * *' - push: - branches: - - master + # Run right after the build workflow publishes a fresh smelt.json, so the + # status page picks up new bytecode classification immediately rather than + # waiting for the next daily run. The job-level guard below restricts this to + # master pushes, the only builds that republish smelt.json. + workflow_run: + workflows: [build] + types: [completed] jobs: status: runs-on: ubuntu-latest + # Scheduled runs always proceed. workflow_run runs only when the triggering + # build was a push to master (i.e. one that republished smelt.json). + if: >- + github.event_name != 'workflow_run' || + (github.event.workflow_run.event == 'push' && + github.event.workflow_run.head_branch == 'master') permissions: actions: write # needed to delete and re-save caches @@ -26,7 +36,14 @@ jobs: - name: Restore pombast cache uses: actions/cache/restore@v4 with: - path: ~/.cache/pombast + # pombast: status caches; jgo: per-artifact bytecode-scan results; + # ~/.m2: candidate JARs that bump classification downloads to scan. + # Persisting these keeps the daily classification from re-downloading + # and re-scanning every candidate on each run. + path: | + ~/.cache/pombast + ~/.cache/jgo + ~/.m2/repository key: ${{ runner.os }}-pombast-status # The monoqueue library is used by pombast to read GitHub issues. @@ -53,7 +70,10 @@ jobs: if: always() uses: actions/cache/save@v4 with: - path: ~/.cache/pombast + path: | + ~/.cache/pombast + ~/.cache/jgo + ~/.m2/repository key: ${{ runner.os }}-pombast-status - name: Delete old monoqueue cache From 8526f78b877fa66a340bd1a84c2fea4ec72d2541 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 13 Jun 2026 21:50:04 -0500 Subject: [PATCH 952/996] Update CI badge locations * scijava-search: build-main -> build * scripting-groovy: build-main -> build * scripting-kotlin: build-main -> build --- pombast.toml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pombast.toml b/pombast.toml index c632fb68..f3ea774e 100644 --- a/pombast.toml +++ b/pombast.toml @@ -585,9 +585,6 @@ last-vetted = "20230309000000" [components."org.scijava:scijava-plugins-text-plain"] ci-build = "build-main" -[components."org.scijava:scijava-search"] -ci-build = "build-main" - [components."org.scijava:scijava-table"] ci-build = "build-main" @@ -609,9 +606,6 @@ ci-build = "build-main" [components."org.scijava:scripting-clojure"] ci-build = "build-main" -[components."org.scijava:scripting-groovy"] -ci-build = "build-main" - [components."org.scijava:scripting-javascript"] ci-build = "build-main" @@ -622,9 +616,6 @@ last-vetted = "20230309000000" [components."org.scijava:scripting-jython"] ci-build = "build-main" -[components."org.scijava:scripting-kotlin"] -ci-build = "build-main" - [components."org.scijava:scripting-matlab"] ci-build = "build-main" last-vetted = "20230309000000" From 20aca6d774769978cff58c8d4c853c003aaef793 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sun, 14 Jun 2026 19:46:21 -0500 Subject: [PATCH 953/996] Update scripting-java: 1.0.0 -> 1.0.1 This fixes a bug when using the Java script language with Java 11 (and only 11 -- with 8, 17, and 21, it was working with 1.0.0). But we need this fix to smelt imagej-legacy, which is built and tested with Java 11, and makes use of the Java script language in its tests. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6cb47e06..50059ef0 100644 --- a/pom.xml +++ b/pom.xml @@ -468,7 +468,7 @@ ${scripting-groovy.version} - 1.0.0 + 1.0.1 ${scripting-java.version} From 27bd2fb9cf3e264f2a0224143556f048dadeea0e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 15 Jun 2026 10:51:27 -0500 Subject: [PATCH 954/996] pombast: skip slow labkit-ui tests --- pombast.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pombast.toml b/pombast.toml index f3ea774e..32a3de5c 100644 --- a/pombast.toml +++ b/pombast.toml @@ -215,7 +215,13 @@ skip-tests = [ # at ij.macro.Interpreter.run(Interpreter.java:162) # at ij.macro.Interpreter.run(Interpreter.java:92) # at sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest.test(CalculateProbabilityMapWithLabkitIJ1PluginTest.java:65) -"sc.fiji:labkit-ui" = ["sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest"] +"sc.fiji:labkit-ui" = [ + "sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest", # Failing (see above) + "sc.fiji.labkit.ui.GarbageCollectionTest", # Too slow (7 s) + "sc.fiji.labkit.ui.plugin.LabkitProbabilityMapForImagesInDirectoryPluginTest", # Too slow (65 s) + "sc.fiji.labkit.ui.plugin.SegmentRGBImageTest", # Too slow (35 s) + "sc.fiji.labkit.ui.segmentation.SegmentationToolTest", # Too slow (34 s) +] [components."fr.inra.ijpb:MorphoLibJ_"] ci-build = "build-main" From 30ee18990c7fd5434d3d258e3986317b89cdac43 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 15 Jun 2026 10:53:09 -0500 Subject: [PATCH 955/996] Update minimaven: 2.2.2 -> 2.2.3 This makes MiniMaven work again with Maven Central's HTTPS-only policy. --- pom.xml | 2 +- pombast.toml | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 50059ef0..6984b143 100644 --- a/pom.xml +++ b/pom.xml @@ -360,7 +360,7 @@ ${junit-benchmarks.version} - 2.2.2 + 2.2.3 ${minimaven.version} diff --git a/pombast.toml b/pombast.toml index 32a3de5c..efcfbc07 100644 --- a/pombast.toml +++ b/pombast.toml @@ -174,10 +174,6 @@ excludes = [ 'org.scijava:scijava-types', ] skip-tests = [ - # java.lang.AssertionError - # at org.scijava.minimaven.BasicTest.testClassifiers(BasicTest.java:216) - "org.scijava:minimaven", - # Error while checking the CLIJ2 installation: null "sc.fiji:labkit-pixel-classification", ] @@ -551,9 +547,6 @@ last-vetted = "20171225120000" ci-build = false last-vetted = "20180905120000" -[components."org.scijava:minimaven"] -last-vetted = "20230309000000" - [components."org.scijava:scijava-cache"] ci-build = "build-main" last-vetted = "20230309000000" From 1fa7fe217a65dba0bec1b1d7ecf97d178dbad85e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 15 Jun 2026 12:14:49 -0500 Subject: [PATCH 956/996] Update bigdataviewer-core: 10.6.7 -> 10.6.11 This updates BDV to use N5 at version 4. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6984b143..26435e3a 100644 --- a/pom.xml +++ b/pom.xml @@ -1058,7 +1058,7 @@ - 10.6.7 + 10.6.11 ${bigdataviewer-core.version} From 63d3770298a5eb0e465b875b49c9d43b2e87f1ce Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 15 Jun 2026 14:22:16 -0500 Subject: [PATCH 957/996] pombast: re-enable now-passing labkit-ui test --- pombast.toml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pombast.toml b/pombast.toml index efcfbc07..3fbc615f 100644 --- a/pombast.toml +++ b/pombast.toml @@ -199,20 +199,7 @@ skip-tests = [ # but the fix is only available in n5-zarr 2.0.0-alpha-1, and we # do not want to update the SciJava BOM to the alpha version. -# In sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest.test: -# Macro Error: "probability map for blobs.tif" not found in line 4 -# selectImage ( <"probability map for blobs.tif"> ) ; -# java.lang.RuntimeException: Macro canceled -# at ij.macro.Interpreter.error(Interpreter.java:1403) -# at ij.macro.Functions.selectImage(Functions.java:3225) -# at ij.macro.Functions.doFunction(Functions.java:136) -# at ij.macro.Interpreter.doStatement(Interpreter.java:280) -# at ij.macro.Interpreter.doStatements(Interpreter.java:266) -# at ij.macro.Interpreter.run(Interpreter.java:162) -# at ij.macro.Interpreter.run(Interpreter.java:92) -# at sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest.test(CalculateProbabilityMapWithLabkitIJ1PluginTest.java:65) "sc.fiji:labkit-ui" = [ - "sc.fiji.labkit.ui.plugin.CalculateProbabilityMapWithLabkitIJ1PluginTest", # Failing (see above) "sc.fiji.labkit.ui.GarbageCollectionTest", # Too slow (7 s) "sc.fiji.labkit.ui.plugin.LabkitProbabilityMapForImagesInDirectoryPluginTest", # Too slow (65 s) "sc.fiji.labkit.ui.plugin.SegmentRGBImageTest", # Too slow (35 s) From f3d254484d3087b4b2ebc8582694acae1df2afff Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 15 Jun 2026 18:03:15 -0500 Subject: [PATCH 958/996] pombast: skip n5 aws-s3 and universe tests for now Hopefully only temporarily! --- pombast.toml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pombast.toml b/pombast.toml index 3fbc615f..1b4a98dd 100644 --- a/pombast.toml +++ b/pombast.toml @@ -176,6 +176,17 @@ excludes = [ skip-tests = [ # Error while checking the CLIJ2 installation: null "sc.fiji:labkit-pixel-classification", + + # TEMP: Until n5-aws-sw test failures are resolved; see also: + # https://github.com/scijava/pom-scijava/pull/304#issuecomment-4684120110 + # Errors are of the form: + # Unable to execute HTTP request: Connect to localhost:9000 + # [localhost/127.0.0.1] failed: Connection refused (Connection refused) + "org.janelia.saalfeldlab:n5-aws-s3", + + # TEMP: Until n5-universe test failures are resolved; see also: + # https://github.com/scijava/pom-scijava/pull/304#issuecomment-4684417746 + "org.janelia.saalfeldlab:n5-universe", ] [remove-tests] From 79d4ab7c429fe6321089889c84be23acb41614c5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 15 Jun 2026 20:38:08 -0500 Subject: [PATCH 959/996] Remove bigdataviewer-vistools It merged into bigdataviewer-core as of 10.5.0. See: bigdataviewer/bigdataviewer-core@156cd8a80831c63eac8df81e232420581b17e7a9 --- pom.xml | 9 --------- pombast.toml | 3 --- 2 files changed, 12 deletions(-) diff --git a/pom.xml b/pom.xml index 26435e3a..f397f110 100644 --- a/pom.xml +++ b/pom.xml @@ -1065,10 +1065,6 @@ 4.0.0 ${bigdataviewer-server.version} - - 1.0.0-beta-36 - ${bigdataviewer-vistools.version} - 6.4.1 ${bigdataviewer_fiji.version} @@ -3781,11 +3777,6 @@ bigdataviewer-server ${sc.fiji.bigdataviewer-server.version} - - sc.fiji - bigdataviewer-vistools - ${sc.fiji.bigdataviewer-vistools.version} - sc.fiji bigdataviewer_fiji diff --git a/pombast.toml b/pombast.toml index 1b4a98dd..9a94e20f 100644 --- a/pombast.toml +++ b/pombast.toml @@ -973,9 +973,6 @@ last-vetted = "20230309000000" [components."sc.fiji:bigdataviewer-server"] ci-build = "build-main" -[components."sc.fiji:bigdataviewer-vistools"] -ci-build = "build-main" - [components."sc.fiji:bigdataviewer_fiji"] ci-build = "build-main" From d459e6b3a3154021cce3ebefd0996e25bfb6f445 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 15 Jun 2026 20:45:12 -0500 Subject: [PATCH 960/996] Update bigvolumeviewer: 0.4.1 -> 0.5.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f397f110..18a0a51e 100644 --- a/pom.xml +++ b/pom.xml @@ -1074,7 +1074,7 @@ ${bigdataviewer-n5.version} - 0.4.1 + 0.5.0 ${bigvolumeviewer.version} From 50ebc9bcc099883ed312e761e874614df44e98dd Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 17 Jun 2026 14:58:14 -0500 Subject: [PATCH 961/996] pombast: skip tests for org.bonej:bonej-plugins I filed a PR addressing the issue: https://github.com/bonej-org/BoneJ2/pull/414 But until it is merged and release, let's skip the problematic tests. --- pombast.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pombast.toml b/pombast.toml index 9a94e20f..52c60b3a 100644 --- a/pombast.toml +++ b/pombast.toml @@ -356,6 +356,8 @@ ci-build = "build-main" [components."org.bonej:bonej-plugins"] java-version = 11 +# TEMP: Until a BoneJ release exists incorporating bonej-org/BoneJ2#414. +properties = { "skipTests" = "true" } ci-build = "build-main" [components."org.bonej:bonej-utilities"] From 0b2c9bc904dd4ee658e6623b73b86d4f141f1067 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Wed, 17 Jun 2026 15:09:28 -0400 Subject: [PATCH 962/996] Bump n5-related component versions * imglib2-algorithm: 0.18.1 -> 0.18.3 * imglib2-realtransform: 4.0.4 -> 4.0.5 * imglib2-label-multisets: 0.15.1 -> 0.15.2 * n5-aws-s3: 5.0.0 -> 5.0.1 * n5-universe: 3.0.1 -> 3.0.2 * multiview-simulation: 0.2.0 -> 0.3.1 The updated n5-aws-s3 and n5-universe libraries now skip any tests for which prereqs are not met locally. Signed-off-by: Curtis Rueden --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 18a0a51e..296a44e0 100644 --- a/pom.xml +++ b/pom.xml @@ -626,7 +626,7 @@ ${imglib2.version} - 0.18.1 + 0.18.3 ${imglib2-algorithm.version} @@ -658,7 +658,7 @@ ${imglib2-mesh.version} - 4.0.4 + 4.0.5 ${imglib2-realtransform.version} @@ -1155,7 +1155,7 @@ - 0.15.1 + 0.15.2 ${imglib2-label-multisets.version} @@ -1163,7 +1163,7 @@ ${n5.version} - 5.0.0 + 5.0.1 ${n5-aws-s3.version} @@ -1187,7 +1187,7 @@ ${n5-imglib2.version} - 3.0.1 + 3.0.2 ${n5-universe.version} @@ -1239,7 +1239,7 @@ 2.6.1 9.0.0 - 0.2.0 + 0.3.1 ${BigStitcher.version} ${multiview-reconstruction.version} ${multiview-simulation.version} From d0e609e8198e7508ecd4783d6c0ff15c9f93690d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 17 Jun 2026 23:17:32 -0500 Subject: [PATCH 963/996] pombast: enable smelt of new scijava components The pombast software now handles components deployed as part of a multi-module reactor, so the new scijava components can finally be smelted properly. --- pombast.toml | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/pombast.toml b/pombast.toml index 52c60b3a..14bd20cb 100644 --- a/pombast.toml +++ b/pombast.toml @@ -141,37 +141,6 @@ excludes = [ 'org.scijava:jep', 'org.scijava:junit-benchmarks', 'org.scijava:vecmath', - # TEMP: Skip components within multi-module reactors. - # Neither pombast nor release-version.sh understand multi- - # module repositories; release-version.sh needs to learn how - # to tag and release individual components from multi-module - # repos, so that when pombast shallow clones the repo at that - # tag and invokes a build, it will be building only the - # released component as it does with single-component repos. - 'org.scijava:scijava-collections', - 'org.scijava:scijava-common3', - 'org.scijava:scijava-concurrent', - 'org.scijava:scijava-discovery-test', - 'org.scijava:scijava-discovery', - 'org.scijava:scijava-function', - 'org.scijava:scijava-legacy', - 'org.scijava:scijava-meta', - 'org.scijava:scijava-ops-api', - 'org.scijava:scijava-ops-benchmarks', - 'org.scijava:scijava-ops-engine', - 'org.scijava:scijava-ops-ext-parser', - 'org.scijava:scijava-ops-flim', - 'org.scijava:scijava-ops-image', - 'org.scijava:scijava-ops-indexer', - 'org.scijava:scijava-ops-opencv', - 'org.scijava:scijava-ops-spi', - 'org.scijava:scijava-ops-tutorial', - 'org.scijava:scijava-priority', - 'org.scijava:scijava-progress', - 'org.scijava:scijava-struct', - 'org.scijava:scijava-taglets', - 'org.scijava:scijava-testutil', - 'org.scijava:scijava-types', ] skip-tests = [ # Error while checking the CLIJ2 installation: null From 4bdb6dcfccebd18ab7b7ec16d70a2ce16814e0bf Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 17 Jun 2026 23:19:21 -0500 Subject: [PATCH 964/996] pombast: update n5-related test workarounds Some tests are fixed, others are now broken... good times! --- pombast.toml | 57 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/pombast.toml b/pombast.toml index 14bd20cb..a41778bc 100644 --- a/pombast.toml +++ b/pombast.toml @@ -145,17 +145,6 @@ excludes = [ skip-tests = [ # Error while checking the CLIJ2 installation: null "sc.fiji:labkit-pixel-classification", - - # TEMP: Until n5-aws-sw test failures are resolved; see also: - # https://github.com/scijava/pom-scijava/pull/304#issuecomment-4684120110 - # Errors are of the form: - # Unable to execute HTTP request: Connect to localhost:9000 - # [localhost/127.0.0.1] failed: Connection refused (Connection refused) - "org.janelia.saalfeldlab:n5-aws-s3", - - # TEMP: Until n5-universe test failures are resolved; see also: - # https://github.com/scijava/pom-scijava/pull/304#issuecomment-4684417746 - "org.janelia.saalfeldlab:n5-universe", ] [remove-tests] @@ -166,18 +155,40 @@ skip-tests = [ # In org.janelia.saalfeldlab.n5.metadata.ome.ngff.v04.WriteAxesTests.testXYT: # java.util.NoSuchElementException: No value present -"org.janelia.saalfeldlab:n5-ij" = ["org.janelia.saalfeldlab.n5.metadata.ome.ngff.v04.WriteAxesTests"] - -# Avoid notNull assertion error at -# org.janelia.saalfeldlab.n5.universe.metadata.MetadataTests.testEmptyBase(MetadataTests.java:346) -"org.janelia.saalfeldlab:n5-universe" = ["org.janelia.saalfeldlab.n5.universe.metadata.MetadataTests"] - -# In org.janelia.saalfeldlab.n5.zarr.ZarrCachedFSTest.cacheBehaviorTest: -# arrays first differed at element [0]; expected:<[a]> but was:<[c]> -"org.janelia.saalfeldlab:n5-zarr" = ["org.janelia.saalfeldlab.n5.zarr.ZarrCachedFSTest"] -# Note: The above test is fixed with saalfeldlab/n5-zarr@e7edcec3, -# but the fix is only available in n5-zarr 2.0.0-alpha-1, and we -# do not want to update the SciJava BOM to the alpha version. +#"org.janelia.saalfeldlab:n5-ij" = ["org.janelia.saalfeldlab.n5.metadata.ome.ngff.v04.WriteAxesTests"] + +# In org.janelia.saalfeldlab.n5.s3.AmazonS3UtilsTest.testUriParsing: +# SdkClient Unable to load region from any of the providers in the chain +# software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain@427475a2: +# [software.amazon.awssdk.regions.providers.SystemSettingsRegionProvider@768b79db: +# Unable to load region from system settings. Region must be specified either +# via environment variable (AWS_REGION) or system property (aws.region)., +# software.amazon.awssdk.regions.providers.AwsProfileRegionProvider@3b59d246: +# No region provided in profile: default, +# software.amazon.awssdk.regions.providers.InstanceProfileRegionProvider@11b0cf30: +# Unable to contact EC2 metadata service.] +"org.janelia.saalfeldlab:n5-aws-s3" = ["org.janelia.saalfeldlab.n5.s3.AmazonS3UtilsTest"] + +# Skip n5-universe'slow tests. +"org.janelia.saalfeldlab:n5-universe" = [ + "org.janelia.saalfeldlab.n5.universe.storage.zarr.ZarrStorageTests", # Time elapsed: 1753 s + "org.janelia.saalfeldlab.n5.universe.storage.zarr.zarr2.Zarr2HttpFactoryTest", # Time elapsed: 947.2 s + "org.janelia.saalfeldlab.n5.universe.storage.n5.N5StorageTests", # Time elapsed: 843.5 s + "org.janelia.saalfeldlab.n5.universe.storage.n5.N5HttpFactoryTest", # Time elapsed: 832.3 s + "org.janelia.saalfeldlab.n5.universe.storage.zarr.zarr3.Zarr3HttpFactoryTest", # Time elapsed: 785.5 s + + # And these are all dependent on the above removed classes. :-( + "org.janelia.saalfeldlab.n5.universe.BackendStorageFormatTests", + "org.janelia.saalfeldlab.n5.universe.storage.n5.N5AmazonS3FactoryTest", + "org.janelia.saalfeldlab.n5.universe.storage.n5.N5FileSystemTest", + "org.janelia.saalfeldlab.n5.universe.storage.n5.N5GoogleCloudFactoryTest", + "org.janelia.saalfeldlab.n5.universe.storage.zarr.zarr2.Zarr2AmazonS3FactoryTest", + "org.janelia.saalfeldlab.n5.universe.storage.zarr.zarr2.Zarr2FileSystemTest", + "org.janelia.saalfeldlab.n5.universe.storage.zarr.zarr2.Zarr2GoogleCloudFactoryTest", + "org.janelia.saalfeldlab.n5.universe.storage.zarr.zarr3.Zarr3AmazonS3FactoryTest", + "org.janelia.saalfeldlab.n5.universe.storage.zarr.zarr3.Zarr3FileSystemTest", + "org.janelia.saalfeldlab.n5.universe.storage.zarr.zarr3.Zarr3GoogleCloudFactoryTest", +] "sc.fiji:labkit-ui" = [ "sc.fiji.labkit.ui.GarbageCollectionTest", # Too slow (7 s) From 02a603f268185f99009a4b4472a00e445e2441c7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 17 Jun 2026 23:19:50 -0500 Subject: [PATCH 965/996] pombast: tweak comment --- pombast.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pombast.toml b/pombast.toml index a41778bc..2ddb73ad 100644 --- a/pombast.toml +++ b/pombast.toml @@ -150,7 +150,7 @@ skip-tests = [ [remove-tests] # CachedOpEnvironmentTest fails intermittently. Of course, it should be -# somehow fixed in imagej-ops. But for now, let's not let it ruin the melt. +# somehow fixed in imagej-ops. But for now, let's not let it ruin the smelt. "net.imagej:imagej-ops" = ["net.imagej.ops.cached.CachedOpEnvironmentTest"] # In org.janelia.saalfeldlab.n5.metadata.ome.ngff.v04.WriteAxesTests.testXYT: From 16ef03b7b4a99365689785557c931178d0901861 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 18 Jun 2026 10:40:57 -0500 Subject: [PATCH 966/996] pombast: update bonej components ci-build path --- pombast.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pombast.toml b/pombast.toml index 2ddb73ad..1fe1db00 100644 --- a/pombast.toml +++ b/pombast.toml @@ -324,25 +324,20 @@ ci-build = "maven" [components."org.bonej:bonej-legacy-plugins_"] java-version = 11 -ci-build = "build-main" [components."org.bonej:bonej-legacy-util_"] java-version = 11 -ci-build = "build-main" [components."org.bonej:bonej-ops"] java-version = 11 -ci-build = "build-main" [components."org.bonej:bonej-plugins"] java-version = 11 # TEMP: Until a BoneJ release exists incorporating bonej-org/BoneJ2#414. properties = { "skipTests" = "true" } -ci-build = "build-main" [components."org.bonej:bonej-utilities"] java-version = 11 -ci-build = "build-main" [components."org.codehaus.groovy:groovy"] last-vetted = "20250101000000" From eb6afaa9e9b02c29e7d3a6960a890c6e3b1c6fb8 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Thu, 18 Jun 2026 22:05:36 -0500 Subject: [PATCH 967/996] pombast: update config for 2026-06-18 revision --- pombast.toml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pombast.toml b/pombast.toml index 1fe1db00..abdcd238 100644 --- a/pombast.toml +++ b/pombast.toml @@ -3,8 +3,9 @@ default-java-version = 8 repositories = ["scijava.public=https://maven.scijava.org/content/groups/public"] [status] +output = "../status.scijava.org/index.html" +smelt = "../status.scijava.org/smelt.json" rules = "rules.xml" -html = "../status.scijava.org/index.html" header = "pombast/header-status.html" footer = "pombast/footer-status.html" nexus-base = "https://maven.scijava.org" @@ -25,7 +26,7 @@ cuttable = [ ] [team] -html = "../status.scijava.org/team.html" +output = "../status.scijava.org/team.html" header = "pombast/header-team.html" footer = "pombast/footer-team.html" includes = [ @@ -45,6 +46,7 @@ includes = [ ] [badges] +output = "../status.scijava.org/badges.json" includes = [ "de.nanoimaging:*", "fr.inra.ijpb:*", @@ -113,6 +115,7 @@ excludes = [ ] [smelt] +output = "../status.scijava.org/smelt.json" includes = [ "ca.mcgill:*", "de.nanoimaging:*", From 5ca84e680c52fc2732a79b4796be2f9c94001b8a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Jun 2026 13:21:52 -0500 Subject: [PATCH 968/996] Update multiview-reconstruction: 9.0.0 -> 9.0.1 Realigned with n5 v4! --- pom.xml | 2 +- pombast.toml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 296a44e0..bc2673d8 100644 --- a/pom.xml +++ b/pom.xml @@ -1238,7 +1238,7 @@ 2.6.1 - 9.0.0 + 9.0.1 0.3.1 ${BigStitcher.version} ${multiview-reconstruction.version} diff --git a/pombast.toml b/pombast.toml index abdcd238..584cd565 100644 --- a/pombast.toml +++ b/pombast.toml @@ -310,9 +310,6 @@ last-vetted = "20230309000000" [components."net.imglib2:imglib2-mesh"] java-version = 11 -[components."net.preibisch:multiview-reconstruction"] -java-version = 11 - [components."net.preibisch:multiview-simulation"] ci-build = "build-main" From 0f9f94cf7a14ce4bacaa7581870b5ee461d0abb5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Jun 2026 13:22:36 -0500 Subject: [PATCH 969/996] pombast: mega-melt-template -> melt-template The "mega" is a less important distinction now that the pombast infrastructure is in place. It's the melt operation of pombast, so for consistency, the template can be melt-template.xml. --- pombast.toml | 2 +- pombast/{mega-melt-template.xml => melt-template.xml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pombast/{mega-melt-template.xml => melt-template.xml} (100%) diff --git a/pombast.toml b/pombast.toml index 584cd565..99514eed 100644 --- a/pombast.toml +++ b/pombast.toml @@ -74,7 +74,7 @@ includes = [ java-version = 21 properties = { "scijava.jvm.version" = "21" } -template = "pombast/mega-melt-template.xml" +template = "pombast/melt-template.xml" excludes = [ # TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone. 'org.bytedeco:hdf5', diff --git a/pombast/mega-melt-template.xml b/pombast/melt-template.xml similarity index 100% rename from pombast/mega-melt-template.xml rename to pombast/melt-template.xml From 4c2c73072269256d533e2724655f452e3eaf253b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Jun 2026 13:23:30 -0500 Subject: [PATCH 970/996] pombast: add FLIMLib artifacts to operations --- pombast.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pombast.toml b/pombast.toml index 99514eed..a17fb730 100644 --- a/pombast.toml +++ b/pombast.toml @@ -11,6 +11,7 @@ footer = "pombast/footer-status.html" nexus-base = "https://maven.scijava.org" cuttable = [ "de.nanoimaging:*", + "flimlib:*", "fr.inra.ijpb:*", "io.scif:*", "jitk:*", @@ -31,6 +32,7 @@ header = "pombast/header-team.html" footer = "pombast/footer-team.html" includes = [ "de.nanoimaging:*", + "flimlib:*", "fr.inra.ijpb:*", "io.scif:*", "jitk:*", @@ -49,6 +51,7 @@ includes = [ output = "../status.scijava.org/badges.json" includes = [ "de.nanoimaging:*", + "flimlib:*", "fr.inra.ijpb:*", "io.scif:*", "jitk:*", @@ -119,6 +122,7 @@ output = "../status.scijava.org/smelt.json" includes = [ "ca.mcgill:*", "de.nanoimaging:*", + "flimlib:*", "fr.inra.ijpb:*", "io.scif:*", "jitk:*", From bb4d4d09115618b94886427e7666b0d6519dd3b4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Jun 2026 13:52:50 -0500 Subject: [PATCH 971/996] pombast: better align included groupIds across ops --- pombast.toml | 102 +++++++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 52 deletions(-) diff --git a/pombast.toml b/pombast.toml index a17fb730..e1bd2876 100644 --- a/pombast.toml +++ b/pombast.toml @@ -79,63 +79,61 @@ properties = { "scijava.jvm.version" = "21" } template = "pombast/melt-template.xml" excludes = [ - # TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone. - 'org.bytedeco:hdf5', - # NB: The following artifacts have messy dependency trees. - # Too many problems to test as part of the melt action. - # See WARNING block in pom-scijava's pom.xml for details. - 'net.imagej:imagej-server', - 'org.apache.spark:spark-core_2.11', - # NB: Skip alternate flavors of other managed components. - 'org.jogamp.gluegen:gluegen', # uberjar flavor of gluegen-rt - 'org.jogamp.jogl:jogl-all-noawt', # slimmed down flavor of jogl-all - # NB: All the SWT platform JARs have the same classes. - # The current platform will be brought in transitively. - 'org.eclipse.swt:org.eclipse.swt.cocoa.macosx', - 'org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64', - 'org.eclipse.swt:org.eclipse.swt.gtk.aix.ppc', - 'org.eclipse.swt:org.eclipse.swt.gtk.aix.ppc64', - 'org.eclipse.swt:org.eclipse.swt.gtk.hpux.ia64', - 'org.eclipse.swt:org.eclipse.swt.gtk.linux.ppc', - 'org.eclipse.swt:org.eclipse.swt.gtk.linux.ppc64', - 'org.eclipse.swt:org.eclipse.swt.gtk.linux.s390', - 'org.eclipse.swt:org.eclipse.swt.gtk.linux.s390x', - 'org.eclipse.swt:org.eclipse.swt.gtk.linux.x86', - 'org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64', - 'org.eclipse.swt:org.eclipse.swt.gtk.solaris.sparc', - 'org.eclipse.swt:org.eclipse.swt.gtk.solaris.x86', - 'org.eclipse.swt:org.eclipse.swt.win32.win32.x86', - 'org.eclipse.swt:org.eclipse.swt.win32.win32.x86_64', - # NB: All SLF4J bindings have the same classes. - # We'll rely on logback-classic being present here. - 'org.slf4j:slf4j-jcl', - 'org.slf4j:slf4j-jdk14', - 'org.slf4j:slf4j-nop', - 'org.slf4j:slf4j-simple', - # NB: Cannot include both commons-logging and jcl-over-slf4j; - # see: http://www.slf4j.org/codes.html#jclDelegationLoop - 'org.slf4j:jcl-over-slf4j', + # TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone. + 'org.bytedeco:hdf5', + # NB: The following artifacts have messy dependency trees. + # Too many problems to test as part of the melt action. + # See WARNING block in pom-scijava's pom.xml for details. + 'net.imagej:imagej-server', + 'org.apache.spark:spark-core_2.11', + # NB: Skip alternate flavors of other managed components. + 'org.jogamp.gluegen:gluegen', # uberjar flavor of gluegen-rt + 'org.jogamp.jogl:jogl-all-noawt', # slimmed down flavor of jogl-all + # NB: All the SWT platform JARs have the same classes. + # The current platform will be brought in transitively. + 'org.eclipse.swt:org.eclipse.swt.cocoa.macosx', + 'org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64', + 'org.eclipse.swt:org.eclipse.swt.gtk.aix.ppc', + 'org.eclipse.swt:org.eclipse.swt.gtk.aix.ppc64', + 'org.eclipse.swt:org.eclipse.swt.gtk.hpux.ia64', + 'org.eclipse.swt:org.eclipse.swt.gtk.linux.ppc', + 'org.eclipse.swt:org.eclipse.swt.gtk.linux.ppc64', + 'org.eclipse.swt:org.eclipse.swt.gtk.linux.s390', + 'org.eclipse.swt:org.eclipse.swt.gtk.linux.s390x', + 'org.eclipse.swt:org.eclipse.swt.gtk.linux.x86', + 'org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64', + 'org.eclipse.swt:org.eclipse.swt.gtk.solaris.sparc', + 'org.eclipse.swt:org.eclipse.swt.gtk.solaris.x86', + 'org.eclipse.swt:org.eclipse.swt.win32.win32.x86', + 'org.eclipse.swt:org.eclipse.swt.win32.win32.x86_64', + # NB: All SLF4J bindings have the same classes. + # We'll rely on logback-classic being present here. + 'org.slf4j:slf4j-jcl', + 'org.slf4j:slf4j-jdk14', + 'org.slf4j:slf4j-nop', + 'org.slf4j:slf4j-simple', + # NB: Cannot include both commons-logging and jcl-over-slf4j; + # see: http://www.slf4j.org/codes.html#jclDelegationLoop + 'org.slf4j:jcl-over-slf4j', ] [smelt] output = "../status.scijava.org/smelt.json" includes = [ - "ca.mcgill:*", - "de.nanoimaging:*", - "flimlib:*", - "fr.inra.ijpb:*", - "io.scif:*", - "jitk:*", - "mpicbg:*", - "net.imagej:*", - "net.imglib2:*", - "net.preibisch:*", - "org.bonej:*", - "org.janelia.saalfeldlab:*", - "org.janelia:*", - "org.morphonets:*", - "org.scijava:*", - "sc.fiji:*", + "de.nanoimaging:*", + "flimlib:*", + "fr.inra.ijpb:*", + "io.scif:*", + "jitk:*", + "mpicbg:*", + "net.imagej:*", + "net.imglib2:*", + "net.preibisch:*", + "org.bonej:*", + "org.janelia*:*", + "org.morphonets:*", + "org.scijava:*", + "sc.fiji:*", ] excludes = [ # NB: Skip closed-source artifacts. From e2087c8bd3dfed16bf630361e2b514e2ffe9a43b Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Jun 2026 13:56:17 -0500 Subject: [PATCH 972/996] pombast: standardize on double quote symbols --- pombast.toml | 64 ++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/pombast.toml b/pombast.toml index e1bd2876..5c9d1ba6 100644 --- a/pombast.toml +++ b/pombast.toml @@ -80,41 +80,41 @@ properties = { "scijava.jvm.version" = "21" } template = "pombast/melt-template.xml" excludes = [ # TEMP: Exclude org.bytedeco:hdf5 until cisd:jhdf5 is gone. - 'org.bytedeco:hdf5', + "org.bytedeco:hdf5", # NB: The following artifacts have messy dependency trees. # Too many problems to test as part of the melt action. # See WARNING block in pom-scijava's pom.xml for details. - 'net.imagej:imagej-server', - 'org.apache.spark:spark-core_2.11', + "net.imagej:imagej-server", + "org.apache.spark:spark-core_2.11", # NB: Skip alternate flavors of other managed components. - 'org.jogamp.gluegen:gluegen', # uberjar flavor of gluegen-rt - 'org.jogamp.jogl:jogl-all-noawt', # slimmed down flavor of jogl-all + "org.jogamp.gluegen:gluegen", # uberjar flavor of gluegen-rt + "org.jogamp.jogl:jogl-all-noawt", # slimmed down flavor of jogl-all # NB: All the SWT platform JARs have the same classes. # The current platform will be brought in transitively. - 'org.eclipse.swt:org.eclipse.swt.cocoa.macosx', - 'org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64', - 'org.eclipse.swt:org.eclipse.swt.gtk.aix.ppc', - 'org.eclipse.swt:org.eclipse.swt.gtk.aix.ppc64', - 'org.eclipse.swt:org.eclipse.swt.gtk.hpux.ia64', - 'org.eclipse.swt:org.eclipse.swt.gtk.linux.ppc', - 'org.eclipse.swt:org.eclipse.swt.gtk.linux.ppc64', - 'org.eclipse.swt:org.eclipse.swt.gtk.linux.s390', - 'org.eclipse.swt:org.eclipse.swt.gtk.linux.s390x', - 'org.eclipse.swt:org.eclipse.swt.gtk.linux.x86', - 'org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64', - 'org.eclipse.swt:org.eclipse.swt.gtk.solaris.sparc', - 'org.eclipse.swt:org.eclipse.swt.gtk.solaris.x86', - 'org.eclipse.swt:org.eclipse.swt.win32.win32.x86', - 'org.eclipse.swt:org.eclipse.swt.win32.win32.x86_64', + "org.eclipse.swt:org.eclipse.swt.cocoa.macosx", + "org.eclipse.swt:org.eclipse.swt.cocoa.macosx.x86_64", + "org.eclipse.swt:org.eclipse.swt.gtk.aix.ppc", + "org.eclipse.swt:org.eclipse.swt.gtk.aix.ppc64", + "org.eclipse.swt:org.eclipse.swt.gtk.hpux.ia64", + "org.eclipse.swt:org.eclipse.swt.gtk.linux.ppc", + "org.eclipse.swt:org.eclipse.swt.gtk.linux.ppc64", + "org.eclipse.swt:org.eclipse.swt.gtk.linux.s390", + "org.eclipse.swt:org.eclipse.swt.gtk.linux.s390x", + "org.eclipse.swt:org.eclipse.swt.gtk.linux.x86", + "org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64", + "org.eclipse.swt:org.eclipse.swt.gtk.solaris.sparc", + "org.eclipse.swt:org.eclipse.swt.gtk.solaris.x86", + "org.eclipse.swt:org.eclipse.swt.win32.win32.x86", + "org.eclipse.swt:org.eclipse.swt.win32.win32.x86_64", # NB: All SLF4J bindings have the same classes. # We'll rely on logback-classic being present here. - 'org.slf4j:slf4j-jcl', - 'org.slf4j:slf4j-jdk14', - 'org.slf4j:slf4j-nop', - 'org.slf4j:slf4j-simple', + "org.slf4j:slf4j-jcl", + "org.slf4j:slf4j-jdk14", + "org.slf4j:slf4j-nop", + "org.slf4j:slf4j-simple", # NB: Cannot include both commons-logging and jcl-over-slf4j; # see: http://www.slf4j.org/codes.html#jclDelegationLoop - 'org.slf4j:jcl-over-slf4j', + "org.slf4j:jcl-over-slf4j", ] [smelt] @@ -137,15 +137,15 @@ includes = [ ] excludes = [ # NB: Skip closed-source artifacts. - 'org.bonej:bonej-plus', + "org.bonej:bonej-plus", # NB: Skip scijava forks of third-party projects. # These are very stable, with few/no dependencies, and # don't need to be retested as pom-scijava evolves. - 'org.scijava:j3dcore', - 'org.scijava:j3dutils', - 'org.scijava:jep', - 'org.scijava:junit-benchmarks', - 'org.scijava:vecmath', + "org.scijava:j3dcore", + "org.scijava:j3dutils", + "org.scijava:jep", + "org.scijava:junit-benchmarks", + "org.scijava:vecmath", ] skip-tests = [ # Error while checking the CLIJ2 installation: null @@ -174,7 +174,7 @@ skip-tests = [ # Unable to contact EC2 metadata service.] "org.janelia.saalfeldlab:n5-aws-s3" = ["org.janelia.saalfeldlab.n5.s3.AmazonS3UtilsTest"] -# Skip n5-universe'slow tests. +# Skip n5-universe slow tests. "org.janelia.saalfeldlab:n5-universe" = [ "org.janelia.saalfeldlab.n5.universe.storage.zarr.ZarrStorageTests", # Time elapsed: 1753 s "org.janelia.saalfeldlab.n5.universe.storage.zarr.zarr2.Zarr2HttpFactoryTest", # Time elapsed: 947.2 s From 9fe0dbc915f947e14fff4396e0fdd96398d37246 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Jun 2026 13:56:34 -0500 Subject: [PATCH 973/996] pombast: ignore scijava-ops build issues for now New releases are needed... soon. --- pombast.toml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pombast.toml b/pombast.toml index 5c9d1ba6..00d9c1ef 100644 --- a/pombast.toml +++ b/pombast.toml @@ -136,6 +136,8 @@ includes = [ "sc.fiji:*", ] excludes = [ + # TEMP: Until scijava-ops-image 2.0.0 is released. + "org.scijava:scijava-ops-image", # NB: Skip closed-source artifacts. "org.bonej:bonej-plus", # NB: Skip scijava forks of third-party projects. @@ -195,6 +197,13 @@ skip-tests = [ "org.janelia.saalfeldlab.n5.universe.storage.zarr.zarr3.Zarr3GoogleCloudFactoryTest", ] +# TEMP: Until scijava-ops-flim 1.0.1 is released. +# FitTest.testGlobalFitImg:214->assertSampleEquals:254 array contents differ at index [0], expected: <2.5887516> but was: <1.2488503> +# FitTest.testGlobalFitImgMultiExp:228->assertSampleEquals:254 array contents differ at index [0], expected: <301.6971> but was: <193.0> +"org.scijava:scijava-ops-flim" = [ + "org.scijava.ops.flim.FitTest", +] + "sc.fiji:labkit-ui" = [ "sc.fiji.labkit.ui.GarbageCollectionTest", # Too slow (7 s) "sc.fiji.labkit.ui.plugin.LabkitProbabilityMapForImagesInDirectoryPluginTest", # Too slow (65 s) From 11b84bf0d4bb8ba19e851ed49b173438948358fa Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Jun 2026 15:17:34 -0500 Subject: [PATCH 974/996] pombast: fix leading whitespace --- pombast.toml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pombast.toml b/pombast.toml index 00d9c1ef..1f4ff477 100644 --- a/pombast.toml +++ b/pombast.toml @@ -150,8 +150,8 @@ excludes = [ "org.scijava:vecmath", ] skip-tests = [ - # Error while checking the CLIJ2 installation: null - "sc.fiji:labkit-pixel-classification", + # Error while checking the CLIJ2 installation: null + "sc.fiji:labkit-pixel-classification", ] [remove-tests] @@ -205,10 +205,10 @@ skip-tests = [ ] "sc.fiji:labkit-ui" = [ - "sc.fiji.labkit.ui.GarbageCollectionTest", # Too slow (7 s) - "sc.fiji.labkit.ui.plugin.LabkitProbabilityMapForImagesInDirectoryPluginTest", # Too slow (65 s) - "sc.fiji.labkit.ui.plugin.SegmentRGBImageTest", # Too slow (35 s) - "sc.fiji.labkit.ui.segmentation.SegmentationToolTest", # Too slow (34 s) + "sc.fiji.labkit.ui.GarbageCollectionTest", # Too slow (7 s) + "sc.fiji.labkit.ui.plugin.LabkitProbabilityMapForImagesInDirectoryPluginTest", # Too slow (65 s) + "sc.fiji.labkit.ui.plugin.SegmentRGBImageTest", # Too slow (35 s) + "sc.fiji.labkit.ui.segmentation.SegmentationToolTest", # Too slow (34 s) ] [components."fr.inra.ijpb:MorphoLibJ_"] From 63fd51e405279919c40c3b78994caf6774d1bd8e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 19 Jun 2026 15:17:48 -0500 Subject: [PATCH 975/996] pombast: remove unneeded Java version pins Pombast got smarter about detecting the right Java version to use. --- pombast.toml | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/pombast.toml b/pombast.toml index 1f4ff477..9f4605f4 100644 --- a/pombast.toml +++ b/pombast.toml @@ -319,6 +319,10 @@ ci-build = "build-main" last-vetted = "20230309000000" [components."net.imglib2:imglib2-mesh"] +# NOTE: Workaround for: error: Could not load processor class file due to +# 'org/scijava/ops/indexer/OpImplNoteParser has been compiled by a more recent +# version of the Java Runtime (class file version 55.0), this version of the +# Java Runtime only recognizes class file versions up to 52.0'. java-version = 11 [components."net.preibisch:multiview-simulation"] @@ -333,23 +337,10 @@ ci-build = "maven" [components."ome:formats-gpl"] ci-build = "maven" -[components."org.bonej:bonej-legacy-plugins_"] -java-version = 11 - -[components."org.bonej:bonej-legacy-util_"] -java-version = 11 - -[components."org.bonej:bonej-ops"] -java-version = 11 - [components."org.bonej:bonej-plugins"] -java-version = 11 # TEMP: Until a BoneJ release exists incorporating bonej-org/BoneJ2#414. properties = { "skipTests" = "true" } -[components."org.bonej:bonej-utilities"] -java-version = 11 - [components."org.codehaus.groovy:groovy"] last-vetted = "20250101000000" @@ -458,9 +449,6 @@ ci-build = "build-main" [components."org.mockito:mockito-core"] last-vetted = "20250101000000" -[components."org.morphonets:SNT"] -java-version = 21 - [components."org.ojalgo:ojalgo"] last-vetted = "20250101000000" @@ -743,9 +731,6 @@ ci-build = "build-main" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:FilamentDetector"] -java-version = 11 - [components."sc.fiji:FlowJ_"] ci-build = "build-main" last-vetted = "20230309000000" @@ -831,9 +816,6 @@ last-vetted = "20230309000000" ci-build = "build-main" last-vetted = "20230309000000" -[components."sc.fiji:OMEVisual"] -java-version = 11 - [components."sc.fiji:PIV_analyser"] ci-build = "build-main" last-vetted = "20230309000000" From 512e3f9d191a61c4811281cae0af04507fe2a4f7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 22 Jun 2026 13:53:59 -0400 Subject: [PATCH 976/996] Manage Amazon AWS SDK v2 components This is done by importing its official BOM. Which is a bit silly, because all the AWS components are monoversioned in alignment with the BOM itself. But it's what their documentation says to do, so OK! https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/setup-project-maven.html --- pom.xml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index bc2673d8..337ced54 100644 --- a/pom.xml +++ b/pom.xml @@ -1372,13 +1372,17 @@ 1.5.0 ${algart-tiff.version} - + 1.12.791 ${aws.version} ${aws.version} ${aws-java-sdk-core.version} ${aws-java-sdk-s3.version} + + + 2.46.15 + 4.3.4 2.7.7 @@ -4427,7 +4431,7 @@ ${net.algart.algart-tiff.version} - + com.amazonaws aws-java-sdk-core @@ -4439,6 +4443,15 @@ ${com.amazonaws.aws-java-sdk-s3.version} + + + software.amazon.awssdk + bom + ${software.amazon.awssdk.bom.version} + pom + import + + antlr From 043e710e2a71cb3b0a2fc93bd18100144a1f49d8 Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Mon, 22 Jun 2026 13:55:30 -0400 Subject: [PATCH 977/996] Update BigStitcher components * BigStitcher: 2.6.1 -> 3.0.1 * multiview-reconstruction: 9.0.1 -> 9.0.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 337ced54..707c952d 100644 --- a/pom.xml +++ b/pom.xml @@ -1237,8 +1237,8 @@ ${clijx-weka_.version} - 2.6.1 - 9.0.1 + 3.0.1 + 9.0.2 0.3.1 ${BigStitcher.version} ${multiview-reconstruction.version} From 42bc2b3ff004291f7b783e8e288872215d8ffa3a Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 22 Jun 2026 14:07:04 -0500 Subject: [PATCH 978/996] Remove flimlib components They do not smelt successfully with the currently managed ImgLib2, and there is a compatibility issue with FLIMLib >=2.2.0. Some related discussion is at: https://imagesc.zulipchat.com/#narrow/channel/604400-COBA/topic/FLIMLib.20breakage.20between.202.2E1.2E1.20and.202.2E2.2E3/with/605875091 Until these issues are resolved, pom-scijava cannot document compatible versions, because there are none. --- pom.xml | 2 +- pombast.toml | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 707c952d..908406bf 100644 --- a/pom.xml +++ b/pom.xml @@ -1207,7 +1207,7 @@ 2.1.2 2.0.0 - 2.2.5 + 2.1.1 ${flimj-ops.version} ${flimj-ui.version} ${flimlib.version} diff --git a/pombast.toml b/pombast.toml index 9f4605f4..208918f3 100644 --- a/pombast.toml +++ b/pombast.toml @@ -11,7 +11,6 @@ footer = "pombast/footer-status.html" nexus-base = "https://maven.scijava.org" cuttable = [ "de.nanoimaging:*", - "flimlib:*", "fr.inra.ijpb:*", "io.scif:*", "jitk:*", @@ -32,7 +31,6 @@ header = "pombast/header-team.html" footer = "pombast/footer-team.html" includes = [ "de.nanoimaging:*", - "flimlib:*", "fr.inra.ijpb:*", "io.scif:*", "jitk:*", @@ -51,7 +49,6 @@ includes = [ output = "../status.scijava.org/badges.json" includes = [ "de.nanoimaging:*", - "flimlib:*", "fr.inra.ijpb:*", "io.scif:*", "jitk:*", @@ -121,7 +118,6 @@ excludes = [ output = "../status.scijava.org/smelt.json" includes = [ "de.nanoimaging:*", - "flimlib:*", "fr.inra.ijpb:*", "io.scif:*", "jitk:*", @@ -197,13 +193,6 @@ skip-tests = [ "org.janelia.saalfeldlab.n5.universe.storage.zarr.zarr3.Zarr3GoogleCloudFactoryTest", ] -# TEMP: Until scijava-ops-flim 1.0.1 is released. -# FitTest.testGlobalFitImg:214->assertSampleEquals:254 array contents differ at index [0], expected: <2.5887516> but was: <1.2488503> -# FitTest.testGlobalFitImgMultiExp:228->assertSampleEquals:254 array contents differ at index [0], expected: <301.6971> but was: <193.0> -"org.scijava:scijava-ops-flim" = [ - "org.scijava.ops.flim.FitTest", -] - "sc.fiji:labkit-ui" = [ "sc.fiji.labkit.ui.GarbageCollectionTest", # Too slow (7 s) "sc.fiji.labkit.ui.plugin.LabkitProbabilityMapForImagesInDirectoryPluginTest", # Too slow (65 s) From bc44c9421c43d6299fd02c822a1eeebf22464ad1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 22 Jun 2026 19:50:23 -0500 Subject: [PATCH 979/996] Manage only software.amazon.awssdk:s3, not all 446 The AWS v2 BOM brings in 446 managed components with groupId software.amazon.awssdk. But our ecosystem only uses one of them: s3. If/when that changes, we can manage more of them. --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 908406bf..78f39850 100644 --- a/pom.xml +++ b/pom.xml @@ -1380,8 +1380,10 @@ ${aws-java-sdk-s3.version} - - 2.46.15 + 2.46.15 + ${awssdk.version} + ${s3.version} + 4.3.4 @@ -4446,10 +4448,8 @@ software.amazon.awssdk - bom - ${software.amazon.awssdk.bom.version} - pom - import + s3 + ${software.amazon.awssdk.s3.version} From 28ac3de79a6d956230ab2f91f92b9f8383ad9b9f Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 23 Jun 2026 11:51:45 -0500 Subject: [PATCH 980/996] Update CI for better separation of concerns Co-authored-by: Claude Opus 4.8 --- .github/melt.sh | 4 ---- .github/publish.sh | 14 +++++++++++--- .github/status.sh | 28 ++++++++++++++++------------ .github/workflows/build.yml | 11 ++++++++--- .github/workflows/status.yml | 6 ++++++ bin/check.sh | 22 ++++++++++++++++++++++ bin/report.sh | 24 ++++++++++++++++++++++++ pombast.toml | 9 ++++----- 8 files changed, 91 insertions(+), 27 deletions(-) delete mode 100755 .github/melt.sh create mode 100755 bin/check.sh create mode 100755 bin/report.sh diff --git a/.github/melt.sh b/.github/melt.sh deleted file mode 100755 index 0785de67..00000000 --- a/.github/melt.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -uv tool install "git+https://github.com/scijava/pombast.git" -pombast melt . || true -pombast smelt --json smelt.json . diff --git a/.github/publish.sh b/.github/publish.sh index be5b0745..0e8bd6d5 100755 --- a/.github/publish.sh +++ b/.github/publish.sh @@ -12,8 +12,8 @@ datestamp="$(TZ=UTC date +'%Y-%m-%d %H:%M:%S UTC')" message="$1 ($datestamp)" shift -git config --global user.name github-actions -git config --global user.email github-actions@github.com +git config --global user.name "SciJava CI" +git config --global user.email ci@scijava.org dest_dir=site-publish @@ -36,5 +36,13 @@ then else echo "== Committing changes ==" git commit -m "$message" - git push + # Retry against concurrent publishers (the build and status workflows both + # push here), rebasing onto whatever landed in between. + n=0 + until git push + do + n=$((n + 1)) + test "$n" -lt 5 || { echo "push failed after $n attempts" >&2; exit 1; } + git pull --rebase + done fi diff --git a/.github/status.sh b/.github/status.sh index 4e212d33..0ff55954 100755 --- a/.github/status.sh +++ b/.github/status.sh @@ -1,5 +1,9 @@ #!/bin/sh -uv tool install "git+https://github.com/scijava/pombast.git" +# CI orchestrator for the status dashboard: fetch the most recently published +# smelt.json, regenerate the status/badges/team reports from it, and publish +# them to status.scijava.org. The report generation itself lives in +# bin/report.sh so it can be run outside CI too. +set -e # Pull the most recently published smelt results so that `pombast status` can # classify each available version bump by its bytecode-floor blast radius @@ -7,17 +11,17 @@ uv tool install "git+https://github.com/scijava/pombast.git" # rather than https://status.scijava.org/, so we pick up a freshly committed # smelt.json immediately instead of waiting on the asynchronous Pages deploy. # -# Best-effort: if smelt.json is not published yet (or the fetch fails), status -# still runs -- just without the bytecode classification overlay. -smelt_arg="" +# Best-effort: if smelt.json is not published yet (or the fetch fails), +# bin/report.sh still generates the reports -- just without the classification. smelt_url=https://raw.githubusercontent.com/scijava/status.scijava.org/gh-pages/smelt.json -if curl -fsSLO "$smelt_url"; then - smelt_arg="--smelt smelt.json" -else +mkdir -p target/pombast +curl -fsSL -o target/pombast/smelt.json "$smelt_url" || echo "== smelt.json unavailable; running status without classification ==" -fi -pombast status $smelt_arg . -pombast badges -o badges.json . -pombast team . -.github/publish.sh "Update status reports" index.html badges.json team.html +bin/report.sh + +.github/publish.sh "Update status reports" \ + target/pombast/index.html \ + target/pombast/badges.json \ + target/pombast/team.html \ + target/pombast/team.json diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4624a368..9b31bdab 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,11 @@ on: # Run weekly on Sunday to keep the Maven cache alive. - cron: '4 5 * * 0' +# Queue runs of the same ref; cancel superseded PR builds (they never publish). +concurrency: + group: build-${{ github.ref }} + cancel-in-progress: ${{ github.event_name == 'pull_request' }} + jobs: build: runs-on: ubuntu-latest @@ -63,8 +68,8 @@ jobs: ~/.cache/jgo key: ${{ runner.os }}-pombast-build - - name: Run pombast melt+smelt commands - run: .github/melt.sh + - name: Run pombast checks (melt + smelt) + run: bin/check.sh shell: bash - name: Delete old pombast cache @@ -86,5 +91,5 @@ jobs: - name: Publish smelt results if: always() && github.ref == 'refs/heads/master' && github.event_name == 'push' - run: .github/publish.sh "Update smelt results" smelt.json + run: .github/publish.sh "Update smelt results" target/pombast/smelt.json shell: bash diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml index 02432927..11d114e2 100644 --- a/.github/workflows/status.yml +++ b/.github/workflows/status.yml @@ -12,6 +12,12 @@ on: workflows: [build] types: [completed] +# Serialize status runs (daily cron + each build completion) so two never push +# to the status.scijava.org gh-pages branch at the same time. +concurrency: + group: status-publish + cancel-in-progress: false + jobs: status: runs-on: ubuntu-latest diff --git a/bin/check.sh b/bin/check.sh new file mode 100755 index 00000000..87fe6f18 --- /dev/null +++ b/bin/check.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# Validate a Maven BOM's managed components against each other: +# +# melt -- mega-melt classpath check (duplicate classes, SNAPSHOTs, enforcer) +# smelt -- per-component build + test against the BOM-pinned dependency set +# +# Both phases always run, so a failure in one (e.g. duplicate classes in melt) +# never hides real incompatibilities surfaced by the other. The script exits +# non-zero if either phase found a problem. +# +# Run from a BOM checkout (e.g. a pom-scijava working copy): +# +# bin/check.sh +# +# Outputs land under target/pombast/ (see pombast.toml). +command -v pombast >/dev/null 2>&1 || + uv tool install "git+https://github.com/scijava/pombast.git" + +rc=0 +pombast melt || rc=$? +pombast smelt || rc=$? +exit $rc diff --git a/bin/report.sh b/bin/report.sh new file mode 100755 index 00000000..58b0f259 --- /dev/null +++ b/bin/report.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# Generate the status, badges, and team reports for a Maven BOM, writing them +# under target/pombast/ (see pombast.toml). +# +# Run from a BOM checkout (e.g. a pom-scijava working copy): +# +# bin/report.sh +# +# The status report overlays binary/source compatibility info from +# target/pombast/smelt.json when present. Run bin/check.sh first, or drop a +# published smelt.json into target/pombast/, to populate it; without it, the +# reports are still generated, just without the bytecode classification. +command -v pombast >/dev/null 2>&1 || + uv tool install "git+https://github.com/scijava/pombast.git" + +smelt=target/pombast/smelt.json +if [ -f "$smelt" ]; then + pombast status --smelt "$smelt" +else + echo "== $smelt not found; generating status without bytecode classification ==" + pombast status +fi +pombast badges +pombast team diff --git a/pombast.toml b/pombast.toml index 208918f3..96b37b93 100644 --- a/pombast.toml +++ b/pombast.toml @@ -3,8 +3,7 @@ default-java-version = 8 repositories = ["scijava.public=https://maven.scijava.org/content/groups/public"] [status] -output = "../status.scijava.org/index.html" -smelt = "../status.scijava.org/smelt.json" +output = "target/pombast/index.html" rules = "rules.xml" header = "pombast/header-status.html" footer = "pombast/footer-status.html" @@ -26,7 +25,7 @@ cuttable = [ ] [team] -output = "../status.scijava.org/team.html" +output = "target/pombast/team.html" header = "pombast/header-team.html" footer = "pombast/footer-team.html" includes = [ @@ -46,7 +45,7 @@ includes = [ ] [badges] -output = "../status.scijava.org/badges.json" +output = "target/pombast/badges.json" includes = [ "de.nanoimaging:*", "fr.inra.ijpb:*", @@ -115,7 +114,7 @@ excludes = [ ] [smelt] -output = "../status.scijava.org/smelt.json" +output = "target/pombast/smelt.json" includes = [ "de.nanoimaging:*", "fr.inra.ijpb:*", From fbf2e2262ca65f1043b452994c3a1f2f0a1a81a0 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 23 Jun 2026 17:31:47 -0500 Subject: [PATCH 981/996] Purge bigdataviewer-vistools from all components All bigdataviewer-vistools classes merged with bigdataviewer-core as of version 10.5.0. --- pom.xml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/pom.xml b/pom.xml index 78f39850..13d9e94a 100644 --- a/pom.xml +++ b/pom.xml @@ -3147,6 +3147,13 @@ net.imglib2 imglib2-imglyb ${net.imglib2.imglib2-imglyb.version} + + + + sc.fiji + bigdataviewer-vistools + + @@ -3242,6 +3249,13 @@ sc.fiji fiji ${sc.fiji.fiji.version} + + + + sc.fiji + bigdataviewer-vistools + + @@ -3943,6 +3957,13 @@ org.janelia.saalfeldlab n5-viewer_fiji ${org.janelia.saalfeldlab.n5-viewer_fiji.version} + + + + sc.fiji + bigdataviewer-vistools + + org.janelia.saalfeldlab @@ -4034,11 +4055,25 @@ net.preibisch BigStitcher ${net.preibisch.BigStitcher.version} + + + + sc.fiji + bigdataviewer-vistools + + net.preibisch multiview-reconstruction ${net.preibisch.multiview-reconstruction.version} + + + + sc.fiji + bigdataviewer-vistools + + net.preibisch @@ -4101,6 +4136,13 @@ sc.fiji MaMuT ${sc.fiji.MaMuT.version} + + + + sc.fiji + bigdataviewer-vistools + + From 5c308a5a6baf1a008499d6c47ee8409b00be2006 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Tue, 23 Jun 2026 21:23:36 -0500 Subject: [PATCH 982/996] pombast CI: fix publish, add log artifacts publish.sh checked `git diff --quiet` after staging the files with `git add`, so it always saw a clean working tree and reported "No changes" -- nothing was ever committed to status.scijava.org's gh-pages branch. Check staged changes with `git diff --cached --quiet` instead. Also upload target/pombast logs (mega-melt validation + per-component build logs) and the generated reports as workflow artifacts, so melt and smelt failures can be diagnosed without waiting on a Pages deploy, and set COLUMNS so the Rich tables in the CI logs are legible. Co-Authored-By: Claude Opus 4.8 --- .github/publish.sh | 4 +++- .github/workflows/build.yml | 16 ++++++++++++++++ .github/workflows/status.yml | 14 ++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/.github/publish.sh b/.github/publish.sh index 0e8bd6d5..997d0ffa 100755 --- a/.github/publish.sh +++ b/.github/publish.sh @@ -30,7 +30,9 @@ do done cd "$dest_dir" -if git diff --quiet . +# Check staged changes (--cached): the files above were already `git add`ed, so +# a plain `git diff` would see an always-clean working tree and never commit. +if git diff --cached --quiet then echo "== No changes ==" else diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b31bdab..1df2f9e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,6 +71,22 @@ jobs: - name: Run pombast checks (melt + smelt) run: bin/check.sh shell: bash + env: + COLUMNS: '200' # widen Rich tables so log output is legible + + - name: Upload pombast logs + if: always() + uses: actions/upload-artifact@v4 + with: + name: pombast-logs + # mega-melt validation.log + dependency-tree.log + per-component build + # logs, plus the smelt report. Lets us diagnose melt/smelt failures + # without waiting on a status.scijava.org deploy. + path: | + target/pombast/**/*.log + target/pombast/smelt.json + if-no-files-found: warn + retention-days: 14 - name: Delete old pombast cache if: always() diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml index 11d114e2..52a49e94 100644 --- a/.github/workflows/status.yml +++ b/.github/workflows/status.yml @@ -64,6 +64,20 @@ jobs: shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + COLUMNS: '200' # widen Rich tables so log output is legible + + - name: Upload status reports + if: always() + uses: actions/upload-artifact@v4 + with: + name: status-reports + path: | + target/pombast/index.html + target/pombast/badges.json + target/pombast/team.html + target/pombast/team.json + if-no-files-found: warn + retention-days: 14 - name: Delete old pombast status cache if: always() From 9057d2fb355e94bd6b132415096aa07f016fccca Mon Sep 17 00:00:00 2001 From: John Bogovic Date: Thu, 25 Jun 2026 14:13:59 -0400 Subject: [PATCH 983/996] bump BigStitcher ecosystem artifact versions --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 13d9e94a..3bf0eb0a 100644 --- a/pom.xml +++ b/pom.xml @@ -777,7 +777,7 @@ 1.0.7 ${Correct_3D_Drift.version} - 2.1.8 + 3.0.1 ${Descriptor_based_registration.version} 2.1.2 @@ -937,7 +937,7 @@ 2.0.1 ${Statistical_Region_Merging.version} - 3.1.9 + 3.1.10 ${Stitching.version} ${Stitching_.version} @@ -1195,7 +1195,7 @@ ${n5-viewer_fiji.version} - 2.0.0 + 2.0.1 ${n5-zarr.version} @@ -1237,8 +1237,8 @@ ${clijx-weka_.version} - 3.0.1 - 9.0.2 + 3.0.6 + 9.0.8 0.3.1 ${BigStitcher.version} ${multiview-reconstruction.version} From ae56e58aa18dda2b289e155bab8d1c791d11a6f5 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 26 Jun 2026 15:12:59 -0500 Subject: [PATCH 984/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3bf0eb0a..9f695ef0 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ pom-scijava - 45.0.0-SNAPSHOT + 45.0.1-SNAPSHOT pom SciJava Parent POM From b2e0b5a1ad6390495ea022e41f9dbfcc999303e6 Mon Sep 17 00:00:00 2001 From: Michael Doube Date: Sun, 28 Jun 2026 17:53:49 +0200 Subject: [PATCH 985/996] BoneJ 7.2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f695ef0..fd5005f1 100644 --- a/pom.xml +++ b/pom.xml @@ -1245,7 +1245,7 @@ ${multiview-simulation.version} - 7.2.0 + 7.2.2 ${bonej.version} ${bonej.version} ${bonej.version} From dbd72fc6e9670a69017608bcfe48ecc9d3979074 Mon Sep 17 00:00:00 2001 From: Stephan Preibisch Date: Thu, 2 Jul 2026 13:23:28 +0200 Subject: [PATCH 986/996] Bump multiview-reconstruction 9.0.9, BigStitcher 3.0.7, Descriptor_based_registration 3.0.2 Co-Authored-By: Claude Opus 4.8 (1M context) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index fd5005f1..11f46d4b 100644 --- a/pom.xml +++ b/pom.xml @@ -777,7 +777,7 @@ 1.0.7 ${Correct_3D_Drift.version} - 3.0.1 + 3.0.2 ${Descriptor_based_registration.version} 2.1.2 @@ -1237,8 +1237,8 @@ ${clijx-weka_.version} - 3.0.6 - 9.0.8 + 3.0.7 + 9.0.9 0.3.1 ${BigStitcher.version} ${multiview-reconstruction.version} From 2b4d23bac6a70c9ced1dd1ac3d4230d52c7ac39f Mon Sep 17 00:00:00 2001 From: Stephan Preibisch Date: Fri, 3 Jul 2026 20:59:43 +0200 Subject: [PATCH 987/996] Bump multiview-reconstruction 9.0.11, BigStitcher 3.0.8, Descriptor_based_registration 3.0.3 Co-Authored-By: Claude Opus 4.8 (1M context) --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 11f46d4b..e47207d2 100644 --- a/pom.xml +++ b/pom.xml @@ -777,7 +777,7 @@ 1.0.7 ${Correct_3D_Drift.version} - 3.0.2 + 3.0.3 ${Descriptor_based_registration.version} 2.1.2 @@ -1237,8 +1237,8 @@ ${clijx-weka_.version} - 3.0.7 - 9.0.9 + 3.0.8 + 9.0.11 0.3.1 ${BigStitcher.version} ${multiview-reconstruction.version} From e9a74b86c2196c61bebad1694c80561d5cbf9e47 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 3 Jul 2026 16:05:25 -0500 Subject: [PATCH 988/996] Update component versions * imagej-updater: 2.0.1 -> 2.0.3 * KymographBuilder: 3.0.0 -> 3.0.2 To align with versions already shipped in Fiji-Latest. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e47207d2..5214e26f 100644 --- a/pom.xml +++ b/pom.xml @@ -612,7 +612,7 @@ ${imagej-ui-swing.version} - 2.0.1 + 2.0.3 ${imagej-updater.version} @@ -853,7 +853,7 @@ 2.0.1 ${Kuwahara_Filter.version} - 3.0.0 + 3.0.2 ${KymographBuilder.version} 4.1.2 From 1e0c34c7445d597e84eb88fbc2ec936e0f1620e8 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 3 Jul 2026 16:09:53 -0500 Subject: [PATCH 989/996] Update net.imagej:imagej: 2.17.0 -> 2.18.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5214e26f..a79cde0e 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ pom-scijava - 45.0.1-SNAPSHOT + 45.1.0-SNAPSHOT pom SciJava Parent POM @@ -523,7 +523,7 @@ ${ij1-patcher.version} - 2.17.0 + 2.18.0 ${imagej2.version} ${imagej.version} From 7449822d8dd7bf7a9fab84414dac574ae6207576 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Wed, 15 Jul 2026 09:10:24 -0500 Subject: [PATCH 990/996] CI: do not run status workflow within forked repos Co-authored-by: Claude Sonnet 5 --- .github/workflows/status.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/status.yml b/.github/workflows/status.yml index 52a49e94..67038f36 100644 --- a/.github/workflows/status.yml +++ b/.github/workflows/status.yml @@ -21,12 +21,16 @@ concurrency: jobs: status: runs-on: ubuntu-latest - # Scheduled runs always proceed. workflow_run runs only when the triggering - # build was a push to master (i.e. one that republished smelt.json). + # Restrict to the canonical repo, since scheduled (cron) triggers fire on + # every fork's default branch too, regardless of push activity there. + # Beyond that: scheduled runs always proceed, while workflow_run runs only + # when the triggering build was a push to master (i.e. one that + # republished smelt.json). if: >- - github.event_name != 'workflow_run' || - (github.event.workflow_run.event == 'push' && - github.event.workflow_run.head_branch == 'master') + github.repository == 'scijava/pom-scijava' && + (github.event_name != 'workflow_run' || + (github.event.workflow_run.event == 'push' && + github.event.workflow_run.head_branch == 'master')) permissions: actions: write # needed to delete and re-save caches From cb337bde166cd77b004aac16f37110c68ca48f54 Mon Sep 17 00:00:00 2001 From: Caleb Hulbert Date: Fri, 17 Jul 2026 14:39:01 -0400 Subject: [PATCH 991/996] Revert "Purge opencensus libraries from the BOM" This reverts commit 7a2c1b3f93d4558b481da360b275ca337219f10c. --- pom.xml | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/pom.xml b/pom.xml index a79cde0e..b5c6a3b3 100644 --- a/pom.xml +++ b/pom.xml @@ -5366,15 +5366,6 @@ com.google.api gax ${com.google.api.gax.version} - - - - io.opencensus - * - - com.google.api @@ -5436,15 +5427,6 @@ com.google.cloud google-cloud-core-http ${com.google.cloud.google-cloud-core-http.version} - - - - io.opencensus - * - - com.google.cloud @@ -5455,29 +5437,11 @@ com.google.cloud google-cloud-resourcemanager ${com.google.cloud.google-cloud-resourcemanager.version} - - - - io.opencensus - * - - com.google.cloud google-cloud-storage ${com.google.cloud.google-cloud-storage.version} - - - - io.opencensus - * - - @@ -5485,15 +5449,6 @@ com.google.http-client google-http-client ${com.google.http-client.google-http-client.version} - - - - io.opencensus - * - - com.google.http-client From b9a90f1f85035c59267ebccac06b0c81b9ce725e Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 17 Jul 2026 17:41:09 -0500 Subject: [PATCH 992/996] Update google-cloud-related component versions * google-cloud-core: 2.33.0 -> 2.72.0 * google-cloud-nio: 0.127.13 -> 0.134.0 * google-cloud-resourcemanager: 1.38.0 -> 1.96.0 * google-cloud-storage: 2.34.0 -> 2.70.0 * gson: 2.10.1 -> 2.14.0 --- pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b5c6a3b3..2e868c66 100644 --- a/pom.xml +++ b/pom.xml @@ -1792,11 +1792,11 @@ ${auto-value-annotations.version} - 2.33.0 + 2.72.0 ${google-cloud-core.version} - 0.127.13 - 1.38.0 - 2.34.0 + 0.134.0 + 1.96.0 + 2.70.0 ${google-cloud-core.version} ${google-cloud-core-http.version} ${google-cloud-nio.version} @@ -1851,7 +1851,7 @@ ${grpc-xds.version} - 2.10.1 + 2.14.0 ${gson.version} From dd0ac8fd52add67f48ff16a73165ff72f8e03601 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 17 Jul 2026 21:04:03 -0500 Subject: [PATCH 993/996] Update component versions * scifio-labeling: 0.3.2 -> 0.4.0 * n5-google-cloud: 6.0.0 -> 6.0.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2e868c66..eac6c83d 100644 --- a/pom.xml +++ b/pom.xml @@ -692,7 +692,7 @@ ${scifio-jai-imageio.version} - 0.3.2 + 0.4.0 ${scifio-labeling.version} @@ -1171,7 +1171,7 @@ ${n5-blosc.version} - 6.0.0 + 6.0.1 ${n5-google-cloud.version} From 17f395c6ec2daeb5adc62c976e91062765a4783c Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 17 Jul 2026 21:29:01 -0500 Subject: [PATCH 994/996] Tell Gradle to shut up about its stupid daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The single-use daemon notification message irritates me greatly. Every time I see it, I get worked up: * I don't want my build system to leave a daemon process lying around post-build (what other build system does this, *especially* by default rather than opt in?), so I pass the --no-daemon flag to prevent that from happening. * I don't care that another transient process is being forked -- other build systems like Maven do this all the time e.g. to invoke javac in its own process, and they don't spam the user about it. At minimum, I would expect there to be some kind of verbosity control, so that I can silence the message. As such, I asked Claude whether it is possible to disable this message by configuring Gradle's logger, and if not, how to go about modifying the source code to add support for such a toggle. Here is what it said: ## Is it already configurable? Not in any targeted way. It is logged at Gradle's lifecycle level, which is the default level. The only existing knobs are the global log-level controls: - --quiet / -q on the CLI, or - org.gradle.logging.level=quiet in gradle.properties Any of those would hide the message — but they suppress all lifecycle output (including BUILD SUCCESSFUL, incubating-feature notices, etc.), so it's far too blunt. There is no per-message toggle for this specific line today. One important architectural fact that shapes the fix: this message is printed by the client/launcher JVM (SingleUseDaemonClient runs in the launcher, it's the thing that forks the daemon). That matters for where a system property is readable — see below. ## Recommendation Gradle itself already has a precedent for exactly this kind of opt-out: WelcomeMessageAction gates its output on the system property org.gradle.internal.launcher.welcomeMessageEnabled. I'd mirror that pattern. There are two levels of effort: ### Option A — minimal, one-file change Downgrade the message from lifecycle to info when a system property is set. In SingleUseDaemonClient.execute(): String recommendation = documentationRegistry.getDocumentationRecommendationFor( "on this", "gradle_daemon", "sec:disabling_the_daemon"); if (Boolean.getBoolean("org.gradle.daemon.singleUseMessage.disabled")) { LOGGER.info(MESSAGE + " {}", recommendation); } else { LOGGER.lifecycle(MESSAGE + " {}", recommendation); } Downgrading to info (rather than deleting the call) keeps the message discoverable with --info/--debug and preserves the existing SingleUseDaemonClientTest expectations if you run at info. Caveat on how you set it: because this runs in the launcher JVM, the property must be a real JVM system property of that process. That means one of: - gradle -Dorg.gradle.daemon.singleUseMessage.disabled=true … - export GRADLE_OPTS="-Dorg.gradle.daemon.singleUseMessage.disabled=true" A plain systemProp entry in gradle.properties will not work here — those are forwarded to the daemon JVM, not applied to the launcher. ### Option B — the "clean" Gradle-idiomatic way If you want it configurable via gradle.properties like org.gradle.welcome, thread a boolean down from BuildActionsFactory.runBuildInSingleUseDaemon (where DaemonParameters — which has parsed gradle.properties — is available) through DaemonClientFactory.createSingleUseDaemonClientServices → SingleUseDaemonClientServices → SingleUseDaemonClient. That's the properly-plumbed version and would let you use a real org.gradle.* build option, but it touches ~4 files and, to be a first-class option, ideally also a BuildOption subclass + serializer entry. It is tempting to file a PR along the lines of Option A, but the fact that it would then not work as expected via gradle.properties would likely then bite people. Properly, the new option should also be added to the documentation and ideally be part of the same PR. So since -q already works to silence the warning, I just opted for that. Sure, it silences a lot more than only the single-use daemon message, but for this use case in pom-scijava, it doesn't matter. Good enough for now, to keep me from having a micro-meltdown on every Maven build. Now if I can just avoid ever noticing the irritating comment line at the top of the POM... See also: - https://github.com/gradle/gradle/issues/2660 - https://github.com/gradle/gradle/issues/11517 - https://github.com/gradle/gradle/issues/25272 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index eac6c83d..534716ec 100644 --- a/pom.xml +++ b/pom.xml @@ -7273,6 +7273,7 @@ ${gradle.wrapper} ${basedir}/gradle-scijava + -q --no-daemon --project-cache-dir ../target/gradle/build From 2bcb0f404bd91a7be8d841e58ca54a63169441d1 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Fri, 17 Jul 2026 22:21:52 -0500 Subject: [PATCH 995/996] Bump to next development cycle Signed-off-by: Curtis Rueden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 534716ec..6b838dd6 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ pom-scijava - 45.1.0-SNAPSHOT + 45.1.1-SNAPSHOT pom SciJava Parent POM From e72f3e778af454ac9b8f0f0f7aa87e68228847b7 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Sat, 18 Jul 2026 18:22:51 -0500 Subject: [PATCH 996/996] Retry artifacts after 2h, not 24h, for melt/smelt This uses a newly added feature of pombast to specify a settings.xml file to use with relevant pombast actions like melt and smelt (see scijava/pombast@12a42f6b2932a278ce5e17c46efb4d6f5ce636c4). In such a file, we can set the updatePolicy of each repository. It is tempting to pass -U to all of pombast's mvn invocations, forcing rechecks for missing artifacts every single time. But that would be overkill, adding more overhead to each smelt component build, whereas reducing the update window from 24 hours to 2 hours means that we won't recheck for (probably still) missing artifacts for every smelted component that depends on it during a single run, but rather we'll recheck "soon" -- hopefully the next time CI runs ~2 hours later. Why 2 hours? Because the pombast CI smelt run takes ~90 minutes when no previous successes have been cached. Would it be better to somehow reset the last-checked metadata before starting the smelt, so that every CI build behaves as though it's the first one of the day? Perhaps! But for now, let's try the 2h interval and see how it goes. --- pombast.toml | 1 + pombast/settings.xml | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 pombast/settings.xml diff --git a/pombast.toml b/pombast.toml index 96b37b93..d6891f70 100644 --- a/pombast.toml +++ b/pombast.toml @@ -1,6 +1,7 @@ [common] default-java-version = 8 repositories = ["scijava.public=https://maven.scijava.org/content/groups/public"] +settings = "pombast/settings.xml" [status] output = "target/pombast/index.html" diff --git a/pombast/settings.xml b/pombast/settings.xml new file mode 100644 index 00000000..534a5e62 --- /dev/null +++ b/pombast/settings.xml @@ -0,0 +1,22 @@ + + + + + update-interval + + + scijava.public + https://maven.scijava.org/content/groups/public + interval:120 + interval:120 + + + central + https://repo.maven.apache.org/maven2 + interval:120 + + + + + update-interval +