From 83f2bd729b60afc1c75d89587533b55a7fae395a Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 15:31:15 -0700 Subject: [PATCH 01/10] Add copybara Fixes: https://github.com/bazelbuild/bazel-central-registry/issues/1368 --- .../0.0.0-20240326-6485af6/MODULE.bazel | 200 +++++++++++++ .../patches/add_module_bazel.patch | 206 +++++++++++++ .../add_rules_jvm_external_patch.patch | 151 ++++++++++ .../patches/update_labels.patch | 270 ++++++++++++++++++ .../patches/update_repos.patch | 74 +++++ .../0.0.0-20240326-6485af6/presubmit.yml | 9 + .../0.0.0-20240326-6485af6/source.json | 12 + modules/copybara/metadata.json | 16 ++ 8 files changed, 938 insertions(+) create mode 100644 modules/copybara/0.0.0-20240326-6485af6/MODULE.bazel create mode 100644 modules/copybara/0.0.0-20240326-6485af6/patches/add_module_bazel.patch create mode 100644 modules/copybara/0.0.0-20240326-6485af6/patches/add_rules_jvm_external_patch.patch create mode 100644 modules/copybara/0.0.0-20240326-6485af6/patches/update_labels.patch create mode 100644 modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch create mode 100644 modules/copybara/0.0.0-20240326-6485af6/presubmit.yml create mode 100644 modules/copybara/0.0.0-20240326-6485af6/source.json create mode 100644 modules/copybara/metadata.json diff --git a/modules/copybara/0.0.0-20240326-6485af6/MODULE.bazel b/modules/copybara/0.0.0-20240326-6485af6/MODULE.bazel new file mode 100644 index 00000000000..921e5832447 --- /dev/null +++ b/modules/copybara/0.0.0-20240326-6485af6/MODULE.bazel @@ -0,0 +1,200 @@ +module( + name = "copybara", + version = "0.0.0-20240326-6485af6", + compatibility_level = 0, +) + +bazel_dep(name = "bazel_skylib", version = "1.5.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") + +single_version_override( + module_name = "rules_jvm_external", + patch_strip = 1, + # Copied from bazelbuild/bazel/third_party has to be kept in sync + patches = ["//third_party/bazel:rules_jvm_external_6.0.patch"], + version = "6.0", +) + +bazel_dep(name = "buildozer", version = "6.4.0.2") +bazel_dep(name = "buildifier_prebuilt", version = "6.4.0") + +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( + name = "maven", + 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.22.0", + "com.google.errorprone:error_prone_annotations:2.22.0", + "com.google.errorprone:error_prone_check_api:2.22.0", + "com.google.errorprone:error_prone_core:2.22.0", + "com.google.errorprone:error_prone_type_annotations:2.22.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:31.1-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.4.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") diff --git a/modules/copybara/0.0.0-20240326-6485af6/patches/add_module_bazel.patch b/modules/copybara/0.0.0-20240326-6485af6/patches/add_module_bazel.patch new file mode 100644 index 00000000000..928f33b7b58 --- /dev/null +++ b/modules/copybara/0.0.0-20240326-6485af6/patches/add_module_bazel.patch @@ -0,0 +1,206 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +new file mode 100644 +index 00000000..921e5832 +--- /dev/null ++++ b/MODULE.bazel +@@ -0,0 +1,200 @@ ++module( ++ name = "copybara", ++ version = "0.0.0-20240326-6485af6", ++ compatibility_level = 0, ++) ++ ++bazel_dep(name = "bazel_skylib", version = "1.5.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") ++ ++single_version_override( ++ module_name = "rules_jvm_external", ++ patch_strip = 1, ++ # Copied from bazelbuild/bazel/third_party has to be kept in sync ++ patches = ["//third_party/bazel:rules_jvm_external_6.0.patch"], ++ version = "6.0", ++) ++ ++bazel_dep(name = "buildozer", version = "6.4.0.2") ++bazel_dep(name = "buildifier_prebuilt", version = "6.4.0") ++ ++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( ++ name = "maven", ++ 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.22.0", ++ "com.google.errorprone:error_prone_annotations:2.22.0", ++ "com.google.errorprone:error_prone_check_api:2.22.0", ++ "com.google.errorprone:error_prone_core:2.22.0", ++ "com.google.errorprone:error_prone_type_annotations:2.22.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:31.1-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.4.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") diff --git a/modules/copybara/0.0.0-20240326-6485af6/patches/add_rules_jvm_external_patch.patch b/modules/copybara/0.0.0-20240326-6485af6/patches/add_rules_jvm_external_patch.patch new file mode 100644 index 00000000000..75ddb983744 --- /dev/null +++ b/modules/copybara/0.0.0-20240326-6485af6/patches/add_rules_jvm_external_patch.patch @@ -0,0 +1,151 @@ +diff --git a/third_party/bazel/rules_jvm_external_6.0.patch b/third_party/bazel/rules_jvm_external_6.0.patch +new file mode 100644 +index 00000000..17c8d822 +--- /dev/null ++++ b/third_party/bazel/rules_jvm_external_6.0.patch +@@ -0,0 +1,145 @@ ++commit ec04b5431181421608c8ce55d1cb53626d51ab3e ++Author: Yun Peng ++Date: Tue Jan 30 11:39:34 2024 +0100 ++ ++ Add targets to make it easier to vendor the `@maven` repository ++ ++ This change is required to support Bazel's offline bootstrap build. ++ More context in https://github.com/bazelbuild/bazel/pull/17112 ++ ++ Instead of checking in jar files in Bazel's source tree, Bazel wants to use rules_jvm_external ++ to fetch jars dependencies. However, to support Bazel's bootstrap build, ++ we need to patch rules_jvm_external for vendoring the @maven repository. ++ ++ - Generate a BUILD.vendor file to be used in the vendored `@maven` repository. ++ Added a jvm_import and a filegroup rule for each downloaded jar artifact. ++ The filegroup rule is required by the bootstrap Java toolchain used in Bazel's ++ bootstrap build. The bootstrap Java toolchain cannot depend on a jvm_import target. ++ Because the jvm_import rule depends on a java_binary tool "AddJarManifestEntry", ++ which requires a Java toolchain. Depending on the jar via a filegroup rule helps ++ avoid this cyclic dependency. ++ - Added a filegroup rule to collect all sources needed for vendoring `@maven`, ++ including BUILD.vendor, WORKSPACE and jar files. ++ ++diff --git a/coursier.bzl b/coursier.bzl ++index c60c590..7b16164 100644 ++--- a/coursier.bzl +++++ b/coursier.bzl ++@@ -53,6 +53,12 @@ bzl_library( ++ ) ++ """ ++ +++_BUILD_VENDOR = """ +++load("@rules_jvm_external//private/rules:jvm_import.bzl", "jvm_import") +++ +++{vendor_targets} +++""" +++ ++ DEFAULT_AAR_IMPORT_LABEL = "@build_bazel_rules_android//android:rules.bzl" ++ ++ _AAR_IMPORT_STATEMENT = """\ ++@@ -593,7 +599,7 @@ def _pinned_coursier_fetch_impl(repository_ctx): ++ ) ++ ++ repository_ctx.report_progress("Generating BUILD targets..") ++- (generated_imports, jar_versionless_target_labels) = parser.generate_imports( +++ (generated_imports, jar_versionless_target_labels, generated_vendor_targets) = parser.generate_imports( ++ repository_ctx = repository_ctx, ++ dependencies = importer.get_artifacts(maven_install_json_content), ++ explicit_artifacts = { ++@@ -633,6 +639,14 @@ def _pinned_coursier_fetch_impl(repository_ctx): ++ executable = False, ++ ) ++ +++ repository_ctx.file( +++ "BUILD.vendor", +++ (_BUILD_VENDOR).format( +++ vendor_targets = generated_vendor_targets, +++ ), +++ executable = False, +++ ) +++ ++ _add_outdated_files(repository_ctx, artifacts, repositories) ++ ++ # Generate a compatibility layer of external repositories for all jar artifacts. ++@@ -1153,7 +1167,7 @@ def _coursier_fetch_impl(repository_ctx): ++ ) ++ ++ repository_ctx.report_progress("Generating BUILD targets..") ++- (generated_imports, jar_versionless_target_labels) = parser.generate_imports( +++ (generated_imports, jar_versionless_target_labels, _) = parser.generate_imports( ++ repository_ctx = repository_ctx, ++ dependencies = v2_lock_file.get_artifacts(lock_file_contents), ++ explicit_artifacts = { ++diff --git a/private/dependency_tree_parser.bzl b/private/dependency_tree_parser.bzl ++index 103fe5e..21159ed 100644 ++--- a/private/dependency_tree_parser.bzl +++++ b/private/dependency_tree_parser.bzl ++@@ -76,7 +76,8 @@ def _generate_target( ++ neverlink_artifacts, ++ testonly_artifacts, ++ default_visibilities, ++- artifact): +++ artifact, +++ vendor_targets): ++ to_return = [] ++ simple_coord = strip_packaging_and_classifier_and_version(artifact["coordinates"]) ++ target_label = escape(simple_coord) ++@@ -284,6 +285,7 @@ def _generate_target( ++ target_import_string.append(")") ++ ++ to_return.append("\n".join(target_import_string)) +++ vendor_targets.append("\n".join(target_import_string)) ++ ++ # 10. Create a versionless alias target ++ # ++@@ -294,6 +296,9 @@ def _generate_target( ++ versioned_target_alias_label = escape(strip_packaging_and_classifier(artifact["coordinates"])) ++ to_return.append("alias(\n\tname = \"%s\",\n\tactual = \"%s\",\n%s)" % ++ (versioned_target_alias_label, target_label, alias_visibility)) +++ file_group_target_string = "filegroup(\n\tname = \"%s\",\n\tsrcs = [\"%s\"],\n%s)" % (target_label + "_file", artifact_path, alias_visibility) +++ to_return.append(file_group_target_string) +++ vendor_targets.append(file_group_target_string) ++ ++ # 11. If using maven_install.json, use a genrule to copy the file from the http_file ++ # repository into this repository. ++@@ -356,6 +361,9 @@ def _generate_imports(repository_ctx, dependencies, explicit_artifacts, neverlin ++ if repository_ctx.attr.maven_install_json: ++ all_imports.append(_genrule_copy_artifact_from_http_file(artifact, default_visibilities)) ++ +++ artifact_paths = [] +++ vendor_targets = [] +++ ++ # Iterate through the list of artifacts, and generate the target declaration strings. ++ for artifact in dependencies: ++ artifact_path = artifact["file"] ++@@ -412,6 +420,7 @@ def _generate_imports(repository_ctx, dependencies, explicit_artifacts, neverlin ++ testonly_artifacts, ++ default_visibilities, ++ raw_artifact, +++ vendor_targets, ++ )) ++ ++ elif artifact_path != None: ++@@ -426,7 +435,9 @@ def _generate_imports(repository_ctx, dependencies, explicit_artifacts, neverlin ++ testonly_artifacts, ++ default_visibilities, ++ artifact, +++ vendor_targets, ++ )) +++ artifact_paths.append("\"%s\"" % artifact_path) ++ else: # artifact_path == None: ++ # Special case for certain artifacts that only come with a POM file. ++ # Such artifacts "aggregate" their dependencies, so they don't have ++@@ -479,7 +490,10 @@ def _generate_imports(repository_ctx, dependencies, explicit_artifacts, neverlin ++ all_imports.append("alias(\n\tname = \"%s\",\n\tactual = \"%s\",\n%s)" % ++ (versioned_target_alias_label, target_label, alias_visibility)) ++ ++- return ("\n".join(all_imports), jar_versionless_target_labels) +++ all_imports.append("filegroup(\n\tname = \"srcs\",\n\tsrcs = [\n\t\t%s,\n\t],\n\tvisibility = [\"//visibility:public\"],\n)" % +++ (",\n\t\t".join(["\"BUILD.vendor\"", "\"defs.bzl\"", "\"WORKSPACE\""] + artifact_paths))) +++ +++ return ("\n".join(all_imports), jar_versionless_target_labels, "\n".join(vendor_targets)) ++ ++ parser = struct( ++ generate_imports = _generate_imports, diff --git a/modules/copybara/0.0.0-20240326-6485af6/patches/update_labels.patch b/modules/copybara/0.0.0-20240326-6485af6/patches/update_labels.patch new file mode 100644 index 00000000000..f0f416e5183 --- /dev/null +++ b/modules/copybara/0.0.0-20240326-6485af6/patches/update_labels.patch @@ -0,0 +1,270 @@ +diff --git a/third_party/BUILD b/third_party/BUILD +index b29dbe2d..99771f48 100644 +--- a/third_party/BUILD ++++ b/third_party/BUILD +@@ -15,8 +15,8 @@ package( + java_library( + name = "guava", + exports = [ +- "@maven//:com_google_guava_failureaccess", +- "@maven//:com_google_guava_guava", ++ "@copybara_maven//:com_google_guava_failureaccess", ++ "@copybara_maven//:com_google_guava_guava", + ], + ) + +@@ -24,21 +24,21 @@ java_library( + name = "guava_testlib", + testonly = 1, + exports = [ +- "@maven//:com_google_guava_guava_testlib", ++ "@copybara_maven//:com_google_guava_guava_testlib", + ], + ) + + java_library( + name = "apache_commons_compress", + exports = [ +- "@maven//:org_apache_commons_commons_compress", ++ "@copybara_maven//:org_apache_commons_commons_compress", + ], + ) + + java_library( + name = "autocommon", + exports = [ +- "@maven//:com_google_auto_auto_common", ++ "@copybara_maven//:com_google_auto_auto_common", + ], + ) + +@@ -46,8 +46,8 @@ java_plugin( + name = "autovalue_plugin", + processor_class = "com.google.auto.value.processor.AutoValueProcessor", + deps = [ +- "@maven//:com_google_auto_value_auto_value", +- "@maven//:com_google_auto_value_auto_value_annotations", ++ "@copybara_maven//:com_google_auto_value_auto_value", ++ "@copybara_maven//:com_google_auto_value_auto_value_annotations", + ], + ) + +@@ -59,8 +59,8 @@ java_library( + # TODO(matvore): What to export to give access to @AutoValue annotation + # without depending on the processor at runtime? + exports = [ +- "@maven//:com_google_auto_value_auto_value", +- "@maven//:com_google_auto_value_auto_value_annotations", ++ "@copybara_maven//:com_google_auto_value_auto_value", ++ "@copybara_maven//:com_google_auto_value_auto_value_annotations", + ], + ) + +@@ -74,7 +74,7 @@ java_library( + java_library( + name = "jimfs", + exports = [ +- "@maven//:com_google_jimfs_jimfs", ++ "@copybara_maven//:com_google_jimfs_jimfs", + ], + ) + +@@ -82,7 +82,7 @@ java_library( + name = "junit", + testonly = 1, + exports = [ +- "@maven//:junit_junit", ++ "@copybara_maven//:junit_junit", + ], + ) + +@@ -90,14 +90,14 @@ java_library( + name = "testparameterinjector", + testonly = 1, + exports = [ +- "@maven//:com_google_testparameterinjector_test_parameter_injector", ++ "@copybara_maven//:com_google_testparameterinjector_test_parameter_injector", + ], + ) + + java_library( + name = "re2j", + exports = [ +- "@maven//:com_google_re2j_re2j", ++ "@copybara_maven//:com_google_re2j_re2j", + ], + ) + +@@ -112,16 +112,16 @@ java_library( + name = "truth", + testonly = 1, + exports = [ +- "@maven//:com_google_truth_extensions_truth_java8_extension", +- "@maven//:com_google_truth_truth", +- "@maven//:com_googlecode_java_diff_utils_diffutils", ++ "@copybara_maven//:com_google_truth_extensions_truth_java8_extension", ++ "@copybara_maven//:com_google_truth_truth", ++ "@copybara_maven//:com_googlecode_java_diff_utils_diffutils", + ], + ) + + java_library( + name = "google_code_gson", + exports = [ +- "@maven//:com_google_code_gson_gson", ++ "@copybara_maven//:com_google_code_gson_gson", + ], + ) + +@@ -129,9 +129,9 @@ java_library( + name = "google_http_client", + exports = [ + ":google_code_gson", +- "@maven//:com_google_http_client_google_http_client", +- "@maven//:com_google_http_client_google_http_client_gson", +- "@maven//:commons_codec_commons_codec", ++ "@copybara_maven//:com_google_http_client_google_http_client", ++ "@copybara_maven//:com_google_http_client_google_http_client_gson", ++ "@copybara_maven//:commons_codec_commons_codec", + ], + ) + +@@ -139,7 +139,7 @@ java_library( + name = "google_http_client_test", + testonly = 1, + exports = [ +- "@maven//:com_google_http_client_google_http_client_test", ++ "@copybara_maven//:com_google_http_client_google_http_client_test", + ], + ) + +@@ -147,19 +147,19 @@ java_library( + name = "mockito", + testonly = 1, + exports = [ +- "@maven//:org_mockito_mockito_core", ++ "@copybara_maven//:org_mockito_mockito_core", + ], + runtime_deps = [ +- "@maven//:net_bytebuddy_byte_buddy", +- "@maven//:net_bytebuddy_byte_buddy_agent", +- "@maven//:org_objenesis_objenesis", ++ "@copybara_maven//:net_bytebuddy_byte_buddy", ++ "@copybara_maven//:net_bytebuddy_byte_buddy_agent", ++ "@copybara_maven//:org_objenesis_objenesis", + ], + ) + + java_library( + name = "jsr305", + exports = [ +- "@maven//:com_google_code_findbugs_jsr305", ++ "@copybara_maven//:com_google_code_findbugs_jsr305", + ], + ) + +@@ -176,10 +176,10 @@ java_library( + java_library( + name = "flogger", + exports = [ +- "@maven//:com_google_flogger_flogger", ++ "@copybara_maven//:com_google_flogger_flogger", + ], + runtime_deps = [ +- "@maven//:com_google_flogger_flogger_system_backend", ++ "@copybara_maven//:com_google_flogger_flogger_system_backend", + ], + ) + +@@ -201,28 +201,28 @@ java_library( + java_library( + name = "tomlj", + exports = [ +- "@maven//:org_tomlj_tomlj", ++ "@copybara_maven//:org_tomlj_tomlj", + ], + ) + + java_library( + name = "jsoup", + exports = [ +- "@maven//:org_jsoup_jsoup", ++ "@copybara_maven//:org_jsoup_jsoup", + ], + ) + + java_library( + name = "sun_mail", + exports = [ +- "@maven//:com_sun_mail_javax_mail", ++ "@copybara_maven//:com_sun_mail_javax_mail", + ], + ) + + java_library( + name = "protobuf_lite", + exports = [ +- "@maven//:com_google_protobuf_protobuf_lite", ++ "@copybara_maven//:com_google_protobuf_protobuf_lite", + ], + ) + +diff --git a/third_party/bazel/BUILD b/third_party/bazel/BUILD +index 12b3cf49..0a19ed09 100644 +--- a/third_party/bazel/BUILD ++++ b/third_party/bazel/BUILD +@@ -9,5 +9,5 @@ package( + java_library( + name = "shell", + srcs = glob(["main/**/*.java"]), +- deps = ["@maven//:com_google_guava_guava"], ++ deps = ["@copybara_maven//:com_google_guava_guava"], + ) +diff --git a/java/com/google/copybara/buildozer/testing/BUILD b/java/com/google/copybara/buildozer/testing/BUILD +index b841dd9c..fcfe6305 100644 +--- a/java/com/google/copybara/buildozer/testing/BUILD ++++ b/java/com/google/copybara/buildozer/testing/BUILD +@@ -19,7 +19,7 @@ licenses(["notice"]) + genrule( + name = "normalised_buildozer", + testonly = 1, +- srcs = ["@buildtools//buildozer"], ++ srcs = ["@buildifier_prebuilt//:buildozer"], + outs = ["buildozer"], + cmd = "cp $(SRCS) $@", + ) +@@ -27,7 +27,7 @@ genrule( + genrule( + name = "normalised_buildifier", + testonly = 1, +- srcs = ["@buildtools//buildifier"], ++ srcs = ["@buildifier_prebuilt//:buildifier"], + outs = ["buildifier"], + cmd = "cp $(SRCS) $@", + ) +diff --git a/javatests/com/google/copybara/format/BUILD b/javatests/com/google/copybara/format/BUILD +index 8bb1772e..22d1461e 100644 +--- a/javatests/com/google/copybara/format/BUILD ++++ b/javatests/com/google/copybara/format/BUILD +@@ -21,7 +21,7 @@ licenses(["notice"]) + genrule( + name = "normalised_buildifier", + testonly = 1, +- srcs = ["@buildtools//buildifier"], ++ srcs = ["@buildifier_prebuilt//:buildifier"], + outs = ["buildifier"], + cmd = "cp $(SRCS) $@", + ) +diff --git a/javatests/com/google/copybara/onboard/BUILD b/javatests/com/google/copybara/onboard/BUILD +index ee650260..c55e8f29 100644 +--- a/javatests/com/google/copybara/onboard/BUILD ++++ b/javatests/com/google/copybara/onboard/BUILD +@@ -23,7 +23,7 @@ licenses(["notice"]) + genrule( + name = "normalised_buildifier", + testonly = 1, +- srcs = ["@buildtools//buildifier"], ++ srcs = ["@buildifier_prebuilt//:buildifier"], + outs = ["buildifier"], + cmd = "cp $(SRCS) $@", + ) diff --git a/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch b/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch new file mode 100644 index 00000000000..cdc7cc901eb --- /dev/null +++ b/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch @@ -0,0 +1,74 @@ +diff --git a/repositories.bzl b/repositories.bzl +index 7912c917..626aae8d 100644 +--- a/repositories.bzl ++++ b/repositories.bzl +@@ -15,7 +15,6 @@ + load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") + load("//third_party:bazel.bzl", "bazel_sha256", "bazel_version") +-load("//third_party:bazel_buildtools.bzl", "buildtools_sha256", "buildtools_version") + load("//third_party:bazel_skylib.bzl", "skylib_sha256", "skylib_version") + + def copybara_repositories(): +@@ -43,25 +42,6 @@ def copybara_repositories(): + patch_args = ["-p1"], + ) + +- # LICENSE: The Apache Software License, Version 2.0 +- maybe( +- http_archive, +- name = "io_bazel", +- sha256 = bazel_sha256, +- strip_prefix = "bazel-" + bazel_version, +- url = "https://github.com/bazelbuild/bazel/archive/" + bazel_version + ".zip", +- ) +- +- # LICENSE: The Apache Software License, Version 2.0 +- # Buildifier and friends: +- maybe( +- http_archive, +- name = "buildtools", +- sha256 = buildtools_sha256, +- strip_prefix = "buildtools-" + buildtools_version, +- url = "https://github.com/bazelbuild/buildtools/archive/" + buildtools_version + ".zip", +- ) +- + # LICENSE: The Apache Software License, Version 2.0 + # Additional bazel rules: + maybe( +@@ -173,6 +153,29 @@ def copybara_repositories(): + ], + ) + ++ # LICENSE: MIT ++ maybe( ++ http_archive, ++ name = "buildifier_prebuilt", ++ sha256 = "8ada9d88e51ebf5a1fdff37d75ed41d51f5e677cdbeafb0a22dda54747d6e07e", ++ strip_prefix = "buildifier-prebuilt-6.4.0", ++ urls = [ ++ "http://github.com/keith/buildifier-prebuilt/archive/6.4.0.tar.gz", ++ ], ++ ) ++ ++ _non_module_deps(None) ++ ++def _non_module_deps(_): ++ # LICENSE: The Apache Software License, Version 2.0 ++ maybe( ++ http_archive, ++ name = "io_bazel", ++ sha256 = bazel_sha256, ++ strip_prefix = "bazel-" + bazel_version, ++ url = "https://github.com/bazelbuild/bazel/archive/" + bazel_version + ".zip", ++ ) ++ + # LICENSE: The Apache Software License, Version 2.0 + maybe( + http_archive, +@@ -183,3 +186,5 @@ def copybara_repositories(): + ], + build_file = Label("//external/third_party:jcommander.BUILD"), + ) ++ ++non_module_deps = module_extension(implementation = _non_module_deps) diff --git a/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml b/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml new file mode 100644 index 00000000000..24d7c81586b --- /dev/null +++ b/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml @@ -0,0 +1,9 @@ +matrix: + platform: ["debian10", "macos", "ubuntu2004", "windows"] + bazel: ["7.x"] +tasks: + verify_targets: + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - "@copybara//java/com/google/copybara:copybara" diff --git a/modules/copybara/0.0.0-20240326-6485af6/source.json b/modules/copybara/0.0.0-20240326-6485af6/source.json new file mode 100644 index 00000000000..a9ee63c723c --- /dev/null +++ b/modules/copybara/0.0.0-20240326-6485af6/source.json @@ -0,0 +1,12 @@ +{ + "integrity": "sha256-KCQwTlvXFmbrxpkjlpbBiFGqgjVWPDjI7kIrzPVUYo0=", + "strip_prefix": "copybara-6485af6a5c662d5549d2f4d229c239d401132e58", + "url": "https://github.com/google/copybara/archive/6485af6a5c662d5549d2f4d229c239d401132e58.tar.gz", + "patch_strip": 1, + "patches": { + "add_module_bazel.patch": "sha256-+1PiWjfDV/tc+pEeBInWNlxb2T6JdZ/7GRonFfLUe6Y=", + "add_rules_jvm_external_patch.patch": "sha256-4K/jDxiKCI7ZYmpK0Er6wrlQuCDnbjFyH1n5t52FW2E=", + "update_labels.patch": "sha256-NgVZLFARwepmslzc13t8NDoZRFv8nxdXqOH9grEr4VM=", + "update_repos.patch": "sha256-de970dZLle3mhPdqqcQrBWgne5tL9AKI8gzXoJ8bZxw=" + } +} diff --git a/modules/copybara/metadata.json b/modules/copybara/metadata.json new file mode 100644 index 00000000000..687f5b01c0a --- /dev/null +++ b/modules/copybara/metadata.json @@ -0,0 +1,16 @@ +{ + "homepage": "https://github.com/google/copybara", + "maintainers": [ + { + "email": "bcr-maintainers@bazel.build", + "name": "No Maintainer Specified" + } + ], + "repository": [ + "github:google/copybara" + ], + "versions": [ + "0.0.0-20240326-6485af6" + ], + "yanked_versions": {} +} From f9e5257f535a847992674e2e210c634615d8b143 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 15:35:45 -0700 Subject: [PATCH 02/10] bump deps --- .../0.0.0-20240326-6485af6/MODULE.bazel | 15 +++++++-------- .../patches/add_module_bazel.patch | 19 +++++++++---------- .../0.0.0-20240326-6485af6/source.json | 2 +- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/modules/copybara/0.0.0-20240326-6485af6/MODULE.bazel b/modules/copybara/0.0.0-20240326-6485af6/MODULE.bazel index 921e5832447..0e163467d8b 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/MODULE.bazel +++ b/modules/copybara/0.0.0-20240326-6485af6/MODULE.bazel @@ -80,7 +80,6 @@ use_repo(maven, "copybara_maven") # Copied from bazelbuild/bazel/MODULE.bazel, has to be kept in sync maven.install( - name = "maven", artifacts = [ "com.beust:jcommander:1.82", "com.github.ben-manes.caffeine:caffeine:3.0.5", @@ -98,20 +97,20 @@ maven.install( "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.22.0", - "com.google.errorprone:error_prone_annotations:2.22.0", - "com.google.errorprone:error_prone_check_api:2.22.0", - "com.google.errorprone:error_prone_core:2.22.0", - "com.google.errorprone:error_prone_type_annotations:2.22.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:31.1-jre", + "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.4.0", + "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", diff --git a/modules/copybara/0.0.0-20240326-6485af6/patches/add_module_bazel.patch b/modules/copybara/0.0.0-20240326-6485af6/patches/add_module_bazel.patch index 928f33b7b58..6c1b013db5f 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/patches/add_module_bazel.patch +++ b/modules/copybara/0.0.0-20240326-6485af6/patches/add_module_bazel.patch @@ -1,9 +1,9 @@ diff --git a/MODULE.bazel b/MODULE.bazel new file mode 100644 -index 00000000..921e5832 +index 00000000..0e163467 --- /dev/null +++ b/MODULE.bazel -@@ -0,0 +1,200 @@ +@@ -0,0 +1,199 @@ +module( + name = "copybara", + version = "0.0.0-20240326-6485af6", @@ -86,7 +86,6 @@ index 00000000..921e5832 + +# Copied from bazelbuild/bazel/MODULE.bazel, has to be kept in sync +maven.install( -+ name = "maven", + artifacts = [ + "com.beust:jcommander:1.82", + "com.github.ben-manes.caffeine:caffeine:3.0.5", @@ -104,20 +103,20 @@ index 00000000..921e5832 + "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.22.0", -+ "com.google.errorprone:error_prone_annotations:2.22.0", -+ "com.google.errorprone:error_prone_check_api:2.22.0", -+ "com.google.errorprone:error_prone_core:2.22.0", -+ "com.google.errorprone:error_prone_type_annotations:2.22.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:31.1-jre", ++ "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.4.0", ++ "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", diff --git a/modules/copybara/0.0.0-20240326-6485af6/source.json b/modules/copybara/0.0.0-20240326-6485af6/source.json index a9ee63c723c..0a46120449b 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/source.json +++ b/modules/copybara/0.0.0-20240326-6485af6/source.json @@ -4,7 +4,7 @@ "url": "https://github.com/google/copybara/archive/6485af6a5c662d5549d2f4d229c239d401132e58.tar.gz", "patch_strip": 1, "patches": { - "add_module_bazel.patch": "sha256-+1PiWjfDV/tc+pEeBInWNlxb2T6JdZ/7GRonFfLUe6Y=", + "add_module_bazel.patch": "sha256-jqwFuZobu1TVWiD7y0nzHVq2gMCiJgfZ/k1QDISQD+U=", "add_rules_jvm_external_patch.patch": "sha256-4K/jDxiKCI7ZYmpK0Er6wrlQuCDnbjFyH1n5t52FW2E=", "update_labels.patch": "sha256-NgVZLFARwepmslzc13t8NDoZRFv8nxdXqOH9grEr4VM=", "update_repos.patch": "sha256-de970dZLle3mhPdqqcQrBWgne5tL9AKI8gzXoJ8bZxw=" From c48cd5925b91781c00498c1d89090db8e1f38baf Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 15:38:33 -0700 Subject: [PATCH 03/10] hack ci --- modules/copybara/0.0.0-20240326-6485af6/presubmit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml b/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml index 24d7c81586b..d1e482495f0 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml +++ b/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml @@ -5,5 +5,6 @@ tasks: verify_targets: platform: ${{ platform }} bazel: ${{ bazel }} + module_path: "" build_targets: - "@copybara//java/com/google/copybara:copybara" From 6117736fde5d271a195a1c2b4281bd8716bf5e06 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 16:05:04 -0700 Subject: [PATCH 04/10] move up --- modules/copybara/0.0.0-20240326-6485af6/presubmit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml b/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml index d1e482495f0..662752ac44c 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml +++ b/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml @@ -2,9 +2,9 @@ matrix: platform: ["debian10", "macos", "ubuntu2004", "windows"] bazel: ["7.x"] tasks: + module_path: '.' verify_targets: platform: ${{ platform }} bazel: ${{ bazel }} - module_path: "" build_targets: - "@copybara//java/com/google/copybara:copybara" From 526bde4b1021edebe4a4674558a751497f47dc13 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 16:10:02 -0700 Subject: [PATCH 05/10] bcr_test_module --- modules/copybara/0.0.0-20240326-6485af6/presubmit.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml b/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml index 662752ac44c..b7d48e4404b 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml +++ b/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml @@ -1,8 +1,8 @@ -matrix: - platform: ["debian10", "macos", "ubuntu2004", "windows"] - bazel: ["7.x"] -tasks: +bcr_test_module: module_path: '.' + matrix: + platform: ["debian10", "macos", "ubuntu2004", "windows"] + bazel: ["7.x"] verify_targets: platform: ${{ platform }} bazel: ${{ bazel }} From 35cc336158ce7c656df41f4c3b4f17a38fde9b3f Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 17:29:53 -0700 Subject: [PATCH 06/10] new patches --- .../0.0.0-20240326-6485af6/MODULE.bazel | 8 - .../patches/add_module_bazel.patch | 12 +- .../add_rules_jvm_external_patch.patch | 151 ------ .../patches/update_repos.patch | 450 +++++++++++++++++- .../0.0.0-20240326-6485af6/presubmit.yml | 10 +- .../0.0.0-20240326-6485af6/source.json | 5 +- 6 files changed, 448 insertions(+), 188 deletions(-) delete mode 100644 modules/copybara/0.0.0-20240326-6485af6/patches/add_rules_jvm_external_patch.patch diff --git a/modules/copybara/0.0.0-20240326-6485af6/MODULE.bazel b/modules/copybara/0.0.0-20240326-6485af6/MODULE.bazel index 0e163467d8b..8283c06d9ef 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/MODULE.bazel +++ b/modules/copybara/0.0.0-20240326-6485af6/MODULE.bazel @@ -15,14 +15,6 @@ 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") -single_version_override( - module_name = "rules_jvm_external", - patch_strip = 1, - # Copied from bazelbuild/bazel/third_party has to be kept in sync - patches = ["//third_party/bazel:rules_jvm_external_6.0.patch"], - version = "6.0", -) - bazel_dep(name = "buildozer", version = "6.4.0.2") bazel_dep(name = "buildifier_prebuilt", version = "6.4.0") diff --git a/modules/copybara/0.0.0-20240326-6485af6/patches/add_module_bazel.patch b/modules/copybara/0.0.0-20240326-6485af6/patches/add_module_bazel.patch index 6c1b013db5f..34e1520e5de 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/patches/add_module_bazel.patch +++ b/modules/copybara/0.0.0-20240326-6485af6/patches/add_module_bazel.patch @@ -1,9 +1,9 @@ diff --git a/MODULE.bazel b/MODULE.bazel new file mode 100644 -index 00000000..0e163467 +index 00000000..8283c06d --- /dev/null +++ b/MODULE.bazel -@@ -0,0 +1,199 @@ +@@ -0,0 +1,191 @@ +module( + name = "copybara", + version = "0.0.0-20240326-6485af6", @@ -21,14 +21,6 @@ index 00000000..0e163467 +non_module_deps = use_extension("//:repositories.bzl", "non_module_deps") +use_repo(non_module_deps, "JCommander", "io_bazel") + -+single_version_override( -+ module_name = "rules_jvm_external", -+ patch_strip = 1, -+ # Copied from bazelbuild/bazel/third_party has to be kept in sync -+ patches = ["//third_party/bazel:rules_jvm_external_6.0.patch"], -+ version = "6.0", -+) -+ +bazel_dep(name = "buildozer", version = "6.4.0.2") +bazel_dep(name = "buildifier_prebuilt", version = "6.4.0") + diff --git a/modules/copybara/0.0.0-20240326-6485af6/patches/add_rules_jvm_external_patch.patch b/modules/copybara/0.0.0-20240326-6485af6/patches/add_rules_jvm_external_patch.patch deleted file mode 100644 index 75ddb983744..00000000000 --- a/modules/copybara/0.0.0-20240326-6485af6/patches/add_rules_jvm_external_patch.patch +++ /dev/null @@ -1,151 +0,0 @@ -diff --git a/third_party/bazel/rules_jvm_external_6.0.patch b/third_party/bazel/rules_jvm_external_6.0.patch -new file mode 100644 -index 00000000..17c8d822 ---- /dev/null -+++ b/third_party/bazel/rules_jvm_external_6.0.patch -@@ -0,0 +1,145 @@ -+commit ec04b5431181421608c8ce55d1cb53626d51ab3e -+Author: Yun Peng -+Date: Tue Jan 30 11:39:34 2024 +0100 -+ -+ Add targets to make it easier to vendor the `@maven` repository -+ -+ This change is required to support Bazel's offline bootstrap build. -+ More context in https://github.com/bazelbuild/bazel/pull/17112 -+ -+ Instead of checking in jar files in Bazel's source tree, Bazel wants to use rules_jvm_external -+ to fetch jars dependencies. However, to support Bazel's bootstrap build, -+ we need to patch rules_jvm_external for vendoring the @maven repository. -+ -+ - Generate a BUILD.vendor file to be used in the vendored `@maven` repository. -+ Added a jvm_import and a filegroup rule for each downloaded jar artifact. -+ The filegroup rule is required by the bootstrap Java toolchain used in Bazel's -+ bootstrap build. The bootstrap Java toolchain cannot depend on a jvm_import target. -+ Because the jvm_import rule depends on a java_binary tool "AddJarManifestEntry", -+ which requires a Java toolchain. Depending on the jar via a filegroup rule helps -+ avoid this cyclic dependency. -+ - Added a filegroup rule to collect all sources needed for vendoring `@maven`, -+ including BUILD.vendor, WORKSPACE and jar files. -+ -+diff --git a/coursier.bzl b/coursier.bzl -+index c60c590..7b16164 100644 -+--- a/coursier.bzl -++++ b/coursier.bzl -+@@ -53,6 +53,12 @@ bzl_library( -+ ) -+ """ -+ -++_BUILD_VENDOR = """ -++load("@rules_jvm_external//private/rules:jvm_import.bzl", "jvm_import") -++ -++{vendor_targets} -++""" -++ -+ DEFAULT_AAR_IMPORT_LABEL = "@build_bazel_rules_android//android:rules.bzl" -+ -+ _AAR_IMPORT_STATEMENT = """\ -+@@ -593,7 +599,7 @@ def _pinned_coursier_fetch_impl(repository_ctx): -+ ) -+ -+ repository_ctx.report_progress("Generating BUILD targets..") -+- (generated_imports, jar_versionless_target_labels) = parser.generate_imports( -++ (generated_imports, jar_versionless_target_labels, generated_vendor_targets) = parser.generate_imports( -+ repository_ctx = repository_ctx, -+ dependencies = importer.get_artifacts(maven_install_json_content), -+ explicit_artifacts = { -+@@ -633,6 +639,14 @@ def _pinned_coursier_fetch_impl(repository_ctx): -+ executable = False, -+ ) -+ -++ repository_ctx.file( -++ "BUILD.vendor", -++ (_BUILD_VENDOR).format( -++ vendor_targets = generated_vendor_targets, -++ ), -++ executable = False, -++ ) -++ -+ _add_outdated_files(repository_ctx, artifacts, repositories) -+ -+ # Generate a compatibility layer of external repositories for all jar artifacts. -+@@ -1153,7 +1167,7 @@ def _coursier_fetch_impl(repository_ctx): -+ ) -+ -+ repository_ctx.report_progress("Generating BUILD targets..") -+- (generated_imports, jar_versionless_target_labels) = parser.generate_imports( -++ (generated_imports, jar_versionless_target_labels, _) = parser.generate_imports( -+ repository_ctx = repository_ctx, -+ dependencies = v2_lock_file.get_artifacts(lock_file_contents), -+ explicit_artifacts = { -+diff --git a/private/dependency_tree_parser.bzl b/private/dependency_tree_parser.bzl -+index 103fe5e..21159ed 100644 -+--- a/private/dependency_tree_parser.bzl -++++ b/private/dependency_tree_parser.bzl -+@@ -76,7 +76,8 @@ def _generate_target( -+ neverlink_artifacts, -+ testonly_artifacts, -+ default_visibilities, -+- artifact): -++ artifact, -++ vendor_targets): -+ to_return = [] -+ simple_coord = strip_packaging_and_classifier_and_version(artifact["coordinates"]) -+ target_label = escape(simple_coord) -+@@ -284,6 +285,7 @@ def _generate_target( -+ target_import_string.append(")") -+ -+ to_return.append("\n".join(target_import_string)) -++ vendor_targets.append("\n".join(target_import_string)) -+ -+ # 10. Create a versionless alias target -+ # -+@@ -294,6 +296,9 @@ def _generate_target( -+ versioned_target_alias_label = escape(strip_packaging_and_classifier(artifact["coordinates"])) -+ to_return.append("alias(\n\tname = \"%s\",\n\tactual = \"%s\",\n%s)" % -+ (versioned_target_alias_label, target_label, alias_visibility)) -++ file_group_target_string = "filegroup(\n\tname = \"%s\",\n\tsrcs = [\"%s\"],\n%s)" % (target_label + "_file", artifact_path, alias_visibility) -++ to_return.append(file_group_target_string) -++ vendor_targets.append(file_group_target_string) -+ -+ # 11. If using maven_install.json, use a genrule to copy the file from the http_file -+ # repository into this repository. -+@@ -356,6 +361,9 @@ def _generate_imports(repository_ctx, dependencies, explicit_artifacts, neverlin -+ if repository_ctx.attr.maven_install_json: -+ all_imports.append(_genrule_copy_artifact_from_http_file(artifact, default_visibilities)) -+ -++ artifact_paths = [] -++ vendor_targets = [] -++ -+ # Iterate through the list of artifacts, and generate the target declaration strings. -+ for artifact in dependencies: -+ artifact_path = artifact["file"] -+@@ -412,6 +420,7 @@ def _generate_imports(repository_ctx, dependencies, explicit_artifacts, neverlin -+ testonly_artifacts, -+ default_visibilities, -+ raw_artifact, -++ vendor_targets, -+ )) -+ -+ elif artifact_path != None: -+@@ -426,7 +435,9 @@ def _generate_imports(repository_ctx, dependencies, explicit_artifacts, neverlin -+ testonly_artifacts, -+ default_visibilities, -+ artifact, -++ vendor_targets, -+ )) -++ artifact_paths.append("\"%s\"" % artifact_path) -+ else: # artifact_path == None: -+ # Special case for certain artifacts that only come with a POM file. -+ # Such artifacts "aggregate" their dependencies, so they don't have -+@@ -479,7 +490,10 @@ def _generate_imports(repository_ctx, dependencies, explicit_artifacts, neverlin -+ all_imports.append("alias(\n\tname = \"%s\",\n\tactual = \"%s\",\n%s)" % -+ (versioned_target_alias_label, target_label, alias_visibility)) -+ -+- return ("\n".join(all_imports), jar_versionless_target_labels) -++ all_imports.append("filegroup(\n\tname = \"srcs\",\n\tsrcs = [\n\t\t%s,\n\t],\n\tvisibility = [\"//visibility:public\"],\n)" % -++ (",\n\t\t".join(["\"BUILD.vendor\"", "\"defs.bzl\"", "\"WORKSPACE\""] + artifact_paths))) -++ -++ return ("\n".join(all_imports), jar_versionless_target_labels, "\n".join(vendor_targets)) -+ -+ parser = struct( -+ generate_imports = _generate_imports, diff --git a/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch b/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch index cdc7cc901eb..9e092bb9f73 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch +++ b/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch @@ -1,5 +1,5 @@ diff --git a/repositories.bzl b/repositories.bzl -index 7912c917..626aae8d 100644 +index 7912c917..ed04ebc8 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -15,7 +15,6 @@ @@ -10,10 +10,14 @@ index 7912c917..626aae8d 100644 load("//third_party:bazel_skylib.bzl", "skylib_sha256", "skylib_version") def copybara_repositories(): -@@ -43,25 +42,6 @@ def copybara_repositories(): - patch_args = ["-p1"], - ) - +@@ -39,27 +38,6 @@ def copybara_repositories(): + # sha256 = RULES_JVM_EXTERNAL_SHA, + strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG, + url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG, +- patches = ["@io_bazel//third_party:rules_jvm_external_6.0.patch"], +- patch_args = ["-p1"], +- ) +- - # LICENSE: The Apache Software License, Version 2.0 - maybe( - http_archive, @@ -31,12 +35,10 @@ index 7912c917..626aae8d 100644 - sha256 = buildtools_sha256, - strip_prefix = "buildtools-" + buildtools_version, - url = "https://github.com/bazelbuild/buildtools/archive/" + buildtools_version + ".zip", -- ) -- + ) + # LICENSE: The Apache Software License, Version 2.0 - # Additional bazel rules: - maybe( -@@ -173,6 +153,29 @@ def copybara_repositories(): +@@ -173,6 +151,33 @@ def copybara_repositories(): ], ) @@ -61,14 +63,440 @@ index 7912c917..626aae8d 100644 + sha256 = bazel_sha256, + strip_prefix = "bazel-" + bazel_version, + url = "https://github.com/bazelbuild/bazel/archive/" + bazel_version + ".zip", ++ patch_args = ["-p1"], ++ patches = [ ++ "//third_party/bazel:bazel.patch", ++ ], + ) + # LICENSE: The Apache Software License, Version 2.0 maybe( http_archive, -@@ -183,3 +186,5 @@ def copybara_repositories(): +@@ -183,3 +188,5 @@ def copybara_repositories(): ], build_file = Label("//external/third_party:jcommander.BUILD"), ) + +non_module_deps = module_extension(implementation = _non_module_deps) +diff --git a/third_party/BUILD b/third_party/BUILD +index b29dbe2d..99771f48 100644 +--- a/third_party/BUILD ++++ b/third_party/BUILD +@@ -15,8 +15,8 @@ package( + java_library( + name = "guava", + exports = [ +- "@maven//:com_google_guava_failureaccess", +- "@maven//:com_google_guava_guava", ++ "@copybara_maven//:com_google_guava_failureaccess", ++ "@copybara_maven//:com_google_guava_guava", + ], + ) + +@@ -24,21 +24,21 @@ java_library( + name = "guava_testlib", + testonly = 1, + exports = [ +- "@maven//:com_google_guava_guava_testlib", ++ "@copybara_maven//:com_google_guava_guava_testlib", + ], + ) + + java_library( + name = "apache_commons_compress", + exports = [ +- "@maven//:org_apache_commons_commons_compress", ++ "@copybara_maven//:org_apache_commons_commons_compress", + ], + ) + + java_library( + name = "autocommon", + exports = [ +- "@maven//:com_google_auto_auto_common", ++ "@copybara_maven//:com_google_auto_auto_common", + ], + ) + +@@ -46,8 +46,8 @@ java_plugin( + name = "autovalue_plugin", + processor_class = "com.google.auto.value.processor.AutoValueProcessor", + deps = [ +- "@maven//:com_google_auto_value_auto_value", +- "@maven//:com_google_auto_value_auto_value_annotations", ++ "@copybara_maven//:com_google_auto_value_auto_value", ++ "@copybara_maven//:com_google_auto_value_auto_value_annotations", + ], + ) + +@@ -59,8 +59,8 @@ java_library( + # TODO(matvore): What to export to give access to @AutoValue annotation + # without depending on the processor at runtime? + exports = [ +- "@maven//:com_google_auto_value_auto_value", +- "@maven//:com_google_auto_value_auto_value_annotations", ++ "@copybara_maven//:com_google_auto_value_auto_value", ++ "@copybara_maven//:com_google_auto_value_auto_value_annotations", + ], + ) + +@@ -74,7 +74,7 @@ java_library( + java_library( + name = "jimfs", + exports = [ +- "@maven//:com_google_jimfs_jimfs", ++ "@copybara_maven//:com_google_jimfs_jimfs", + ], + ) + +@@ -82,7 +82,7 @@ java_library( + name = "junit", + testonly = 1, + exports = [ +- "@maven//:junit_junit", ++ "@copybara_maven//:junit_junit", + ], + ) + +@@ -90,14 +90,14 @@ java_library( + name = "testparameterinjector", + testonly = 1, + exports = [ +- "@maven//:com_google_testparameterinjector_test_parameter_injector", ++ "@copybara_maven//:com_google_testparameterinjector_test_parameter_injector", + ], + ) + + java_library( + name = "re2j", + exports = [ +- "@maven//:com_google_re2j_re2j", ++ "@copybara_maven//:com_google_re2j_re2j", + ], + ) + +@@ -112,16 +112,16 @@ java_library( + name = "truth", + testonly = 1, + exports = [ +- "@maven//:com_google_truth_extensions_truth_java8_extension", +- "@maven//:com_google_truth_truth", +- "@maven//:com_googlecode_java_diff_utils_diffutils", ++ "@copybara_maven//:com_google_truth_extensions_truth_java8_extension", ++ "@copybara_maven//:com_google_truth_truth", ++ "@copybara_maven//:com_googlecode_java_diff_utils_diffutils", + ], + ) + + java_library( + name = "google_code_gson", + exports = [ +- "@maven//:com_google_code_gson_gson", ++ "@copybara_maven//:com_google_code_gson_gson", + ], + ) + +@@ -129,9 +129,9 @@ java_library( + name = "google_http_client", + exports = [ + ":google_code_gson", +- "@maven//:com_google_http_client_google_http_client", +- "@maven//:com_google_http_client_google_http_client_gson", +- "@maven//:commons_codec_commons_codec", ++ "@copybara_maven//:com_google_http_client_google_http_client", ++ "@copybara_maven//:com_google_http_client_google_http_client_gson", ++ "@copybara_maven//:commons_codec_commons_codec", + ], + ) + +@@ -139,7 +139,7 @@ java_library( + name = "google_http_client_test", + testonly = 1, + exports = [ +- "@maven//:com_google_http_client_google_http_client_test", ++ "@copybara_maven//:com_google_http_client_google_http_client_test", + ], + ) + +@@ -147,19 +147,19 @@ java_library( + name = "mockito", + testonly = 1, + exports = [ +- "@maven//:org_mockito_mockito_core", ++ "@copybara_maven//:org_mockito_mockito_core", + ], + runtime_deps = [ +- "@maven//:net_bytebuddy_byte_buddy", +- "@maven//:net_bytebuddy_byte_buddy_agent", +- "@maven//:org_objenesis_objenesis", ++ "@copybara_maven//:net_bytebuddy_byte_buddy", ++ "@copybara_maven//:net_bytebuddy_byte_buddy_agent", ++ "@copybara_maven//:org_objenesis_objenesis", + ], + ) + + java_library( + name = "jsr305", + exports = [ +- "@maven//:com_google_code_findbugs_jsr305", ++ "@copybara_maven//:com_google_code_findbugs_jsr305", + ], + ) + +@@ -176,10 +176,10 @@ java_library( + java_library( + name = "flogger", + exports = [ +- "@maven//:com_google_flogger_flogger", ++ "@copybara_maven//:com_google_flogger_flogger", + ], + runtime_deps = [ +- "@maven//:com_google_flogger_flogger_system_backend", ++ "@copybara_maven//:com_google_flogger_flogger_system_backend", + ], + ) + +@@ -201,28 +201,28 @@ java_library( + java_library( + name = "tomlj", + exports = [ +- "@maven//:org_tomlj_tomlj", ++ "@copybara_maven//:org_tomlj_tomlj", + ], + ) + + java_library( + name = "jsoup", + exports = [ +- "@maven//:org_jsoup_jsoup", ++ "@copybara_maven//:org_jsoup_jsoup", + ], + ) + + java_library( + name = "sun_mail", + exports = [ +- "@maven//:com_sun_mail_javax_mail", ++ "@copybara_maven//:com_sun_mail_javax_mail", + ], + ) + + java_library( + name = "protobuf_lite", + exports = [ +- "@maven//:com_google_protobuf_protobuf_lite", ++ "@copybara_maven//:com_google_protobuf_protobuf_lite", + ], + ) + +diff --git a/third_party/bazel/BUILD b/third_party/bazel/BUILD +index 12b3cf49..0a19ed09 100644 +--- a/third_party/bazel/BUILD ++++ b/third_party/bazel/BUILD +@@ -9,5 +9,5 @@ package( + java_library( + name = "shell", + srcs = glob(["main/**/*.java"]), +- deps = ["@maven//:com_google_guava_guava"], ++ deps = ["@copybara_maven//:com_google_guava_guava"], + ) +diff --git a/third_party/bazel/bazel.patch b/third_party/bazel/bazel.patch +new file mode 100644 +index 00000000..881356b3 +--- /dev/null ++++ b/third_party/bazel/bazel.patch +@@ -0,0 +1,194 @@ ++diff --git a/third_party/BUILD b/third_party/BUILD ++index 262577182a..1bf4666b53 100644 ++--- a/third_party/BUILD +++++ b/third_party/BUILD ++@@ -250,8 +250,8 @@ java_library( ++ distrib_jar_filegroup( ++ name = "auto_value-jars", ++ srcs = [ ++- "@maven//:com_google_auto_value_auto_value_annotations_file", ++- "@maven//:com_google_auto_value_auto_value_file", +++ "@maven//:com_google_auto_value_auto_value", +++ "@maven//:com_google_auto_value_auto_value_annotations", ++ ], ++ enable_distributions = ["debian"], ++ ) ++@@ -305,8 +305,8 @@ java_library( ++ distrib_jar_filegroup( ++ name = "error_prone_annotations-jar", ++ srcs = [ ++- "@maven//:com_google_errorprone_error_prone_annotations_file", ++- "@maven//:org_threeten_threeten_extra_file", +++ "@maven//:com_google_errorprone_error_prone_annotations", +++ "@maven//:org_threeten_threeten_extra", ++ ], ++ enable_distributions = ["debian"], ++ ) ++@@ -329,7 +329,7 @@ alias( ++ distrib_jar_filegroup( ++ name = "jcip_annotations-jars", ++ srcs = [ ++- "@maven//:com_github_stephenc_jcip_jcip_annotations_file", +++ "@maven//:com_github_stephenc_jcip_jcip_annotations", ++ ], ++ enable_distributions = ["debian"], ++ ) ++@@ -352,17 +352,15 @@ filegroup( ++ ++ # TODO(https://github.com/bazelbuild/bazel/issues/18214): After fixing Guava leak ++ # in test-runner, the guava target can be reverted back to java_library ++-java_import( +++java_library( ++ name = "guava", ++ applicable_licenses = [":guava_license"], ++- jars = [ ++- "@maven//:com_google_guava_guava_file", ++- "@maven//:com_google_guava_failureaccess_file", ++- ], ++ exports = [ ++ ":error_prone_annotations", ++ ":jcip_annotations", ++ ":jsr305", +++ "@maven//:com_google_guava_failureaccess", +++ "@maven//:com_google_guava_guava", ++ ], ++ ) ++ ++@@ -396,9 +394,9 @@ license( ++ distrib_jar_filegroup( ++ name = "flogger-jars", ++ srcs = [ ++- "@maven//:com_google_flogger_flogger_file", ++- "@maven//:com_google_flogger_flogger_system_backend_file", ++- "@maven//:com_google_flogger_google_extensions_file", +++ "@maven//:com_google_flogger_flogger", +++ "@maven//:com_google_flogger_flogger_system_backend", +++ "@maven//:com_google_flogger_google_extensions", ++ ], ++ enable_distributions = ["debian"], ++ ) ++@@ -406,14 +404,14 @@ distrib_jar_filegroup( ++ # For bootstrapping JavaBuilder ++ distrib_jar_filegroup( ++ name = "guava-jars", ++- srcs = ["@maven//:com_google_guava_guava_file"], +++ srcs = ["@maven//:com_google_guava_guava"], ++ enable_distributions = ["debian"], ++ ) ++ ++ # For desugaring the Guava jar. ++ distrib_jar_filegroup( ++ name = "guava-failureaccess-jar", ++- srcs = ["@maven//:com_google_guava_failureaccess_file"], +++ srcs = ["@maven//:com_google_guava_failureaccess"], ++ enable_distributions = ["debian"], ++ ) ++ ++@@ -443,7 +441,7 @@ alias( ++ # For bootstrapping JavaBuilder ++ distrib_jar_filegroup( ++ name = "jsr305-jars", ++- srcs = ["@maven//:com_google_code_findbugs_jsr305_file"], +++ srcs = ["@maven//:com_google_code_findbugs_jsr305"], ++ enable_distributions = ["debian"], ++ ) ++ ++@@ -475,11 +473,11 @@ UNNECESSARY_DYNAMIC_LIBRARIES = select({ ++ genrule( ++ name = "filter_netty_dynamic_libs", ++ srcs = select({ ++- "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_aarch_64_file"], ++- "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_x86_64_file"], ++- "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_aarch_64_file"], ++- "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_x86_64_file"], ++- "//src/conditions:windows": ["@maven//:io_netty_netty_tcnative_boringssl_static_windows_x86_64_file"], +++ "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_aarch_64"], +++ "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_x86_64"], +++ "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_aarch_64"], +++ "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_x86_64"], +++ "//src/conditions:windows": ["@maven//:io_netty_netty_tcnative_boringssl_static_windows_x86_64"], ++ "//conditions:default": [], ++ }), ++ outs = ["netty_tcnative/netty-tcnative-filtered.jar"], ++@@ -493,31 +491,31 @@ distrib_java_import( ++ name = "netty", ++ enable_distributions = ["debian"], ++ jars = [ ++- "@maven//:io_netty_netty_buffer_file", ++- "@maven//:io_netty_netty_codec_file", ++- "@maven//:io_netty_netty_codec_http2_file", ++- "@maven//:io_netty_netty_codec_http_file", ++- "@maven//:io_netty_netty_common_file", ++- "@maven//:io_netty_netty_handler_file", ++- "@maven//:io_netty_netty_handler_proxy_file", ++- "@maven//:io_netty_netty_resolver_file", ++- "@maven//:io_netty_netty_resolver_dns_file", ++- "@maven//:io_netty_netty_transport_file", ++- "@maven//:io_netty_netty_transport_classes_epoll_file", ++- "@maven//:io_netty_netty_transport_classes_kqueue_file", +++ "@maven//:io_netty_netty_buffer", +++ "@maven//:io_netty_netty_codec", +++ "@maven//:io_netty_netty_codec_http2", +++ "@maven//:io_netty_netty_codec_http", +++ "@maven//:io_netty_netty_common", +++ "@maven//:io_netty_netty_handler", +++ "@maven//:io_netty_netty_handler_proxy", +++ "@maven//:io_netty_netty_resolver", +++ "@maven//:io_netty_netty_resolver_dns", +++ "@maven//:io_netty_netty_transport", +++ "@maven//:io_netty_netty_transport_classes_epoll", +++ "@maven//:io_netty_netty_transport_classes_kqueue", ++ ] + select({ ++- "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_transport_native_unix_common_osx_aarch_64_file"], ++- "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_transport_native_unix_common_osx_x86_64_file"], ++- "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_unix_common_linux_aarch_64_file"], ++- "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_unix_common_linux_x86_64_file"], ++- "//conditions:default": ["@maven//:io_netty_netty_transport_native_unix_common_file"], +++ "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_transport_native_unix_common_osx_aarch_64"], +++ "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_transport_native_unix_common_osx_x86_64"], +++ "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_unix_common_linux_aarch_64"], +++ "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_unix_common_linux_x86_64"], +++ "//conditions:default": ["@maven//:io_netty_netty_transport_native_unix_common"], ++ }) + select({ ++- "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_transport_native_kqueue_osx_aarch_64_file"], ++- "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_transport_native_kqueue_osx_x86_64_file"], +++ "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_transport_native_kqueue_osx_aarch_64"], +++ "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_transport_native_kqueue_osx_x86_64"], ++ "//conditions:default": [], ++ }) + select({ ++- "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_epoll_linux_aarch_64_file"], ++- "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_epoll_linux_x86_64_file"], +++ "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_epoll_linux_aarch_64"], +++ "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_epoll_linux_x86_64"], ++ "//conditions:default": [], ++ }), ++ ) ++@@ -526,7 +524,7 @@ distrib_java_import( ++ name = "netty_tcnative", ++ enable_distributions = ["debian"], ++ jars = [ ++- "@maven//:io_netty_netty_tcnative_classes_file", +++ "@maven//:io_netty_netty_tcnative_classes", ++ ] + select({ ++ "//src/conditions:darwin_arm64": [":netty_tcnative/netty-tcnative-filtered.jar"], ++ "//src/conditions:darwin_x86_64": [":netty_tcnative/netty-tcnative-filtered.jar"], ++@@ -545,7 +543,7 @@ alias( ++ # For bootstrapping JavaBuilder ++ distrib_jar_filegroup( ++ name = "tomcat_annotations_api-jars", ++- srcs = ["@maven//:org_apache_tomcat_tomcat_annotations_api_file"], +++ srcs = ["@maven//:org_apache_tomcat_tomcat_annotations_api"], ++ enable_distributions = ["debian"], ++ ) ++ ++@@ -618,8 +616,8 @@ alias( ++ filegroup( ++ name = "junit4-jars", ++ srcs = [ ++- "@maven//:junit_junit_file", ++- "@maven//:org_hamcrest_hamcrest_core_file", +++ "@maven//:junit_junit", +++ "@maven//:org_hamcrest_hamcrest_core", ++ ], ++ ) ++ diff --git a/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml b/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml index b7d48e4404b..6349bdeca73 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml +++ b/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml @@ -1,8 +1,8 @@ -bcr_test_module: - module_path: '.' - matrix: - platform: ["debian10", "macos", "ubuntu2004", "windows"] - bazel: ["7.x"] +matrix: + platform: ["debian10", "macos", "ubuntu2004", "windows"] + bazel: ["7.x"] + +tasks: verify_targets: platform: ${{ platform }} bazel: ${{ bazel }} diff --git a/modules/copybara/0.0.0-20240326-6485af6/source.json b/modules/copybara/0.0.0-20240326-6485af6/source.json index 0a46120449b..2eda7fd39d1 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/source.json +++ b/modules/copybara/0.0.0-20240326-6485af6/source.json @@ -4,9 +4,8 @@ "url": "https://github.com/google/copybara/archive/6485af6a5c662d5549d2f4d229c239d401132e58.tar.gz", "patch_strip": 1, "patches": { - "add_module_bazel.patch": "sha256-jqwFuZobu1TVWiD7y0nzHVq2gMCiJgfZ/k1QDISQD+U=", - "add_rules_jvm_external_patch.patch": "sha256-4K/jDxiKCI7ZYmpK0Er6wrlQuCDnbjFyH1n5t52FW2E=", + "add_module_bazel.patch": "sha256-vFWdPyr8tW4qvlpoE/f3uKiUwcBL3lNWw6eUafvOvoA=", "update_labels.patch": "sha256-NgVZLFARwepmslzc13t8NDoZRFv8nxdXqOH9grEr4VM=", - "update_repos.patch": "sha256-de970dZLle3mhPdqqcQrBWgne5tL9AKI8gzXoJ8bZxw=" + "update_repos.patch": "sha256-zYvLfhLoVwq5LsIrz5ivHmbk9uJqMKmPXBcs7LfAqLk=" } } From c4c00f2d8d8facbb3a0d729c7a95a8e3be4ce5d8 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 17:31:56 -0700 Subject: [PATCH 07/10] fix patches --- .../patches/update_repos.patch | 211 ------------------ .../0.0.0-20240326-6485af6/source.json | 2 +- 2 files changed, 1 insertion(+), 212 deletions(-) diff --git a/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch b/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch index 9e092bb9f73..f3af288a4bc 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch +++ b/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch @@ -78,217 +78,6 @@ index 7912c917..ed04ebc8 100644 ) + +non_module_deps = module_extension(implementation = _non_module_deps) -diff --git a/third_party/BUILD b/third_party/BUILD -index b29dbe2d..99771f48 100644 ---- a/third_party/BUILD -+++ b/third_party/BUILD -@@ -15,8 +15,8 @@ package( - java_library( - name = "guava", - exports = [ -- "@maven//:com_google_guava_failureaccess", -- "@maven//:com_google_guava_guava", -+ "@copybara_maven//:com_google_guava_failureaccess", -+ "@copybara_maven//:com_google_guava_guava", - ], - ) - -@@ -24,21 +24,21 @@ java_library( - name = "guava_testlib", - testonly = 1, - exports = [ -- "@maven//:com_google_guava_guava_testlib", -+ "@copybara_maven//:com_google_guava_guava_testlib", - ], - ) - - java_library( - name = "apache_commons_compress", - exports = [ -- "@maven//:org_apache_commons_commons_compress", -+ "@copybara_maven//:org_apache_commons_commons_compress", - ], - ) - - java_library( - name = "autocommon", - exports = [ -- "@maven//:com_google_auto_auto_common", -+ "@copybara_maven//:com_google_auto_auto_common", - ], - ) - -@@ -46,8 +46,8 @@ java_plugin( - name = "autovalue_plugin", - processor_class = "com.google.auto.value.processor.AutoValueProcessor", - deps = [ -- "@maven//:com_google_auto_value_auto_value", -- "@maven//:com_google_auto_value_auto_value_annotations", -+ "@copybara_maven//:com_google_auto_value_auto_value", -+ "@copybara_maven//:com_google_auto_value_auto_value_annotations", - ], - ) - -@@ -59,8 +59,8 @@ java_library( - # TODO(matvore): What to export to give access to @AutoValue annotation - # without depending on the processor at runtime? - exports = [ -- "@maven//:com_google_auto_value_auto_value", -- "@maven//:com_google_auto_value_auto_value_annotations", -+ "@copybara_maven//:com_google_auto_value_auto_value", -+ "@copybara_maven//:com_google_auto_value_auto_value_annotations", - ], - ) - -@@ -74,7 +74,7 @@ java_library( - java_library( - name = "jimfs", - exports = [ -- "@maven//:com_google_jimfs_jimfs", -+ "@copybara_maven//:com_google_jimfs_jimfs", - ], - ) - -@@ -82,7 +82,7 @@ java_library( - name = "junit", - testonly = 1, - exports = [ -- "@maven//:junit_junit", -+ "@copybara_maven//:junit_junit", - ], - ) - -@@ -90,14 +90,14 @@ java_library( - name = "testparameterinjector", - testonly = 1, - exports = [ -- "@maven//:com_google_testparameterinjector_test_parameter_injector", -+ "@copybara_maven//:com_google_testparameterinjector_test_parameter_injector", - ], - ) - - java_library( - name = "re2j", - exports = [ -- "@maven//:com_google_re2j_re2j", -+ "@copybara_maven//:com_google_re2j_re2j", - ], - ) - -@@ -112,16 +112,16 @@ java_library( - name = "truth", - testonly = 1, - exports = [ -- "@maven//:com_google_truth_extensions_truth_java8_extension", -- "@maven//:com_google_truth_truth", -- "@maven//:com_googlecode_java_diff_utils_diffutils", -+ "@copybara_maven//:com_google_truth_extensions_truth_java8_extension", -+ "@copybara_maven//:com_google_truth_truth", -+ "@copybara_maven//:com_googlecode_java_diff_utils_diffutils", - ], - ) - - java_library( - name = "google_code_gson", - exports = [ -- "@maven//:com_google_code_gson_gson", -+ "@copybara_maven//:com_google_code_gson_gson", - ], - ) - -@@ -129,9 +129,9 @@ java_library( - name = "google_http_client", - exports = [ - ":google_code_gson", -- "@maven//:com_google_http_client_google_http_client", -- "@maven//:com_google_http_client_google_http_client_gson", -- "@maven//:commons_codec_commons_codec", -+ "@copybara_maven//:com_google_http_client_google_http_client", -+ "@copybara_maven//:com_google_http_client_google_http_client_gson", -+ "@copybara_maven//:commons_codec_commons_codec", - ], - ) - -@@ -139,7 +139,7 @@ java_library( - name = "google_http_client_test", - testonly = 1, - exports = [ -- "@maven//:com_google_http_client_google_http_client_test", -+ "@copybara_maven//:com_google_http_client_google_http_client_test", - ], - ) - -@@ -147,19 +147,19 @@ java_library( - name = "mockito", - testonly = 1, - exports = [ -- "@maven//:org_mockito_mockito_core", -+ "@copybara_maven//:org_mockito_mockito_core", - ], - runtime_deps = [ -- "@maven//:net_bytebuddy_byte_buddy", -- "@maven//:net_bytebuddy_byte_buddy_agent", -- "@maven//:org_objenesis_objenesis", -+ "@copybara_maven//:net_bytebuddy_byte_buddy", -+ "@copybara_maven//:net_bytebuddy_byte_buddy_agent", -+ "@copybara_maven//:org_objenesis_objenesis", - ], - ) - - java_library( - name = "jsr305", - exports = [ -- "@maven//:com_google_code_findbugs_jsr305", -+ "@copybara_maven//:com_google_code_findbugs_jsr305", - ], - ) - -@@ -176,10 +176,10 @@ java_library( - java_library( - name = "flogger", - exports = [ -- "@maven//:com_google_flogger_flogger", -+ "@copybara_maven//:com_google_flogger_flogger", - ], - runtime_deps = [ -- "@maven//:com_google_flogger_flogger_system_backend", -+ "@copybara_maven//:com_google_flogger_flogger_system_backend", - ], - ) - -@@ -201,28 +201,28 @@ java_library( - java_library( - name = "tomlj", - exports = [ -- "@maven//:org_tomlj_tomlj", -+ "@copybara_maven//:org_tomlj_tomlj", - ], - ) - - java_library( - name = "jsoup", - exports = [ -- "@maven//:org_jsoup_jsoup", -+ "@copybara_maven//:org_jsoup_jsoup", - ], - ) - - java_library( - name = "sun_mail", - exports = [ -- "@maven//:com_sun_mail_javax_mail", -+ "@copybara_maven//:com_sun_mail_javax_mail", - ], - ) - - java_library( - name = "protobuf_lite", - exports = [ -- "@maven//:com_google_protobuf_protobuf_lite", -+ "@copybara_maven//:com_google_protobuf_protobuf_lite", - ], - ) - diff --git a/third_party/bazel/BUILD b/third_party/bazel/BUILD index 12b3cf49..0a19ed09 100644 --- a/third_party/bazel/BUILD diff --git a/modules/copybara/0.0.0-20240326-6485af6/source.json b/modules/copybara/0.0.0-20240326-6485af6/source.json index 2eda7fd39d1..e27de5844ab 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/source.json +++ b/modules/copybara/0.0.0-20240326-6485af6/source.json @@ -6,6 +6,6 @@ "patches": { "add_module_bazel.patch": "sha256-vFWdPyr8tW4qvlpoE/f3uKiUwcBL3lNWw6eUafvOvoA=", "update_labels.patch": "sha256-NgVZLFARwepmslzc13t8NDoZRFv8nxdXqOH9grEr4VM=", - "update_repos.patch": "sha256-zYvLfhLoVwq5LsIrz5ivHmbk9uJqMKmPXBcs7LfAqLk=" + "update_repos.patch": "sha256-ZPoPvbSZuDzMFCf1oA/i87lOKZKg8gCvleUaErsuZhM=" } } From 4f0f947bbd0e8249cd1c49495b10bf542e12b890 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 17:37:15 -0700 Subject: [PATCH 08/10] for real --- .../patches/update_repos.patch | 101 ++++-------------- .../0.0.0-20240326-6485af6/source.json | 2 +- 2 files changed, 20 insertions(+), 83 deletions(-) diff --git a/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch b/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch index f3af288a4bc..c055fd51cca 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch +++ b/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch @@ -8,7 +8,7 @@ index 7912c917..ed04ebc8 100644 load("//third_party:bazel.bzl", "bazel_sha256", "bazel_version") -load("//third_party:bazel_buildtools.bzl", "buildtools_sha256", "buildtools_version") load("//third_party:bazel_skylib.bzl", "skylib_sha256", "skylib_version") - + def copybara_repositories(): @@ -39,27 +38,6 @@ def copybara_repositories(): # sha256 = RULES_JVM_EXTERNAL_SHA, @@ -36,12 +36,12 @@ index 7912c917..ed04ebc8 100644 - strip_prefix = "buildtools-" + buildtools_version, - url = "https://github.com/bazelbuild/buildtools/archive/" + buildtools_version + ".zip", ) - + # LICENSE: The Apache Software License, Version 2.0 @@ -173,6 +151,33 @@ def copybara_repositories(): ], ) - + + # LICENSE: MIT + maybe( + http_archive, @@ -78,61 +78,36 @@ index 7912c917..ed04ebc8 100644 ) + +non_module_deps = module_extension(implementation = _non_module_deps) -diff --git a/third_party/bazel/BUILD b/third_party/bazel/BUILD -index 12b3cf49..0a19ed09 100644 ---- a/third_party/bazel/BUILD -+++ b/third_party/bazel/BUILD -@@ -9,5 +9,5 @@ package( - java_library( - name = "shell", - srcs = glob(["main/**/*.java"]), -- deps = ["@maven//:com_google_guava_guava"], -+ deps = ["@copybara_maven//:com_google_guava_guava"], - ) diff --git a/third_party/bazel/bazel.patch b/third_party/bazel/bazel.patch new file mode 100644 -index 00000000..881356b3 +index 00000000..30a50b8b --- /dev/null +++ b/third_party/bazel/bazel.patch -@@ -0,0 +1,194 @@ +@@ -0,0 +1,142 @@ +diff --git a/third_party/BUILD b/third_party/BUILD +index 262577182a..1bf4666b53 100644 +--- a/third_party/BUILD ++++ b/third_party/BUILD -+@@ -250,8 +250,8 @@ java_library( -+ distrib_jar_filegroup( -+ name = "auto_value-jars", ++@@ -252,4 +252,4 @@ distrib_jar_filegroup( + srcs = [ +- "@maven//:com_google_auto_value_auto_value_annotations_file", +- "@maven//:com_google_auto_value_auto_value_file", ++ "@maven//:com_google_auto_value_auto_value", ++ "@maven//:com_google_auto_value_auto_value_annotations", + ], -+ enable_distributions = ["debian"], -+ ) -+@@ -305,8 +305,8 @@ java_library( -+ distrib_jar_filegroup( -+ name = "error_prone_annotations-jar", ++@@ -307,4 +307,4 @@ distrib_jar_filegroup( + srcs = [ +- "@maven//:com_google_errorprone_error_prone_annotations_file", +- "@maven//:org_threeten_threeten_extra_file", ++ "@maven//:com_google_errorprone_error_prone_annotations", ++ "@maven//:org_threeten_threeten_extra", + ], -+ enable_distributions = ["debian"], -+ ) -+@@ -329,7 +329,7 @@ alias( -+ distrib_jar_filegroup( -+ name = "jcip_annotations-jars", ++@@ -331,3 +331,3 @@ distrib_jar_filegroup( + srcs = [ +- "@maven//:com_github_stephenc_jcip_jcip_annotations_file", ++ "@maven//:com_github_stephenc_jcip_jcip_annotations", + ], -+ enable_distributions = ["debian"], -+ ) -+@@ -352,17 +352,15 @@ filegroup( -+ -+ # TODO(https://github.com/bazelbuild/bazel/issues/18214): After fixing Guava leak ++@@ -354,9 +354,5 @@ filegroup( + # in test-runner, the guava target can be reverted back to java_library +-java_import( ++java_library( @@ -143,17 +118,12 @@ index 00000000..881356b3 +- "@maven//:com_google_guava_failureaccess_file", +- ], + exports = [ -+ ":error_prone_annotations", -+ ":jcip_annotations", ++@@ -365,2 +361,4 @@ java_import( + ":jsr305", ++ "@maven//:com_google_guava_failureaccess", ++ "@maven//:com_google_guava_guava", + ], -+ ) -+ -+@@ -396,9 +394,9 @@ license( -+ distrib_jar_filegroup( -+ name = "flogger-jars", ++@@ -398,5 +396,5 @@ distrib_jar_filegroup( + srcs = [ +- "@maven//:com_google_flogger_flogger_file", +- "@maven//:com_google_flogger_flogger_system_backend_file", @@ -162,37 +132,22 @@ index 00000000..881356b3 ++ "@maven//:com_google_flogger_flogger_system_backend", ++ "@maven//:com_google_flogger_google_extensions", + ], -+ enable_distributions = ["debian"], -+ ) -+@@ -406,14 +404,14 @@ distrib_jar_filegroup( -+ # For bootstrapping JavaBuilder -+ distrib_jar_filegroup( ++@@ -408,3 +406,3 @@ distrib_jar_filegroup( + name = "guava-jars", +- srcs = ["@maven//:com_google_guava_guava_file"], ++ srcs = ["@maven//:com_google_guava_guava"], + enable_distributions = ["debian"], -+ ) -+ -+ # For desugaring the Guava jar. -+ distrib_jar_filegroup( ++@@ -415,3 +413,3 @@ distrib_jar_filegroup( + name = "guava-failureaccess-jar", +- srcs = ["@maven//:com_google_guava_failureaccess_file"], ++ srcs = ["@maven//:com_google_guava_failureaccess"], + enable_distributions = ["debian"], -+ ) -+ -+@@ -443,7 +441,7 @@ alias( -+ # For bootstrapping JavaBuilder -+ distrib_jar_filegroup( ++@@ -445,3 +443,3 @@ distrib_jar_filegroup( + name = "jsr305-jars", +- srcs = ["@maven//:com_google_code_findbugs_jsr305_file"], ++ srcs = ["@maven//:com_google_code_findbugs_jsr305"], + enable_distributions = ["debian"], -+ ) -+ -+@@ -475,11 +473,11 @@ UNNECESSARY_DYNAMIC_LIBRARIES = select({ -+ genrule( -+ name = "filter_netty_dynamic_libs", ++@@ -477,7 +475,7 @@ genrule( + srcs = select({ +- "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_aarch_64_file"], +- "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_x86_64_file"], @@ -205,11 +160,7 @@ index 00000000..881356b3 ++ "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_x86_64"], ++ "//src/conditions:windows": ["@maven//:io_netty_netty_tcnative_boringssl_static_windows_x86_64"], + "//conditions:default": [], -+ }), -+ outs = ["netty_tcnative/netty-tcnative-filtered.jar"], -+@@ -493,31 +491,31 @@ distrib_java_import( -+ name = "netty", -+ enable_distributions = ["debian"], ++@@ -495,27 +493,27 @@ distrib_java_import( + jars = [ +- "@maven//:io_netty_netty_buffer_file", +- "@maven//:io_netty_netty_codec_file", @@ -258,34 +209,20 @@ index 00000000..881356b3 ++ "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_epoll_linux_aarch_64"], ++ "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_epoll_linux_x86_64"], + "//conditions:default": [], -+ }), -+ ) -+@@ -526,7 +524,7 @@ distrib_java_import( -+ name = "netty_tcnative", -+ enable_distributions = ["debian"], ++@@ -528,3 +526,3 @@ distrib_java_import( + jars = [ +- "@maven//:io_netty_netty_tcnative_classes_file", ++ "@maven//:io_netty_netty_tcnative_classes", + ] + select({ -+ "//src/conditions:darwin_arm64": [":netty_tcnative/netty-tcnative-filtered.jar"], -+ "//src/conditions:darwin_x86_64": [":netty_tcnative/netty-tcnative-filtered.jar"], -+@@ -545,7 +543,7 @@ alias( -+ # For bootstrapping JavaBuilder -+ distrib_jar_filegroup( ++@@ -547,3 +545,3 @@ distrib_jar_filegroup( + name = "tomcat_annotations_api-jars", +- srcs = ["@maven//:org_apache_tomcat_tomcat_annotations_api_file"], ++ srcs = ["@maven//:org_apache_tomcat_tomcat_annotations_api"], + enable_distributions = ["debian"], -+ ) -+ -+@@ -618,8 +616,8 @@ alias( -+ filegroup( -+ name = "junit4-jars", ++@@ -620,4 +618,4 @@ filegroup( + srcs = [ +- "@maven//:junit_junit_file", +- "@maven//:org_hamcrest_hamcrest_core_file", ++ "@maven//:junit_junit", ++ "@maven//:org_hamcrest_hamcrest_core", + ], -+ ) -+ diff --git a/modules/copybara/0.0.0-20240326-6485af6/source.json b/modules/copybara/0.0.0-20240326-6485af6/source.json index e27de5844ab..b1a70f86c81 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/source.json +++ b/modules/copybara/0.0.0-20240326-6485af6/source.json @@ -6,6 +6,6 @@ "patches": { "add_module_bazel.patch": "sha256-vFWdPyr8tW4qvlpoE/f3uKiUwcBL3lNWw6eUafvOvoA=", "update_labels.patch": "sha256-NgVZLFARwepmslzc13t8NDoZRFv8nxdXqOH9grEr4VM=", - "update_repos.patch": "sha256-ZPoPvbSZuDzMFCf1oA/i87lOKZKg8gCvleUaErsuZhM=" + "update_repos.patch": "sha256-OxYoaPWcwBP2cdyIjApyINJM0i9e7N2nvn275UrgBZA=" } } From 6283db0013ab48bbe73065b3611990e0c52bf9e8 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Wed, 27 Mar 2024 17:39:20 -0700 Subject: [PATCH 09/10] flags --- modules/copybara/0.0.0-20240326-6485af6/presubmit.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml b/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml index 6349bdeca73..dc56897f22c 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml +++ b/modules/copybara/0.0.0-20240326-6485af6/presubmit.yml @@ -6,5 +6,8 @@ tasks: verify_targets: platform: ${{ platform }} bazel: ${{ bazel }} + build_flags: + - "--java_language_version=11" + - "--tool_java_language_version=11" build_targets: - "@copybara//java/com/google/copybara:copybara" From 58c9dd88ba254a2c02fafcd150def10e95540fdd Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Thu, 28 Mar 2024 09:10:22 -0700 Subject: [PATCH 10/10] smaller patch --- .../patches/update_repos.patch | 135 ++---------------- .../0.0.0-20240326-6485af6/source.json | 2 +- 2 files changed, 9 insertions(+), 128 deletions(-) diff --git a/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch b/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch index c055fd51cca..efb4bb63ec0 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch +++ b/modules/copybara/0.0.0-20240326-6485af6/patches/update_repos.patch @@ -80,34 +80,16 @@ index 7912c917..ed04ebc8 100644 +non_module_deps = module_extension(implementation = _non_module_deps) diff --git a/third_party/bazel/bazel.patch b/third_party/bazel/bazel.patch new file mode 100644 -index 00000000..30a50b8b +index 00000000..9ad790ca --- /dev/null +++ b/third_party/bazel/bazel.patch -@@ -0,0 +1,142 @@ +@@ -0,0 +1,23 @@ +diff --git a/third_party/BUILD b/third_party/BUILD -+index 262577182a..1bf4666b53 100644 ++index 262577182a..6300c8f25a 100644 +--- a/third_party/BUILD ++++ b/third_party/BUILD -+@@ -252,4 +252,4 @@ distrib_jar_filegroup( -+ srcs = [ -+- "@maven//:com_google_auto_value_auto_value_annotations_file", -+- "@maven//:com_google_auto_value_auto_value_file", -++ "@maven//:com_google_auto_value_auto_value", -++ "@maven//:com_google_auto_value_auto_value_annotations", -+ ], -+@@ -307,4 +307,4 @@ distrib_jar_filegroup( -+ srcs = [ -+- "@maven//:com_google_errorprone_error_prone_annotations_file", -+- "@maven//:org_threeten_threeten_extra_file", -++ "@maven//:com_google_errorprone_error_prone_annotations", -++ "@maven//:org_threeten_threeten_extra", -+ ], -+@@ -331,3 +331,3 @@ distrib_jar_filegroup( -+ srcs = [ -+- "@maven//:com_github_stephenc_jcip_jcip_annotations_file", -++ "@maven//:com_github_stephenc_jcip_jcip_annotations", -+ ], -+@@ -354,9 +354,5 @@ filegroup( ++@@ -353,15 +353,13 @@ filegroup( ++ # TODO(https://github.com/bazelbuild/bazel/issues/18214): After fixing Guava leak + # in test-runner, the guava target can be reverted back to java_library +-java_import( ++java_library( @@ -118,111 +100,10 @@ index 00000000..30a50b8b +- "@maven//:com_google_guava_failureaccess_file", +- ], + exports = [ -+@@ -365,2 +361,4 @@ java_import( ++ ":error_prone_annotations", ++ ":jcip_annotations", + ":jsr305", ++ "@maven//:com_google_guava_failureaccess", ++ "@maven//:com_google_guava_guava", + ], -+@@ -398,5 +396,5 @@ distrib_jar_filegroup( -+ srcs = [ -+- "@maven//:com_google_flogger_flogger_file", -+- "@maven//:com_google_flogger_flogger_system_backend_file", -+- "@maven//:com_google_flogger_google_extensions_file", -++ "@maven//:com_google_flogger_flogger", -++ "@maven//:com_google_flogger_flogger_system_backend", -++ "@maven//:com_google_flogger_google_extensions", -+ ], -+@@ -408,3 +406,3 @@ distrib_jar_filegroup( -+ name = "guava-jars", -+- srcs = ["@maven//:com_google_guava_guava_file"], -++ srcs = ["@maven//:com_google_guava_guava"], -+ enable_distributions = ["debian"], -+@@ -415,3 +413,3 @@ distrib_jar_filegroup( -+ name = "guava-failureaccess-jar", -+- srcs = ["@maven//:com_google_guava_failureaccess_file"], -++ srcs = ["@maven//:com_google_guava_failureaccess"], -+ enable_distributions = ["debian"], -+@@ -445,3 +443,3 @@ distrib_jar_filegroup( -+ name = "jsr305-jars", -+- srcs = ["@maven//:com_google_code_findbugs_jsr305_file"], -++ srcs = ["@maven//:com_google_code_findbugs_jsr305"], -+ enable_distributions = ["debian"], -+@@ -477,7 +475,7 @@ genrule( -+ srcs = select({ -+- "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_aarch_64_file"], -+- "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_x86_64_file"], -+- "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_aarch_64_file"], -+- "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_x86_64_file"], -+- "//src/conditions:windows": ["@maven//:io_netty_netty_tcnative_boringssl_static_windows_x86_64_file"], -++ "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_aarch_64"], -++ "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_x86_64"], -++ "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_aarch_64"], -++ "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_x86_64"], -++ "//src/conditions:windows": ["@maven//:io_netty_netty_tcnative_boringssl_static_windows_x86_64"], -+ "//conditions:default": [], -+@@ -495,27 +493,27 @@ distrib_java_import( -+ jars = [ -+- "@maven//:io_netty_netty_buffer_file", -+- "@maven//:io_netty_netty_codec_file", -+- "@maven//:io_netty_netty_codec_http2_file", -+- "@maven//:io_netty_netty_codec_http_file", -+- "@maven//:io_netty_netty_common_file", -+- "@maven//:io_netty_netty_handler_file", -+- "@maven//:io_netty_netty_handler_proxy_file", -+- "@maven//:io_netty_netty_resolver_file", -+- "@maven//:io_netty_netty_resolver_dns_file", -+- "@maven//:io_netty_netty_transport_file", -+- "@maven//:io_netty_netty_transport_classes_epoll_file", -+- "@maven//:io_netty_netty_transport_classes_kqueue_file", -++ "@maven//:io_netty_netty_buffer", -++ "@maven//:io_netty_netty_codec", -++ "@maven//:io_netty_netty_codec_http2", -++ "@maven//:io_netty_netty_codec_http", -++ "@maven//:io_netty_netty_common", -++ "@maven//:io_netty_netty_handler", -++ "@maven//:io_netty_netty_handler_proxy", -++ "@maven//:io_netty_netty_resolver", -++ "@maven//:io_netty_netty_resolver_dns", -++ "@maven//:io_netty_netty_transport", -++ "@maven//:io_netty_netty_transport_classes_epoll", -++ "@maven//:io_netty_netty_transport_classes_kqueue", -+ ] + select({ -+- "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_transport_native_unix_common_osx_aarch_64_file"], -+- "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_transport_native_unix_common_osx_x86_64_file"], -+- "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_unix_common_linux_aarch_64_file"], -+- "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_unix_common_linux_x86_64_file"], -+- "//conditions:default": ["@maven//:io_netty_netty_transport_native_unix_common_file"], -++ "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_transport_native_unix_common_osx_aarch_64"], -++ "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_transport_native_unix_common_osx_x86_64"], -++ "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_unix_common_linux_aarch_64"], -++ "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_unix_common_linux_x86_64"], -++ "//conditions:default": ["@maven//:io_netty_netty_transport_native_unix_common"], -+ }) + select({ -+- "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_transport_native_kqueue_osx_aarch_64_file"], -+- "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_transport_native_kqueue_osx_x86_64_file"], -++ "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_transport_native_kqueue_osx_aarch_64"], -++ "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_transport_native_kqueue_osx_x86_64"], -+ "//conditions:default": [], -+ }) + select({ -+- "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_epoll_linux_aarch_64_file"], -+- "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_epoll_linux_x86_64_file"], -++ "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_epoll_linux_aarch_64"], -++ "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_epoll_linux_x86_64"], -+ "//conditions:default": [], -+@@ -528,3 +526,3 @@ distrib_java_import( -+ jars = [ -+- "@maven//:io_netty_netty_tcnative_classes_file", -++ "@maven//:io_netty_netty_tcnative_classes", -+ ] + select({ -+@@ -547,3 +545,3 @@ distrib_jar_filegroup( -+ name = "tomcat_annotations_api-jars", -+- srcs = ["@maven//:org_apache_tomcat_tomcat_annotations_api_file"], -++ srcs = ["@maven//:org_apache_tomcat_tomcat_annotations_api"], -+ enable_distributions = ["debian"], -+@@ -620,4 +618,4 @@ filegroup( -+ srcs = [ -+- "@maven//:junit_junit_file", -+- "@maven//:org_hamcrest_hamcrest_core_file", -++ "@maven//:junit_junit", -++ "@maven//:org_hamcrest_hamcrest_core", -+ ], ++ ) diff --git a/modules/copybara/0.0.0-20240326-6485af6/source.json b/modules/copybara/0.0.0-20240326-6485af6/source.json index b1a70f86c81..9f1791f3c21 100644 --- a/modules/copybara/0.0.0-20240326-6485af6/source.json +++ b/modules/copybara/0.0.0-20240326-6485af6/source.json @@ -6,6 +6,6 @@ "patches": { "add_module_bazel.patch": "sha256-vFWdPyr8tW4qvlpoE/f3uKiUwcBL3lNWw6eUafvOvoA=", "update_labels.patch": "sha256-NgVZLFARwepmslzc13t8NDoZRFv8nxdXqOH9grEr4VM=", - "update_repos.patch": "sha256-OxYoaPWcwBP2cdyIjApyINJM0i9e7N2nvn275UrgBZA=" + "update_repos.patch": "sha256-l/GcBEsFIYHst3TIG8765eSFxvr3LjzZlWr2W3Xtb9o=" } }