Merge pull request #38 from dgault/dependency-updates

Dependency updates
ome · Jun 27, 2022 · 3205f7a · 3205f7a
2 parents debc057 + af893b9
commit 3205f7a
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 331 deletions.
diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,11 @@
   </pluginRepositories>
 
   <dependencies>
-
+    <dependency>
+      <groupId>ome</groupId>
+      <artifactId>formats-api</artifactId>
+      <version>6.10.0</version>
+    </dependency>
     <dependency>
       <groupId>com.bc.zarr</groupId>
       <artifactId>jzarr</artifactId>
@@ -67,36 +71,17 @@
       <groupId>org.mockito</groupId>
       <artifactId>mockito-inline</artifactId>
       <version>3.7.7</version>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
-      <version>6.8</version>
+      <version>6.10</version>
+      <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>s3</artifactId>
-      <version>2.13.8</version>
-    </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>netty-nio-client</artifactId>
-      <version>2.13.8</version>
-    </dependency>
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>sts</artifactId>
-      <version>2.13.8</version>
-    </dependency>
 
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>bom</artifactId>
-      <version>2.11.10</version>
-      <type>pom</type>
-    </dependency>
     <dependency>
       <!-- NB: We want this, despite warning from dependency:analyze. -->
       <groupId>xalan</groupId>
@@ -111,16 +96,7 @@
       <version>2.7.2</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>2.8.0</version>
-    </dependency>
-    <dependency>
-      <groupId>ome</groupId>
-      <artifactId>formats-api</artifactId>
-      <version>6.7.0</version>
-    </dependency>
+
 
 
   </dependencies>
@@ -134,7 +110,7 @@
 
   <build>
     <sourceDirectory>${project.basedir}/src</sourceDirectory>
-    <testSourceDirectory>${project.basedir}/src/test</testSourceDirectory>
+    <testSourceDirectory>${project.basedir}/test</testSourceDirectory>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

diff --git a/src/loci/formats/S3FileSystemStore.java b/src/loci/formats/S3FileSystemStore.java