feat: remove GKEHubv1alpha2 (#10415)

* feat: remove GKEHubv1alpha2 * chore:simplify deep-copy syntax. --------- Co-authored-by: Min Zhu <zhumin@google.com>
googleapis · Mar 4, 2024 · 3e95fa4 · 3e95fa4
1 parent a90ba11
commit 3e95fa4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 59 deletions.
diff --git a/java-gkehub/.OwlBot.yaml b/java-gkehub/.OwlBot.yaml
@@ -20,32 +20,10 @@ deep-remove-regex:
 - "/java-gkehub/google-.*/src"
 
 deep-copy-regex:
-- source: "/google/cloud/gkehub/v1/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/java-gkehub/v1/proto-google-cloud-gkehub-v1/src"
-- source: "/google/cloud/gkehub/v1alpha/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/java-gkehub/v1alpha/proto-google-cloud-gkehub-v1alpha/src"
-- source: "/google/cloud/gkehub/v1beta/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/java-gkehub/v1beta/proto-google-cloud-gkehub-v1beta/src"
-- source: "/google/cloud/gkehub/v1beta1/.*-java/proto-google-.*/src/main/java/com/google/cloud/gkehub"
-  dest: "/owl-bot-staging/java-gkehub/v1beta1/proto-google-cloud-gkehub-v1beta1/src/main/java/com/google/cloud/gkehub"
-- source: "/google/cloud/gkehub/v1alpha2/.*-java/proto-google-.*/src/main/java/com/google/cloud/gkehub"
-  dest: "/owl-bot-staging/java-gkehub/v1alpha2/proto-google-cloud-gkehub-v1alpha2/src/main/java/com/google/cloud/gkehub"
-
-- source: "/google/cloud/gkehub/v1beta1/.*-java/proto-google-.*/src/main/proto/google/cloud/gkehub"
-  dest: "/owl-bot-staging/java-gkehub/v1beta1/proto-google-cloud-gkehub-v1beta1/src/main/proto/google/cloud/gkehub"
-- source: "/google/cloud/gkehub/v1alpha2/.*-java/proto-google-.*/src/main/proto/google/cloud/gkehub"
-  dest: "/owl-bot-staging/java-gkehub/v1alpha2/proto-google-cloud-gkehub-v1alpha2/src/main/proto/google/cloud/gkehub"
-
-- source: "/google/cloud/gkehub/v1/.*-java/grpc-google-.*/src"
-  dest: "/owl-bot-staging/java-gkehub/v1/grpc-google-cloud-gkehub-v1/src"
-- source: "/google/cloud/gkehub/v1alpha/.*-java/grpc-google-.*/src"
-  dest: "/owl-bot-staging/java-gkehub/v1alpha/grpc-google-cloud-gkehub-v1alpha/src"
-- source: "/google/cloud/gkehub/v1beta/.*-java/grpc-google-.*/src"
-  dest: "/owl-bot-staging/java-gkehub/v1beta/grpc-google-cloud-gkehub-v1beta/src"
-- source: "/google/cloud/gkehub/v1beta1/.*-java/grpc-google-.*/src/main/java/com/google/cloud/gkehub"
-  dest: "/owl-bot-staging/java-gkehub/v1beta1/grpc-google-cloud-gkehub-v1beta1/src/main/java/com/google/cloud/gkehub"
-- source: "/google/cloud/gkehub/v1alpha2/.*-java/grpc-google-.*/src/main/java/com/google/cloud/gkehub"
-  dest: "/owl-bot-staging/java-gkehub/v1alpha2/grpc-google-cloud-gkehub-v1alpha2/src/main/java/com/google/cloud/gkehub"
+- source: "/google/cloud/gkehub/(v.*)/.*-java/proto-google-.*/src"
+  dest: "/owl-bot-staging/java-gkehub/$1/proto-google-cloud-gkehub-$1/src"
+- source: "/google/cloud/gkehub/(v.*)/.*-java/grpc-google-.*/src"
+  dest: "/owl-bot-staging/java-gkehub/$1/grpc-google-cloud-gkehub-$1/src"
 
 - source: "/google/cloud/gkehub/(v.*)/.*-java/gapic-google-.*/src"
   dest: "/owl-bot-staging/java-gkehub/$1/google-cloud-gkehub/src"

diff --git a/java-gkehub/google-cloud-gkehub-bom/pom.xml b/java-gkehub/google-cloud-gkehub-bom/pom.xml
@@ -49,11 +49,6 @@
         <artifactId>grpc-google-cloud-gkehub-v1beta</artifactId>
         <version>0.43.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-gkehub-v1beta:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-gkehub-v1alpha2</artifactId>
-        <version>0.43.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-gkehub-v1alpha2:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-gkehub-v1beta1</artifactId>
@@ -69,11 +64,6 @@
         <artifactId>proto-google-cloud-gkehub-v1alpha</artifactId>
         <version>0.43.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-gkehub-v1alpha:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-gkehub-v1alpha2</artifactId>
-        <version>0.43.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-gkehub-v1alpha2:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-gkehub-v1beta</artifactId>

diff --git a/java-gkehub/google-cloud-gkehub/pom.xml b/java-gkehub/google-cloud-gkehub/pom.xml
@@ -57,10 +57,6 @@
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-gkehub-v1beta</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>proto-google-cloud-gkehub-v1alpha2</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-gkehub-v1alpha</artifactId>
@@ -106,11 +102,6 @@
       <artifactId>grpc-google-cloud-gkehub-v1beta1</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-cloud-gkehub-v1alpha2</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>grpc-google-cloud-gkehub-v1beta</artifactId>

diff --git a/java-gkehub/pom.xml b/java-gkehub/pom.xml
@@ -36,11 +36,6 @@
         <artifactId>proto-google-cloud-gkehub-v1beta</artifactId>
         <version>0.43.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-gkehub-v1beta:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-gkehub-v1alpha2</artifactId>
-        <version>0.43.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-gkehub-v1alpha2:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-gkehub-v1alpha</artifactId>
@@ -51,11 +46,6 @@
         <artifactId>proto-google-cloud-gkehub-v1</artifactId>
         <version>1.37.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-gkehub-v1:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-gkehub-v1alpha2</artifactId>
-        <version>0.43.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-gkehub-v1alpha2:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-gkehub-v1beta</artifactId>
@@ -90,11 +80,9 @@
     <module>grpc-google-cloud-gkehub-v1</module>
     <module>grpc-google-cloud-gkehub-v1alpha</module>
     <module>grpc-google-cloud-gkehub-v1beta</module>
-    <module>grpc-google-cloud-gkehub-v1alpha2</module>
     <module>proto-google-cloud-gkehub-v1beta1</module>
     <module>proto-google-cloud-gkehub-v1</module>
     <module>proto-google-cloud-gkehub-v1alpha</module>
-    <module>proto-google-cloud-gkehub-v1alpha2</module>
     <module>proto-google-cloud-gkehub-v1beta</module>
     <module>google-cloud-gkehub-bom</module>
   </modules>

diff --git a/versions.txt b/versions.txt
@@ -288,11 +288,9 @@ grpc-google-cloud-gkehub-v1beta1:0.42.0:0.43.0-SNAPSHOT
 grpc-google-cloud-gkehub-v1:1.36.0:1.37.0-SNAPSHOT
 grpc-google-cloud-gkehub-v1alpha:0.42.0:0.43.0-SNAPSHOT
 grpc-google-cloud-gkehub-v1beta:0.42.0:0.43.0-SNAPSHOT
-grpc-google-cloud-gkehub-v1alpha2:0.42.0:0.43.0-SNAPSHOT
 proto-google-cloud-gkehub-v1beta1:0.42.0:0.43.0-SNAPSHOT
 proto-google-cloud-gkehub-v1:1.36.0:1.37.0-SNAPSHOT
 proto-google-cloud-gkehub-v1alpha:0.42.0:0.43.0-SNAPSHOT
-proto-google-cloud-gkehub-v1alpha2:0.42.0:0.43.0-SNAPSHOT
 proto-google-cloud-gkehub-v1beta:0.42.0:0.43.0-SNAPSHOT
 google-cloud-gke-multi-cloud:0.35.0:0.36.0-SNAPSHOT
 proto-google-cloud-gke-multi-cloud-v1:0.35.0:0.36.0-SNAPSHOT