From 083844ff873196b61d45129c5a408da54d30407e Mon Sep 17 00:00:00 2001
From: AcqEngJ-Bot <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 07:42:43 +0000
Subject: [PATCH 1/5] update AcqEngJ version and PycroManagerJava version
 (Created by Github action)

---
 java/pom.xml | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index 81cb4bd4..3692906d 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.micro-manager.pycro-manager</groupId>
     <artifactId>PycroManagerJava</artifactId>
-     <version>0.46.14</version>
+     <version>0.46.15</version>
     <packaging>jar</packaging>
     <name>Pycro-Manager Java</name>
     <description>The Java components of Pycro-Manager</description>
@@ -55,7 +55,7 @@
       <dependency>
          <groupId>org.micro-manager.acqengj</groupId>
          <artifactId>AcqEngJ</artifactId>
-     <version>0.38.0</version>
+     <version>0.38.1</version>
       </dependency>
       <dependency>
          <groupId>org.micro-manager.ndviewer</groupId>
@@ -133,13 +133,7 @@
        <autoReleaseAfterClose>true</autoReleaseAfterClose>
         <stagingProgressTimeoutMinutes>20</stagingProgressTimeoutMinutes>
       </configuration>
-<!--       <dependencies>
-       <dependency>
-         <groupId>com.thoughtworks.xstream</groupId>
-         <artifactId>xstream</artifactId>
-         <version>1.4.15</version> 
-       </dependency>
-      </dependencies> -->
+
       </plugin>
     
       </plugins>
@@ -154,4 +148,4 @@
       </repository>
    </distributionManagement>
 
-</project>
+</project>
\ No newline at end of file

From 49fc0905bd630e8fa89f37722095ab56d6c9c6b1 Mon Sep 17 00:00:00 2001
From: Henry Pinkard <7969470+henrypinkard@users.noreply.github.com>
Date: Tue, 25 Jun 2024 09:53:16 +0200
Subject: [PATCH 2/5] Update update_dependency.py

---
 build_automation/update_dependency.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build_automation/update_dependency.py b/build_automation/update_dependency.py
index 3f65a1df..abfb2620 100644
--- a/build_automation/update_dependency.py
+++ b/build_automation/update_dependency.py
@@ -11,13 +11,17 @@
 import time
 
 dep_name = sys.argv[1]
+if len(sys.argv) == 3: # NDTiffStorage.jar comes from NDStorage repo
+    repo_name = sys.argv[2]
+else:
+    repo_name = dep_name
 git_repos_dir = str(Path(__file__).parent.parent.parent) + '/'
 
 
 if('java' in os.listdir(git_repos_dir + dep_name)):
-    pom_path = git_repos_dir + dep_name + '/java/pom.xml'
+    pom_path = git_repos_dir + repo_name + '/java/pom.xml'
 else:
-    pom_path = git_repos_dir + dep_name + '/pom.xml'
+    pom_path = git_repos_dir + repo_name + '/pom.xml'
 
     
 # Get the latest version number

From 9fabc1ced4bd1a21694659b9a5409f148056050a Mon Sep 17 00:00:00 2001
From: Henry Pinkard <7969470+henrypinkard@users.noreply.github.com>
Date: Tue, 25 Jun 2024 10:15:09 +0200
Subject: [PATCH 3/5] Update update_dependency.py

---
 build_automation/update_dependency.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_automation/update_dependency.py b/build_automation/update_dependency.py
index abfb2620..d2a487bb 100644
--- a/build_automation/update_dependency.py
+++ b/build_automation/update_dependency.py
@@ -18,7 +18,7 @@
 git_repos_dir = str(Path(__file__).parent.parent.parent) + '/'
 
 
-if('java' in os.listdir(git_repos_dir + dep_name)):
+if('java' in os.listdir(repo_name + dep_name)):
     pom_path = git_repos_dir + repo_name + '/java/pom.xml'
 else:
     pom_path = git_repos_dir + repo_name + '/pom.xml'

From 1cce82a8bb66ad4907416445a976f1c050426db6 Mon Sep 17 00:00:00 2001
From: Henry Pinkard <7969470+henrypinkard@users.noreply.github.com>
Date: Tue, 25 Jun 2024 10:16:44 +0200
Subject: [PATCH 4/5] Update update_dependency.py

---
 build_automation/update_dependency.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_automation/update_dependency.py b/build_automation/update_dependency.py
index d2a487bb..145516e3 100644
--- a/build_automation/update_dependency.py
+++ b/build_automation/update_dependency.py
@@ -18,7 +18,7 @@
 git_repos_dir = str(Path(__file__).parent.parent.parent) + '/'
 
 
-if('java' in os.listdir(repo_name + dep_name)):
+if('java' in os.listdir(git_repos_dir + repo_name)):
     pom_path = git_repos_dir + repo_name + '/java/pom.xml'
 else:
     pom_path = git_repos_dir + repo_name + '/pom.xml'

From a381390e6ae501b742078953c43eef6d9c8618e0 Mon Sep 17 00:00:00 2001
From: NDStorage-Bot <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 08:17:12 +0000
Subject: [PATCH 5/5] update NDStorage version and PycroManagerJava version
 (Created by Github action)

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

diff --git a/java/pom.xml b/java/pom.xml
index 3692906d..6a0bb800 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.micro-manager.pycro-manager</groupId>
     <artifactId>PycroManagerJava</artifactId>
-     <version>0.46.15</version>
+     <version>0.46.16</version>
     <packaging>jar</packaging>
     <name>Pycro-Manager Java</name>
     <description>The Java components of Pycro-Manager</description>
@@ -65,7 +65,7 @@
       <dependency>
          <groupId>org.micro-manager.ndtiffstorage</groupId>
          <artifactId>NDTiffStorage</artifactId>
-     <version>2.18.2</version>
+     <version>2.18.4</version>
       </dependency>
   </dependencies>