-
Notifications
You must be signed in to change notification settings - Fork 263
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
Add support for bzlmod #287
Closed
Closed
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
aab919d
Update labels for new maven repo name
keith 230a66b
Ignore MODULE.bazel.lock
keith ccadbf8
Reference buildifier_prebuilt for binaries for now
keith 84258db
Add MODULE.bazel
keith 89a3217
Add maven generated files
keith cbb00ee
Make non-bzlmod work
keith 42504f5
Share more config between bzlmod
keith 81188ed
Remove lockfiles
keith 0b2166e
Use bazel patch instead since it's outside of bzlmod
keith 85c2c14
improve patch
keith a8ce72b
Remove unused dep
keith 3b13331
Reduce bazel patch
keith 791cd96
remove bazel patch
keith be50f48
Merge branch 'master' into ks/add-bzlmod
hsudhof File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,3 +4,4 @@ bazel-* | |
*.pyc | ||
.ijwb | ||
/.bazelrc.user | ||
MODULE.bazel.lock |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,189 @@ | ||
module( | ||
name = "copybara", | ||
version = "0", | ||
compatibility_level = 0, | ||
) | ||
|
||
bazel_dep(name = "bazel_skylib", version = "1.5.0") | ||
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0") | ||
bazel_dep(name = "platforms", version = "0.0.8") | ||
bazel_dep(name = "rules_java", version = "7.5.0") | ||
bazel_dep(name = "rules_jvm_external", version = "6.0") | ||
bazel_dep(name = "rules_license", version = "0.0.8") | ||
bazel_dep(name = "rules_pkg", version = "0.10.1") | ||
bazel_dep(name = "rules_python", version = "0.31.0") | ||
|
||
non_module_deps = use_extension("//:repositories.bzl", "non_module_deps") | ||
use_repo(non_module_deps, "JCommander", "io_bazel") | ||
|
||
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") | ||
maven.install( | ||
name = "copybara_maven", | ||
artifacts = [ | ||
"com.github.stephenc.jcip:jcip-annotations:1.0-1", | ||
"com.google.auto.service:auto-service-annotations:1.1.1", | ||
"com.google.auto.service:auto-service:1.1.1", | ||
"com.google.auto.value:auto-value-annotations:1.10.2", | ||
"com.google.auto.value:auto-value:1.10.2", | ||
"com.google.auto:auto-common:1.2.2", | ||
"com.google.code.findbugs:jsr305:3.0.2", | ||
"com.google.code.gson:gson:2.10.1", | ||
"com.google.errorprone:error_prone_type_annotations:2.20.0", | ||
"com.google.flogger:flogger-system-backend:0.7.4", | ||
"com.google.flogger:flogger:0.7.4", | ||
"com.google.flogger:google-extensions:0.7.4", | ||
"com.google.guava:failureaccess:1.0.1", | ||
"com.google.guava:guava-testlib:33.0.0-jre", | ||
"com.google.guava:guava:33.0.0-jre", | ||
"com.google.http-client:google-http-client-gson:1.43.3", | ||
"com.google.http-client:google-http-client-test:1.43.3", | ||
"com.google.http-client:google-http-client:1.43.3", | ||
"com.google.jimfs:jimfs:1.2", | ||
"com.google.re2j:re2j:1.7", | ||
"com.google.testparameterinjector:test-parameter-injector:1.8", | ||
"com.google.truth.extensions:truth-java8-extension:1.3.0", | ||
"com.google.truth:truth:1.3.0", | ||
"com.googlecode.java-diff-utils:diffutils:1.3.0", | ||
"com.ryanharter.auto.value:auto-value-gson-extension:1.3.1", | ||
"com.ryanharter.auto.value:auto-value-gson-factory:1.3.1", | ||
"com.ryanharter.auto.value:auto-value-gson-runtime:1.3.1", | ||
"com.sun.mail:javax.mail:1.5.6", | ||
"commons-codec:commons-codec:1.16.0", | ||
"junit:junit:4.13.2", | ||
"net.bytebuddy:byte-buddy-agent:1.14.5", | ||
"net.bytebuddy:byte-buddy:1.14.5", | ||
"org.apache.commons:commons-compress:1.25.0", | ||
"org.apache.tomcat:tomcat-annotations-api:8.0.5", | ||
"org.apache.velocity:velocity:1.7", | ||
"org.jsoup:jsoup:1.16.1", | ||
"org.mockito:mockito-core:4.5.1", | ||
"org.objenesis:objenesis:1.0", | ||
"org.tomlj:tomlj:1.1.1", | ||
], | ||
fail_if_repin_required = True, | ||
repositories = [ | ||
"https://repo1.maven.org/maven2", | ||
"https://maven.google.com", | ||
], | ||
) | ||
use_repo(maven, "copybara_maven") | ||
|
||
# Copied from bazelbuild/bazel/MODULE.bazel, has to be kept in sync | ||
maven.install( | ||
artifacts = [ | ||
"com.beust:jcommander:1.82", | ||
"com.github.ben-manes.caffeine:caffeine:3.0.5", | ||
"com.github.kevinstern:software-and-algorithms:1.0", | ||
"com.github.stephenc.jcip:jcip-annotations:1.0-1", | ||
"com.google.api-client:google-api-client-gson:1.35.2", | ||
"com.google.api-client:google-api-client:1.35.2", | ||
"com.google.auth:google-auth-library-credentials:1.6.0", | ||
"com.google.auth:google-auth-library-oauth2-http:1.6.0", | ||
"com.google.auto.service:auto-service-annotations:1.0.1", | ||
"com.google.auto.service:auto-service:1.0", | ||
"com.google.auto.value:auto-value-annotations:1.9", | ||
"com.google.auto.value:auto-value:1.8.2", | ||
"com.google.auto:auto-common:1.2.1", | ||
"com.google.code.findbugs:jsr305:3.0.2", | ||
"com.google.code.gson:gson:2.9.0", | ||
"com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0", | ||
"com.google.errorprone:error_prone_annotation:2.23.0", | ||
"com.google.errorprone:error_prone_annotations:2.23.0", | ||
"com.google.errorprone:error_prone_check_api:2.23.0", | ||
"com.google.errorprone:error_prone_core:2.23.0", | ||
"com.google.errorprone:error_prone_type_annotations:2.23.0", | ||
"com.google.flogger:flogger-system-backend:0.5.1", | ||
"com.google.flogger:flogger:0.5.1", | ||
"com.google.flogger:google-extensions:0.5.1", | ||
"com.google.guava:failureaccess:1.0.1", | ||
"com.google.guava:guava:33.0.0-jre", | ||
"com.google.http-client:google-http-client-gson:1.42.0", | ||
"com.google.http-client:google-http-client:1.42.0", | ||
"com.google.j2objc:j2objc-annotations:1.3", | ||
"com.google.turbine:turbine:0.5.0", | ||
"com.ryanharter.auto.value:auto-value-gson-extension:1.3.1", | ||
"com.ryanharter.auto.value:auto-value-gson-runtime:1.3.1", | ||
"com.ryanharter.auto.value:auto-value-gson-factory:1.3.1", | ||
"com.squareup:javapoet:1.12.0", | ||
"commons-collections:commons-collections:3.2.2", | ||
"commons-lang:commons-lang:2.6", | ||
"io.github.java-diff-utils:java-diff-utils:4.12", | ||
"io.grpc:grpc-api:1.48.1", | ||
"io.grpc:grpc-auth:1.48.1", | ||
"io.grpc:grpc-context:1.48.1", | ||
"io.grpc:grpc-core:1.48.1", | ||
"io.grpc:grpc-netty:1.48.1", | ||
"io.grpc:grpc-protobuf-lite:1.48.1", | ||
"io.grpc:grpc-protobuf:1.48.1", | ||
"io.grpc:grpc-stub:1.48.1", | ||
"io.netty:netty-buffer:4.1.93.Final", | ||
"io.netty:netty-codec-http2:4.1.93.Final", | ||
"io.netty:netty-codec-http:4.1.93.Final", | ||
"io.netty:netty-codec:4.1.93.Final", | ||
"io.netty:netty-common:4.1.93.Final", | ||
"io.netty:netty-handler-proxy:4.1.93.Final", | ||
"io.netty:netty-handler:4.1.93.Final", | ||
"io.netty:netty-resolver-dns:4.1.93.Final", | ||
"io.netty:netty-resolver:4.1.93.Final", | ||
"io.netty:netty-tcnative-boringssl-static:jar:linux-aarch_64:2.0.56.Final", | ||
"io.netty:netty-tcnative-boringssl-static:jar:linux-x86_64:2.0.56.Final", | ||
"io.netty:netty-tcnative-boringssl-static:jar:osx-aarch_64:2.0.56.Final", | ||
"io.netty:netty-tcnative-boringssl-static:jar:osx-x86_64:2.0.56.Final", | ||
"io.netty:netty-tcnative-boringssl-static:jar:windows-x86_64:2.0.56.Final", | ||
"io.netty:netty-tcnative-classes:2.0.56.Final", | ||
"io.netty:netty-transport-classes-epoll:4.1.93.Final", | ||
"io.netty:netty-transport-classes-kqueue:4.1.93.Final", | ||
"io.netty:netty-transport-native-epoll:jar:linux-aarch_64:4.1.93.Final", | ||
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.93.Final", | ||
"io.netty:netty-transport-native-kqueue:jar:osx-aarch_64:4.1.93.Final", | ||
"io.netty:netty-transport-native-kqueue:jar:osx-x86_64:4.1.93.Final", | ||
"io.netty:netty-transport-native-unix-common:4.1.93.Final", | ||
"io.netty:netty-transport-native-unix-common:jar:linux-aarch_64:4.1.93.Final", | ||
"io.netty:netty-transport-native-unix-common:jar:linux-x86_64:4.1.93.Final", | ||
"io.netty:netty-transport-native-unix-common:jar:osx-aarch_64:4.1.93.Final", | ||
"io.netty:netty-transport-native-unix-common:jar:osx-x86_64:4.1.93.Final", | ||
"io.netty:netty-transport:4.1.93.Final", | ||
"io.reactivex.rxjava3:rxjava:3.1.2", | ||
"it.unimi.dsi:fastutil:7.2.1", | ||
"javax.activation:javax.activation-api:1.2.0", | ||
"javax.annotation:javax.annotation-api:1.3.2", | ||
"javax.inject:javax.inject:1", | ||
"net.bytebuddy:byte-buddy-agent:1.14.5", | ||
"net.bytebuddy:byte-buddy:1.14.5", | ||
"org.apache.commons:commons-compress:1.20", | ||
"org.apache.commons:commons-pool2:2.8.0", | ||
"org.apache.tomcat:tomcat-annotations-api:8.0.5", | ||
"org.apache.velocity:velocity:1.7", | ||
"org.checkerframework:checker-qual:3.19.0", | ||
"org.ow2.asm:asm-analysis:9.2", | ||
"org.ow2.asm:asm-commons:9.2", | ||
"org.ow2.asm:asm-tree:9.2", | ||
"org.ow2.asm:asm-util:9.2", | ||
"org.ow2.asm:asm:9.2", | ||
"org.pcollections:pcollections:3.1.4", | ||
"org.threeten:threeten-extra:1.5.0", | ||
"org.tukaani:xz:1.9", | ||
"org.yaml:snakeyaml:1.28", | ||
"tools.profiler:async-profiler:3.0", | ||
# The following jars are for testing. | ||
# junit is not test only due to //src/java_tools/junitrunner/java/com/google/testing/junit/junit4:runner, | ||
# and hamcrest is a dependency of junit. | ||
"junit:junit:4.13.2", | ||
"org.hamcrest:hamcrest-core:1.3", | ||
], | ||
excluded_artifacts = [ | ||
# org.apache.httpcomponents and org.eclipse.jgit:org.eclipse.jgit | ||
# require java.security.jgss module to be embedded in the Bazel binary. | ||
"org.apache.httpcomponents:httpclient", | ||
"org.apache.httpcomponents:httpcore", | ||
"org.eclipse.jgit:org.eclipse.jgit", | ||
# We build protobuf Java library from source, exclude protobuf jars to be safe. | ||
"com.google.protobuf:protobuf-java", | ||
"com.google.protobuf:protobuf-javalite", | ||
], | ||
repositories = [ | ||
"https://repo1.maven.org/maven2", | ||
], | ||
strict_visibility = True, | ||
) | ||
use_repo(maven, "maven") |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
# When bzlmod is enabled this makes sure nothing from the legacy WORKSPACE is loaded |
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,9 +12,9 @@ | |
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
load("@rules_jvm_external//:defs.bzl", "DEFAULT_REPOSITORY_NAME", "maven_install") | ||
load("@rules_jvm_external//:specs.bzl", "maven") | ||
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") | ||
load("@rules_jvm_external//:defs.bzl", "maven_install") | ||
load("@rules_jvm_external//:specs.bzl", "maven") | ||
|
||
COPYBARA_MAVEN_ARTIFACTS = [ | ||
maven.artifact("com.github.stephenc.jcip", "jcip-annotations", "1.0-1"), | ||
|
@@ -66,7 +66,13 @@ COPYBARA_MAVEN_ARTIFACT_ADDITIONAL_REPOSITORIES = [ | |
def copybara_maven_repositories(): | ||
maybe( | ||
maven_install, | ||
name = DEFAULT_REPOSITORY_NAME, | ||
name = "copybara_maven", | ||
artifacts = COPYBARA_MAVEN_ARTIFACTS, | ||
repositories = COPYBARA_MAVEN_ARTIFACT_ADDITIONAL_REPOSITORIES + ["https://repo1.maven.org/maven2"], | ||
) | ||
maybe( | ||
maven_install, | ||
name = "maven", | ||
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. for bzlmod it's better to have a unique name for a repository that might be a dependency of something else, but for building bazel we have to use this name as well, right now these are dup'd but in bzlmod they have a separate set of deps |
||
artifacts = COPYBARA_MAVEN_ARTIFACTS, | ||
repositories = COPYBARA_MAVEN_ARTIFACT_ADDITIONAL_REPOSITORIES + ["https://repo1.maven.org/maven2"], | ||
) |
Oops, something went wrong.
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.
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.
buildtools isn't in the bcr yet, this repo vendors the downloads directly from that repo's releases
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.
Adding links regarding buildtools migration to bzlmod:
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.
We currently automatically vendor buildtools from HEAD because we had needs to be pretty close to the edge. I wonder if this can be treated like io_bazel?
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.
the problem is that pulling in buildtools that way would require pulling rules_go and resolving the go.mod transitive dependencies of that repo as well.
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.
I see. I will look into merging this provided we don't end up with too much version skew for build_tools vs the internal monorepo.
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.
sounds good, i don't feel like there are a ton of changes there enough to cause major drift