commit fa37f6120af318849eaf87d1b471e154adf01c61
author Fabian Meumertzheim <fabian@meumertzhe.im> Tue Mar 12 09:33:03 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Mar 12 09:33:39 2024 -0700
tree 322326dd74c000f08885fdc6a6e4528f0e258bbe
parent f217c9cb37b6da4a38b90908086a2dfe50c674e8

Rename `java/modules` to `java/common`

Copybara Import from https://github.com/bazelbuild/rules_java/pull/174

BEGIN_PUBLIC

Rename `java/modules` to `java/common` (#174)

The term "modules" is easily confused with "Bazel modules" from Bzlmod.

Closes #174

END_PUBLIC

COPYBARA_INTEGRATE_REVIEW=https://github.com/bazelbuild/rules_java/pull/174 from fmeum:master 5a9babe46b3581e6ed8fe24c7409482cc5d0b4c6
PiperOrigin-RevId: 615070661
Change-Id: I0731edb4f8ce3e6a19a742fe7fd51dbde05bd53b

java/BUILD

diff --git a/java/BUILD b/java/BUILD
index e6f5d2c..eb4f228 100644
--- a/java/BUILD
+++ b/java/BUILD
@@ -7,7 +7,7 @@
 filegroup(
     name = "srcs",
     srcs = glob(["**"]) + [
-        "//java/modules:srcs",
+        "//java/common:srcs",
         "//java/private:srcs",
         "//java/proto:srcs",
         "//java/toolchains:srcs",
@@ -21,7 +21,7 @@
     visibility = ["//visibility:public"],
     deps = [
         ":core_rules",
-        "//java/modules",
+        "//java/common",
         "//java/toolchains:toolchain_rules",
     ],
 )

java/common/BUILD

diff --git a/java/modules/BUILD b/java/common/BUILD
similarity index 93%
rename from java/modules/BUILD
rename to java/common/BUILD
index d9ed6e6..7ad7ada 100644
--- a/java/modules/BUILD
+++ b/java/common/BUILD
@@ -11,7 +11,7 @@
 )
 
 bzl_library(
-    name = "modules",
+    name = "common",
     srcs = glob(["*.bzl"]),
     visibility = ["//visibility:public"],
     deps = ["//java/private"],

java/common/java_common.bzl

diff --git a/java/modules/java_common.bzl b/java/common/java_common.bzl
similarity index 100%
rename from java/modules/java_common.bzl
rename to java/common/java_common.bzl

java/common/java_info.bzl

diff --git a/java/modules/java_info.bzl b/java/common/java_info.bzl
similarity index 100%
rename from java/modules/java_info.bzl
rename to java/common/java_info.bzl

java/common/java_plugin_info.bzl

diff --git a/java/modules/java_plugin_info.bzl b/java/common/java_plugin_info.bzl
similarity index 100%
rename from java/modules/java_plugin_info.bzl
rename to java/common/java_plugin_info.bzl

java/defs.bzl

diff --git a/java/defs.bzl b/java/defs.bzl
index 64263f8..3fc9332 100644
--- a/java/defs.bzl
+++ b/java/defs.bzl
@@ -18,9 +18,9 @@
 load("//java:java_library.bzl", _java_library = "java_library")
 load("//java:java_plugin.bzl", _java_plugin = "java_plugin")
 load("//java:java_test.bzl", _java_test = "java_test")
-load("//java/modules:java_common.bzl", _java_common = "java_common")
-load("//java/modules:java_info.bzl", _JavaInfo = "JavaInfo")
-load("//java/modules:java_plugin_info.bzl", _JavaPluginInfo = "JavaPluginInfo")
+load("//java/common:java_common.bzl", _java_common = "java_common")
+load("//java/common:java_info.bzl", _JavaInfo = "JavaInfo")
+load("//java/common:java_plugin_info.bzl", _JavaPluginInfo = "JavaPluginInfo")
 load("//java/toolchains:java_package_configuration.bzl", _java_package_configuration = "java_package_configuration")
 load("//java/toolchains:java_runtime.bzl", _java_runtime = "java_runtime")
 load("//java/toolchains:java_toolchain.bzl", _java_toolchain = "java_toolchain")