AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Addresses duplicates identified in #8925 (#8939)

Browse Source 
* 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
This commit is contained in:
Derek Perez 2021-08-31 19:14:11 +00:00 committed by GitHub
parent 3bc229afae
commit 2937b2ca63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
java/core/BUILD
View File

@ -98,16 +98,22 @@ LITE_SRCS = [
]
# 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 @@ java_library(
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 @@ java_export(
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 @@ filegroup(
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",
]
)

21
java/util/BUILD
View File

@ -4,10 +4,8 @@ load("@rules_proto//proto:defs.bzl", "proto_library")
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 @@ java_export(
"//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",
]
)