Skip to content

Commit 96cffb3

Browse files
committed
Removing dependencies and renaming bazel version file
1 parent 89a9f45 commit 96cffb3

File tree

5 files changed

+5
-20
lines changed

5 files changed

+5
-20
lines changed

WORKSPACE

-15
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ http_archive(
2626
],
2727
)
2828

29-
http_archive(
30-
name = "bazel_common",
31-
sha256 = "d8c9586b24ce4a5513d972668f94b62eb7d705b92405d4bc102131f294751f1d",
32-
strip_prefix = "bazel-common-413b433b91f26dbe39cdbc20f742ad6555dd1e27",
33-
url = "https://github.com/google/bazel-common/archive/413b433b91f26dbe39cdbc20f742ad6555dd1e27.zip",
34-
)
35-
3629
# Load common dependencies.
3730
load("//:protobuf_deps.bzl", "protobuf_deps")
3831
protobuf_deps()
@@ -42,14 +35,6 @@ bind(
4235
actual = "//util/python:python_headers",
4336
)
4437

45-
load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
46-
47-
rules_jvm_external_deps()
48-
49-
load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
50-
51-
rules_jvm_external_setup()
52-
5338
load("@rules_jvm_external//:defs.bzl", "maven_install")
5439
maven_install(
5540
artifacts = [

java/core/BUILD

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ load("@rules_java//java:defs.bzl", "java_library", "java_proto_library", "java_l
33
load("@rules_jvm_external//:defs.bzl", "java_export")
44
load("@rules_proto//proto:defs.bzl", "proto_lang_toolchain", "proto_library")
55
load("//:internal.bzl", "conformance_test")
6-
load("//:version.bzl", "VERSION")
6+
load("//:protobuf_version.bzl", "PROTOBUF_VERSION")
77
load("//java/internal:testing.bzl", "junit_tests")
88

99
LITE_SRCS = [
@@ -100,7 +100,7 @@ LITE_SRCS = [
100100
# Should be used as `//java/lite`.
101101
java_export(
102102
name = "lite",
103-
maven_coordinates = "com.google.protobuf:protobuf-javalite:%s" % VERSION,
103+
maven_coordinates = "com.google.protobuf:protobuf-javalite:%s" % PROTOBUF_VERSION,
104104
pom_template = "//java/lite:pom_template.xml",
105105
srcs = LITE_SRCS + [
106106
"//:gen_well_known_protos_javalite"
@@ -120,7 +120,7 @@ java_library(
120120

121121
java_export(
122122
name = "core",
123-
maven_coordinates = "com.google.protobuf:protobuf-java:%s" % VERSION,
123+
maven_coordinates = "com.google.protobuf:protobuf-java:%s" % PROTOBUF_VERSION,
124124
pom_template = "pom_template.xml",
125125
srcs = glob(
126126
[

java/util/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@rules_java//java:defs.bzl", "java_proto_library")
22
load("@rules_jvm_external//:defs.bzl", "java_export")
33
load("@rules_proto//proto:defs.bzl", "proto_library")
4-
load("//:version.bzl", "VERSION")
4+
load("//:protobuf_version.bzl", "PROTOBUF_VERSION")
55
load("//java/internal:testing.bzl", "junit_tests")
66

77
java_export(

protobuf_version.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
PROTOBUF_VERSION = '3.17.3'

version.bzl

-1
This file was deleted.

0 commit comments

Comments
 (0)