Merge branch 'main' into main

henrypinkard · Jun 28, 2024 · a5bcd90 · a5bcd90
2 parents 3ad24ef + b45507b
commit a5bcd90
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git 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'
+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 + dep_name + '/pom.xml'
+    pom_path = git_repos_dir + repo_name + '/pom.xml'
 
 
 # Get the latest version number

diff --git 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.16</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>
@@ -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>
 
@@ -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>