From 3ec6d6285c91543d943a93113c1f4e4324596939 Mon Sep 17 00:00:00 2001
From: jmoore <josh@glencoesoftware.com>
Date: Mon, 6 Sep 2021 17:16:01 +0200
Subject: [PATCH 1/5] Bump to SNAPSHOT for merge build

---
 pom.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index f4b16c9..d475106 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>ome</groupId>
   <artifactId>OMEZarrReader</artifactId>
-  <version>0.0.1</version>
+  <version>0.1.0-SNAPSHOT</version>
 
   <repositories>
     <repository>
@@ -35,23 +35,23 @@
       <layout>default</layout>
     </pluginRepository>
   </pluginRepositories>
-  
+
   <dependencies>
 
-    
+
 <!--     <dependency> -->
 <!--       <groupId>org.blosc</groupId> -->
 <!--       <artifactId>jblosc</artifactId> -->
 <!--       <version>1.0.1</version> -->
 <!--     </dependency> -->
-        
+
     <dependency>
       <groupId>com.bc.zarr</groupId>
       <artifactId>jzarr</artifactId>
       <version>0.3.3-gs-SNAPSHOT</version>
       <!-- <version>0.4-SNAPSHOT</version>-->
     </dependency>
-    
+
 <!--     <dependency> -->
 <!--     <groupId>org.lasersonlab</groupId> -->
 <!--     <artifactId>s3fs</artifactId> -->
@@ -89,9 +89,9 @@
       <artifactId>formats-api</artifactId>
       <version>6.6.1-SNAPSHOT</version>
     </dependency>
-    
+
   </dependencies>
-  
+
     <properties>
     <project.rootdir>${basedir}/../..</project.rootdir>
     <maven.compiler.source>1.8</maven.compiler.source>

From 3b65ac1846b126a898ce59bb8415ed2338c14d87 Mon Sep 17 00:00:00 2001
From: jmoore <josh@glencoesoftware.com>
Date: Mon, 6 Sep 2021 17:24:55 +0200
Subject: [PATCH 2/5] Copy required pom.xml changes from #3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d475106..9abc441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
     <repository>
       <id>bc-nexus-repo</id>
       <name>Brockmann-Consult Public Maven Repository</name>
-      <url>http://nexus.senbox.net/nexus/content/groups/public/</url>
+      <url>https://nexus.senbox.net/nexus/content/groups/public/</url>
     </repository>
     <repository>
       <id>glencoe-jzarr</id>
@@ -87,7 +87,7 @@
 <dependency>
       <groupId>ome</groupId>
       <artifactId>formats-api</artifactId>
-      <version>6.6.1-SNAPSHOT</version>
+      <version>6.6.1</version>
     </dependency>
 
   </dependencies>

From 39147ef477cbb27a008f1c69ef78bc63ffb0e58b Mon Sep 17 00:00:00 2001
From: David Gault <d.gault@dundee.ac.uk>
Date: Wed, 8 Sep 2021 15:48:23 +0100
Subject: [PATCH 3/5] Bumping formats-api to 6.7.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9abc441..a716eb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
 <dependency>
       <groupId>ome</groupId>
       <artifactId>formats-api</artifactId>
-      <version>6.6.1</version>
+      <version>6.7.0</version>
     </dependency>
 
   </dependencies>

From 9ff49ca1c4492797c4ce53ac4a306c78abe7e910 Mon Sep 17 00:00:00 2001
From: jmoore <josh@glencoesoftware.com>
Date: Mon, 13 Sep 2021 15:43:09 +0200
Subject: [PATCH 4/5] Depend on bio-formats-tool for testing purposes

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a716eb3..91df158 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,9 +84,9 @@
       <artifactId>commons-io</artifactId>
       <version>2.8.0</version>
     </dependency>
-<dependency>
+    <dependency>
       <groupId>ome</groupId>
-      <artifactId>formats-api</artifactId>
+      <artifactId>bio-formats-tools</artifactId>
       <version>6.7.0</version>
     </dependency>
 

From aa001defc2ec20f123f6111f5e01538ff358ad7a Mon Sep 17 00:00:00 2001
From: jmoore <josh@glencoesoftware.com>
Date: Fri, 17 Sep 2021 09:25:21 +0200
Subject: [PATCH 5/5] Revert to formats-api dependency

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 91df158..a943f19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
     </dependency>
     <dependency>
       <groupId>ome</groupId>
-      <artifactId>bio-formats-tools</artifactId>
+      <artifactId>formats-api</artifactId>
       <version>6.7.0</version>
     </dependency>