From b0f86e26f94185cdb8fce0bc6e3ccbef495f90ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Waldemar=20=C5=BBurowski?=
 <45210402+wzur-r3@users.noreply.github.com>
Date: Fri, 1 Sep 2023 10:50:47 +0100
Subject: [PATCH 1/2] ES-412: added automatic forward merge for Corda 4 (#7469)

* uses an already existing shared pipeline
* will start automatic PR creation for changes between 4.6 and 4.7
---
 .ci/dev/forward-merge/Jenkinsfile | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .ci/dev/forward-merge/Jenkinsfile

diff --git a/.ci/dev/forward-merge/Jenkinsfile b/.ci/dev/forward-merge/Jenkinsfile
new file mode 100644
index 0000000000..a7604506ff
--- /dev/null
+++ b/.ci/dev/forward-merge/Jenkinsfile
@@ -0,0 +1,8 @@
+@Library('corda-shared-build-pipeline-steps@5.1') _
+
+forwardMerger(
+    targetBranch: 'release/os/4.7',
+    originBranch: 'release/os/4.6',
+    slackChannel: '#build-team-automated-notifications'
+)
+

From 267b500c93b01694e3e9503d4ad6eeb195ba97a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Waldemar=20=C5=BBurowski?=
 <45210402+wzur-r3@users.noreply.github.com>
Date: Fri, 1 Sep 2023 11:56:24 +0200
Subject: [PATCH 2/2] updated forward merged to new branch

---
 .ci/dev/forward-merge/Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/dev/forward-merge/Jenkinsfile b/.ci/dev/forward-merge/Jenkinsfile
index a7604506ff..15bab869d8 100644
--- a/.ci/dev/forward-merge/Jenkinsfile
+++ b/.ci/dev/forward-merge/Jenkinsfile
@@ -1,8 +1,8 @@
 @Library('corda-shared-build-pipeline-steps@5.1') _
 
 forwardMerger(
-    targetBranch: 'release/os/4.7',
-    originBranch: 'release/os/4.6',
+    targetBranch: 'release/os/4.8',
+    originBranch: 'release/os/4.7',
     slackChannel: '#build-team-automated-notifications'
 )