Skip to content

Commit

Permalink
test: remove unnecessary release tag from test data (#9552)
Browse files Browse the repository at this point in the history 
In https://togithub.com/googleapis/google-cloud-java/actions/runs/5293556156/jobs/9581838165?pr=9550 (which was invoked by https://togithub.com/googleapis/google-cloud-java/pull/9550/), the test data was modified by Release Please.

<img width="1198" alt="Screenshot 2023-06-16 at 4 31 10 PM" src="https://togithub.com/googleapis/google-cloud-java/assets/28604/64227a1b-f980-4a9a-a23d-928233fb84b3">


The annotations are irrelevant to the function of release note generation. Let's remove the annotations.
  • Loading branch information
@suztomo
suztomo authored Jun 16, 2023
1 parent 07a8685 commit a792d29
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 148 deletions.
55 changes: 1 addition & 54 deletions .github/release-note-generation/testdata/java-analytics-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
53 changes: 3 additions & 50 deletions .github/release-note-generation/testdata/java-maps-mapsplatformdatasets/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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>
46 changes: 3 additions & 43 deletions .github/release-note-generation/testdata/nested1/nested2/test-java-analytics-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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>

Expand All @@ -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>
3 changes: 2 additions & 1 deletion generation/check_non_release_please_versions.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a792d29

Please sign in to comment.