-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: [cloudbuild] remove empty v2.CloudBuild definition #9077
Conversation
Owl bot is regenerating pull request 9077... |
PiperOrigin-RevId: 508723510 Source-Link: googleapis/googleapis@a3748ac Source-Link: https://github.com/googleapis/googleapis-gen/commit/d0365debed4331c15ddfa6ef2904d7da0cdee732 Copy-Tag: eyJwIjoiamF2YS1jbG91ZGJ1aWxkLy5Pd2xCb3QueWFtbCIsImgiOiJkMDM2NWRlYmVkNDMzMWMxNWRkZmE2ZWYyOTA0ZDdkYTBjZGVlNzMyIn0= feat: Client libraries for Cloud Build Repositories (preview) PiperOrigin-RevId: 506886904 Source-Link: googleapis/googleapis@88181f5 Source-Link: https://github.com/googleapis/googleapis-gen/commit/a534d6f4a4347faaee521e130e9608e9988f2047 Copy-Tag: eyJwIjoiamF2YS1jbG91ZGJ1aWxkLy5Pd2xCb3QueWFtbCIsImgiOiJhNTM0ZDZmNGE0MzQ3ZmFhZWU1MjFlMTMwZTk2MDhlOTk4OGYyMDQ3In0=
9c199ad
to
232c490
Compare
PiperOrigin-RevId: 509865389 Source-Link: googleapis/googleapis@573e7eb Source-Link: https://github.com/googleapis/googleapis-gen/commit/4c03ea45a7a2c247d9f5dd3b7fadbeece4b88e7d Copy-Tag: eyJwIjoiamF2YS1jbG91ZGJ1aWxkLy5Pd2xCb3QueWFtbCIsImgiOiI0YzAzZWE0NWE3YTJjMjQ3ZDlmNWRkM2I3ZmFkYmVlY2U0Yjg4ZTdkIn0=
Edit: missing dependencies need to be added manually to this PR. |
<profiles> | ||
<profile> | ||
<id>java9</id> | ||
<activation> | ||
<jdk>[9,)</jdk> | ||
</activation> | ||
<dependencies> | ||
<dependency> | ||
<groupId>javax.annotation</groupId> | ||
<artifactId>javax.annotation-api</artifactId> | ||
</dependency> | ||
</dependencies> | ||
</profile> | ||
</profiles> | ||
|
||
<build> | ||
<plugins> | ||
<plugin> | ||
<groupId>org.codehaus.mojo</groupId> | ||
<artifactId>flatten-maven-plugin</artifactId> | ||
</plugin> | ||
</plugins> | ||
</build> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Per #8637, it seems like this block should not have been included in this generated pom?
Logs from failing generation diff / consolidate-config
check:
diff --git a/java-cloudbuild/grpc-google-cloud-build-v2/pom.xml b/java-cloudbuild/grpc-google-cloud-build-v2/pom.xml
index 7e[5](https://github.com/googleapis/google-cloud-java/actions/runs/4189619832/jobs/7262150832#step:4:6)[6](https://github.com/googleapis/google-cloud-java/actions/runs/4189619832/jobs/7262150832#step:4:7)1eadc..fe7d400c1 100644
--- a/java-cloudbuild/grpc-google-cloud-build-v2/pom.xml
+++ b/java-cloudbuild/grpc-google-cloud-build-v2/pom.xml
@@ -42,2[8](https://github.com/googleapis/google-cloud-java/actions/runs/4189619832/jobs/7262150832#step:4:9) +42,4 @@
<artifactId>guava</artifactId>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>java[9](https://github.com/googleapis/google-cloud-java/actions/runs/4189619832/jobs/7262150832#step:4:10)</id>
- <activation>
- <jdk>[9,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
\ No newline at end of file
diff --git a/java-cloudbuild/proto-google-cloud-build-v2/pom.xml b/java-cloudbuild/proto-google-cloud-build-v2/pom.xml
index 434422f1c..f22d2eb45 100644
--- a/java-cloudbuild/proto-google-cloud-build-v2/pom.xml
+++ b/java-cloudbuild/proto-google-cloud-build-v2/pom.xml
@@ -34,13 +34,4 @@
<artifactId>guava</artifactId>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this is a similar issue as #8860 (comment). Manually updating in ff40aa4.
PiperOrigin-RevId: 509865389
Source-Link: googleapis/googleapis@573e7eb
Source-Link: https://github.com/googleapis/googleapis-gen/commit/4c03ea45a7a2c247d9f5dd3b7fadbeece4b88e7d
Copy-Tag: eyJwIjoiamF2YS1jbG91ZGJ1aWxkLy5Pd2xCb3QueWFtbCIsImgiOiI0YzAzZWE0NWE3YTJjMjQ3ZDlmNWRkM2I3ZmFkYmVlY2U0Yjg4ZTdkIn0=
BEGIN_NESTED_COMMIT
chore: [cloudbuild] configure CloudBuild V1 for PHP
PiperOrigin-RevId: 508723510
Source-Link: googleapis/googleapis@a3748ac
Source-Link: https://github.com/googleapis/googleapis-gen/commit/d0365debed4331c15ddfa6ef2904d7da0cdee732
Copy-Tag: eyJwIjoiamF2YS1jbG91ZGJ1aWxkLy5Pd2xCb3QueWFtbCIsImgiOiJkMDM2NWRlYmVkNDMzMWMxNWRkZmE2ZWYyOTA0ZDdkYTBjZGVlNzMyIn0=
feat: Client libraries for Cloud Build Repositories (preview)
PiperOrigin-RevId: 506886904
Source-Link: googleapis/googleapis@88181f5
Source-Link: https://github.com/googleapis/googleapis-gen/commit/a534d6f4a4347faaee521e130e9608e9988f2047
Copy-Tag: eyJwIjoiamF2YS1jbG91ZGJ1aWxkLy5Pd2xCb3QueWFtbCIsImgiOiJhNTM0ZDZmNGE0MzQ3ZmFhZWU1MjFlMTMwZTk2MDhlOTk4OGYyMDQ3In0=
END_NESTED_COMMIT