-
Notifications
You must be signed in to change notification settings - Fork 69
Merge the latest main to protobuf-4.x-rc branch #4017
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
Changes from all commits
46b2cee
0731847
a8060a2
b250e2d
833b3e5
a694bf8
c931e1b
480cf13
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| { | ||
| ".": "2.64.1" | ||
| ".": "2.64.2" | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,14 +9,14 @@ | |
| # Pom-Parent Dependencies | ||
| # These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml | ||
| javax.annotation:javax.annotation-api,javax.annotation-api=1.3.2 | ||
| io.grpc:grpc-bom,grpc=1.74.0 | ||
| com.google.auth:google-auth-library-bom,google.auth=1.40.0 | ||
| com.google.http-client:google-http-client,google.http-client=1.47.1 | ||
| io.grpc:grpc-bom,grpc=1.76.2 | ||
| com.google.auth:google-auth-library-bom,google.auth=1.41.0 | ||
| com.google.http-client:google-http-client,google.http-client=2.0.2 | ||
| com.google.code.gson:gson,gson=2.13.2 | ||
| com.google.guava:guava,guava=33.4.8-jre | ||
| com.google.protobuf:protobuf-java,protobuf=4.31.1 | ||
| io.opentelemetry:opentelemetry-bom,opentelemetry=1.55.0 | ||
| com.google.errorprone:error_prone_annotations,errorprone=2.43.0 | ||
| com.google.guava:guava,guava=33.5.0-jre | ||
| com.google.protobuf:protobuf-java,protobuf=4.33.1 | ||
| io.opentelemetry:opentelemetry-bom,opentelemetry=1.57.0 | ||
| com.google.errorprone:error_prone_annotations,errorprone=2.45.0 | ||
| com.google.j2objc:j2objc-annotations,j2objc-annotations=3.1 | ||
| org.threeten:threetenbp,threetenbp=1.7.2 | ||
| org.slf4j:slf4j-api,slf4j=2.0.17 | ||
|
Comment on lines
+12
to
22
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There are several version mismatches between this file and Mismatches with
Please resolve these inconsistencies to ensure all dependency versions are aligned across the project configuration files. |
||
|
|
@@ -44,7 +44,7 @@ com.google.cloud.opentelemetry:exporter-metrics,google.cloud.opentelemetry=0.36. | |
| com.google.flogger:flogger,flogger=0.9 | ||
| org.apache.arrow:arrow-memory-core,arrow=18.3.0 | ||
| dev.cel:cel,dev.cel=0.11.1 | ||
| com.google.crypto.tink:tink,com.google.crypto.tink=1.19.0 | ||
| com.google.crypto.tink:tink,com.google.crypto.tink=1.20.0 | ||
| # The follow opentelemetry dependencies have a different version from the opentelemetry-bom | ||
| io.opentelemetry.semconv:opentelemetry-semconv,opentelemetry-semconv=1.37.0 | ||
| io.opentelemetry.contrib:opentelemetry-gcp-resources,io.opentelemetry.contrib.opentelemetry-gcp-resources=1.48.0-alpha | ||
| io.opentelemetry.contrib:opentelemetry-gcp-resources,io.opentelemetry.contrib.opentelemetry-gcp-resources=1.52.0-alpha | ||
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.
There are two separate entries for upgrading
grpc. It would be clearer to have a single entry for the final version1.76.2.Also, for consistency, please use consistent capitalization for the commit messages (e.g., 'Upgrade' vs 'upgrade').