Skip to content

Commit 73cf49f

Browse files
committed
Update scijava-common: 2.98.0 -> 2.99.0
And reenable the imagej-ops tests, which shouldn't OOME anymore...
1 parent 046a84b commit 73cf49f

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@
330330
<org.scijava.scijava-cache.version>${scijava-cache.version}</org.scijava.scijava-cache.version>
331331

332332
<!-- SciJava Common - https://github.com/scijava/scijava-common -->
333-
<scijava-common.version>2.98.0</scijava-common.version>
333+
<scijava-common.version>2.99.0</scijava-common.version>
334334
<org.scijava.scijava-common.version>${scijava-common.version}</org.scijava.scijava-common.version>
335335

336336
<!-- SciJava Config - https://github.com/scijava/scijava-config -->

tests/run.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,7 @@ chmod +x "$meltScript" ||
210210
# HACK: Remove flaky tests from imagej-ops builds.
211211
# CachedOpEnvironmentTest fails intermittently. Of course, it should be
212212
# somehow fixed in imagej-ops. But for now, let's not let it ruin the melt.
213-
#rm -f "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/cached/CachedOpEnvironmentTest.java"
214-
215-
# TEMP: Until scijava/pom-scijava#236 is solved.
216-
echo "net.imagej/imagej-ops" >> "$skipTestsFile" &&
213+
rm -f "$meltingPotDir/net.imagej/imagej-ops/src/test/java/net/imagej/ops/cached/CachedOpEnvironmentTest.java"
217214

218215
# TEMP: Until saalfeldlab/n5-aws-s3#13 is released.
219216
echo "org.janelia.saalfeldlab/n5-aws-s3" >> "$skipTestsFile" &&

0 commit comments

Comments
 (0)