From f4d0c127e4ed8e38b7855ce58fe88d86a70e6e16 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Fri, 16 Jun 2023 16:36:36 -0400
Subject: [PATCH 1/2] test: remove unnecessary release tag from test data

---
 .../testdata/java-analytics-admin/pom.xml     | 55 +------------------
 .../java-maps-mapsplatformdatasets/pom.xml    | 53 +-----------------
 .../nested2/test-java-analytics-admin/pom.xml | 46 +---------------
 3 files changed, 7 insertions(+), 147 deletions(-)

diff --git a/.github/release-note-generation/testdata/java-analytics-admin/pom.xml b/.github/release-note-generation/testdata/java-analytics-admin/pom.xml
index a91027894410..ace51afbf239 100644
--- a/.github/release-note-generation/testdata/java-analytics-admin/pom.xml
+++ b/.github/release-note-generation/testdata/java-analytics-admin/pom.xml
@@ -4,63 +4,10 @@
   <groupId>com.google.analytics</groupId>
   <artifactId>google-analytics-admin-parent</artifactId>
   <packaging>pom</packaging>
-  <version>0.29.0</version><!-- {x-version-update:google-analytics-admin:current} -->
+  <version>0.29.0</version>
   <name>Google Analytics Admin Parent</name>
   <description>
     Java idiomatic client for Google Cloud Platform services.
   </description>
 
-  <parent>
-    <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-jar-parent</artifactId>
-    <version>1.13.0</version><!-- {x-version-update:google-cloud-java:current} -->
-    <relativePath>../google-cloud-jar-parent/pom.xml</relativePath>
-  </parent>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <github.global.server>github</github.global.server>
-    <site.installationModule>google-analytics-admin-parent</site.installationModule>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.google.analytics</groupId>
-        <artifactId>google-analytics-admin</artifactId>
-        <version>0.29.0</version><!-- {x-version-update:google-analytics-admin:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-analytics-admin-v1beta</artifactId>
-        <version>0.29.0</version><!-- {x-version-update:proto-google-analytics-admin-v1beta:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-analytics-admin-v1beta</artifactId>
-        <version>0.29.0</version><!-- {x-version-update:grpc-google-analytics-admin-v1beta:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-analytics-admin-v1alpha</artifactId>
-        <version>0.29.0</version><!-- {x-version-update:proto-google-analytics-admin-v1alpha:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-analytics-admin-v1alpha</artifactId>
-        <version>0.29.0</version><!-- {x-version-update:grpc-google-analytics-admin-v1alpha:current} -->
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <modules>
-    <module>google-analytics-admin</module>
-    <module>grpc-google-analytics-admin-v1alpha</module>
-    <module>grpc-google-analytics-admin-v1beta</module>
-    <module>proto-google-analytics-admin-v1alpha</module>
-    <module>proto-google-analytics-admin-v1beta</module>
-    <module>google-analytics-admin-bom</module>
-  </modules>
-
   </project>
diff --git a/.github/release-note-generation/testdata/java-maps-mapsplatformdatasets/pom.xml b/.github/release-note-generation/testdata/java-maps-mapsplatformdatasets/pom.xml
index 1e7f28449da9..b5217d3a0e77 100644
--- a/.github/release-note-generation/testdata/java-maps-mapsplatformdatasets/pom.xml
+++ b/.github/release-note-generation/testdata/java-maps-mapsplatformdatasets/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.maps</groupId>
   <artifactId>google-maps-mapsplatformdatasets-parent</artifactId>
   <packaging>pom</packaging>
-  <version>0.8.0</version><!-- {x-version-update:google-maps-mapsplatformdatasets:current} -->
+  <version>0.8.0</version>
   <name>Google Maps Platform Datasets API Parent</name>
   <description>
     Java idiomatic client for Google Cloud Platform services.
@@ -13,54 +13,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-jar-parent</artifactId>
-    <version>1.13.0</version><!-- {x-version-update:google-cloud-java:current} -->
+    <version>1.13.0</version>
     <relativePath>../google-cloud-jar-parent/pom.xml</relativePath>
   </parent>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <github.global.server>github</github.global.server>
-    <site.installationModule>google-maps-mapsplatformdatasets-parent</site.installationModule>
-  </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.google.maps</groupId>
-        <artifactId>google-maps-mapsplatformdatasets</artifactId>
-        <version>0.8.0</version><!-- {x-version-update:google-maps-mapsplatformdatasets:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.maps.api.grpc</groupId>
-        <artifactId>proto-google-maps-mapsplatformdatasets-v1</artifactId>
-        <version>0.8.0</version><!-- {x-version-update:proto-google-maps-mapsplatformdatasets-v1:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.maps.api.grpc</groupId>
-        <artifactId>grpc-google-maps-mapsplatformdatasets-v1</artifactId>
-        <version>0.8.0</version><!-- {x-version-update:grpc-google-maps-mapsplatformdatasets-v1:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.maps.api.grpc</groupId>
-        <artifactId>grpc-google-maps-mapsplatformdatasets-v1alpha</artifactId>
-        <version>0.8.0</version><!-- {x-version-update:grpc-google-maps-mapsplatformdatasets-v1alpha:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.maps.api.grpc</groupId>
-        <artifactId>proto-google-maps-mapsplatformdatasets-v1alpha</artifactId>
-        <version>0.8.0</version><!-- {x-version-update:proto-google-maps-mapsplatformdatasets-v1alpha:current} -->
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <modules>
-    <module>google-maps-mapsplatformdatasets</module>
-    <module>grpc-google-maps-mapsplatformdatasets-v1alpha</module>
-    <module>grpc-google-maps-mapsplatformdatasets-v1</module>
-    <module>proto-google-maps-mapsplatformdatasets-v1alpha</module>
-    <module>proto-google-maps-mapsplatformdatasets-v1</module>
-    <module>google-maps-mapsplatformdatasets-bom</module>
-  </modules>
-
-  </project>
+</project>
diff --git a/.github/release-note-generation/testdata/nested1/nested2/test-java-analytics-admin/pom.xml b/.github/release-note-generation/testdata/nested1/nested2/test-java-analytics-admin/pom.xml
index a91027894410..4d6f685af31b 100644
--- a/.github/release-note-generation/testdata/nested1/nested2/test-java-analytics-admin/pom.xml
+++ b/.github/release-note-generation/testdata/nested1/nested2/test-java-analytics-admin/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.analytics</groupId>
   <artifactId>google-analytics-admin-parent</artifactId>
   <packaging>pom</packaging>
-  <version>0.29.0</version><!-- {x-version-update:google-analytics-admin:current} -->
+  <version>0.29.0</version>
   <name>Google Analytics Admin Parent</name>
   <description>
     Java idiomatic client for Google Cloud Platform services.
@@ -13,7 +13,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-jar-parent</artifactId>
-    <version>1.13.0</version><!-- {x-version-update:google-cloud-java:current} -->
+    <version>1.13.0</version>
     <relativePath>../google-cloud-jar-parent/pom.xml</relativePath>
   </parent>
 
@@ -23,44 +23,4 @@
     <github.global.server>github</github.global.server>
     <site.installationModule>google-analytics-admin-parent</site.installationModule>
   </properties>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.google.analytics</groupId>
-        <artifactId>google-analytics-admin</artifactId>
-        <version>0.29.0</version><!-- {x-version-update:google-analytics-admin:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-analytics-admin-v1beta</artifactId>
-        <version>0.29.0</version><!-- {x-version-update:proto-google-analytics-admin-v1beta:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-analytics-admin-v1beta</artifactId>
-        <version>0.29.0</version><!-- {x-version-update:grpc-google-analytics-admin-v1beta:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>proto-google-analytics-admin-v1alpha</artifactId>
-        <version>0.29.0</version><!-- {x-version-update:proto-google-analytics-admin-v1alpha:current} -->
-      </dependency>
-      <dependency>
-        <groupId>com.google.api.grpc</groupId>
-        <artifactId>grpc-google-analytics-admin-v1alpha</artifactId>
-        <version>0.29.0</version><!-- {x-version-update:grpc-google-analytics-admin-v1alpha:current} -->
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-
-  <modules>
-    <module>google-analytics-admin</module>
-    <module>grpc-google-analytics-admin-v1alpha</module>
-    <module>grpc-google-analytics-admin-v1beta</module>
-    <module>proto-google-analytics-admin-v1alpha</module>
-    <module>proto-google-analytics-admin-v1beta</module>
-    <module>google-analytics-admin-bom</module>
-  </modules>
-
-  </project>
+</project>

From 5e29d088b5ec723a132a44e36e2f742a8e93cf8f Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Fri, 16 Jun 2023 16:42:03 -0400
Subject: [PATCH 2/2] allow unmanaged version files in .github

---
 generation/check_non_release_please_versions.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/generation/check_non_release_please_versions.sh b/generation/check_non_release_please_versions.sh
index 5c45738ded2c..41b5c1a98d05 100755
--- a/generation/check_non_release_please_versions.sh
+++ b/generation/check_non_release_please_versions.sh
@@ -7,7 +7,8 @@ for pomFile in $(find . -mindepth 2 -name pom.xml | sort ); do
   if [[ "${pomFile}" =~ .*google-cloud-jar-parent.* ]] || \
       [[ "${pomFile}" =~ .*google-cloud-pom-parent.* ]] || \
       [[ "${pomFile}" =~ .*CoverageAggregator.* ]] || \
-      [[ "${pomFile}" =~ .*java-shared-dependencies*. ]]; then
+      [[ "${pomFile}" =~ .*java-shared-dependencies*. ]] || \
+      [[ "${pomFile}" =~ .*.github*. ]]; then
     continue
   fi
   if [[ "${pomFile}" =~ .*owl-bot-postprocessor.* ]]; then