Merge 25.7 to 25.8

Author: labkey-teamcity

SequenceAnalysis/build.gradle

@@ -135,7 +135,7 @@ dependencies {
     BuildUtils.addExternalDependency(
             project,
             new ExternalDependency(
-                    "com.github.broadinstitute:picard:3.1.0",
+                    "com.github.broadinstitute:picard:3.4.0",
                     "Picard Tools Lib",
                     "PicardTools",
                     "https://github.com/broadinstitute/picard",

SequenceAnalysis/src/org/labkey/sequenceanalysis/run/util/FastqcRunner.java

@@ -46,6 +46,7 @@
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -366,7 +367,7 @@ private List<String> getBaseParams() throws FileNotFoundException
             throw new RuntimeException("Not found: " + jbzip2.getPath());
         }
 
-        File htsjdkJar = new File(libDir, "htsjdk-4.0.0.jar");
+        File htsjdkJar = findJar(libDir, "htsjdk-");
         if (!htsjdkJar.exists())
         {
             throw new RuntimeException("Not found: " + htsjdkJar.getPath());
@@ -401,6 +402,27 @@ private List<String> getBaseParams() throws FileNotFoundException
         return params;
     }
 
+    private File findJar(final File libDir, final String prefix)
+    {
+        if (!libDir.exists())
+        {
+            throw new RuntimeException("Missing directory: " + libDir);
+        }
+
+        List<String> jarNames = Arrays.stream(libDir.list()).filter(fn -> fn.startsWith(prefix)).sorted().toList();
+        if (jarNames.isEmpty())
+        {
+            throw new RuntimeException("Unable to find JAR with prefix: " + prefix);
+        }
+
+        if (jarNames.size() > 1)
+        {
+            _logger.info("More than one JAR found with prefix: " + prefix);
+        }
+
+        return new File(libDir, jarNames.get(jarNames.size() - 1));
+    }
+
     private int getThreads()
     {
         return _threads;