-
Notifications
You must be signed in to change notification settings - Fork 10
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
Bazel, module, and JAR upgrades #182
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mbland
requested review from
laszlocsomor,
saraadams and
WillEngFlow
as code owners
July 2, 2024 20:25
- https://github.com/bazelbuild/bazel/releases/tag/7.2.1 Signed-off-by: Mike Bland <mbland@engflow.com>
- https://github.com/bazelbuild/bazel-skylib/releases/tag/1.7.1 - https://github.com/bazelbuild/platforms/releases/tag/0.0.10 Signed-off-by: Mike Bland <mbland@engflow.com>
- https://github.com/bazelbuild/rules_proto/releases/tag/6.0.2 Signed-off-by: Mike Bland <mbland@engflow.com>
- com.google.code.gson:gson:2.11.0 - com.google.guava:guava:33.2.1-jre - commons-cli:commons-cli:1.8.0 For Tests - com.google.googlejavaformat:google-java-format:1.22.0 - com.google.truth:truth:1.4.3 - com.google.truth.extensions:truth-java8-extension:1.4.3 - org.mockito:mockito-core:5.12.0 Signed-off-by: Mike Bland <mbland@engflow.com>
Resolves these warnings: ```txt DEBUG: .../external/rules_jvm_external~/private/extensions/maven.bzl:154:14: The maven repository 'maven' is used in two different bazel modules, originally in 'com_engflow_bazel_invocation_analyzer' and now in 'protobuf' DEBUG: .../external/rules_jvm_external~/private/extensions/maven.bzl:154:14: The maven repository 'maven' is used in two different bazel modules, originally in 'com_engflow_bazel_invocation_analyzer' and now in 'protobuf' DEBUG: .../external/rules_jvm_external~/coursier.bzl:593:18: Found duplicate artifact versions com.google.code.gson:gson has multiple versions 2.11.0, 2.8.9 com.google.guava:guava has multiple versions 33.2.1-jre, 31.1-jre com.google.truth:truth has multiple versions 1.4.3, 1.1.2 org.mockito:mockito-core has multiple versions 5.12.0, 4.3.1 Please remove duplicate artifacts from the artifact list so you do not get unexpected artifact versions ``` See also: - Duplicate maven repositories when importing bazel_deps that use maven.install bazel-contrib/rules_jvm_external#916 - Using maven as the repo name causes duplicate warnings when using bzlmod protocolbuffers/protobuf#16839 - MODULE.bazel doesn't define @maven repository protocolbuffers/protobuf#17176 - Stop including extra artifacts on maven.install() bazel-contrib/rules_jvm_external#1168 - Use a custom name for the maven repository (maven_protobuf) protocolbuffers/protobuf#17190 Signed-off-by: Mike Bland <mbland@engflow.com>
mbland
force-pushed
the
bazel-and-module-upgrades
branch
from
July 2, 2024 20:27
ad2385a
to
afd2b9f
Compare
WillEngFlow
approved these changes
Jul 2, 2024
mbland
added a commit
that referenced
this pull request
Jul 8, 2024
- https://github.com/bazelbuild/rules_jvm_external/releases/tag/6.2 This new version resolves the issue mentioned in #182: - bazel-contrib/rules_jvm_external#1189 Fixed by: - bazel-contrib/rules_jvm_external#1122 Per my comment on that issue, source JARs are no longer fetched without explicitly setting `fetch_sources = True`. This is why they no longer appear in `maven_install.json`. Finally, @shs96c noted to me in private that: > ...with recent `rules_jvm_external` releases, all you need to update > is `bazel run @maven//:pin`. There’s no need for the `unpinned_maven` > repo any more. I removed the `unpinned_maven` repo and ran `REPIN=1 bazel run @maven//:pin` to regenerate `maven_install.json`. This also removed the `unpinned_maven` entries from `MODULE.bazel.lock`. I'll update this section of my Bzlmod migration blog post after merging this change: - https://blog.engflow.com/2024/06/27/migrating-to-bazel-modules-aka-bzlmod---the-easy-parts/#with-rules_jvm_external
mbland
added a commit
that referenced
this pull request
Jul 8, 2024
- https://github.com/bazelbuild/rules_jvm_external/releases/tag/6.2 This new version resolves the issue mentioned in #182: - bazel-contrib/rules_jvm_external#1189 Fixed by: - bazel-contrib/rules_jvm_external#1122 Per my comment on that issue, source JARs are no longer fetched without explicitly setting `fetch_sources = True`. This is why they no longer appear in `maven_install.json`. Finally, @shs96c noted to me in private that: > ...with recent `rules_jvm_external` releases, all you need to update > is `bazel run @maven//:pin`. There’s no need for the `unpinned_maven` > repo any more. I removed the `unpinned_maven` repo and ran `REPIN=1 bazel run @maven//:pin` to regenerate `maven_install.json`. This also removed the `unpinned_maven` entries from `MODULE.bazel.lock`. I'll update this section of my Bzlmod migration blog post after merging this change: - https://blog.engflow.com/2024/06/27/migrating-to-bazel-modules-aka-bzlmod---the-easy-parts/#with-rules_jvm_external Signed-off-by: Mike Bland <mbland@engflow.com>
mbland
added a commit
that referenced
this pull request
Jul 10, 2024
Details: - https://github.com/bazelbuild/rules_jvm_external/releases/tag/6.2 This new version resolves the issue mentioned in #182: - bazel-contrib/rules_jvm_external#1189 Fixed by: - bazel-contrib/rules_jvm_external#1122 Per my comment on that issue, source JARs are no longer fetched without explicitly setting `fetch_sources = True`. This is why they no longer appear in `maven_install.json`. Finally, @shs96c noted to me in private that: > ...with recent `rules_jvm_external` releases, all you need to update is `bazel run @maven//:pin`. There’s no need for the `unpinned_maven` repo any more. I removed the `unpinned_maven` repo and ran `REPIN=1 bazel run @maven//:pin` to regenerate `maven_install.json`. This also removed the `unpinned_maven` entries from `MODULE.bazel.lock`. I'll update this section of my Bzlmod migration blog post after merging this change: - https://blog.engflow.com/2024/06/27/migrating-to-bazel-modules-aka-bzlmod---the-easy-parts/#with-rules_jvm_external Signed-off-by: Mike Bland <mbland@engflow.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates as much as possible except rules_jvm_external.
The latest rules_jvm_external v6.1 breaks this project, both under the previous Bazel version (7.0.2) and the new one (7.2.1). I've filed bazel-contrib/rules_jvm_external#1189, which uses this repo and this PR as an example.
See the last section below for details.
Bazel update:
https://github.com/bazelbuild/bazel/releases/tag/7.2.1
Bazel module updates:
https://github.com/bazelbuild/bazel-skylib/releases/tag/1.7.1
https://github.com/bazelbuild/platforms/releases/tag/0.0.10
https://github.com/bazelbuild/rules_proto/releases/tag/6.0.2
JAR updates:
Test JAR updates:
Added explicit module spec and repinned the maven deps for:
https://github.com/protocolbuffers/protobuf/releases/tag/v27.2
Adding protobuf explicitly resolves these warnings:
See also:
Duplicate maven repositories when importing bazel_deps that use
maven.install
Duplicate maven repositories when importing bazel_deps that use maven.install bazel-contrib/rules_jvm_external#916
Using maven as the repo name causes duplicate warnings when using
bzlmod
Using
maven
as the repo name causes duplicate warnings when using bzlmod protocolbuffers/protobuf#16839MODULE.bazel doesn't define @maven repository
MODULE.bazel doesn't define @maven repository protocolbuffers/protobuf#17176
Stop including extra artifacts on maven.install()
Stop including extra artifacts on maven.install() bazel-contrib/rules_jvm_external#1168
Use a custom name for the maven repository (maven_protobuf)
Use a custom name for the maven repository (maven_protobuf) protocolbuffers/protobuf#17190
rules_jvm_external v6.1 somehow creates duplicate
jvm_import
rules for binary and source jars, instead of using thesrcjar
attribute:The content of rules_jvm_external~~maven~maven/BUILD at lines 9 and 34:
This pattern repeats for all the JAR targets.
The BUILD contents from v5.3, which builds successfully both before and after applying the PR changes: