commit b37b613436ac84bf2d29f43494e4afa062db35bf
author zhangskz <89936743+zhangskz@users.noreply.github.com> Tue May 03 11:58:31 2022 -0400
committer GitHub <noreply@github.com> Tue May 03 11:58:31 2022 -0400
tree fcb1f90925273ee48545fdd967e5aaf442702921
parent cdc11c2d2d314ce0382fe0eaa715e5e0e1270438

Update protobuf_version.bzl to separate protoc and per-language java major version (#9900)

java/core/BUILD.bazel

diff --git a/java/core/BUILD.bazel b/java/core/BUILD.bazel
index 4a38847..60be807 100644
--- a/java/core/BUILD.bazel
+++ b/java/core/BUILD.bazel
@@ -4,7 +4,7 @@
 load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
 load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
 load("//:internal.bzl", "conformance_test")
-load("//:protobuf_version.bzl", "PROTOBUF_VERSION")
+load("//:protobuf_version.bzl", "PROTOBUF_JAVA_VERSION")
 load("//java/internal:testing.bzl", "junit_tests")
 
 LITE_SRCS = [
@@ -116,7 +116,7 @@
 # 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,
+    maven_coordinates = "com.google.protobuf:protobuf-javalite:%s" % PROTOBUF_JAVA_VERSION,
     pom_template = "//java/lite:pom_template.xml",
     resources = [
         "//:lite_well_known_protos",
@@ -151,7 +151,7 @@
 # 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,
+    maven_coordinates = "com.google.protobuf:protobuf-java:%s" % PROTOBUF_JAVA_VERSION,
     pom_template = "pom_template.xml",
     resources = [
         "//:well_known_protos",