Skip to content

chore: [alloydb] refactor BUILD#9926

Merged
ddixit14 merged 7 commits into
mainfrom
owl-bot-copy-java-alloydb-connectors
Oct 10, 2023
Merged

chore: [alloydb] refactor BUILD#9926
ddixit14 merged 7 commits into
mainfrom
owl-bot-copy-java-alloydb-connectors

Conversation

@gcf-owl-bot

@gcf-owl-bot gcf-owl-bot Bot commented Sep 29, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor
  • Regenerate this pull request now.

PiperOrigin-RevId: 569615108

Source-Link: googleapis/googleapis@522f79c

Source-Link: https://github.com/googleapis/googleapis-gen/commit/14b8589bd8f4d4d92fc565fc9ae98030189ea3f7
Copy-Tag: eyJwIjoiamF2YS1hbGxveWRiLWNvbm5lY3RvcnMvLk93bEJvdC55YW1sIiwiaCI6IjE0Yjg1ODliZDhmNGQ0ZDkyZmM1NjVmYzlhZTk4MDMwMTg5ZWEzZjcifQ==

BEGIN_NESTED_COMMIT
feat: [alloydb] Add metadata exchange support for AlloyDB GA connectors
PiperOrigin-RevId: 569333566

Source-Link: googleapis/googleapis@bc4a508

Source-Link: https://github.com/googleapis/googleapis-gen/commit/551261595a8ca22c8aaf72eb7cd513b7513f9cec
Copy-Tag: eyJwIjoiamF2YS1hbGxveWRiLWNvbm5lY3RvcnMvLk93bEJvdC55YW1sIiwiaCI6IjU1MTI2MTU5NWE4Y2EyMmM4YWFmNzJlYjdjZDUxM2I3NTEzZjljZWMifQ==
END_NESTED_COMMIT

@gcf-owl-bot
feat: Add metadata exchange support for AlloyDB GA connectors
cacb1d2 
PiperOrigin-RevId: 569333566

Source-Link: googleapis/googleapis@bc4a508

Source-Link: https://github.com/googleapis/googleapis-gen/commit/551261595a8ca22c8aaf72eb7cd513b7513f9cec
Copy-Tag: eyJwIjoiamF2YS1hbGxveWRiLWNvbm5lY3RvcnMvLk93bEJvdC55YW1sIiwiaCI6IjU1MTI2MTU5NWE4Y2EyMmM4YWFmNzJlYjdjZDUxM2I3NTEzZjljZWMifQ==
@trusted-contributions-gcf trusted-contributions-gcf Bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Sep 29, 2023
@gcf-owl-bot gcf-owl-bot Bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 29, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Sep 29, 2023
@gcf-owl-bot gcf-owl-bot Bot marked this pull request as ready for review September 29, 2023 03:00
@trusted-contributions-gcf trusted-contributions-gcf Bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Sep 29, 2023
@gcf-owl-bot gcf-owl-bot Bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 29, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Sep 29, 2023
@gcf-owl-bot
chore: refactor BUILD
ec74274 
PiperOrigin-RevId: 569615108

Source-Link: googleapis/googleapis@522f79c

Source-Link: https://github.com/googleapis/googleapis-gen/commit/14b8589bd8f4d4d92fc565fc9ae98030189ea3f7
Copy-Tag: eyJwIjoiamF2YS1hbGxveWRiLWNvbm5lY3RvcnMvLk93bEJvdC55YW1sIiwiaCI6IjE0Yjg1ODliZDhmNGQ0ZDkyZmM1NjVmYzlhZTk4MDMwMTg5ZWEzZjcifQ==
@gcf-owl-bot gcf-owl-bot Bot changed the title feat: [alloydb] Add metadata exchange support for AlloyDB GA connectors chore: [alloydb] refactor BUILD Sep 30, 2023
@trusted-contributions-gcf trusted-contributions-gcf Bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Sep 30, 2023
@gcf-owl-bot gcf-owl-bot Bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 30, 2023
@trusted-contributions-gcf trusted-contributions-gcf Bot added the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 30, 2023
@gcf-owl-bot gcf-owl-bot Bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Sep 30, 2023
@ddixit14 ddixit14 added kokoro:force-run Add this label to force Kokoro to re-run the tests. and removed kokoro:force-run Add this label to force Kokoro to re-run the tests. labels Oct 9, 2023
@trusted-contributions-gcf trusted-contributions-gcf Bot added the owlbot:run Add this label to trigger the Owlbot post processor. label Oct 9, 2023
@gcf-owl-bot gcf-owl-bot Bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Oct 9, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Oct 9, 2023
@trusted-contributions-gcf trusted-contributions-gcf Bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Oct 9, 2023
@gcf-owl-bot gcf-owl-bot Bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Oct 9, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Oct 9, 2023
@trusted-contributions-gcf trusted-contributions-gcf Bot added kokoro:force-run Add this label to force Kokoro to re-run the tests. owlbot:run Add this label to trigger the Owlbot post processor. labels Oct 9, 2023
@gcf-owl-bot gcf-owl-bot Bot removed the owlbot:run Add this label to trigger the Owlbot post processor. label Oct 9, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Oct 9, 2023
@ddixit14

ddixit14 commented Oct 9, 2023

Copy link
Copy Markdown
Contributor

generation diff / root-pom (pull_request) and other pom.xml version match tests were failing with this error:

image

This looks like a snapshot/non-snapshot version thing required by release-please. At the time of merging non-release prs, the version should always be snapshot. Only the release-pr will have non-snapshot versions. Hence making it snapshot version.

@ddixit14

ddixit14 commented Oct 9, 2023

Copy link
Copy Markdown
Contributor

generation diff / consolidate-config (pull_request) failed with this error:

diff --git a/java-alloydb-connectors/proto-google-cloud-alloydb-connectors-v1/pom.xml b/java-alloydb-connectors/proto-google-cloud-alloydb-connectors-v1/pom.xml
[5](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:6)
index d9ba5ffc7..fa8f45b80 100644
[6](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:7)
--- a/java-alloydb-connectors/proto-google-cloud-alloydb-connectors-v1/pom.xml
[7](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:8)
+++ b/java-alloydb-connectors/proto-google-cloud-alloydb-connectors-v1/pom.xml
[8](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:9)
@@ -34,13 +34,4 @@
[9](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:10)
       <artifactId>guava</artifactId>
[10](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:11)
     </dependency>
[11](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:12)
   </dependencies>
[12](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:13)
-
[13](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:14)
-  <build>
[14](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:15)
-    <plugins>
[15](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:16)
-      <plugin>
[16](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:17)
-          <groupId>org.codehaus.mojo</groupId>
[17](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:18)
-          <artifactId>flatten-maven-plugin</artifactId>
[18](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:19)
-        </plugin>
[19](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:20)
-    </plugins>
[20](https://github.com/googleapis/google-cloud-java/actions/runs/6461367781/job/17540889998?pr=9926#step:4:21)
-  </build>

Removing this extra plugin configuration from the module (this should be inherited by the parent).

@ddixit14 ddixit14 added the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Oct 10, 2023
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run Add this label to force Kokoro to re-run the tests. label Oct 10, 2023
@ddixit14 ddixit14 merged commit 559675f into main Oct 10, 2023
@ddixit14 ddixit14 deleted the owl-bot-copy-java-alloydb-connectors branch October 10, 2023 14:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@blakeli0 blakeli0 blakeli0 approved these changes

Assignees

No one assigned

Labels

owl-bot-copy

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ddixit14 @blakeli0 @yoshi-kokoro