From 5a8d3ffdaa876ca6a9f1e6d4bd086cde1b5b6bf4 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 13 Oct 2025 12:25:52 -0500 Subject: [PATCH 1/5] Reenable vecmath short version We aren't managing the SciJava Java 3D fork versions anymore. --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 128f4ee..6120a8e 100644 --- a/pom.xml +++ b/pom.xml @@ -2125,8 +2125,7 @@ 1.7.2 ${jogamp-java3d.version} ${jogamp-java3d.version} - - + ${jogamp-java3d.version} ${java3d-core.version} ${java3d-utils.version} ${jogamp-java3d.version} From c6205486d83a440bcc86e0b2a345339fb1f94bbf Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Thu, 16 Jan 2025 16:39:29 -0600 Subject: [PATCH 2/5] Add SciJava monorepo components --- pom.xml | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6120a8e..d451b4d 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ pom-scijava - 43.0.1-SNAPSHOT + 43.1.0-SNAPSHOT pom SciJava Parent POM @@ -305,6 +305,48 @@ + + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + 1.0.0 + ${scijava-collections.version} + ${scijava-common3.version} + ${scijava-concurrent.version} + ${scijava-discovery.version} + ${scijava-function.version} + ${scijava-legacy.version} + ${scijava-meta.version} + ${scijava-ops-api.version} + ${scijava-ops-engine.version} + ${scijava-ops-flim.version} + ${scijava-ops-image.version} + ${scijava-ops-indexer.version} + ${scijava-ops-opencv.version} + ${scijava-ops-spi.version} + ${scijava-priority.version} + ${scijava-progress.version} + ${scijava-struct.version} + ${scijava-taglets.version} + ${scijava-testutil.version} + ${scijava-types.version} + 2.3.1 ${app-launcher.version} @@ -2421,6 +2463,118 @@ + + + org.scijava + scijava-collections + ${org.scijava.scijava-collections.version} + + + org.scijava + scijava-common3 + ${org.scijava.scijava-common3.version} + + + org.scijava + scijava-concurrent + ${org.scijava.scijava-concurrent.version} + + + org.scijava + scijava-discovery + ${org.scijava.scijava-discovery.version} + + + org.scijava + scijava-function + ${org.scijava.scijava-function.version} + + + org.scijava + scijava-legacy + ${org.scijava.scijava-legacy.version} + + + org.scijava + scijava-meta + ${org.scijava.scijava-meta.version} + + + org.scijava + scijava-ops-api + ${org.scijava.scijava-ops-api.version} + + + org.scijava + scijava-ops-engine + ${org.scijava.scijava-ops-engine.version} + + + org.scijava + scijava-ops-flim + ${org.scijava.scijava-ops-flim.version} + + + org.scijava + scijava-ops-image + ${org.scijava.scijava-ops-image.version} + + + org.scijava + scijava-ops-indexer + ${org.scijava.scijava-ops-indexer.version} + + + org.scijava + scijava-ops-opencv + ${org.scijava.scijava-ops-opencv.version} + + + org.scijava + scijava-ops-spi + ${org.scijava.scijava-ops-spi.version} + + + org.scijava + scijava-priority + ${org.scijava.scijava-priority.version} + + + org.scijava + scijava-progress + ${org.scijava.scijava-progress.version} + + + org.scijava + scijava-struct + ${org.scijava.scijava-struct.version} + + + org.scijava + scijava-taglets + ${org.scijava.scijava-taglets.version} + + + org.scijava + scijava-testutil + ${org.scijava.scijava-testutil.version} + + + org.scijava + scijava-taglets + ${org.scijava.scijava-taglets.version} + + + org.scijava + scijava-testutil + ${org.scijava.scijava-testutil.version} + + + org.scijava + scijava-types + ${org.scijava.scijava-types.version} + + org.scijava From 35e8ece1a0ca4ef65119a5be813d5eb335a23d0d Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 13 Oct 2025 12:43:07 -0500 Subject: [PATCH 3/5] mega-melt: skip components in multi-module builds The SciJava infrastructure is not yet smart enough to handle them. --- tests/generate-mega-melt.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index 7eacc9c..5227394 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -35,6 +35,38 @@ def child(node, tag): # 1.54m/1.54n/1.54p that breaks some downstream tests. # Disable them till we have time to address the issue. 'ij1-patcher', 'imagej-legacy', + # 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', From b7f93d170e037e7bfecb883a274254a523cbb4a3 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 13 Oct 2025 12:44:36 -0500 Subject: [PATCH 4/5] mega-melt: move SNT into "Java 9+" section for now --- tests/generate-mega-melt.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index 5227394..46d5686 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -21,10 +21,6 @@ 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, @@ -76,6 +72,7 @@ def child(node, tag): 'javafx-media', 'javafx-swing', 'javafx-web', + 'SNT', # NB: Skip closed-source artifacts. 'bonej-plus', # NB: The following artifacts have messy dependency trees. From ad61b4cc8066c443b389afc47762df13b266ce85 Mon Sep 17 00:00:00 2001 From: Curtis Rueden Date: Mon, 13 Oct 2025 12:44:53 -0500 Subject: [PATCH 5/5] mega-melt: reenable ij1-patcher & imagej-legacy The latest releases of these components should work with ImageJ 1.54p. --- tests/generate-mega-melt.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/generate-mega-melt.py b/tests/generate-mega-melt.py index 46d5686..fef2758 100644 --- a/tests/generate-mega-melt.py +++ b/tests/generate-mega-melt.py @@ -27,10 +27,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: The original ImageJ introduced changes in - # 1.54m/1.54n/1.54p that breaks some downstream tests. - # Disable them till we have time to address the issue. - 'ij1-patcher', 'imagej-legacy', # 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