diff --git a/build_defs/java_opts.bzl b/build_defs/java_opts.bzl
index e06c06fd1bd5..6f76c3678790 100644
--- a/build_defs/java_opts.bzl
+++ b/build_defs/java_opts.bzl
@@ -1,6 +1,6 @@
 """Java options and protobuf-specific java build rules with those options."""
 
-load("@rules_java//java:defs.bzl", "java_library", "java_import")
+load("@rules_java//java:defs.bzl", "java_import", "java_library")
 load("@rules_jvm_external//:defs.bzl", "java_export")
 load("//:protobuf_version.bzl", "PROTOBUF_JAVA_VERSION")
 load("//java/osgi:osgi.bzl", "osgi_java_library")
@@ -26,7 +26,7 @@ JAVA9_OPTS = [
 
 ## Default JAR manifest entries to stamp on export.
 DEFAULT_MANIFEST_ENTRIES = {
-    "Multi-Release": "true"
+    "Multi-Release": "true",
 }
 
 ## Default visibility settings for Java module targets.
@@ -48,13 +48,13 @@ def protobuf_java_library(**kwargs):
     )
 
 def protobuf_java_module(
-    name,
-    module,
-    module_deps = [],
-    deps = [],
-    jvm_version = JPMS_JDK_TARGET,
-    visibility = DEFAULT_JMOD_VISIBILITY,
-    **kwargs):
+        name,
+        module,
+        module_deps = [],
+        deps = [],
+        jvm_version = JPMS_JDK_TARGET,
+        visibility = DEFAULT_JMOD_VISIBILITY,
+        **kwargs):
     """Builds a `module-info.java` definition for use with a Protobuf Java target.
 
     This macro replaces a chain of `java_library` and `genrule` steps to coax Bazel
@@ -121,7 +121,8 @@ def protobuf_java_module(
     deps_rewritten = []
     if len(module_deps) > 0:
         deps_rewritten = [
-            "%s-compilejar" % i for i in module_deps
+            "%s-compilejar" % i
+            for i in module_deps
         ]
 
     java_library(
@@ -130,7 +131,7 @@ def protobuf_java_module(
         javacopts = JAVA9_OPTS,
         deps = deps_rewritten + (deps or []),
         visibility = visibility,
-        **kwargs,
+        **kwargs
     )
     native.genrule(
         name = module_class_target_name,
diff --git a/java/core/BUILD.bazel b/java/core/BUILD.bazel
index 10e5d5261b05..b5035215bfe0 100644
--- a/java/core/BUILD.bazel
+++ b/java/core/BUILD.bazel
@@ -130,11 +130,11 @@ protobuf_java_module(
 # Should be used as `//java/lite`.
 java_library(
     name = "lite",
-    resources = [":javamodule"],
-    resource_strip_prefix = "java/core/",
     srcs = LITE_SRCS + [
         ":gen_well_known_protos_javalite",
     ],
+    resource_strip_prefix = "java/core/",
+    resources = [":javamodule"],
     visibility = [
         "//java/lite:__pkg__",
     ],
@@ -150,8 +150,8 @@ protobuf_versioned_java_library(
                          "guarantee API/ABI stability.",
     bundle_name = "Protocol Buffers [Lite]",
     bundle_symbolic_name = "com.google.protobuf",
-    resources = [":javamodule"],
     resource_strip_prefix = "java/core/",
+    resources = [":javamodule"],
     visibility = [
         "//java/lite:__pkg__",
     ],
@@ -224,9 +224,9 @@ java_library(
     ) + [
         ":gen_well_known_protos_java",
     ],
-    visibility = ["//visibility:public"],
-    resources = [":javamodule"],
     resource_strip_prefix = "java/core/",
+    resources = [":javamodule"],
+    visibility = ["//visibility:public"],
     exports = [
         ":lite_runtime_only",
     ],
@@ -250,8 +250,8 @@ protobuf_versioned_java_library(
                          "efficient yet extensible format.",
     bundle_name = "Protocol Buffers [Core]",
     bundle_symbolic_name = "com.google.protobuf",
-    resources = [":javamodule"],
     resource_strip_prefix = "java/core/",
+    resources = [":javamodule"],
     visibility = ["//visibility:public"],
     exports = [
         ":lite_runtime_only",
diff --git a/java/util/BUILD.bazel b/java/util/BUILD.bazel
index bb13d7d4ad43..820db234753c 100644
--- a/java/util/BUILD.bazel
+++ b/java/util/BUILD.bazel
@@ -17,8 +17,8 @@ java_library(
     srcs = glob([
         "src/main/java/com/google/protobuf/util/*.java",
     ]),
-    resources = [":javamodule"],
     resource_strip_prefix = "java/util/",
+    resources = [":javamodule"],
     visibility = ["//visibility:public"],
     deps = [
         "//java/core",
@@ -38,8 +38,8 @@ protobuf_versioned_java_library(
     bundle_description = "Utilities for Protocol Buffers",
     bundle_name = "Protocol Buffers [Util]",
     bundle_symbolic_name = "com.google.protobuf.util",
-    resources = [":javamodule"],
     resource_strip_prefix = "java/util/",
+    resources = [":javamodule"],
     visibility = ["//visibility:public"],
     deps = [
         "//java/core",