Skip to content
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.

Sign up for GitHub

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

Jump to bottom

deps: normalize dependencies #2574

Merged
merged 7 commits into from
Mar 15, 2024
Merged

deps: normalize dependencies #2574

merged 7 commits into from
Mar 15, 2024

Conversation

diegomarquezp
Copy link
Contributor

No description provided.

@diegomarquezp diegomarquezp requested a review from a team as a code owner March 14, 2024 21:07
@product-auto-label product-auto-label bot added the size: xs Pull request size is extra small. label Mar 14, 2024
@diegomarquezp diegomarquezp changed the title deps: update guava.version to 33.1.0-jre deps: update guava.version to 33.1.0-jre and add error_prone_annotations to java-core Mar 14, 2024
@product-auto-label product-auto-label bot added size: s Pull request size is small. and removed size: xs Pull request size is extra small. labels Mar 14, 2024
@diegomarquezp diegomarquezp changed the title deps: update guava.version to 33.1.0-jre and add error_prone_annotations to java-core deps: normalize dependencies Mar 14, 2024
@diegomarquezp diegomarquezp mentioned this pull request Mar 14, 2024
Open
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Mar 14, 2024

Quality Gate Passed Quality Gate passed for 'gapic-generator-java-root'

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Mar 14, 2024

Quality Gate Passed Quality Gate passed for 'java_showcase_integration_tests'

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

blakeli0
blakeli0 reviewed Mar 14, 2024
View reviewed changes
api-common-java/pom.xml
<dependency>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
<version>${j2objc-annotations.version}</version>
Copy link
Collaborator

Choose a reason for hiding this comment

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

@suztomo We have to declare this dependency here and the version in gapic-generator-java-pom-parent, to resolve a Maven enforcer failure. In addition, it is already declared in third-party-dependencies, do you have a good way to declare this dependency in a centralized place?

Copy link
Member

Choose a reason for hiding this comment

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

Use variables. Follow gRPC's version.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We are using variables for errorprone and j2objc in

  • gapic-generator-java-pom-parent
  • java-shared-dependencies/third-party-dependencies

suztomo
suztomo reviewed Mar 15, 2024
View reviewed changes
java-shared-dependencies/third-party-dependencies/pom.xml
@@ -37,7 +37,7 @@
<!-- ensure checker-qual version matches what Guava uses -->
<checker-qual.version>3.42.0</checker-qual.version>
<perfmark-api.version>0.27.0</perfmark-api.version>
<j2objc-annotations.version>2.8</j2objc-annotations.version>
Copy link
Member

Choose a reason for hiding this comment

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

Shall we keep this as old version for now, to reduce uncertainty?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was necessary as part of updating guava to 33.1.0. Setting it to 2.8 causes:

[ERROR] Failed to execute goal org.apache.maven.plugins:maven-enforcer-plugin:3.4.1:enforce (enforce) on project grpc-google-common-protos: 
[ERROR] Rule 2: org.apache.maven.enforcer.rules.dependency.RequireUpperBoundDeps failed with message:
[ERROR] Failed while enforcing RequireUpperBoundDeps. The error(s) are [
[ERROR] Require upper bound dependencies error for com.google.j2objc:j2objc-annotations:2.8 paths to dependency are:
[ERROR] +-com.google.api.grpc:grpc-google-common-protos:2.36.1-SNAPSHOT
[ERROR]   +-com.google.guava:guava:33.1.0-jre
[ERROR]     +-com.google.j2objc:j2objc-annotations:2.8 (managed) <-- com.google.j2objc:j2objc-annotations:3.0.0
[ERROR] ]
[ERROR] -> [Help 1]

Copy link
Member

Choose a reason for hiding this comment

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

OK. Thank you for checking.

suztomo
suztomo reviewed Mar 15, 2024
View reviewed changes
gapic-generator-java-pom-parent/pom.xml
@@ -30,10 +30,12 @@
<google.auth.version>1.23.0</google.auth.version>
<google.http-client.version>1.44.1</google.http-client.version>
<gson.version>2.10.1</gson.version>
<guava.version>32.1.3-jre</guava.version>
Copy link
Member

Choose a reason for hiding this comment

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

Can you check the release note for Guava 33 for any breaking changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, I just did. I did not find any breaking changes

Copy link
Member

Choose a reason for hiding this comment

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

Thank you

@diegomarquezp diegomarquezp merged commit 6622238 into main Mar 15, 2024
44 checks passed
@diegomarquezp diegomarquezp deleted the update-guava-version branch March 15, 2024 14:53
@release-please release-please bot mentioned this pull request Mar 15, 2024
Merged
diegomarquezp pushed a commit that referenced this pull request Mar 15, 2024
@release-please
chore(main): release 2.38.0 (#2529)
b4006c2 
🤖 I have created a release *beep* *boop*
---


<details><summary>2.38.0</summary>

##
[2.38.0](v2.37.0...v2.38.0)
(2024-03-15)


### Features

* [common-protos] add `api_version` extension to `ServiceOptions`, for
collaborative versioning
([d343be9](d343be9))
* [common-protos] add `api_version` extension to `ServiceOptions`, for
collaborative versioning
([#2551](#2551))
([d343be9](d343be9))
* add `ErrorReason.LOCATION_POLICY_VIOLATED` enum value
([d343be9](d343be9))
* add `ErrorReason.LOCATION_POLICY_VIOLATED` enum value
([d343be9](d343be9))
* add `Publishing.rest_reference_documentation_uri` to aid client
library publication
([d343be9](d343be9))
* add `Publishing.rest_reference_documentation_uri` to aid client
library publication
([d343be9](d343be9))
* Add shopping and chat common protos.
([#2553](#2553))
([5f2d4e7](5f2d4e7)),
closes
[#2018](#2018)
* get PR description from googleapis commits
([#2531](#2531))
([c2ea697](c2ea697))
* Introduce OpenTelemetry Metrics Recording
([#2500](#2500))
([b936580](b936580))
* skip build only commit
([#2555](#2555))
([180c8a9](180c8a9))
* Universe Domain Environment Variable Support
([#2485](#2485))
([1463d64](1463d64))


### Dependencies

* normalize dependencies
([#2574](#2574))
([6622238](6622238))
* update arrow.version to v15.0.1
([#2565](#2565))
([b2c3f6a](b2c3f6a))
* update dependency com.fasterxml.jackson:jackson-bom to v2.17.0
([#2564](#2564))
([40ae7f9](40ae7f9))
* update dependency com.google.api-client:google-api-client-bom to
v2.4.0
([#2570](#2570))
([f60441f](f60441f))
* update dependency com.google.errorprone:error_prone_annotations to
v2.26.1
([#2530](#2530))
([7c1aaab](7c1aaab))
* update dependency com.google.errorprone:error_prone_annotations to
v2.26.1
([#2532](#2532))
([447b4e1](447b4e1))
* update dependency io.netty:netty-tcnative-boringssl-static to
v2.0.65.final
([#2547](#2547))
([46e0e0f](46e0e0f))
* update dependency net.bytebuddy:byte-buddy to v1.14.12
([#2522](#2522))
([edfec32](edfec32))
* update google api dependencies
([#2484](#2484))
([92e91bc](92e91bc))
* update google api dependencies
([#2538](#2538))
([d9355cf](d9355cf))
* update googleapis/java-cloud-bom digest to 3f93d58
([#2499](#2499))
([5fd4d5e](5fd4d5e))
* update googleapis/java-cloud-bom digest to 659764f
([#2545](#2545))
([d6c8be6](d6c8be6))
* update netty dependencies
([#2480](#2480))
([40753c3](40753c3))
* update opentelemetry-java monorepo to v1.35.0
([#2477](#2477))
([3ecefff](3ecefff))
* update opentelemetry-java monorepo to v1.36.0
([#2550](#2550))
([9669c21](9669c21))
* update opentelemetry-java monorepo to v1.36.0
([#2573](#2573))
([f5f201e](f5f201e))
* update slf4j monorepo to v2.0.12
([#2481](#2481))
([363a354](363a354))


### Documentation

* minor tweaks to various comments
([d343be9](d343be9))
* minor tweaks to various comments
([d343be9](d343be9))
</details>

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
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

@suztomo suztomo suztomo approved these changes

Assignees
No one assigned
Labels
size: s Pull request size is small.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@diegomarquezp @suztomo @blakeli0