Merge 21.3 to 21.7

labkey-teamcity · labkey-teamcity · commit 3aebd51fc00a · 2022-04-21T15:12:21.000Z
diff --git a/SequenceAnalysis/build.gradle b/SequenceAnalysis/build.gradle
@@ -10,6 +10,7 @@ import java.util.regex.Matcher
 
 repositories {
    mavenCentral()
+   // Added for org.clojars.chapmanb:sam dependency required by com.github.samtools:htsjdk
    maven {
       url "https://clojars.org/repo"
    }
diff --git a/jbrowse/build.gradle b/jbrowse/build.gradle
@@ -1,12 +1,14 @@
 import org.labkey.gradle.util.BuildUtils;
 
 repositories {
-	mavenCentral()
-	maven {
-		url "https://clojars.org/repo"
-	}
+    mavenCentral()
+    // Added for org.clojars.chapmanb:sam dependency required by com.github.samtools:htsjdk
+    maven {
+        url "https://clojars.org/repo"
+    }
 }
 
+
 dependencies {
     implementation "com.github.samtools:htsjdk:${htsjdkVersion}"
 	BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile")

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import java.util.regex.Matcher`
`10`	`10`
`11`	`11`	`repositories {`
`12`	`12`	`mavenCentral()`
	`13`	`+ // Added for org.clojars.chapmanb:sam dependency required by com.github.samtools:htsjdk`
`13`	`14`	`maven {`
`14`	`15`	`url "https://clojars.org/repo"`
`15`	`16`	`}`