From 8ea6c072a00ba01aa5eefad9b3740df9df2b00a0 Mon Sep 17 00:00:00 2001
From: Ivo List <ilist@google.com>
Date: Thu, 10 Nov 2022 23:28:58 +0100
Subject: [PATCH] Bump version to 5.3.5, fix failures from 5.3.4

---
 .bcr/presubmit.yml                    | 2 +-
 BUILD                                 | 2 +-
 MODULE.bazel                          | 4 ++--
 java/BUILD                            | 4 ++--
 java/defs.bzl                         | 2 +-
 java/private/BUILD                    | 4 ++--
 toolchains/BUILD                      | 2 +-
 toolchains/default_java_toolchain.bzl | 2 ++
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
index 0cbdf61..52f713e 100644
--- a/.bcr/presubmit.yml
+++ b/.bcr/presubmit.yml
@@ -5,4 +5,4 @@ tasks:
     name: "Verify build targets"
     platform: ${{ platform }}
     build_targets:
-      - "@rules_java//..."
+      - "@rules_java//java/..."
diff --git a/BUILD b/BUILD
index 1daa47d..0fdc3cd 100644
--- a/BUILD
+++ b/BUILD
@@ -12,5 +12,5 @@ filegroup(
         "//java:srcs",
         "//toolchains:srcs",
     ],
-    visibility = ["@//distro:__pkg__"],
+    visibility = ["//distro:__pkg__"],
 )
diff --git a/MODULE.bazel b/MODULE.bazel
index 675abb0..f325f19 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -1,11 +1,11 @@
 module(
     name = "rules_java",
     compatibility_level = 1,
-    version = "5.3.4",
+    version = "5.3.5",
 )
 
 bazel_dep(name = "platforms", version = "0.0.4")
-bazel_dep(name = "rules_cc", version = "0.0.1")
+bazel_dep(name = "rules_cc", version = "0.0.2")
 bazel_dep(name = "bazel_skylib", version = "1.2.0")
 
 # rules_proto is required by @remote_java_tools, which is loaded via module extension.
diff --git a/java/BUILD b/java/BUILD
index 3d7f129..8e07ca3 100644
--- a/java/BUILD
+++ b/java/BUILD
@@ -6,8 +6,8 @@ licenses(["notice"])
 
 filegroup(
     name = "srcs",
-    srcs = glob(["**"]) + ["@//java/private:srcs"],
-    visibility = ["@//:__pkg__"],
+    srcs = glob(["**"]) + ["//java/private:srcs"],
+    visibility = ["//:__pkg__"],
 )
 
 bzl_library(
diff --git a/java/defs.bzl b/java/defs.bzl
index 1aa678d..ef7a445 100644
--- a/java/defs.bzl
+++ b/java/defs.bzl
@@ -18,7 +18,7 @@ load("//java/private:native.bzl", "NativeJavaInfo", "NativeJavaPluginInfo", "nat
 # Do not touch: This line marks the end of loads; needed for PR importing.
 
 _MIGRATION_TAG = "__JAVA_RULES_MIGRATION_DO_NOT_USE_WILL_BREAK__"
-version = "5.3.4"
+version = "5.3.5"
 
 def _add_tags(attrs):
     if "tags" in attrs and attrs["tags"] != None:
diff --git a/java/private/BUILD b/java/private/BUILD
index 2995c97..9f50995 100644
--- a/java/private/BUILD
+++ b/java/private/BUILD
@@ -5,11 +5,11 @@ licenses(["notice"])
 bzl_library(
     name = "private",
     srcs = ["native.bzl"],
-    visibility = ["@//java:__pkg__"],
+    visibility = ["//java:__pkg__"],
 )
 
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
-    visibility = ["@//java:__pkg__"],
+    visibility = ["//java:__pkg__"],
 )
diff --git a/toolchains/BUILD b/toolchains/BUILD
index 3c1f8b2..d9f3362 100644
--- a/toolchains/BUILD
+++ b/toolchains/BUILD
@@ -22,7 +22,7 @@ licenses(["notice"])
 filegroup(
     name = "srcs",
     srcs = glob(["**"]),
-    visibility = ["@//:__pkg__"],
+    visibility = ["//:__pkg__"],
 )
 
 # Used to distinguish toolchains used for Java development, ie the JavaToolchainProvider.
diff --git a/toolchains/default_java_toolchain.bzl b/toolchains/default_java_toolchain.bzl
index bbe20fb..417f08b 100644
--- a/toolchains/default_java_toolchain.bzl
+++ b/toolchains/default_java_toolchain.bzl
@@ -177,6 +177,7 @@ def java_runtime_files(name, srcs):
     native.filegroup(
         name = name,
         srcs = srcs,
+        tags = ["manual"],
     )
     for src in srcs:
         native.genrule(
@@ -185,6 +186,7 @@ def java_runtime_files(name, srcs):
             toolchains = ["//toolchains:current_java_runtime"],
             cmd = "cp $(JAVABASE)/%s $@" % src,
             outs = [src],
+            tags = ["manual"],
         )
 
 def _bootclasspath_impl(ctx):