This is an automated email from the ASF dual-hosted git repository.
joshfischer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new bcaa38d Upgrade protobuf to 3.16.1 CVE-2021-22569 (#3797)
bcaa38d is described below
commit bcaa38d2f42a326857dfbc30cafe9ccced27b2b1
Author: choi se <[email protected]>
AuthorDate: Sat Mar 26 02:42:11 2022 +0900
Upgrade protobuf to 3.16.1 CVE-2021-22569 (#3797)
* Upgrade protobuf to 3.16.1 to address CVE-2021-22569
- protobuf < 3.16.1 contains DoS vulnerability CVE-2021-22569,
https://nvd.nist.gov/vuln/detail/CVE-2021-22569.
* Fix include
(cherry picked from commit 52ed112dc14bc831afe25c1e3a66a96d9d4e7f06)
* Update protobuf-3.16.0 of Python
Update protobuf-java-3.16.1 of Java
* typo conflit
---
WORKSPACE | 35 +++---
heron/common/src/cpp/network/event_loop_impl.cpp | 1 +
.../cpp/boltimpl/bolt-output-collector-impl.cpp | 4 +-
heron/proto/BUILD | 2 +-
heron/stmgr/src/cpp/util/tuple-cache.cpp | 8 +-
.../cpp/server/checkpoint-gateway_unittest.cpp | 6 +-
heron/tools/tracker/src/python/BUILD | 2 +-
heronpy/proto/BUILD | 4 +-
maven_install.json | 120 ++++++++++-----------
scripts/packages/heronpy/requirements.txt | 2 +-
10 files changed, 96 insertions(+), 88 deletions(-)
diff --git a/WORKSPACE b/WORKSPACE
index f41dfe8..5852eab 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -20,6 +20,7 @@ workspace(name = "org_apache_heron")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive",
"http_file")
RULES_JVM_EXTERNAL_TAG = "4.2"
+
RULES_JVM_EXTERNAL_SHA =
"cd1a77b7b02e8e008439ca76fd34f5b07aecb8c752961f9640dea15e9e5ba1ca"
http_archive(
@@ -115,6 +116,7 @@ maven_install(
"com.google.inject:guice:5.1.0",
"com.google.inject.extensions:guice-assistedinject:5.1.0",
"com.google.guava:guava:23.6-jre",
+ "com.google.protobuf:protobuf-java:3.16.1",
"io.gsonfire:gson-fire:1.8.3",
"org.apache.curator:curator-framework:" + curator_version,
"org.apache.curator:curator-recipes:" + curator_version,
@@ -140,13 +142,19 @@ maven_install(
"com.puppycrawl.tools:checkstyle:6.17",
"com.googlecode.json-simple:json-simple:1.1",
maven.artifact(
- group = "org.apache.httpcomponents",
artifact = "httpclient",
- version = http_client_version,
classifier = "tests",
+ group = "org.apache.httpcomponents",
packaging = "test-jar",
+ version = http_client_version,
),
],
+ excluded_artifacts = [
+ "org.slf4j:slf4j-jdk14",
+ "org.slf4j:slf4j-log4j12",
+ "log4j:log4j",
+ "commons-logging:commons-logging",
+ ],
fail_if_repin_required = True,
fetch_sources = True,
maven_install_json = "//:maven_install.json",
@@ -155,12 +163,6 @@ maven_install(
"https://maven.google.com";,
"https://repo1.maven.org/maven2";,
],
- excluded_artifacts = [
- "org.slf4j:slf4j-jdk14",
- "org.slf4j:slf4j-log4j12",
- "log4j:log4j",
- "commons-logging:commons-logging",
- ],
version_conflict_policy = "pinned",
)
@@ -168,13 +170,14 @@ maven_install(
# To update `maven_install.json` run the following command:
# `REPIN=1 bazel run @unpinned_maven//:pin`
load("@maven//:defs.bzl", "pinned_maven_install")
+
pinned_maven_install()
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
git_repository(
name = "com_github_johnynek_bazel_jar_jar",
- commit = "171f268569384c57c19474b04aebe574d85fde0d", # Latest commit SHA
as at 2019/02/13
+ commit = "171f268569384c57c19474b04aebe574d85fde0d", # Latest commit SHA
as at 2019/02/13
remote = "https://github.com/johnynek/bazel_jar_jar.git";,
shallow_since = "1594234634 -1000",
)
@@ -183,6 +186,7 @@ load(
"@com_github_johnynek_bazel_jar_jar//:jar_jar.bzl",
"jar_jar_repositories",
)
+
jar_jar_repositories()
http_archive(
@@ -285,9 +289,9 @@ http_file(
# protobuf dependencies for C++ and Java
http_archive(
name = "com_google_protobuf",
- sha256 =
"03d2e5ef101aee4c2f6ddcf145d2a04926b9c19e7086944df3842b1b8502b783",
- strip_prefix = "protobuf-3.8.0",
- urls =
["https://github.com/protocolbuffers/protobuf/archive/v3.8.0.tar.gz";],
+ sha256 =
"fb9158b00b2df4949f66da0bb8a9eaf662b842c7987d096b260759d629805d7f",
+ strip_prefix = "protobuf-3.16.1",
+ urls =
["https://github.com/protocolbuffers/protobuf/archive/v3.16.1.tar.gz";],
)
# end protobuf dependencies for C++ and Java
@@ -423,6 +427,7 @@ load(
"@io_bazel_rules_docker//repositories:repositories.bzl",
container_repositories = "repositories",
)
+
container_repositories()
load("@io_bazel_rules_docker//repositories:deps.bzl", container_deps = "deps")
@@ -449,13 +454,15 @@ container_pull(
http_archive(
name = "rules_pkg",
+ sha256 =
"aeca78988341a2ee1ba097641056d168320ecc51372ef7ff8e64b139516a4937",
urls = [
"https://github.com/bazelbuild/rules_pkg/releases/download/0.2.6/rules_pkg-0.2.6.tar.gz";,
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.6/rules_pkg-0.2.6.tar.gz";,
],
- sha256 =
"aeca78988341a2ee1ba097641056d168320ecc51372ef7ff8e64b139516a4937",
)
+
load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
+
rules_pkg_dependencies()
# scala integration
@@ -463,8 +470,8 @@ rules_scala_version =
"358ab829626c6c2d34ec27f856485d3121e299c7" # Jan 15 2020
http_archive(
name = "io_bazel_rules_scala",
- strip_prefix = "rules_scala-%s" % rules_scala_version,
sha256 =
"5abd638278de10ccccb0b4d614158f394278b828708ba990461334ecc01529a6",
+ strip_prefix = "rules_scala-%s" % rules_scala_version,
type = "zip",
url = "https://github.com/bazelbuild/rules_scala/archive/%s.zip"; %
rules_scala_version,
)
diff --git a/heron/common/src/cpp/network/event_loop_impl.cpp
b/heron/common/src/cpp/network/event_loop_impl.cpp
index b7de06d..87ba0bf 100644
--- a/heron/common/src/cpp/network/event_loop_impl.cpp
+++ b/heron/common/src/cpp/network/event_loop_impl.cpp
@@ -18,6 +18,7 @@
*/
#include "network/event_loop_impl.h"
+#include <signal.h>
#include <errno.h>
#include <iostream>
#include "glog/logging.h"
diff --git a/heron/instance/src/cpp/boltimpl/bolt-output-collector-impl.cpp
b/heron/instance/src/cpp/boltimpl/bolt-output-collector-impl.cpp
index 102c093..ce19cb0 100644
--- a/heron/instance/src/cpp/boltimpl/bolt-output-collector-impl.cpp
+++ b/heron/instance/src/cpp/boltimpl/bolt-output-collector-impl.cpp
@@ -97,7 +97,7 @@ void
BoltOutputCollectorImpl::ack(std::shared_ptr<api::tuple::Tuple> tup) {
int64_t tupSize = 0;
for (int i = 0; i < actualRepr->roots_size(); ++i) {
ack->add_roots()->CopyFrom(actualRepr->roots(i));
- tupSize += actualRepr->roots(i).ByteSize();
+ tupSize += actualRepr->roots(i).ByteSizeLong();
}
collector_->addAckTuple(ack, tupSize);
int64_t currentTime =
std::chrono::duration_cast<std::chrono::nanoseconds>(
@@ -118,7 +118,7 @@ void
BoltOutputCollectorImpl::fail(std::shared_ptr<api::tuple::Tuple> tup) {
int64_t tupSize = 0;
for (int i = 0; i < actualRepr->roots_size(); ++i) {
fl->add_roots()->CopyFrom(actualRepr->roots(i));
- tupSize += actualRepr->roots(i).ByteSize();
+ tupSize += actualRepr->roots(i).ByteSizeLong();
}
collector_->addFailTuple(fl, tupSize);
int64_t currentTime =
std::chrono::duration_cast<std::chrono::nanoseconds>(
diff --git a/heron/proto/BUILD b/heron/proto/BUILD
index eee9fc8..c25c3a3 100644
--- a/heron/proto/BUILD
+++ b/heron/proto/BUILD
@@ -181,7 +181,7 @@ java_library(
pex_library(
name = "proto-py",
reqs = [
- "protobuf==3.14.0",
+ "protobuf==3.16.0",
"setuptools==51.0.0",
],
deps = [
diff --git a/heron/stmgr/src/cpp/util/tuple-cache.cpp
b/heron/stmgr/src/cpp/util/tuple-cache.cpp
index 28b7415..6cb791f 100644
--- a/heron/stmgr/src/cpp/util/tuple-cache.cpp
+++ b/heron/stmgr/src/cpp/util/tuple-cache.cpp
@@ -191,7 +191,7 @@ void TupleCache::TupleList::add_ack_tuple(sp_int32
_src_task_id,
current_->set_src_task_id(_src_task_id);
current_size_ = 0;
}
- sp_int64 tuple_size = _tuple.ByteSize();
+ sp_int64 tuple_size = _tuple.ByteSizeLong();
current_size_ += tuple_size;
*_total_size += tuple_size;
current_->mutable_control()->add_acks()->CopyFrom(_tuple);
@@ -209,7 +209,7 @@ void TupleCache::TupleList::add_fail_tuple(sp_int32
_src_task_id,
current_->set_src_task_id(_src_task_id);
current_size_ = 0;
}
- sp_int64 tuple_size = _tuple.ByteSize();
+ sp_int64 tuple_size = _tuple.ByteSizeLong();
current_size_ += tuple_size;
*_total_size += tuple_size;
current_->mutable_control()->add_fails()->CopyFrom(_tuple);
@@ -228,7 +228,7 @@ void TupleCache::TupleList::add_emit_tuple(sp_int32
_src_task_id,
current_->set_src_task_id(_src_task_id);
current_size_ = 0;
}
- sp_int64 tuple_size = _tuple.ByteSize();
+ sp_int64 tuple_size = _tuple.ByteSizeLong();
current_size_ += tuple_size;
*_total_size += tuple_size;
current_->mutable_control()->add_emits()->CopyFrom(_tuple);
@@ -242,7 +242,7 @@ void TupleCache::TupleList::add_checkpoint_tuple(
current_ = NULL;
current_size_ = 0;
}
- sp_int64 tuple_size = _message->ByteSize();
+ sp_int64 tuple_size = _message->ByteSizeLong();
*_total_size += tuple_size;
tuples_.push_front(_message);
}
diff --git a/heron/stmgr/tests/cpp/server/checkpoint-gateway_unittest.cpp
b/heron/stmgr/tests/cpp/server/checkpoint-gateway_unittest.cpp
index 51d8efd..aa05c78 100644
--- a/heron/stmgr/tests/cpp/server/checkpoint-gateway_unittest.cpp
+++ b/heron/stmgr/tests/cpp/server/checkpoint-gateway_unittest.cpp
@@ -400,7 +400,7 @@ TEST(CheckpointGateway, overflow) {
// Now send another tuple from the upstreamer.
auto tup = new heron::proto::system::HeronTupleSet2();
tup->set_src_task_id(upstreamer);
- sp_uint32 cached_size = tup->ByteSize();
+ sp_uint64 cached_size = tup->ByteSizeLong();
gateway->SendToInstance(local_bolt, tup);
if (upstream_map[local_bolt].empty()) {
// They only have one upstreamer, so the tuple is passed thru
@@ -420,14 +420,14 @@ TEST(CheckpointGateway, overflow) {
EXPECT_EQ(0, drainer3_markers.size());
tup = new heron::proto::system::HeronTupleSet2();
tup->set_src_task_id(upstreamer);
- cached_size += tup->ByteSize();
+ cached_size += tup->ByteSizeLong();
total_sent++;
gateway->SendToInstance(local_bolt, tup);
}
// Send one more to tip over
tup = new heron::proto::system::HeronTupleSet2();
tup->set_src_task_id(upstreamer);
- cached_size += tup->ByteSize();
+ cached_size += tup->ByteSizeLong();
total_sent++;
gateway->SendToInstance(local_bolt, tup);
EXPECT_EQ(total_sent, drainer1_tuples.size());
diff --git a/heron/tools/tracker/src/python/BUILD
b/heron/tools/tracker/src/python/BUILD
index 6a2daaa..09425a0 100644
--- a/heron/tools/tracker/src/python/BUILD
+++ b/heron/tools/tracker/src/python/BUILD
@@ -12,7 +12,7 @@ pex_library(
"httpx==0.16.1",
"javaobj-py3==0.4.1",
"networkx==2.5",
- "protobuf==3.14.0",
+ "protobuf==3.16.0",
"uvicorn==0.11.7",
],
deps = [
diff --git a/heronpy/proto/BUILD b/heronpy/proto/BUILD
index 3579939..cd90d07 100644
--- a/heronpy/proto/BUILD
+++ b/heronpy/proto/BUILD
@@ -27,7 +27,7 @@ pex_library(
name = "proto-py",
srcs = glob(["**/*.py"]),
reqs = [
- "protobuf==3.14.0",
+ "protobuf==3.16.0",
"setuptools==51.0.0",
],
deps = [
@@ -50,7 +50,7 @@ pex_binary(
name = "proto-py-package",
srcs = glob(["**/*.py"]),
reqs = [
- "protobuf==3.14.0",
+ "protobuf==3.16.0",
"setuptools==51.0.0",
],
deps = [
diff --git a/maven_install.json b/maven_install.json
index 1454800..c689dee 100644
--- a/maven_install.json
+++ b/maven_install.json
@@ -1,8 +1,8 @@
{
"dependency_tree": {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY":
"THERE_IS_NO_DATA_ONLY_ZUUL",
- "__INPUT_ARTIFACTS_HASH": 34782025,
- "__RESOLVED_ARTIFACTS_HASH": -450596822,
+ "__INPUT_ARTIFACTS_HASH": 1663729345,
+ "__RESOLVED_ARTIFACTS_HASH": -1103127270,
"conflict_resolution": {},
"dependencies": [
{
@@ -1261,7 +1261,7 @@
"url":
"https://jcenter.bintray.com/com/google/oauth-client/google-oauth-client/1.22.0/google-oauth-client-1.22.0.jar";
},
{
- "coord":
"com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "coord":
"com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"dependencies": [],
"directDependencies": [],
"exclusions": [
@@ -1270,17 +1270,17 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file":
"v1/https/jcenter.bintray.com/com/google/protobuf/protobuf-java/3.19.1/protobuf-java-3.19.1-sources.jar",
+ "file":
"v1/https/jcenter.bintray.com/com/google/protobuf/protobuf-java/3.16.1/protobuf-java-3.16.1-sources.jar",
"mirror_urls": [
-
"https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.19.1/protobuf-java-3.19.1-sources.jar";,
-
"https://maven.google.com/com/google/protobuf/protobuf-java/3.19.1/protobuf-java-3.19.1-sources.jar";,
-
"https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.19.1/protobuf-java-3.19.1-sources.jar";
+
"https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.16.1/protobuf-java-3.16.1-sources.jar";,
+
"https://maven.google.com/com/google/protobuf/protobuf-java/3.16.1/protobuf-java-3.16.1-sources.jar";,
+
"https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.16.1/protobuf-java-3.16.1-sources.jar";
],
- "sha256":
"e78d2cffb2f4c4edf8a1b5f658d5e4a063b90158be2d68eb4a9aa482d6d5afc5",
- "url":
"https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.19.1/protobuf-java-3.19.1-sources.jar";
+ "sha256":
"40306be9034f624617caad4a8ef4f825dede5d45b68451af6ab400cc3b9a2c81",
+ "url":
"https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.16.1/protobuf-java-3.16.1-sources.jar";
},
{
- "coord": "com.google.protobuf:protobuf-java:3.19.1",
+ "coord": "com.google.protobuf:protobuf-java:3.16.1",
"dependencies": [],
"directDependencies": [],
"exclusions": [
@@ -1289,14 +1289,14 @@
"log4j:log4j",
"commons-logging:commons-logging"
],
- "file":
"v1/https/jcenter.bintray.com/com/google/protobuf/protobuf-java/3.19.1/protobuf-java-3.19.1.jar",
+ "file":
"v1/https/jcenter.bintray.com/com/google/protobuf/protobuf-java/3.16.1/protobuf-java-3.16.1.jar",
"mirror_urls": [
-
"https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.19.1/protobuf-java-3.19.1.jar";,
-
"https://maven.google.com/com/google/protobuf/protobuf-java/3.19.1/protobuf-java-3.19.1.jar";,
-
"https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.19.1/protobuf-java-3.19.1.jar";
+
"https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.16.1/protobuf-java-3.16.1.jar";,
+
"https://maven.google.com/com/google/protobuf/protobuf-java/3.16.1/protobuf-java-3.16.1.jar";,
+
"https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.16.1/protobuf-java-3.16.1.jar";
],
- "sha256":
"24f7d0d91797ed230a6d3da93cd80590a4c3aa9a27249f6025b5c6da078edde7",
- "url":
"https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.19.1/protobuf-java-3.19.1.jar";
+ "sha256":
"7b845a34210acde78b7f77977b3724988b9c60b2dce7a93a9afbbb1fee7978c4",
+ "url":
"https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.16.1/protobuf-java-3.16.1.jar";
},
{
"coord": "com.hashicorp.nomad:nomad-sdk:jar:sources:0.7.0",
@@ -2434,10 +2434,10 @@
{
"coord": "io.kubernetes:client-java-proto:jar:sources:14.0.0",
"dependencies": [
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1"
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1"
],
"directDependencies": [
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1"
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1"
],
"exclusions": [
"org.slf4j:slf4j-jdk14",
@@ -2457,10 +2457,10 @@
{
"coord": "io.kubernetes:client-java-proto:14.0.0",
"dependencies": [
- "com.google.protobuf:protobuf-java:3.19.1"
+ "com.google.protobuf:protobuf-java:3.16.1"
],
"directDependencies": [
- "com.google.protobuf:protobuf-java:3.19.1"
+ "com.google.protobuf:protobuf-java:3.16.1"
],
"exclusions": [
"org.slf4j:slf4j-jdk14",
@@ -2482,7 +2482,7 @@
"dependencies": [
"com.google.code.findbugs:jsr305:jar:sources:3.0.2",
"com.google.code.gson:gson:jar:sources:2.8.9",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"com.squareup.okhttp3:logging-interceptor:jar:sources:4.9.1",
"com.squareup.okhttp3:okhttp:jar:sources:4.9.1",
"com.squareup.okio:okio:jar:sources:2.8.0",
@@ -2510,7 +2510,7 @@
"org.yaml:snakeyaml:jar:sources:1.29"
],
"directDependencies": [
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"commons-codec:commons-codec:jar:sources:1.15",
"commons-io:commons-io:jar:sources:2.4",
"io.kubernetes:client-java-api:jar:sources:14.0.0",
@@ -2544,7 +2544,7 @@
"dependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
"com.google.code.gson:gson:2.8.9",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"com.squareup.okhttp3:logging-interceptor:4.9.1",
"com.squareup.okhttp3:okhttp:4.9.1",
"com.squareup.okio:okio:2.8.0",
@@ -2572,7 +2572,7 @@
"org.yaml:snakeyaml:1.29"
],
"directDependencies": [
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"commons-codec:commons-codec:1.15",
"commons-io:commons-io:2.4",
"io.kubernetes:client-java-api:14.0.0",
@@ -4958,13 +4958,13 @@
{
"coord":
"org.apache.bookkeeper:bookkeeper-proto:jar:sources:4.13.0",
"dependencies": [
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"commons-configuration:commons-configuration:jar:sources:1.10",
"commons-lang:commons-lang:jar:sources:2.6",
"org.slf4j:slf4j-api:jar:sources:1.7.36"
],
"directDependencies": [
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"commons-configuration:commons-configuration:jar:sources:1.10",
"org.slf4j:slf4j-api:jar:sources:1.7.36"
],
@@ -4986,13 +4986,13 @@
{
"coord": "org.apache.bookkeeper:bookkeeper-proto:4.13.0",
"dependencies": [
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"commons-configuration:commons-configuration:1.10",
"commons-lang:commons-lang:2.6",
"org.slf4j:slf4j-api:1.7.36"
],
"directDependencies": [
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"commons-configuration:commons-configuration:1.10",
"org.slf4j:slf4j-api:1.7.36"
],
@@ -5019,7 +5019,7 @@
"com.fasterxml.jackson.core:jackson-core:jar:sources:2.8.8",
"com.fasterxml.jackson.core:jackson-databind:jar:sources:2.8.8",
"com.google.guava:guava:jar:sources:23.6-jre",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"commons-cli:commons-cli:jar:sources:1.3.1",
"commons-codec:commons-codec:jar:sources:1.15",
"commons-configuration:commons-configuration:jar:sources:1.10",
@@ -5097,7 +5097,7 @@
"com.fasterxml.jackson.core:jackson-core:2.8.8",
"com.fasterxml.jackson.core:jackson-databind:2.8.8",
"com.google.guava:guava:23.6-jre",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"commons-cli:commons-cli:1.3.1",
"commons-codec:commons-codec:1.15",
"commons-configuration:commons-configuration:1.10",
@@ -5865,7 +5865,7 @@
"com.fasterxml.jackson.core:jackson-core:jar:sources:2.8.8",
"com.fasterxml.jackson.core:jackson-databind:jar:sources:2.8.8",
"com.google.guava:guava:jar:sources:23.6-jre",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"commons-cli:commons-cli:jar:sources:1.3.1",
"commons-codec:commons-codec:jar:sources:1.15",
"commons-configuration:commons-configuration:jar:sources:1.10",
@@ -5932,7 +5932,7 @@
"com.fasterxml.jackson.core:jackson-core:2.8.8",
"com.fasterxml.jackson.core:jackson-databind:2.8.8",
"com.google.guava:guava:23.6-jre",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"commons-cli:commons-cli:1.3.1",
"commons-codec:commons-codec:1.15",
"commons-configuration:commons-configuration:1.10",
@@ -6246,10 +6246,10 @@
{
"coord": "org.apache.mesos:mesos:jar:sources:0.22.0",
"dependencies": [
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1"
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1"
],
"directDependencies": [
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1"
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1"
],
"exclusions": [
"org.slf4j:slf4j-jdk14",
@@ -6269,10 +6269,10 @@
{
"coord": "org.apache.mesos:mesos:0.22.0",
"dependencies": [
- "com.google.protobuf:protobuf-java:3.19.1"
+ "com.google.protobuf:protobuf-java:3.16.1"
],
"directDependencies": [
- "com.google.protobuf:protobuf-java:3.19.1"
+ "com.google.protobuf:protobuf-java:3.16.1"
],
"exclusions": [
"org.slf4j:slf4j-jdk14",
@@ -6348,7 +6348,7 @@
"dependencies": [
"com.fasterxml.jackson.core:jackson-databind:2.8.8",
"com.google.guava:guava:23.6-jre",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"com.typesafe.netty:netty-reactive-streams:1.0.8",
"com.yahoo.datasketches:sketches-core:0.6.0",
"commons-codec:commons-codec:1.15",
@@ -6393,7 +6393,7 @@
"dependencies": [
"com.fasterxml.jackson.core:jackson-databind:jar:sources:2.8.8",
"com.google.guava:guava:jar:sources:23.6-jre",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"com.typesafe.netty:netty-reactive-streams:jar:sources:1.0.8",
"com.yahoo.datasketches:sketches-core:jar:sources:0.6.0",
"commons-codec:commons-codec:jar:sources:1.15",
@@ -6438,7 +6438,7 @@
"dependencies": [
"com.fasterxml.jackson.core:jackson-databind:jar:sources:2.8.8",
"com.google.guava:guava:jar:sources:23.6-jre",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"io.netty:netty-all:jar:sources:4.1.72.Final",
"net.jpountz.lz4:lz4:jar:sources:1.3.0",
"org.apache.pulsar:pulsar-checksum:jar:sources:1.19.0-incubating",
@@ -6447,7 +6447,7 @@
"directDependencies": [
"com.fasterxml.jackson.core:jackson-databind:jar:sources:2.8.8",
"com.google.guava:guava:jar:sources:23.6-jre",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"io.netty:netty-all:jar:sources:4.1.72.Final",
"net.jpountz.lz4:lz4:jar:sources:1.3.0",
"org.apache.pulsar:pulsar-checksum:jar:sources:1.19.0-incubating",
@@ -6473,7 +6473,7 @@
"dependencies": [
"com.fasterxml.jackson.core:jackson-databind:2.8.8",
"com.google.guava:guava:23.6-jre",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"io.netty:netty-all:4.1.72.Final",
"net.jpountz.lz4:lz4:1.3.0",
"org.apache.pulsar:pulsar-checksum:1.19.0-incubating",
@@ -6482,7 +6482,7 @@
"directDependencies": [
"com.fasterxml.jackson.core:jackson-databind:2.8.8",
"com.google.guava:guava:23.6-jre",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"io.netty:netty-all:4.1.72.Final",
"net.jpountz.lz4:lz4:1.3.0",
"org.apache.pulsar:pulsar-checksum:1.19.0-incubating",
@@ -6546,7 +6546,7 @@
"dependencies": [
"cglib:cglib:jar:sources:3.1",
"com.google.code.findbugs:jsr305:jar:sources:3.0.2",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"commons-cli:commons-cli:jar:sources:1.3.1",
"commons-configuration:commons-configuration:jar:sources:1.10",
"commons-lang:commons-lang:jar:sources:2.6",
@@ -6563,7 +6563,7 @@
],
"directDependencies": [
"com.google.code.findbugs:jsr305:jar:sources:3.0.2",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"net.jcip:jcip-annotations:jar:sources:1.0",
"org.apache.commons:commons-lang3:jar:sources:3.12.0",
"org.apache.reef:reef-annotations:jar:sources:0.14.0",
@@ -6591,7 +6591,7 @@
"dependencies": [
"cglib:cglib:3.1",
"com.google.code.findbugs:jsr305:3.0.2",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"commons-cli:commons-cli:1.3.1",
"commons-configuration:commons-configuration:1.10",
"commons-lang:commons-lang:2.6",
@@ -6608,7 +6608,7 @@
],
"directDependencies": [
"com.google.code.findbugs:jsr305:3.0.2",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"net.jcip:jcip-annotations:1.0",
"org.apache.commons:commons-lang3:3.12.0",
"org.apache.reef:reef-annotations:0.14.0",
@@ -6636,7 +6636,7 @@
"dependencies": [
"cglib:cglib:jar:sources:3.1",
"com.google.code.findbugs:jsr305:jar:sources:3.0.2",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"commons-cli:commons-cli:jar:sources:1.3.1",
"commons-configuration:commons-configuration:jar:sources:1.10",
"commons-lang:commons-lang:jar:sources:2.6",
@@ -6675,7 +6675,7 @@
"dependencies": [
"cglib:cglib:3.1",
"com.google.code.findbugs:jsr305:3.0.2",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"commons-cli:commons-cli:1.3.1",
"commons-configuration:commons-configuration:1.10",
"commons-lang:commons-lang:2.6",
@@ -6714,7 +6714,7 @@
"dependencies": [
"cglib:cglib:jar:sources:3.1",
"com.google.code.findbugs:jsr305:jar:sources:3.0.2",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"commons-cli:commons-cli:jar:sources:1.3.1",
"commons-configuration:commons-configuration:jar:sources:1.10",
"commons-lang:commons-lang:jar:sources:2.6",
@@ -6755,7 +6755,7 @@
"dependencies": [
"cglib:cglib:3.1",
"com.google.code.findbugs:jsr305:3.0.2",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"commons-cli:commons-cli:1.3.1",
"commons-configuration:commons-configuration:1.10",
"commons-lang:commons-lang:2.6",
@@ -6796,7 +6796,7 @@
"dependencies": [
"cglib:cglib:jar:sources:3.1",
"com.google.code.findbugs:jsr305:jar:sources:3.0.2",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"commons-cli:commons-cli:jar:sources:1.3.1",
"commons-configuration:commons-configuration:jar:sources:1.10",
"commons-lang:commons-lang:jar:sources:2.6",
@@ -6835,7 +6835,7 @@
"dependencies": [
"cglib:cglib:3.1",
"com.google.code.findbugs:jsr305:3.0.2",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"commons-cli:commons-cli:1.3.1",
"commons-configuration:commons-configuration:1.10",
"commons-lang:commons-lang:2.6",
@@ -6922,7 +6922,7 @@
{
"coord": "org.apache.reef:tang:jar:sources:0.14.0",
"dependencies": [
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"commons-cli:commons-cli:jar:sources:1.3.1",
"commons-configuration:commons-configuration:jar:sources:1.10",
"commons-lang:commons-lang:jar:sources:2.6",
@@ -6930,7 +6930,7 @@
"org.apache.avro:avro:jar:sources:1.7.4"
],
"directDependencies": [
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"commons-cli:commons-cli:jar:sources:1.3.1",
"commons-configuration:commons-configuration:jar:sources:1.10",
"javax.inject:javax.inject:jar:sources:1",
@@ -6954,7 +6954,7 @@
{
"coord": "org.apache.reef:tang:0.14.0",
"dependencies": [
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"commons-cli:commons-cli:1.3.1",
"commons-configuration:commons-configuration:1.10",
"commons-lang:commons-lang:2.6",
@@ -6962,7 +6962,7 @@
"org.apache.avro:avro:1.7.4"
],
"directDependencies": [
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"commons-cli:commons-cli:1.3.1",
"commons-configuration:commons-configuration:1.10",
"javax.inject:javax.inject:1",
@@ -6987,7 +6987,7 @@
"coord": "org.apache.reef:wake:jar:sources:0.14.0",
"dependencies": [
"cglib:cglib:jar:sources:3.1",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"commons-cli:commons-cli:jar:sources:1.3.1",
"commons-configuration:commons-configuration:jar:sources:1.10",
"commons-lang:commons-lang:jar:sources:2.6",
@@ -7000,7 +7000,7 @@
],
"directDependencies": [
"cglib:cglib:jar:sources:3.1",
- "com.google.protobuf:protobuf-java:jar:sources:3.19.1",
+ "com.google.protobuf:protobuf-java:jar:sources:3.16.1",
"io.netty:netty-all:jar:sources:4.1.72.Final",
"net.jcip:jcip-annotations:jar:sources:1.0",
"org.apache.reef:tang:jar:sources:0.14.0"
@@ -7024,7 +7024,7 @@
"coord": "org.apache.reef:wake:0.14.0",
"dependencies": [
"cglib:cglib:3.1",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"commons-cli:commons-cli:1.3.1",
"commons-configuration:commons-configuration:1.10",
"commons-lang:commons-lang:2.6",
@@ -7037,7 +7037,7 @@
],
"directDependencies": [
"cglib:cglib:3.1",
- "com.google.protobuf:protobuf-java:3.19.1",
+ "com.google.protobuf:protobuf-java:3.16.1",
"io.netty:netty-all:4.1.72.Final",
"net.jcip:jcip-annotations:1.0",
"org.apache.reef:tang:0.14.0"
diff --git a/scripts/packages/heronpy/requirements.txt
b/scripts/packages/heronpy/requirements.txt
index 6ce5b89..a2de3c7 100644
--- a/scripts/packages/heronpy/requirements.txt
+++ b/scripts/packages/heronpy/requirements.txt
@@ -1,2 +1,2 @@
-protobuf==3.8.0
+protobuf==3.16.0
cloudpickle~=1.5.0
