Use IJ Supplied Versions For Libraries

virtualcell · Apr 25, 2024 · fcf6f45 · fcf6f45
1 parent 1091191
commit fcf6f45
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/view-simulation-results/pom.xml b/view-simulation-results/pom.xml
@@ -130,42 +130,30 @@
         <dependency>
             <groupId>org.janelia.saalfeldlab</groupId>
             <artifactId>n5</artifactId>
-            <version>3.1.2</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.janelia.saalfeldlab/n5-imglib2 -->
         <dependency>
             <groupId>org.janelia.saalfeldlab</groupId>
             <artifactId>n5-imglib2</artifactId>
-            <version>7.0.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.janelia.saalfeldlab/n5-aws-s3 -->
         <dependency>
             <groupId>org.janelia.saalfeldlab</groupId>
             <artifactId>n5-aws-s3</artifactId>
-            <version>4.1.1</version>
-        </dependency>
-
-        <!-- https://mvnrepository.com/artifact/org.janelia.saalfeldlab/n5-universe -->
-        <dependency>
-            <groupId>org.janelia.saalfeldlab</groupId>
-            <artifactId>n5-universe</artifactId>
-            <version>1.3.1</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.janelia.saalfeldlab/n5-zarr -->
         <dependency>
             <groupId>org.janelia.saalfeldlab</groupId>
             <artifactId>n5-zarr</artifactId>
-            <version>1.2.0</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.janelia.saalfeldlab/n5-ij -->
         <dependency>
             <groupId>org.janelia.saalfeldlab</groupId>
             <artifactId>n5-ij</artifactId>
-            <version>4.0.0</version>
         </dependency>
 
 

diff --git a/view-simulation-results/src/main/java/org/vcell/N5/SimResultsLoader.java b/view-simulation-results/src/main/java/org/vcell/N5/SimResultsLoader.java
@@ -7,17 +7,14 @@
 import com.amazonaws.services.s3.AmazonS3;
 import com.amazonaws.services.s3.AmazonS3ClientBuilder;
 import com.amazonaws.services.s3.AmazonS3URI;
-import com.google.gson.GsonBuilder;
 import ij.ImagePlus;
 import ij.plugin.Duplicator;
 import net.imglib2.cache.img.CachedCellImg;
 import net.imglib2.img.display.imagej.ImageJFunctions;
 import net.imglib2.type.numeric.real.DoubleType;
 import org.janelia.saalfeldlab.n5.N5FSReader;
-import org.janelia.saalfeldlab.n5.N5KeyValueReader;
 import org.janelia.saalfeldlab.n5.N5Reader;
 import org.janelia.saalfeldlab.n5.imglib2.N5Utils;
-import org.janelia.saalfeldlab.n5.s3.AmazonS3KeyValueAccess;
 import org.janelia.saalfeldlab.n5.s3.N5AmazonS3Reader;
 import org.scijava.log.Logger;
 import org.vcell.N5.UI.N5ExportTable;
@@ -137,10 +134,10 @@ public ImagePlus getImgPlusFromLocalN5File() throws IOException {
     }
 
     public ImagePlus getImgPlusFromN5File() throws IOException {
-        AmazonS3KeyValueAccess amazonS3KeyValueAccess = new AmazonS3KeyValueAccess(s3Client, bucketName, false);
-        N5KeyValueReader n5AmazonS3Reader = new N5KeyValueReader(amazonS3KeyValueAccess, s3ObjectKey, new GsonBuilder(), true);
+//        AmazonS3KeyValueAccess amazonS3KeyValueAccess = new AmazonS3KeyValueAccess(s3Client, bucketName, false);
+//        N5KeyValueReader n5AmazonS3Reader = new N5KeyValueReader(amazonS3KeyValueAccess, s3ObjectKey, new GsonBuilder(), true);
 
-//        N5AmazonS3Reader n5AmazonS3Reader = new N5AmazonS3Reader(s3Client, bucketName, "/" + s3ObjectKey);
+        N5AmazonS3Reader n5AmazonS3Reader = new N5AmazonS3Reader(s3Client, bucketName, "/" + s3ObjectKey);
         long start = System.currentTimeMillis();
         logger.debug("Reading N5 File Into Virtual Image");
         ImagePlus imagePlus = ImageJFunctions.wrap((CachedCellImg<DoubleType, ?>) N5Utils.open(n5AmazonS3Reader, dataSetChosen), userSetFileName);