Skip to content

[bot] Fast-forward for 21.11.11 #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
github-actions merged 7 commits into from
Mar 29, 2023
Merged

[bot] Fast-forward for 21.11.11 #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4aed65
Update maven repositories in preparation for Artifactory configuratio…
labkey-susanh Apr 19, 2022
4ca9977
Merge 21.3 to 21.7
labkey-teamcity Apr 21, 2022
70fa652
Merge 21.7 to 21.11
labkey-teamcity Apr 22, 2022
0769318
Add scijava repository back to pick up clojars dependency (#115)
labkey-susanh May 23, 2022
c841495
Merge 21.3 to 21.7
labkey-tchad May 24, 2022
06639c4
Merge 21.7 to 21.11
labkey-teamcity May 26, 2022
8d032fd
Update artifactory URL for 21.11 (#128)
Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions covidseq/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ plugins {
id 'org.labkey.build.module'
}

repositories {
mavenCentral()
// Added for org.clojars.chapmanb:sam dependency required by com.github.samtools:htsjdk
maven {
url "https://clojars.org/repo"
}
// Added for org.clojars.chapmanb:sam (required by SequenceAnalysis)
maven {
url "https://maven.scijava.org/content/groups/public"
}
}

dependencies {
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:laboratory", depProjectConfig: "apiJarFile")
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiJarFile")
Expand Down
2 changes: 1 addition & 1 deletion mcc/.npmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@labkey:registry=https://artifactory.labkey.com/artifactory/api/npm/libs-client
@labkey:registry=https://labkey.jfrog.io/artifactory/api/npm/libs-client
8 changes: 4 additions & 4 deletions mcc/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions primeseq/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
import org.labkey.gradle.util.BuildUtils;

repositories {
mavenCentral()
// Added for org.clojars.chapmanb:sam dependency required by com.github.samtools:htsjdk
maven {
url "https://clojars.org/repo"
}
// Added for org.clojars.chapmanb:sam (required by SequenceAnalysis)
maven {
url "https://maven.scijava.org/content/groups/public"
}
}

dependencies {
implementation "com.github.samtools:htsjdk:${htsjdkVersion}"
implementation "net.sf.opencsv:opencsv:${opencsvVersion}"
Expand Down
12 changes: 12 additions & 0 deletions tcrdb/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
import org.labkey.gradle.util.BuildUtils;
import org.labkey.gradle.util.ExternalDependency

repositories {
mavenCentral()
// Added for org.clojars.chapmanb:sam dependency required by com.github.samtools:htsjdk
maven {
url "https://clojars.org/repo"
}
// Added for org.clojars.chapmanb:sam (required by SequenceAnalysis)
maven {
url "https://maven.scijava.org/content/groups/public"
}
}

dependencies {
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:DiscvrLabKeyModules:singlecell", depProjectConfig: "apiJarFile")
BuildUtils.addLabKeyDependency(project: project, config: "implementation", depProjectPath: ":server:modules:DiscvrLabKeyModules:SequenceAnalysis", depProjectConfig: "apiJarFile")
Expand Down
12 changes: 12 additions & 0 deletions variantdb/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@ import org.labkey.gradle.util.BuildUtils
import org.labkey.gradle.util.ExternalDependency


repositories {
mavenCentral()
// Added for org.clojars.chapmanb:sam dependency required by com.github.samtools:htsjdk
maven {
url "https://clojars.org/repo"
}
// Added for org.clojars.chapmanb:sam (required by SequenceAnalysis)
maven {
url "https://maven.scijava.org/content/groups/public"
}
}

dependencies {
implementation "com.github.samtools:htsjdk:${htsjdkVersion}"
BuildUtils.addExternalDependency(
Expand Down