diff --git a/.ci/dev/compatibility/JenkinsfileJDK11Compile b/.ci/dev/compatibility/JenkinsfileJDK11Compile index 4fea64e15a..549845dc5d 100644 --- a/.ci/dev/compatibility/JenkinsfileJDK11Compile +++ b/.ci/dev/compatibility/JenkinsfileJDK11Compile @@ -22,6 +22,13 @@ pipeline { buildDiscarder(logRotator(daysToKeepStr: '14', artifactDaysToKeepStr: '14')) } + environment { + ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials') + CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}" + CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}" + CORDA_USE_CACHE = "corda-remotes" + } + stages { stage('JDK 11 Compile') { steps { diff --git a/.ci/dev/nightly-regression/Jenkinsfile b/.ci/dev/nightly-regression/Jenkinsfile index 7b4ad695ce..1c4f0bd520 100644 --- a/.ci/dev/nightly-regression/Jenkinsfile +++ b/.ci/dev/nightly-regression/Jenkinsfile @@ -44,6 +44,7 @@ pipeline { ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials') CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}" CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}" + CORDA_USE_CACHE = "corda-remotes" } stages { diff --git a/.ci/dev/pr-code-checks/Jenkinsfile b/.ci/dev/pr-code-checks/Jenkinsfile index 2ac3aef24a..ba89d0b85d 100644 --- a/.ci/dev/pr-code-checks/Jenkinsfile +++ b/.ci/dev/pr-code-checks/Jenkinsfile @@ -17,6 +17,10 @@ pipeline { environment { SNYK_API_TOKEN = credentials('c4-os-snyk-api-token-secret') C4_OS_SNYK_ORG_ID = credentials('c4-os-snyk-org-id') + ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials') + CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}" + CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}" + CORDA_USE_CACHE = "corda-remotes" } stages { diff --git a/.ci/dev/regression/Jenkinsfile b/.ci/dev/regression/Jenkinsfile index 4bab8e416c..7042624f95 100644 --- a/.ci/dev/regression/Jenkinsfile +++ b/.ci/dev/regression/Jenkinsfile @@ -56,6 +56,7 @@ pipeline { CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}" CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}" CORDA_BUILD_EDITION = "${buildEdition}" + CORDA_USE_CACHE = "corda-remotes" DOCKER_URL = "https://index.docker.io/v1/" EMAIL_RECIPIENTS = credentials('corda4-email-recipient') SNYK_API_KEY = "c4-os-snyk" //Jenkins credential type: Snyk Api token @@ -328,7 +329,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/Jenkinsfile b/Jenkinsfile index b46d3647bd..0e8c951218 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,6 +47,7 @@ pipeline { ARTIFACTORY_CREDENTIALS = credentials('artifactory-credentials') CORDA_ARTIFACTORY_PASSWORD = "${env.ARTIFACTORY_CREDENTIALS_PSW}" CORDA_ARTIFACTORY_USERNAME = "${env.ARTIFACTORY_CREDENTIALS_USR}" + CORDA_USE_CACHE = "corda-remotes" } stages { diff --git a/build.gradle b/build.gradle index f6f2e7bd72..3d94dc2eaf 100644 --- a/build.gradle +++ b/build.gradle @@ -107,6 +107,7 @@ buildscript { ext.hikari_version = constants.getProperty("hikariVersion") ext.liquibase_version = constants.getProperty("liquibaseVersion") ext.artifactory_contextUrl = 'https://software.r3.com/artifactory' + ext.publicArtifactURL = 'https://download.corda.net/maven' ext.docker_compose_rule_version = constants.getProperty("dockerComposeRuleVersion") ext.selenium_version = constants.getProperty("seleniumVersion") ext.ghostdriver_version = constants.getProperty("ghostdriverVersion") @@ -169,14 +170,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(\\..*)?' @@ -400,7 +401,7 @@ allprojects { } } else { maven { - url "${artifactory_contextUrl}/corda-dependencies" + url "${publicArtifactURL}/corda-dependencies" content { includeGroupByRegex 'net\\.corda(\\..*)?' includeGroupByRegex 'com\\.r3(\\..*)?' @@ -411,7 +412,7 @@ allprojects { } } maven { - url "${artifactory_contextUrl}/corda-dev" + url "${publicArtifactURL}/corda-dev" content { includeGroupByRegex 'net\\.corda(\\..*)?' includeGroupByRegex 'com\\.r3(\\..*)?' diff --git a/docker/src/docker/Dockerfile b/docker/src/docker/Dockerfile index 607e3abfc9..1e44aeb6f1 100644 --- a/docker/src/docker/Dockerfile +++ b/docker/src/docker/Dockerfile @@ -1,5 +1,8 @@ FROM azul/zulu-openjdk:8u352 +## Remove Azul Zulu repo, as it is gone by now +RUN rm /etc/apt/sources.list.d/zulu.list + ## Add packages, clean cache, create dirs, create corda user and change ownership RUN apt-get update && \ apt-mark hold zulu8-jdk && \ 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 725afdc6d9..65fd739c94 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 {