ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-18 20:47:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'release/os/4.9' into connelm/merge-4.9-4.10-2023-07-14

Browse Source 
# Conflicts:
#	build.gradle
This commit is contained in:
Connel McGovern 2023-07-14 18:19:55 +01:00
commit b01f85fb11
10 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.ci/dev/compatibility/JenkinsfileJDK11Compile
View File

@ -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 {

1
.ci/dev/nightly-regression/Jenkinsfile vendored
View File

@ -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 {

4
.ci/dev/pr-code-checks/Jenkinsfile vendored
View File

@ -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 {

3
.ci/dev/regression/Jenkinsfile vendored
View File

@ -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) {

1
Jenkinsfile vendored
View File

@ -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 {

10
build.gradle
View File

@ -107,6 +107,8 @@ 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.snake_yaml_version = constants.getProperty('snakeYamlVersion')
ext.docker_compose_rule_version = constants.getProperty("dockerComposeRuleVersion")
ext.selenium_version = constants.getProperty("seleniumVersion")
ext.ghostdriver_version = constants.getProperty("ghostdriverVersion")
@ -169,14 +171,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 +402,7 @@ allprojects {
}
} else {
maven {
url "${artifactory_contextUrl}/corda-dependencies"
url "${publicArtifactURL}/corda-dependencies"
content {
includeGroupByRegex 'net\\.corda(\\..*)?'
includeGroupByRegex 'com\\.r3(\\..*)?'
@ -411,7 +413,7 @@ allprojects {
}
}
maven {
url "${artifactory_contextUrl}/corda-dev"
url "${publicArtifactURL}/corda-dev"
content {
includeGroupByRegex 'net\\.corda(\\..*)?'
includeGroupByRegex 'com\\.r3(\\..*)?'

3
docker/src/docker/Dockerfile
View File

@ -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 && \

2
jdk8u-deterministic/build.gradle
View File

@ -1,6 +1,6 @@
repositories {
maven {
url "$artifactory_contextUrl/corda-dependencies"
url "$publicArtifactURL/corda-dependencies"
}
}

3
settings.gradle
View File

@ -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" }
}
}
}

4
testing/cordapps/dbfailure/dbfcontracts/build.gradle
View File

@ -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 {