From de3e96661adc7641b0cd39c996cb00c42cbd5672 Mon Sep 17 00:00:00 2001
From: Tor Colvin <tor.colvin@couchbase.com>
Date: Thu, 6 Apr 2023 09:07:01 -0400
Subject: [PATCH 1/4] Add 3.1 release manifest

---
 manifest/3.1.xml             | 30 ++++++++++++++++++++++++++++++
 manifest/product-config.json |  9 +++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 manifest/3.1.xml

diff --git a/manifest/3.1.xml b/manifest/3.1.xml
new file mode 100644
index 0000000000..93c7979daa
--- /dev/null
+++ b/manifest/3.1.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Copyright 2016-Present Couchbase, Inc.
+
+Use of this software is governed by the Business Source License included in
+the file licenses/BSL-Couchbase.txt.  As of the Change Date specified in that
+file, in accordance with the Business Source License, use of this software will
+be governed by the Apache License, Version 2.0, included in the file
+licenses/APL2.txt.
+-->
+
+<manifest>
+
+  <remote fetch="https://github.com/couchbase/" name="couchbase"/>
+  <default remote="couchbase" revision="master"/>
+
+  <!-- Build Scripts (required on CI servers) -->
+  <project name="product-texts" path="product-texts" remote="couchbase"/>
+  <project name="build" path="cbbuild" remote="couchbase" revision="844e2484067053d7af88e706a814766265bf03df">
+    <annotation name="VERSION" value="3.1.0"     keep="true"/>
+    <annotation name="BLD_NUM" value="@BLD_NUM@" keep="true"/>
+    <annotation name="RELEASE" value="@RELEASE@" keep="true"/>
+  </project>
+
+
+  <!-- Sync Gateway -->
+   <project name="sync_gateway" path="sync_gateway" remote="couchbase" />
+
+</manifest>
diff --git a/manifest/product-config.json b/manifest/product-config.json
index 0872df18e3..dff121cec4 100644
--- a/manifest/product-config.json
+++ b/manifest/product-config.json
@@ -389,6 +389,15 @@
             "trigger_blackduck": true,
             "start_build": 1
         },
+        "manifest/3.1.xml": {
+            "release": "3.1.0",
+            "release_name": "Couchbase Sync Gateway 3.1.0",
+            "production": true,
+            "interval": 120,
+            "go_version": "1.19.5",
+            "trigger_blackduck": true,
+            "start_build": 1
+        },
         "manifest/dev.xml": {
             "release": "dev",
             "release_name": "Couchbase Sync Gateway Dev",

From 53e2b1f4212c9930a682014831ee0011c3435ef5 Mon Sep 17 00:00:00 2001
From: Tor Colvin <tor.colvin@couchbase.com>
Date: Thu, 6 Apr 2023 12:20:21 -0400
Subject: [PATCH 2/4] bump version number for default branch

---
 manifest/default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest/default.xml b/manifest/default.xml
index 93c7979daa..b805eda7fb 100644
--- a/manifest/default.xml
+++ b/manifest/default.xml
@@ -18,7 +18,7 @@ licenses/APL2.txt.
   <!-- Build Scripts (required on CI servers) -->
   <project name="product-texts" path="product-texts" remote="couchbase"/>
   <project name="build" path="cbbuild" remote="couchbase" revision="844e2484067053d7af88e706a814766265bf03df">
-    <annotation name="VERSION" value="3.1.0"     keep="true"/>
+    <annotation name="VERSION" value="3.2.0"     keep="true"/>
     <annotation name="BLD_NUM" value="@BLD_NUM@" keep="true"/>
     <annotation name="RELEASE" value="@RELEASE@" keep="true"/>
   </project>

From 4cbc192c9997072f7c1f9cad12131525072101cc Mon Sep 17 00:00:00 2001
From: Tor Colvin <tor.colvin@couchbase.com>
Date: Thu, 6 Apr 2023 12:45:55 -0400
Subject: [PATCH 3/4] Make correct updates to manifests

---
 base/version.go              | 2 +-
 manifest/3.1.xml             | 2 +-
 manifest/product-config.json | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/base/version.go b/base/version.go
index c6e64f5792..aff28382c2 100644
--- a/base/version.go
+++ b/base/version.go
@@ -20,7 +20,7 @@ const (
 	ProductName = "Couchbase Sync Gateway"
 
 	ProductAPIVersionMajor = "3"
-	ProductAPIVersionMinor = "1"
+	ProductAPIVersionMinor = "2"
 	ProductAPIVersion      = ProductAPIVersionMajor + "." + ProductAPIVersionMinor
 )
 
diff --git a/manifest/3.1.xml b/manifest/3.1.xml
index 93c7979daa..8e7ae50ffd 100644
--- a/manifest/3.1.xml
+++ b/manifest/3.1.xml
@@ -12,7 +12,7 @@ licenses/APL2.txt.
 
 <manifest>
 
-  <remote fetch="https://github.com/couchbase/" name="couchbase"/>
+  <remote fetch="https://github.com/couchbase/" name="couchbase" revision="release/3.1.0"/>
   <default remote="couchbase" revision="master"/>
 
   <!-- Build Scripts (required on CI servers) -->
diff --git a/manifest/product-config.json b/manifest/product-config.json
index dff121cec4..39b819d90a 100644
--- a/manifest/product-config.json
+++ b/manifest/product-config.json
@@ -2,7 +2,7 @@
     "product": "sync_gateway",
     "manifests": {
         "manifest/default.xml": {
-            "release": "3.1.0",
+            "release": "3.2.0",
             "release_name": "Couchbase Sync Gateway",
             "production": true,
             "interval": 30,
@@ -396,7 +396,7 @@
             "interval": 120,
             "go_version": "1.19.5",
             "trigger_blackduck": true,
-            "start_build": 1
+            "start_build": 586
         },
         "manifest/dev.xml": {
             "release": "dev",

From bd870eeb4ba0a84d0e1925e200efbaf0dc8f2dde Mon Sep 17 00:00:00 2001
From: Tor Colvin <tor.colvin@couchbase.com>
Date: Tue, 11 Apr 2023 09:28:51 -0400
Subject: [PATCH 4/4] Add revision to correct location

---
 manifest/3.1.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest/3.1.xml b/manifest/3.1.xml
index 8e7ae50ffd..03cd041a75 100644
--- a/manifest/3.1.xml
+++ b/manifest/3.1.xml
@@ -12,7 +12,7 @@ licenses/APL2.txt.
 
 <manifest>
 
-  <remote fetch="https://github.com/couchbase/" name="couchbase" revision="release/3.1.0"/>
+  <remote fetch="https://github.com/couchbase/" name="couchbase"/>
   <default remote="couchbase" revision="master"/>
 
   <!-- Build Scripts (required on CI servers) -->
@@ -25,6 +25,6 @@ licenses/APL2.txt.
 
 
   <!-- Sync Gateway -->
-   <project name="sync_gateway" path="sync_gateway" remote="couchbase" />
+   <project name="sync_gateway" path="sync_gateway" remote="couchbase" revision="release/3.1.0"/>
 
 </manifest>