Removing dependencies and renaming bazel version file

pull/8752/head
Deanna Garcia 4 years ago
parent 89a9f459e9
commit 96cffb3ac3
  1. 15
      WORKSPACE
  2. 6
      java/core/BUILD
  3. 2
      java/util/BUILD
  4. 1
      protobuf_version.bzl
  5. 1
      version.bzl

@ -26,13 +26,6 @@ http_archive(
],
)
http_archive(
name = "bazel_common",
sha256 = "d8c9586b24ce4a5513d972668f94b62eb7d705b92405d4bc102131f294751f1d",
strip_prefix = "bazel-common-413b433b91f26dbe39cdbc20f742ad6555dd1e27",
url = "https://github.com/google/bazel-common/archive/413b433b91f26dbe39cdbc20f742ad6555dd1e27.zip",
)
# Load common dependencies.
load("//:protobuf_deps.bzl", "protobuf_deps")
protobuf_deps()
@ -42,14 +35,6 @@ bind(
actual = "//util/python:python_headers",
)
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
rules_jvm_external_deps()
load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
rules_jvm_external_setup()
load("@rules_jvm_external//:defs.bzl", "maven_install")
maven_install(
artifacts = [

@ -3,7 +3,7 @@ load("@rules_java//java:defs.bzl", "java_library", "java_proto_library", "java_l
load("@rules_jvm_external//:defs.bzl", "java_export")
load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
load("//:internal.bzl", "conformance_test")
load("//:version.bzl", "VERSION")
load("//:protobuf_version.bzl", "PROTOBUF_VERSION")
load("//java/internal:testing.bzl", "junit_tests")
LITE_SRCS = [
@ -100,7 +100,7 @@ LITE_SRCS = [
# Should be used as `//java/lite`.
java_export(
name = "lite",
maven_coordinates = "com.google.protobuf:protobuf-javalite:%s" % VERSION,
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"
@ -120,7 +120,7 @@ java_library(
java_export(
name = "core",
maven_coordinates = "com.google.protobuf:protobuf-java:%s" % VERSION,
maven_coordinates = "com.google.protobuf:protobuf-java:%s" % PROTOBUF_VERSION,
pom_template = "pom_template.xml",
srcs = glob(
[

@ -1,7 +1,7 @@
load("@rules_java//java:defs.bzl", "java_proto_library")
load("@rules_jvm_external//:defs.bzl", "java_export")
load("@rules_proto//proto:defs.bzl", "proto_library")
load("//:version.bzl", "VERSION")
load("//:protobuf_version.bzl", "PROTOBUF_VERSION")
load("//java/internal:testing.bzl", "junit_tests")
java_export(

@ -0,0 +1 @@
PROTOBUF_VERSION = '3.17.3'

@ -1 +0,0 @@
VERSION = '3.17.3'
Loading…
Cancel
Save