From 74c378e68c5fa91db8e958f29692cf1f1c56ded2 Mon Sep 17 00:00:00 2001
From: Tor Colvin <tor.colvin@couchbase.com>
Date: Mon, 1 May 2023 10:02:46 -0400
Subject: [PATCH 1/2] CBG-2912 Add release-3.1.1

---
 manifest/3.1.xml             |  4 ++--
 manifest/3.1/3.1.0.xml       | 30 ++++++++++++++++++++++++++++++
 manifest/product-config.json | 13 ++++++++++++-
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 manifest/3.1/3.1.0.xml

diff --git a/manifest/3.1.xml b/manifest/3.1.xml
index 03cd041a75..c027ceb25c 100644
--- a/manifest/3.1.xml
+++ b/manifest/3.1.xml
@@ -18,13 +18,13 @@ 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.1.1"     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" revision="release/3.1.0"/>
+   <project name="sync_gateway" path="sync_gateway" remote="couchbase" revision="release/3.1.1"/>
 
 </manifest>
diff --git a/manifest/3.1/3.1.0.xml b/manifest/3.1/3.1.0.xml
new file mode 100644
index 0000000000..06d543abfb
--- /dev/null
+++ b/manifest/3.1/3.1.0.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" revision="2a9837d8971e15e56ffe9374322b566316bce160" />
+
+</manifest>
diff --git a/manifest/product-config.json b/manifest/product-config.json
index 04c0712c44..c94cda715c 100644
--- a/manifest/product-config.json
+++ b/manifest/product-config.json
@@ -410,14 +410,25 @@
             "start_build": 1
         },
         "manifest/3.1.xml": {
+            "release": "3.1.1",
+            "release_name": "Couchbase Sync Gateway 3.1.1",
+            "production": true,
+            "interval": 120,
+            "go_version": "1.19.5",
+            "trigger_blackduck": true,
+            "start_build": 593
+        },
+        "manifest/3.1.0.xml": {
+            "do-build": false,
             "release": "3.1.0",
             "release_name": "Couchbase Sync Gateway 3.1.0",
             "production": true,
-            "interval": 120,
+            "interval": 1440,
             "go_version": "1.19.5",
             "trigger_blackduck": true,
             "start_build": 586
         },
+
         "manifest/dev.xml": {
             "release": "dev",
             "release_name": "Couchbase Sync Gateway Dev",

From 95687869371a1fcde3a6007f0f442bbc0cb026e4 Mon Sep 17 00:00:00 2001
From: Tor Colvin <tor.colvin@couchbase.com>
Date: Tue, 2 May 2023 18:12:25 -0400
Subject: [PATCH 2/2] Set start build to 1

---
 manifest/product-config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest/product-config.json b/manifest/product-config.json
index c94cda715c..8c82db9b20 100644
--- a/manifest/product-config.json
+++ b/manifest/product-config.json
@@ -416,7 +416,7 @@
             "interval": 120,
             "go_version": "1.19.5",
             "trigger_blackduck": true,
-            "start_build": 593
+            "start_build": 1
         },
         "manifest/3.1.0.xml": {
             "do-build": false,