From 967bee2e1e7e6311bbf9cdb101338b5ce7ddbdb0 Mon Sep 17 00:00:00 2001
From: Burke Davison <40617934+burkedavison@users.noreply.github.com>
Date: Thu, 3 Aug 2023 18:13:49 +0000
Subject: [PATCH] fix: remove netapp v1beta1 project remnants (#9729)

* fix: remove netapp v1beta1 project remnants

* chore: also remove netapp v1beta1 from netapp-bom
---
 java-netapp/google-cloud-netapp-bom/pom.xml   | 10 -----
 java-netapp/google-cloud-netapp/pom.xml       |  9 ----
 .../grpc-google-cloud-netapp-v1beta1/pom.xml  | 45 -------------------
 java-netapp/pom.xml                           | 14 +-----
 .../clirr-ignored-differences.xml             | 19 --------
 .../proto-google-cloud-netapp-v1beta1/pom.xml | 37 ---------------
 6 files changed, 1 insertion(+), 133 deletions(-)
 delete mode 100644 java-netapp/grpc-google-cloud-netapp-v1beta1/pom.xml
 delete mode 100644 java-netapp/proto-google-cloud-netapp-v1beta1/clirr-ignored-differences.xml
 delete mode 100644 java-netapp/proto-google-cloud-netapp-v1beta1/pom.xml

diff --git a/java-netapp/google-cloud-netapp-bom/pom.xml b/java-netapp/google-cloud-netapp-bom/pom.xml
index eb79e8806d22..36db09821be5 100644
--- a/java-netapp/google-cloud-netapp-bom/pom.xml
+++ b/java-netapp/google-cloud-netapp-bom/pom.xml
@@ -29,21 +29,11 @@
         <artifactId>google-cloud-netapp</artifactId>
         <version>0.2.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-netapp:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-netapp-v1beta1</artifactId>
-        <version>0.2.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-netapp-v1beta1:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-netapp-v1</artifactId>
         <version>0.2.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-netapp-v1:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-netapp-v1beta1</artifactId>
-        <version>0.2.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-netapp-v1beta1:current} -->
-      </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-netapp-v1</artifactId>
diff --git a/java-netapp/google-cloud-netapp/pom.xml b/java-netapp/google-cloud-netapp/pom.xml
index fcfdd30697fa..3addfd46b49d 100644
--- a/java-netapp/google-cloud-netapp/pom.xml
+++ b/java-netapp/google-cloud-netapp/pom.xml
@@ -45,10 +45,6 @@
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-netapp-v1</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>proto-google-cloud-netapp-v1beta1</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -94,11 +90,6 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-cloud-netapp-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-netapp/grpc-google-cloud-netapp-v1beta1/pom.xml b/java-netapp/grpc-google-cloud-netapp-v1beta1/pom.xml
deleted file mode 100644
index 886dd2e3b370..000000000000
--- a/java-netapp/grpc-google-cloud-netapp-v1beta1/pom.xml
+++ /dev/null
@@ -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-netapp-v1beta1</artifactId>
-  <version>0.2.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-netapp-v1beta1:current} -->
-  <name>grpc-google-cloud-netapp-v1beta1</name>
-  <description>GRPC library for google-cloud-netapp</description>
-  <parent>
-    <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-netapp-parent</artifactId>
-    <version>0.2.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-netapp: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-netapp-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-netapp/pom.xml b/java-netapp/pom.xml
index 9d9947d89717..d1c22eeb2056 100644
--- a/java-netapp/pom.xml
+++ b/java-netapp/pom.xml
@@ -41,26 +41,14 @@
         <artifactId>grpc-google-cloud-netapp-v1</artifactId>
         <version>0.2.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-netapp-v1:current} -->
       </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-cloud-netapp-v1beta1</artifactId>
-        <version>0.2.0-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-netapp-v1beta1:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-cloud-netapp-v1beta1</artifactId>
-        <version>0.2.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-netapp-v1beta1:current} -->
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
   <modules>
     <module>google-cloud-netapp</module>
-    <module>grpc-google-cloud-netapp-v1beta1</module>
     <module>grpc-google-cloud-netapp-v1</module>
-    <module>proto-google-cloud-netapp-v1beta1</module>
     <module>proto-google-cloud-netapp-v1</module>
     <module>google-cloud-netapp-bom</module>
   </modules>
 
-  </project>
+</project>
diff --git a/java-netapp/proto-google-cloud-netapp-v1beta1/clirr-ignored-differences.xml b/java-netapp/proto-google-cloud-netapp-v1beta1/clirr-ignored-differences.xml
deleted file mode 100644
index 646af43d1297..000000000000
--- a/java-netapp/proto-google-cloud-netapp-v1beta1/clirr-ignored-differences.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
-<differences>
-  <difference>
-    <differenceType>7012</differenceType>
-    <className>com/google/cloud/netapp/v1beta1/*OrBuilder</className>
-    <method>* get*(*)</method>
-  </difference>
-  <difference>
-    <differenceType>7012</differenceType>
-    <className>com/google/cloud/netapp/v1beta1/*OrBuilder</className>
-    <method>boolean contains*(*)</method>
-  </difference>
-  <difference>
-    <differenceType>7012</differenceType>
-    <className>com/google/cloud/netapp/v1beta1/*OrBuilder</className>
-    <method>boolean has*(*)</method>
-  </difference>
-</differences>
diff --git a/java-netapp/proto-google-cloud-netapp-v1beta1/pom.xml b/java-netapp/proto-google-cloud-netapp-v1beta1/pom.xml
deleted file mode 100644
index 0aac555a5b03..000000000000
--- a/java-netapp/proto-google-cloud-netapp-v1beta1/pom.xml
+++ /dev/null
@@ -1,37 +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>proto-google-cloud-netapp-v1beta1</artifactId>
-  <version>0.2.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-netapp-v1beta1:current} -->
-  <name>proto-google-cloud-netapp-v1beta1</name>
-  <description>Proto library for google-cloud-netapp</description>
-  <parent>
-    <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-netapp-parent</artifactId>
-    <version>0.2.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-netapp:current} -->
-  </parent>
-  <dependencies>
-    <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-iam-v1</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.api</groupId>
-      <artifactId>api-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-  </dependencies>
-</project>