Skip to content
This repository was archived by the owner on Feb 6, 2026. It is now read-only.

chore: migrate to owlbot#669

Merged
simonz130 merged 3 commits into
masterfrom
owlbot-migration
Sep 16, 2021
Merged

chore: migrate to owlbot#669
simonz130 merged 3 commits into
masterfrom
owlbot-migration

Conversation

@Neenu1995

Copy link
Copy Markdown
Contributor

No description provided.

@Neenu1995 Neenu1995 requested review from a team September 14, 2021 20:38
@google-cla google-cla Bot added the cla: yes This human has signed the Contributor License Agreement. label Sep 14, 2021
@generated-files-bot

Copy link
Copy Markdown

Warning: This pull request is touching the following templated files:

  • .github/trusted-contribution.yml
  • .github/workflows/ci.yaml
  • .kokoro/release/common.sh
  • .kokoro/release/drop.sh
  • .kokoro/release/promote.sh
  • .kokoro/release/publish_javadoc.sh
  • .kokoro/release/publish_javadoc11.sh
  • .kokoro/release/stage.sh
  • .kokoro/trampoline.sh
  • renovate.json

@product-auto-label product-auto-label Bot added the api: logging Issues related to the googleapis/java-logging API. label Sep 14, 2021

@minherz minherz left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be possible to comment on all the order changes in CI and POM files?

Comment thread .github/workflows/ci.yaml Outdated
Comment on lines -14 to -17
- uses: actions/checkout@v2
- uses: stCarolas/setup-maven@v4
with:
maven-version: 3.8.1
- uses: actions/checkout@v2

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is a reason to change the order?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The order of these commands across libraries is as owlbot's change here. Set up the environment first, then setup the maven version.

Comment thread README.md
Comment on lines -45 to +53
<version>3.1.0</version>
<version>3.1.1</version>
</dependency>

```

If you are using Gradle 5.x or later, add this to your dependencies

```Groovy
implementation platform('com.google.cloud:libraries-bom:22.0.0')
implementation platform('com.google.cloud:libraries-bom:23.0.0')

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aren't these supposed to be auto-generated?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They are autogenerated. When running the migration script, it picks up all the latest unmerged changes in the repo.

Comment thread google-cloud-logging-bom/pom.xml Outdated
Comment on lines +55 to +66
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-logging-v2</artifactId>
<version>0.90.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging</artifactId>
<version>3.1.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-logging-v2</artifactId>
<version>0.90.2-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-logging-v2:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-logging</artifactId>
<version>3.1.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-logging:current} -->
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-logging-v2</artifactId>
<version>0.90.2-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-logging-v2:current} -->

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there any specific reason to change order of the dependencies?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change in the order of dependencies doesn't make any difference since maven creates its own dependency tree and resolves the order. Owlbot reorders the dependencies purely for consistency across libraries.

Comment thread pom.xml
Comment on lines -138 to +140
<module>proto-google-cloud-logging-v2</module>
<module>grpc-google-cloud-logging-v2</module>
<module>google-cloud-logging</module>
<module>grpc-google-cloud-logging-v2</module>
<module>proto-google-cloud-logging-v2</module>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same question about the order.

@Neenu1995 Neenu1995 Sep 16, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same. For consistency.

@Neenu1995 Neenu1995 requested a review from minherz September 16, 2021 21:42
@simonz130

Copy link
Copy Markdown

@minherz - this PR is autogenerated. I'm merging it.

@simonz130 simonz130 merged commit ff7c4d1 into master Sep 16, 2021
@simonz130 simonz130 deleted the owlbot-migration branch September 16, 2021 22:35
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

api: logging Issues related to the googleapis/java-logging API. cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants