Addresses duplicates identified in #8925 (#8939)
* Addresses duplicates identified in #8925
java_export aliases the rule name to the full maven_project_jar which consolidates all deps into a merged jar. This is not what we want for Bazel users.
* Update :util to match
diff --git a/java/core/BUILD b/java/core/BUILD
index f77b2ce..9308ba7 100644
--- a/java/core/BUILD
+++ b/java/core/BUILD
@@ -98,16 +98,22 @@
]
# Should be used as `//java/lite`.
-java_export(
+java_library(
name = "lite",
- maven_coordinates = "com.google.protobuf:protobuf-javalite:%s" % PROTOBUF_VERSION,
- pom_template = "//java/lite:pom_template.xml",
srcs = LITE_SRCS + [
"//:gen_well_known_protos_javalite"
],
visibility = [
"//java/lite:__pkg__",
],
+)
+
+# Bazel users, don't depend on this target, use //java/lite.
+java_export(
+ name = "lite_mvn",
+ maven_coordinates = "com.google.protobuf:protobuf-javalite:%s" % PROTOBUF_VERSION,
+ pom_template = "//java/lite:pom_template.xml",
+ runtime_deps = [":lite"],
resources = [
"//:lite_well_known_protos",
],
@@ -118,10 +124,8 @@
srcs = LITE_SRCS,
)
-java_export(
+java_library(
name = "core",
- maven_coordinates = "com.google.protobuf:protobuf-java:%s" % PROTOBUF_VERSION,
- pom_template = "pom_template.xml",
srcs = glob(
[
"src/main/java/com/google/protobuf/*.java",
@@ -137,6 +141,14 @@
deps = [
":lite_runtime_only",
],
+)
+
+# Bazel users, don't depend on this target, use :core.
+java_export(
+ name = "core_mvn",
+ maven_coordinates = "com.google.protobuf:protobuf-java:%s" % PROTOBUF_VERSION,
+ pom_template = "pom_template.xml",
+ runtime_deps = [":core"],
resources = [
"//:well_known_protos",
],
@@ -146,14 +158,14 @@
name = "release",
visibility = ["//java:__pkg__"],
srcs = [
- ":core-pom",
- ":core-maven-source",
- ":core-docs",
- ":core-project",
- ":lite-pom",
- ":lite-maven-source",
- ":lite-docs",
- ":lite-project",
+ ":core_mvn-pom",
+ ":core_mvn-maven-source",
+ ":core_mvn-docs",
+ ":core_mvn-project",
+ ":lite_mvn-pom",
+ ":lite_mvn-maven-source",
+ ":lite_mvn-docs",
+ ":lite_mvn-project",
]
)
diff --git a/java/util/BUILD b/java/util/BUILD
index b839575..bd773ee 100644
--- a/java/util/BUILD
+++ b/java/util/BUILD
@@ -4,10 +4,8 @@
load("//:protobuf_version.bzl", "PROTOBUF_VERSION")
load("//java/internal:testing.bzl", "junit_tests")
-java_export(
+java_library(
name = "util",
- maven_coordinates = "com.google.protobuf:protobuf-java-util:%s" % PROTOBUF_VERSION,
- pom_template = "pom_template.xml",
srcs = glob([
"src/main/java/com/google/protobuf/util/*.java",
]),
@@ -17,17 +15,26 @@
"//external:gson",
"//external:guava",
"//java/core",
+ "//java/lite",
],
)
+# Bazel users, don't depend on this target, use :util.
+java_export(
+ name = "util_mvn",
+ maven_coordinates = "com.google.protobuf:protobuf-java-util:%s" % PROTOBUF_VERSION,
+ pom_template = "pom_template.xml",
+ runtime_deps = [":util"],
+ visibility = ["//java:__pkg__"],
+)
filegroup(
name = "release",
visibility = ["//java:__pkg__"],
srcs = [
- ":util-pom",
- ":util-maven-source",
- ":util-docs",
- ":util-project",
+ ":util_mvn-pom",
+ ":util_mvn-maven-source",
+ ":util_mvn-docs",
+ ":util_mvn-project",
]
)
