jj_3_way.patch

<<<<<<< Conflict 1 of 1
%%%%%%% Changes from base #1 to side #1
 load("@contrib_rules_jvm//java:defs.bzl", "java_binary")
 
 java_binary(
     name = "mvn",
     jvm_flags = ["-Dmaven.multiModuleProjectDirectory=/tmp/m2"],
     main_class = "org.apache.maven.cli.MavenCli",
     visibility = [
         "//python/release_tools:__pkg__",
     ],
-    runtime_deps = ["@maven//:org_apache_maven_maven_embedder"],
+    runtime_deps = [
+        "@maven//:org_apache_maven_maven_embedder",
+        "@maven//:org_slf4j_slf4j_simple",
+    ],
 )
+++++++ Contents of side #2
%%%%%%% Changes from base #2 to side #3
 load("@contrib_rules_jvm//java:defs.bzl", "java_binary")
 
 java_binary(
     name = "mvn",
     jvm_flags = ["-Dmaven.multiModuleProjectDirectory=/tmp/m2"],
     main_class = "org.apache.maven.cli.MavenCli",
     runtime_deps = [
         "@maven//:org_apache_maven_maven_embedder",
         "@maven//:org_slf4j_slf4j_simple",
     ],
+    visibility = [
+        "//python/release_tools:__pkg__",
+    ],
 )
>>>>>>> Conflict 1 of 1 ends