ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-06 11:09:18 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ES-853: Merging forward updates from 4.7 to 4.8 (2023-07-13)

Browse Source
This commit is contained in:
Ronan Browne 2023-07-13 07:07:17 +01:00
commit 6bcc843f19
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,7 +327,7 @@ pipeline {
always { always {
script { script {
if (gitUtils.isReleaseTag()) { 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 { try {
if (params.DO_TEST) { if (params.DO_TEST) {

9
build.gradle
View File

@ -113,6 +113,7 @@ buildscript {
ext.hikari_version = '3.3.1' ext.hikari_version = '3.3.1'
ext.liquibase_version = '3.6.3' ext.liquibase_version = '3.6.3'
ext.artifactory_contextUrl = 'https://software.r3.com/artifactory' ext.artifactory_contextUrl = 'https://software.r3.com/artifactory'
ext.publicArtifactURL = 'https://download.corda.net/maven'
ext.snake_yaml_version = constants.getProperty('snakeYamlVersion') ext.snake_yaml_version = constants.getProperty('snakeYamlVersion')
ext.docker_compose_rule_version = '1.5.0' ext.docker_compose_rule_version = '1.5.0'
ext.selenium_version = '3.141.59' ext.selenium_version = '3.141.59'
@ -174,14 +175,14 @@ buildscript {
} }
} else { } else {
maven { maven {
url "${artifactory_contextUrl}/corda-dependencies-dev" url "${publicArtifactURL}/corda-dependencies-dev"
content { content {
includeGroupByRegex 'net\\.corda(\\..*)?' includeGroupByRegex 'net\\.corda(\\..*)?'
includeGroupByRegex 'com\\.r3(\\..*)?' includeGroupByRegex 'com\\.r3(\\..*)?'
} }
} }
maven { maven {
url "${artifactory_contextUrl}/corda-releases" url "${publicArtifactURL}/corda-releases"
content { content {
includeGroupByRegex 'net\\.corda(\\..*)?' includeGroupByRegex 'net\\.corda(\\..*)?'
includeGroupByRegex 'com\\.r3(\\..*)?' includeGroupByRegex 'com\\.r3(\\..*)?'
@ -398,7 +399,7 @@ allprojects {
} }
} else { } else {
maven { maven {
url "${artifactory_contextUrl}/corda-dependencies" url "${publicArtifactURL}/corda-dependencies"
content { content {
includeGroupByRegex 'net\\.corda(\\..*)?' includeGroupByRegex 'net\\.corda(\\..*)?'
includeGroupByRegex 'com\\.r3(\\..*)?' includeGroupByRegex 'com\\.r3(\\..*)?'
@ -409,7 +410,7 @@ allprojects {
} }
} }
maven { maven {
url "${artifactory_contextUrl}/corda-dev" url "${publicArtifactURL}/corda-dev"
content { content {
includeGroupByRegex 'net\\.corda(\\..*)?' includeGroupByRegex 'net\\.corda(\\..*)?'
includeGroupByRegex 'com\\.r3(\\..*)?' includeGroupByRegex 'com\\.r3(\\..*)?'

2
jdk8u-deterministic/build.gradle
View File

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

3
settings.gradle
View File

@ -1,5 +1,6 @@
pluginManagement { pluginManagement {
ext.artifactory_contextUrl = 'https://software.r3.com/artifactory' ext.artifactory_contextUrl = 'https://software.r3.com/artifactory'
ext.publicArtifactURL = 'https://download.corda.net/maven'
repositories { repositories {
// Use system environment to activate caching with Artifactory, // Use system environment to activate caching with Artifactory,
@ -21,7 +22,7 @@ pluginManagement {
} else { } else {
mavenLocal() mavenLocal()
gradlePluginPortal() 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 { repositories {
mavenLocal() mavenLocal()
mavenCentral() mavenCentral()
maven { url "$artifactory_contextUrl/corda-dependencies" } maven { url "$publicArtifactURL/corda-dependencies" }
maven { url "$artifactory_contextUrl/corda" } maven { url "$publicArtifactURL/corda" }
} }
dependencies { dependencies {