build(deps): Bump Bazel from 7.4.1 to 8.0.0

enola-dev · Dec 30, 2024 · 6af9f82 · 6af9f82
1 parent 9d522ca
commit 6af9f82
Show file tree

Hide file tree

Showing 29 changed files with 131 additions and 145 deletions.
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.4.1
+8.0.0
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -23,7 +23,7 @@ GRPC_JAVA_VERSION = "1.69.0"
 register_toolchains("//tools/java_toolchain:repository_default_java_toolchain_definition")
 
 # https://github.com/protocolbuffers/protobuf/tree/main?tab=readme-ov-file#bazel-with-bzlmod
-bazel_dep(name = "protobuf", version = "29.2", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "29.2")
 
 # https://registry.bazel.build/modules/rules_java
 bazel_dep(name = "rules_java", version = "8.6.3")

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/connectors/demo/BUILD.disabled b/connectors/demo/BUILD.disabled
@@ -15,13 +15,13 @@
 # limitations under the License.
 
 load("@rules_java//java:defs.bzl", "java_binary", "java_proto_library", "java_test")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
 
 proto_library(
     name = "demo_proto",
     srcs = ["src/main/java/dev/enola/demo/demo_data.proto"],
     deps = [
-        "@com_google_protobuf//:timestamp_proto",
+        "@protobuf//:timestamp_proto",
     ],
 )
 

diff --git a/java/dev/enola/common/BUILD b/java/dev/enola/common/BUILD
@@ -34,7 +34,7 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(["*Test.java"]),
     deps = [
         ":common",
     ],

diff --git a/java/dev/enola/common/canonicalize/BUILD b/java/dev/enola/common/canonicalize/BUILD
@@ -38,7 +38,7 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(["*Test.java"]),
     deps = [
         ":canonicalize",
         "//java/dev/enola/common/context/testlib",

diff --git a/java/dev/enola/common/concurrent/BUILD b/java/dev/enola/common/concurrent/BUILD
@@ -36,7 +36,7 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(["*Test.java"]),
     deps = [
         ":concurrent",
         "//java/dev/enola/common/context",

diff --git a/java/dev/enola/common/context/BUILD b/java/dev/enola/common/context/BUILD
@@ -35,7 +35,7 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(["*Test.java"]),
     deps = [
         ":context",
         "//java/dev/enola/common/context/testlib",

diff --git a/java/dev/enola/common/context/testlib/BUILD b/java/dev/enola/common/context/testlib/BUILD
@@ -21,7 +21,7 @@ java_library(
     name = "testlib",
     srcs = glob(
         ["*.java"],
-        exclude = ["**/*Test.java"],
+        exclude = ["*Test.java"],
     ),
     visibility = ["//:__subpackages__"],
     deps = [
@@ -39,7 +39,10 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(
+        include = ["*Test.java"],
+        allow_empty = True,
+    ),
     deps = [
         ":testlib",
         "//java/dev/enola/common/io",

diff --git a/java/dev/enola/common/convert/BUILD b/java/dev/enola/common/convert/BUILD
@@ -36,7 +36,7 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(["*Test.java"]),
     deps = [
         ":convert",
     ],

diff --git a/java/dev/enola/common/diff/testlib/BUILD b/java/dev/enola/common/diff/testlib/BUILD
@@ -36,7 +36,10 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(
+        include = ["*Test.java"],
+        allow_empty = True,
+    ),
     deps = [
         ":testlib",
         "//java/dev/enola/common/io",

diff --git a/java/dev/enola/common/html/BUILD b/java/dev/enola/common/html/BUILD
@@ -34,7 +34,10 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(
+        include = ["*Test.java"],
+        allow_empty = True,
+    ),
     deps = [
         ":html",
         "//java/dev/enola/common/io",

diff --git a/java/dev/enola/common/io/testlib/BUILD b/java/dev/enola/common/io/testlib/BUILD
@@ -38,7 +38,10 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["*Test.java"]),
+    srcs = glob(
+        include = ["*Test.java"],
+        allow_empty = True,
+    ),
     deps = [
         ":testlib",
         "//java/dev/enola/common/io",

diff --git a/java/dev/enola/common/markdown/exec/BUILD b/java/dev/enola/common/markdown/exec/BUILD
@@ -34,7 +34,7 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(["*Test.java"]),
     deps = [
         ":markdown",
     ],

diff --git a/java/dev/enola/common/protobuf/BUILD b/java/dev/enola/common/protobuf/BUILD
@@ -14,15 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//tools/bazel:junit.bzl", "junit_tests")
 
 proto_library(
     name = "validation_proto",
     srcs = ["validation.proto"],
     deps = [
-        "@com_google_protobuf//:any_proto",
+        "@protobuf//:any_proto",
     ],
 )
 
@@ -38,10 +38,10 @@ proto_library(
     name = "test_proto",
     srcs = ["test.proto"],
     deps = [
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:descriptor_proto",
-        "@com_google_protobuf//:struct_proto",
-        "@com_google_protobuf//:timestamp_proto",
+        "@protobuf//:any_proto",
+        "@protobuf//:descriptor_proto",
+        "@protobuf//:struct_proto",
+        "@protobuf//:timestamp_proto",
     ],
 )
 
@@ -77,7 +77,7 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(["*Test.java"]),
     deps = [
         ":protobuf",
         ":test_java_proto",

diff --git a/java/dev/enola/common/time/BUILD b/java/dev/enola/common/time/BUILD
@@ -32,7 +32,7 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(["*Test.java"]),
     deps = [
         ":time",
     ],

diff --git a/java/dev/enola/common/tree/BUILD b/java/dev/enola/common/tree/BUILD
@@ -36,7 +36,7 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(["*Test.java"]),
     deps = [
         ":tree",
     ],

diff --git a/java/dev/enola/common/xml/BUILD b/java/dev/enola/common/xml/BUILD
@@ -36,7 +36,7 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(["*Test.java"]),
     deps = [
         ":xml",
         "//java/dev/enola/common/context/testlib",

diff --git a/java/dev/enola/common/yamljson/BUILD b/java/dev/enola/common/yamljson/BUILD
@@ -37,7 +37,7 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(["*Test.java"]),
     deps = [
         ":yamljson",
         "//java/dev/enola/common/io",

diff --git a/java/dev/enola/common/yamljson/testlib/BUILD b/java/dev/enola/common/yamljson/testlib/BUILD
@@ -35,7 +35,10 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["*Test.java"]),
+    srcs = glob(
+        include = ["*Test.java"],
+        allow_empty = True,
+    ),
     deps = [
         ":testlib",
     ],

diff --git a/java/dev/enola/core/BUILD b/java/dev/enola/core/BUILD
@@ -22,15 +22,15 @@ load("//tools/bazel:junit.bzl", "junit_tests")
 
 # https://github.com/bazelbuild/rules_go/blob/master/proto/core.rst#go_proto_library
 
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_go//proto:def.bzl", "go_proto_library")
 load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
 
 proto_library(
     name = "ext_proto",
     srcs = ["enola_ext.proto"],
     deps = [
-        "@com_google_protobuf//:descriptor_proto",
+        "@protobuf//:descriptor_proto",
     ],
 )
 
@@ -40,17 +40,17 @@ proto_library(
     deps = [
         ":ext_proto",
         "//java/dev/enola/thing:thing_proto",
-        "@com_google_protobuf//:any_proto",
-        "@com_google_protobuf//:descriptor_proto",
-        "@com_google_protobuf//:struct_proto",
+        "@protobuf//:any_proto",
+        "@protobuf//:descriptor_proto",
+        "@protobuf//:struct_proto",
     ],
 )
 
 proto_library(
     name = "util_proto",
     srcs = ["util/enola_util.proto"],
     deps = [
-        "@com_google_protobuf//:timestamp_proto",
+        "@protobuf//:timestamp_proto",
     ],
 )
 

diff --git a/java/dev/enola/datatype/BUILD b/java/dev/enola/datatype/BUILD
@@ -38,7 +38,10 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(
+        include = ["*Test.java"],
+        allow_empty = True,
+    ),
     deps = [
         ":datatype",
         "//java/dev/enola/common/convert",

diff --git a/java/dev/enola/format/xml/BUILD b/java/dev/enola/format/xml/BUILD
@@ -28,7 +28,6 @@ java_library(
     ),
     plugins = ["//tools/bazel/java_plugin:autoservice"],
     resource_strip_prefix = "java/",
-    resources = glob(["**/*.html"]),
     visibility = ["//:__subpackages__"],
     deps = [
         "//java/dev/enola/common/context",

diff --git a/java/dev/enola/infer/datalog/BUILD b/java/dev/enola/infer/datalog/BUILD
@@ -37,7 +37,10 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["**/*Test.java"]),
+    srcs = glob(
+        include = ["*Test.java"],
+        allow_empty = True,
+    ),
     deps = [
         ":datalog",
     ],

diff --git a/java/dev/enola/model/enola/meta/proto/BUILD b/java/dev/enola/model/enola/meta/proto/BUILD
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
 
 proto_library(
     name = "meta_proto",

diff --git a/java/dev/enola/rdf/proto/BUILD b/java/dev/enola/rdf/proto/BUILD
@@ -57,8 +57,10 @@ java_library(
 
 junit_tests(
     name = "tests",
-    srcs = glob(["*Test.java"]),
-    srcs_utils = glob(["*Subject.java"]),
+    srcs = glob(
+        include = ["*Test.java"],
+        allow_empty = True,
+    ),
     deps = [
         ":proto",
         "//java/dev/enola/common/context",

diff --git a/java/dev/enola/thing/BUILD b/java/dev/enola/thing/BUILD
@@ -14,17 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_go//proto:def.bzl", "go_proto_library")
 load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load("//tools/bazel:junit.bzl", "junit_tests")
 
 proto_library(
     name = "thing_proto",
     srcs = ["thing.proto"],
     visibility = ["//:__subpackages__"],
     deps = [
-        "@com_google_protobuf//:timestamp_proto",
+        "@protobuf//:timestamp_proto",
     ],
 )
 

diff --git a/java/dev/enola/thing/gen/BUILD b/java/dev/enola/thing/gen/BUILD
@@ -60,10 +60,6 @@ junit_tests(
     srcs = glob([
         "**/*Test.java",
     ]),
-    srcs_utils = glob(
-        ["**/*Test*.java"],
-        exclude = ["**/*Test.java"],
-    ),
     deps = [
         ":gen",
         "//java/dev/enola/common/context",

diff --git a/java/dev/enola/web/BUILD b/java/dev/enola/web/BUILD
@@ -51,7 +51,6 @@ junit_tests(
     name = "tests",
     size = "medium",
     srcs = glob(["*Test.java"]),
-    srcs_utils = glob(["*Abstract.java"]),
     runtime_deps = [
         "@enola_maven//:org_slf4j_slf4j_simple",
     ],