Merge branch 'master' into mdoube-patch-1

Author: ctrueden

pom.xml

@@ -306,7 +306,7 @@
 		<!-- SciJava - https://github.com/scijava -->
 
 		<!-- App Launcher - https://github.com/scijava/app-launcher -->
-		<app-launcher.version>2.0.0</app-launcher.version>
+		<app-launcher.version>2.1.0</app-launcher.version>
 		<org.scijava.app-launcher.version>${app-launcher.version}</org.scijava.app-launcher.version>
 
 		<!-- Batch Processor - https://github.com/scijava/batch-processor -->

tests/run.sh

@@ -361,14 +361,20 @@ sectionEnd # Adjusting the melting pot: melt.sh script
 
 sectionStart 'Adjusting the melting pot: unit test hacks'
 
-# HACK: Remove flaky tests from imagej-ops builds.
+# 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"
+# 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.metadata.ome.ngff.v04.WriteAxesTests.testXYT:
 # java.util.NoSuchElementException: No value present
-echo "org.janelia.saalfeldlab/n5-ij" >> "$skipTestsFile" &&
+rm -f "$meltingPotDir/org.janelia.saalfeldlab/n5-ij/src/test/java/org/janelia/saalfeldlab/n5/metadata/ome/ngff/v04/WriteAxesTests.java"
+
+# Skip testing of components with non-working tests.
 
 # Error while checking the CLIJ2 installation: null
 echo "sc.fiji/labkit-pixel-classification" >> "$skipTestsFile" ||