From 63b05696263932f261bba3d3830c5852d2e7984b Mon Sep 17 00:00:00 2001
From: Rajat Bhatta <93644539+rajatbhatta@users.noreply.github.com>
Date: Mon, 15 May 2023 13:07:55 +0530
Subject: [PATCH 1/6] chore: mark CLIRR check optional

---
 .github/sync-repo-settings.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index e0797baefa9..ed1010fe960 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -11,7 +11,6 @@ branchProtectionRules:
       - dependencies (8)
       - dependencies (11)
       - lint
-      - clirr
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
@@ -74,7 +73,6 @@ branchProtectionRules:
     requiresStrictStatusChecks: false
     requiredStatusCheckContexts:
       - lint
-      - clirr
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
@@ -87,7 +85,6 @@ branchProtectionRules:
     requiresStrictStatusChecks: false
     requiredStatusCheckContexts:
       - lint
-      - clirr
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'

From a5a1e64ff544961668f5a11c843add283f8669a9 Mon Sep 17 00:00:00 2001
From: Rajat Bhatta <93644539+rajatbhatta@users.noreply.github.com>
Date: Mon, 15 May 2023 13:18:48 +0530
Subject: [PATCH 2/6] Update pre-commit hook

---
 git-hooks/pre-commit | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit
index 70e559f9fbc..7430e9c5850 100755
--- a/git-hooks/pre-commit
+++ b/git-hooks/pre-commit
@@ -1,11 +1,3 @@
 #!/bin/sh
 #
 # Copy this file into your .git/hooks folder
-
-set -e
-
-# Checks for:
-#   - Formatting errors
-#   - Clirr errors
-mvn com.coveo:fmt-maven-plugin:check clirr:check
-

From 162a4987eea82d47dcfd1fe7172cf8cae7718c53 Mon Sep 17 00:00:00 2001
From: Rajat Bhatta <93644539+rajatbhatta@users.noreply.github.com>
Date: Mon, 15 May 2023 13:21:38 +0530
Subject: [PATCH 3/6] Update snapshot.sh

---
 .kokoro/release/snapshot.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh
index 1f55b77024d..06177141adc 100755
--- a/.kokoro/release/snapshot.sh
+++ b/.kokoro/release/snapshot.sh
@@ -30,4 +30,5 @@ mvn clean deploy -B \
   -DperformRelease=true \
   -Dgpg.executable=gpg \
   -Dgpg.passphrase=${GPG_PASSPHRASE} \
-  -Dgpg.homedir=${GPG_HOMEDIR}
+  -Dgpg.homedir=${GPG_HOMEDIR} \
+  -Dclirr.skip=true

From f85e62a8f259f37b9d254ba74a028349ea3c618c Mon Sep 17 00:00:00 2001
From: Rajat Bhatta <93644539+rajatbhatta@users.noreply.github.com>
Date: Mon, 15 May 2023 13:24:21 +0530
Subject: [PATCH 4/6] Update samples.yaml

---
 .github/workflows/samples.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml
index d0eb0cb5def..8bc427d1eee 100644
--- a/.github/workflows/samples.yaml
+++ b/.github/workflows/samples.yaml
@@ -23,7 +23,7 @@ jobs:
         java-version: 11
         distribution: zulu
     - name: Compile Spanner
-      run: mvn clean install
+      run: mvn clean install -Dclirr.skip=true
     - uses: actions/setup-java@v3
       with:
         java-version: 8
@@ -44,7 +44,7 @@ jobs:
         java-version: ${{matrix.java}}
         distribution: zulu
     - name: Compile Spanner
-      run: mvn clean install
+      run: mvn clean install -Dclirr.skip=true
     - name: Compile samples
       run: mvn compile
-      working-directory: samples
\ No newline at end of file
+      working-directory: samples

From 046d990380994fa544f520962e3d0cd244cd7c98 Mon Sep 17 00:00:00 2001
From: Rajat Bhatta <93644539+rajatbhatta@users.noreply.github.com>
Date: Mon, 15 May 2023 13:53:00 +0530
Subject: [PATCH 5/6] Update pre-commit

---
 git-hooks/pre-commit | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit
index 7430e9c5850..0683a6fcc64 100755
--- a/git-hooks/pre-commit
+++ b/git-hooks/pre-commit
@@ -1,3 +1,8 @@
 #!/bin/sh
 #
 # Copy this file into your .git/hooks folder
+
+set -e
+
+# Checks for Formatting errors
+mvn com.coveo:fmt-maven-plugin:check

From 2ea318c177bd74a22b21eab24591034dcbb531d5 Mon Sep 17 00:00:00 2001
From: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Date: Mon, 15 May 2023 08:25:46 +0000
Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?=
 =?UTF-8?q?st-processor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md
---
 .kokoro/release/snapshot.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh
index 06177141adc..1f55b77024d 100755
--- a/.kokoro/release/snapshot.sh
+++ b/.kokoro/release/snapshot.sh
@@ -30,5 +30,4 @@ mvn clean deploy -B \
   -DperformRelease=true \
   -Dgpg.executable=gpg \
   -Dgpg.passphrase=${GPG_PASSPHRASE} \
-  -Dgpg.homedir=${GPG_HOMEDIR} \
-  -Dclirr.skip=true
+  -Dgpg.homedir=${GPG_HOMEDIR}