Merge remote-tracking branch 'origin/master'

Author: elect86

pom.xml

@@ -472,7 +472,7 @@
 		<net.imagej.imagej.version>${imagej.version}</net.imagej.imagej.version>
 
 		<!-- ImageJ - https://github.com/imagej/ImageJ -->
-		<imagej1.version>1.54h</imagej1.version>
+		<imagej1.version>1.54g</imagej1.version>
 		<ij.version>${imagej1.version}</ij.version>
 		<net.imagej.ij.version>${ij.version}</net.imagej.ij.version>
 
@@ -1103,11 +1103,11 @@
 		<net.imglib2.imglib2-label-multisets.version>${imglib2-label-multisets.version}</net.imglib2.imglib2-label-multisets.version>
 
 		<!-- N5 - https://github.com/saalfeldlab/n5 -->
-		<n5.version>3.1.3</n5.version>
+		<n5.version>3.1.2</n5.version>
 		<org.janelia.saalfeldlab.n5.version>${n5.version}</org.janelia.saalfeldlab.n5.version>
 
 		<!-- N5 AWS S3 - https://github.com/saalfeldlab/n5-aws-s3 -->
-		<n5-aws-s3.version>4.0.2</n5-aws-s3.version>
+		<n5-aws-s3.version>4.0.1</n5-aws-s3.version>
 		<org.janelia.saalfeldlab.n5-aws-s3.version>${n5-aws-s3.version}</org.janelia.saalfeldlab.n5-aws-s3.version>
 
 		<!-- N5 Blosc - https://github.com/saalfeldlab/n5-blosc -->
@@ -1131,15 +1131,15 @@
 		<org.janelia.saalfeldlab.n5-imglib2.version>${n5-imglib2.version}</org.janelia.saalfeldlab.n5-imglib2.version>
 
 		<!-- N5 Universe - https://github.com/saalfeldlab/n5-universe -->
-		<n5-universe.version>1.3.2</n5-universe.version>
+		<n5-universe.version>1.3.1</n5-universe.version>
 		<org.janelia.saalfeldlab.n5-universe.version>${n5-universe.version}</org.janelia.saalfeldlab.n5-universe.version>
 
 		<!-- N5 Viewer for Fiji - https://github.com/saalfeldlab/n5-viewer_fiji -->
 		<n5-viewer_fiji.version>6.0.1</n5-viewer_fiji.version>
 		<org.janelia.saalfeldlab.n5-viewer_fiji.version>${n5-viewer_fiji.version}</org.janelia.saalfeldlab.n5-viewer_fiji.version>
 
 		<!-- N5 Zarr - https://github.com/saalfeldlab/n5-zarr -->
-		<n5-zarr.version>1.2.1</n5-zarr.version>
+		<n5-zarr.version>1.2.0</n5-zarr.version>
 		<org.janelia.saalfeldlab.n5-zarr.version>${n5-zarr.version}</org.janelia.saalfeldlab.n5-zarr.version>
 
 		<!-- N5 ZStandard - https://github.com/JaneliaSciComp/n5-zstandard -->

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.

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.<init>() -> [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" ||