Skip to content

Commit 2914d25

Browse files
committed
chore: depend on new n5 releases
* use N5Factory's s3Configuration
1 parent 782ca63 commit 2914d25

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
<license.licenseName>bsd_2</license.licenseName>
8989
<license.copyrightOwners>BigDataViewer developers.</license.copyrightOwners>
9090

91-
<n5-universe.version>2.1.0</n5-universe.version>
91+
<n5-aws-s3.version>5.0.0</n5-aws-s3.version>
92+
<n5-universe.version>3.0.0</n5-universe.version>
9293

9394
<!-- NB: Deploy releases to the SciJava Maven repository. -->
9495
<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
@@ -120,6 +121,10 @@
120121
<groupId>org.janelia.saalfeldlab</groupId>
121122
<artifactId>n5</artifactId>
122123
</dependency>
124+
<dependency>
125+
<groupId>org.janelia.saalfeldlab</groupId>
126+
<artifactId>n5-aws-s3</artifactId>
127+
</dependency>
123128
<dependency>
124129
<groupId>org.janelia.saalfeldlab</groupId>
125130
<artifactId>n5-universe</artifactId>

src/main/java/org/bigdataviewer/n5/XmlIoN5CloudImageLoader.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import mpicbg.spim.data.generic.sequence.AbstractSequenceDescription;
4343
import mpicbg.spim.data.generic.sequence.ImgLoaderIo;
4444
import mpicbg.spim.data.generic.sequence.XmlIoBasicImgLoader;
45+
import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
4546

4647
@ImgLoaderIo( format = "bdv.n5.cloud", type = N5CloudImageLoader.class )
4748
public class XmlIoN5CloudImageLoader implements XmlIoBasicImgLoader< N5CloudImageLoader >
@@ -80,8 +81,11 @@ public N5CloudImageLoader fromXml( final Element elem, final URI basePathURI, fi
8081
try
8182
{
8283
//System.out.println( "Trying reading with credentials ..." );
83-
N5Factory factory = new N5Factory();
84-
factory.s3UseCredentials();
84+
N5Factory factory = new N5Factory()
85+
.s3Configuration(builder -> {
86+
builder.credentialsProvider(DefaultCredentialsProvider.create());
87+
});
88+
8589
n5Reader = factory.openReader( StorageFormat.N5, uri );
8690
}
8791
catch ( Exception e )

0 commit comments

Comments
 (0)