From a406306ac4060a24dc6ed78b0313bcbf75b9ab87 Mon Sep 17 00:00:00 2001
From: Blake Li <blakeli@google.com>
Date: Mon, 18 Nov 2024 15:40:44 -0500
Subject: [PATCH] fix!: Remove grpc module for gke-connect-gateway (#11315)

---
 .../.OwlBot-hermetic.yaml                     |  3 --
 .../pom.xml                                   |  5 ---
 .../google-cloud-gke-connect-gateway/pom.xml  |  5 ---
 .../pom.xml                                   | 45 -------------------
 java-gke-connect-gateway/pom.xml              |  6 ---
 versions.txt                                  |  1 -
 6 files changed, 65 deletions(-)

diff --git a/java-gke-connect-gateway/.OwlBot-hermetic.yaml b/java-gke-connect-gateway/.OwlBot-hermetic.yaml
index 93ba654f5cb9..0836e81c8682 100644
--- a/java-gke-connect-gateway/.OwlBot-hermetic.yaml
+++ b/java-gke-connect-gateway/.OwlBot-hermetic.yaml
@@ -15,15 +15,12 @@
 
 deep-remove-regex:
 - "/java-gke-connect-gateway/samples/snippets/generated"
-- "/java-gke-connect-gateway/grpc-google-.*/src"
 - "/java-gke-connect-gateway/proto-google-.*/src"
 - "/java-gke-connect-gateway/google-.*/src"
 
 deep-copy-regex:
 - source: "/google/cloud/gkeconnect/gateway/(v.*)/.*-java/proto-google-.*/src"
   dest: "/owl-bot-staging/java-gke-connect-gateway/$1/proto-google-cloud-gke-connect-gateway-$1/src"
-- source: "/google/cloud/gkeconnect/gateway/(v.*)/.*-java/grpc-google-.*/src"
-  dest: "/owl-bot-staging/java-gke-connect-gateway/$1/grpc-google-cloud-gke-connect-gateway-$1/src"
 - source: "/google/cloud/gkeconnect/gateway/(v.*)/.*-java/gapic-google-.*/src"
   dest: "/owl-bot-staging/java-gke-connect-gateway/$1/google-cloud-gke-connect-gateway/src"
 - source: "/google/cloud/gkeconnect/gateway/(v.*)/.*-java/samples/snippets/generated"
diff --git a/java-gke-connect-gateway/google-cloud-gke-connect-gateway-bom/pom.xml b/java-gke-connect-gateway/google-cloud-gke-connect-gateway-bom/pom.xml
index c23b7c835c06..fd1b6d0e02e6 100644
--- a/java-gke-connect-gateway/google-cloud-gke-connect-gateway-bom/pom.xml
+++ b/java-gke-connect-gateway/google-cloud-gke-connect-gateway-bom/pom.xml
@@ -29,11 +29,6 @@
         <artifactId>google-cloud-gke-connect-gateway</artifactId>
         <version>0.55.0</version><!-- {x-version-update:google-cloud-gke-connect-gateway:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-gke-connect-gateway-v1beta1</artifactId>
-        <version>0.55.0</version><!-- {x-version-update:grpc-google-cloud-gke-connect-gateway-v1beta1:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-gke-connect-gateway-v1beta1</artifactId>
diff --git a/java-gke-connect-gateway/google-cloud-gke-connect-gateway/pom.xml b/java-gke-connect-gateway/google-cloud-gke-connect-gateway/pom.xml
index 1b70c3cbb2c4..e01c527c82fe 100644
--- a/java-gke-connect-gateway/google-cloud-gke-connect-gateway/pom.xml
+++ b/java-gke-connect-gateway/google-cloud-gke-connect-gateway/pom.xml
@@ -65,11 +65,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-cloud-gke-connect-gateway-v1beta1</artifactId>
-      <scope>test</scope>
-    </dependency>
     <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>
diff --git a/java-gke-connect-gateway/grpc-google-cloud-gke-connect-gateway-v1beta1/pom.xml b/java-gke-connect-gateway/grpc-google-cloud-gke-connect-gateway-v1beta1/pom.xml
index 3c5bd9f686a4..e69de29bb2d1 100644
--- a/java-gke-connect-gateway/grpc-google-cloud-gke-connect-gateway-v1beta1/pom.xml
+++ b/java-gke-connect-gateway/grpc-google-cloud-gke-connect-gateway-v1beta1/pom.xml
@@ -1,45 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.google.api.grpc</groupId>
-  <artifactId>grpc-google-cloud-gke-connect-gateway-v1beta1</artifactId>
-  <version>0.55.0</version><!-- {x-version-update:grpc-google-cloud-gke-connect-gateway-v1beta1:current} -->
-  <name>grpc-google-cloud-gke-connect-gateway-v1beta1</name>
-  <description>GRPC library for google-cloud-gke-connect-gateway</description>
-  <parent>
-    <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-gke-connect-gateway-parent</artifactId>
-    <version>0.55.0</version><!-- {x-version-update:google-cloud-gke-connect-gateway:current} -->
-  </parent>
-  <dependencies>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-stub</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.grpc</groupId>
-      <artifactId>grpc-protobuf</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>proto-google-common-protos</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>proto-google-cloud-gke-connect-gateway-v1beta1</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/java-gke-connect-gateway/pom.xml b/java-gke-connect-gateway/pom.xml
index fd5c82af78ba..2248ae6cf53d 100644
--- a/java-gke-connect-gateway/pom.xml
+++ b/java-gke-connect-gateway/pom.xml
@@ -31,11 +31,6 @@
         <artifactId>google-cloud-gke-connect-gateway</artifactId>
         <version>0.55.0</version><!-- {x-version-update:google-cloud-gke-connect-gateway:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-gke-connect-gateway-v1beta1</artifactId>
-        <version>0.55.0</version><!-- {x-version-update:grpc-google-cloud-gke-connect-gateway-v1beta1:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-gke-connect-gateway-v1beta1</artifactId>
@@ -46,7 +41,6 @@
 
   <modules>
     <module>google-cloud-gke-connect-gateway</module>
-    <module>grpc-google-cloud-gke-connect-gateway-v1beta1</module>
     <module>proto-google-cloud-gke-connect-gateway-v1beta1</module>
     <module>google-cloud-gke-connect-gateway-bom</module>
   </modules>
diff --git a/versions.txt b/versions.txt
index e15e0201c830..6002741c495c 100644
--- a/versions.txt
+++ b/versions.txt
@@ -280,7 +280,6 @@ google-cloud-gke-backup:0.53.0:0.53.0
 proto-google-cloud-gke-backup-v1:0.53.0:0.53.0
 grpc-google-cloud-gke-backup-v1:0.53.0:0.53.0
 google-cloud-gke-connect-gateway:0.55.0:0.55.0
-grpc-google-cloud-gke-connect-gateway-v1beta1:0.55.0:0.55.0
 proto-google-cloud-gke-connect-gateway-v1beta1:0.55.0:0.55.0
 google-cloud-gkehub:1.54.0:1.54.0
 grpc-google-cloud-gkehub-v1beta1:0.60.0:0.60.0