From 1fdc23692adf01700f5a4c64706361fd629faf89 Mon Sep 17 00:00:00 2001
From: Ronan Browne <ronan.browne@r3.com>
Date: Thu, 14 Sep 2023 11:13:15 +0100
Subject: [PATCH] ES-1351: set up 4.12 branch

---
 .ci/dev/forward-merge/Jenkinsfile                             | 4 ++--
 .../src/main/kotlin/net/corda/common/logging/Constants.kt     | 2 +-
 constants.properties                                          | 2 +-
 docker/src/bash/example-mini-network.sh                       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.ci/dev/forward-merge/Jenkinsfile b/.ci/dev/forward-merge/Jenkinsfile
index 91ac0e1580..a7ba84d869 100644
--- a/.ci/dev/forward-merge/Jenkinsfile
+++ b/.ci/dev/forward-merge/Jenkinsfile
@@ -13,13 +13,13 @@
  * the branch name of origin branch, it should match the current branch
  * 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
  * 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
diff --git a/common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt b/common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt
index cc86ed31ab..d8b45b85e6 100644
--- a/common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt
+++ b/common/logging/src/main/kotlin/net/corda/common/logging/Constants.kt
@@ -9,4 +9,4 @@ package net.corda.common.logging
  * (originally added to source control for ease of use)
  */
 
-internal const val CURRENT_MAJOR_RELEASE = "4.11-SNAPSHOT"
\ No newline at end of file
+internal const val CURRENT_MAJOR_RELEASE = "4.12-SNAPSHOT"
\ No newline at end of file
diff --git a/constants.properties b/constants.properties
index 55e9e68db7..29b7d398ab 100644
--- a/constants.properties
+++ b/constants.properties
@@ -3,7 +3,7 @@
 # their own projects. So don't get fancy with syntax!
 # Fancy syntax - multi pass ${whatever} replacement
 
-cordaVersion=4.11
+cordaVersion=4.12
 versionSuffix=SNAPSHOT
 gradlePluginsVersion=5.0.12
 kotlinVersion=1.2.71
diff --git a/docker/src/bash/example-mini-network.sh b/docker/src/bash/example-mini-network.sh
index f8e628a7e1..e59e9eb698 100755
--- a/docker/src/bash/example-mini-network.sh
+++ b/docker/src/bash/example-mini-network.sh
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 NODE_LIST=("dockerNode1" "dockerNode2" "dockerNode3")
 NETWORK_NAME=mininet
-CORDAPP_VERSION="4.11-SNAPSHOT"
-DOCKER_IMAGE_VERSION="corda-zulu-4.11-snapshot"
+CORDAPP_VERSION="4.12-SNAPSHOT"
+DOCKER_IMAGE_VERSION="corda-zulu-4.12-snapshot"
 
 mkdir cordapps
 rm -f cordapps/*