diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile index 836ccdb3b5..8de0c5c60c 100644 --- a/.ci/dev/regression/Jenkinsfile +++ b/.ci/dev/regression/Jenkinsfile @@ -325,7 +325,7 @@ pipeline { always { script { if (gitUtils.isReleaseTag()) { - gitUtils.getGitLog(env.TAG_NAME, env.GIT_URL.replace('https://github.com/corda/', ''), scm.userRemoteConfigs[0].credentialsId) + gitUtils.getGitLog(env.TAG_NAME, env.GIT_URL.replace('https://github.com/corda/', '')) } try { if (params.DO_TEST) { diff --git a/build.gradle b/build.gradle index 0dafa6db2a..e599ca1140 100644 --- a/build.gradle +++ b/build.gradle @@ -113,6 +113,7 @@ buildscript { ext.hikari_version = '3.3.1' ext.liquibase_version = '3.6.3' ext.artifactory_contextUrl = 'https://software.r3.com/artifactory' + ext.publicArtifactURL = 'https://download.corda.net/maven' ext.snake_yaml_version = constants.getProperty('snakeYamlVersion') ext.docker_compose_rule_version = '1.5.0' ext.selenium_version = '3.141.59' @@ -174,14 +175,14 @@ buildscript { } } else { maven { - url "${artifactory_contextUrl}/corda-dependencies-dev" + url "${publicArtifactURL}/corda-dependencies-dev" content { includeGroupByRegex 'net\\.corda(\\..*)?' includeGroupByRegex 'com\\.r3(\\..*)?' } } maven { - url "${artifactory_contextUrl}/corda-releases" + url "${publicArtifactURL}/corda-releases" content { includeGroupByRegex 'net\\.corda(\\..*)?' includeGroupByRegex 'com\\.r3(\\..*)?' @@ -398,7 +399,7 @@ allprojects { } } else { maven { - url "${artifactory_contextUrl}/corda-dependencies" + url "${publicArtifactURL}/corda-dependencies" content { includeGroupByRegex 'net\\.corda(\\..*)?' includeGroupByRegex 'com\\.r3(\\..*)?' @@ -409,7 +410,7 @@ allprojects { } } maven { - url "${artifactory_contextUrl}/corda-dev" + url "${publicArtifactURL}/corda-dev" content { includeGroupByRegex 'net\\.corda(\\..*)?' includeGroupByRegex 'com\\.r3(\\..*)?' diff --git a/jdk8u-deterministic/build.gradle b/jdk8u-deterministic/build.gradle index f9a91c9cc8..80804d15a8 100644 --- a/jdk8u-deterministic/build.gradle +++ b/jdk8u-deterministic/build.gradle @@ -1,6 +1,6 @@ repositories { maven { - url "$artifactory_contextUrl/corda-dependencies" + url "$publicArtifactURL/corda-dependencies" } } diff --git a/settings.gradle b/settings.gradle index d896cc16d5..a6ade1959e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,6 @@ pluginManagement { ext.artifactory_contextUrl = 'https://software.r3.com/artifactory' + ext.publicArtifactURL = 'https://download.corda.net/maven' repositories { // Use system environment to activate caching with Artifactory, @@ -21,7 +22,7 @@ pluginManagement { } else { mavenLocal() gradlePluginPortal() - maven { url "${artifactory_contextUrl}/corda-dependencies" } + maven { url "${publicArtifactURL}/corda-dependencies" } } } } diff --git a/testing/cordapps/dbfailure/dbfcontracts/build.gradle b/testing/cordapps/dbfailure/dbfcontracts/build.gradle index 8767f08a31..886a9f9728 100644 --- a/testing/cordapps/dbfailure/dbfcontracts/build.gradle +++ b/testing/cordapps/dbfailure/dbfcontracts/build.gradle @@ -5,8 +5,8 @@ apply plugin: 'kotlin' repositories { mavenLocal() mavenCentral() - maven { url "$artifactory_contextUrl/corda-dependencies" } - maven { url "$artifactory_contextUrl/corda" } + maven { url "$publicArtifactURL/corda-dependencies" } + maven { url "$publicArtifactURL/corda" } } dependencies {