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

ES-1351: set up 4.12 branch

Browse Source
This commit is contained in:
Ronan Browne 2023-09-14 11:13:15 +01:00
parent a90e0b4cfb
commit 1fdc23692a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/dev/forward-merge/Jenkinsfile vendored
View File

@ -13,13 +13,13 @@
* the branch name of origin branch, it should match the current branch * the branch name of origin branch, it should match the current branch
* and it acts as a fail-safe inside {@code forwardMerger} pipeline * and it acts as a fail-safe inside {@code forwardMerger} pipeline
*/ */
String originBranch = 'release/os/4.11' String originBranch = 'release/os/4.12'
/** /**
* the branch name of target branch, it should be the branch with the next version * the branch name of target branch, it should be the branch with the next version
* after the one in current branch. * after the one in current branch.
*/ */
String targetBranch = 'release/os/4.12' String targetBranch = 'release/os/4.13'
/** /**
* Forward merge any changes between #originBranch and #targetBranch * Forward merge any changes between #originBranch and #targetBranch

2
common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt
View File

@ -9,4 +9,4 @@ package net.corda.common.logging
* (originally added to source control for ease of use) * (originally added to source control for ease of use)
*/ */
internal const val CURRENT_MAJOR_RELEASE = "4.11-SNAPSHOT" internal const val CURRENT_MAJOR_RELEASE = "4.12-SNAPSHOT"

2
constants.properties
View File

@ -3,7 +3,7 @@
# their own projects. So don't get fancy with syntax! # their own projects. So don't get fancy with syntax!
# Fancy syntax - multi pass ${whatever} replacement # Fancy syntax - multi pass ${whatever} replacement
cordaVersion=4.11 cordaVersion=4.12
versionSuffix=SNAPSHOT versionSuffix=SNAPSHOT
gradlePluginsVersion=5.0.12 gradlePluginsVersion=5.0.12
kotlinVersion=1.2.71 kotlinVersion=1.2.71

4
docker/src/bash/example-mini-network.sh
View File

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
NODE_LIST=("dockerNode1" "dockerNode2" "dockerNode3") NODE_LIST=("dockerNode1" "dockerNode2" "dockerNode3")
NETWORK_NAME=mininet NETWORK_NAME=mininet
CORDAPP_VERSION="4.11-SNAPSHOT" CORDAPP_VERSION="4.12-SNAPSHOT"
DOCKER_IMAGE_VERSION="corda-zulu-4.11-snapshot" DOCKER_IMAGE_VERSION="corda-zulu-4.12-snapshot"
mkdir cordapps mkdir cordapps
rm -f cordapps/* rm -f cordapps/*