Skip to content

Commit

Permalink
Add support for ZarrKeyValueReader
Browse files Browse the repository at this point in the history
 * Add ZarrKeyValueReaderBuilder to MultiscaleImage.
 * Update ZarrImageLoader and XmlIoZarrImageLoader to use ZarrKeyValueAccessBuilder.
 * Disable caching and merging - did not work.
 * Add "s3bucket" entry to ImageLoader in the xml.
 * Pom updates.
 * Add explicit anonymous authentication to S3 connection.
  • Loading branch information
kgabor committed Oct 10, 2023
1 parent a69c96a commit 84bb91d
Show file tree
Hide file tree
Showing 8 changed files with 379 additions and 65 deletions.
37 changes: 26 additions & 11 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
<parent>
<groupId>org.scijava</groupId>
<artifactId>pom-scijava</artifactId>
<!-- <version>34.1.0</version>-->
<version>31.1.0</version>
<relativePath />
<version>36.0.0</version>
</parent>

<groupId>org.bigdataviewer</groupId>
Expand Down Expand Up @@ -89,6 +87,11 @@
<license.licenseName>bsd_2</license.licenseName>
<license.copyrightOwners>BigDataViewer developers.</license.copyrightOwners>


<n5.version>3.0.0-SNAPSHOT</n5.version>
<n5-aws-s3.version>3.2.1-SNAPSHOT</n5-aws-s3.version>
<n5-zarr.version>0.0.9-SNAPSHOT</n5-zarr.version>

<!-- NB: Deploy releases to the SciJava Maven repository. -->
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
</properties>
Expand All @@ -104,39 +107,51 @@
<dependency>
<groupId>sc.fiji</groupId>
<artifactId>bigdataviewer-core</artifactId>
<version>10.4.6</version>
</dependency>
<dependency>
<groupId>sc.fiji</groupId>
<artifactId>bigdataviewer-vistools</artifactId>
<version>1.0.0-beta-32</version>
</dependency>
<dependency>
<groupId>net.imglib2</groupId>
<artifactId>imglib2-cache</artifactId>
<version>1.0.0-beta-17</version>
</dependency>
<dependency>
<groupId>net.imglib2</groupId>
<artifactId>imglib2</artifactId>
<version>6.1.0</version>
</dependency>


<!-- N5 -->
<dependency>
<groupId>org.janelia.saalfeldlab</groupId>
<artifactId>n5</artifactId>
</dependency>
<dependency>
<groupId>org.janelia.saalfeldlab</groupId>
<artifactId>n5-imglib2</artifactId>
<version>5.0.0</version>
<artifactId>n5-aws-s3</artifactId>
</dependency>
<dependency>
<groupId>org.janelia.saalfeldlab</groupId>
<artifactId>n5-zarr</artifactId>
<version>0.0.8</version>
</dependency>
<dependency>
<groupId>org.janelia.saalfeldlab</groupId>
<artifactId>n5-imglib2</artifactId>
</dependency>


<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
<version>1.12.465</version>
</dependency>

</dependencies>
</project>
2 changes: 0 additions & 2 deletions src/main/java/bdv/img/omezarr/JsonTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import org.janelia.saalfeldlab.n5.GsonAttributesParser;

import java.io.BufferedWriter;
import java.io.IOException;
Expand Down
Loading

0 comments on commit 84bb91d

Please sign in to comment.