diff --git a/WORKSPACE b/WORKSPACE index 5b61d38d6a1..a5bcced33fe 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -109,6 +109,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, @@ -135,13 +136,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", + ], fetch_sources = True, maven_install_json = "//:maven_install.json", repositories = [ @@ -149,12 +156,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", ) @@ -169,7 +170,7 @@ 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", ) @@ -178,6 +179,7 @@ load( "@com_github_johnynek_bazel_jar_jar//:jar_jar.bzl", "jar_jar_repositories", ) + jar_jar_repositories() http_archive( @@ -395,6 +397,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") @@ -421,13 +424,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 @@ -435,8 +440,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/instance/src/cpp/boltimpl/bolt-output-collector-impl.cpp b/heron/instance/src/cpp/boltimpl/bolt-output-collector-impl.cpp index 102c0933080..ce19cb0c78d 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 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( @@ -118,7 +118,7 @@ void BoltOutputCollectorImpl::fail(std::shared_ptr 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( diff --git a/heron/proto/BUILD b/heron/proto/BUILD index 822756f2fda..69466f474c6 100644 --- a/heron/proto/BUILD +++ b/heron/proto/BUILD @@ -181,7 +181,7 @@ java_library( pex_library( name = "proto-py", reqs = [ - "protobuf==3.8.0", + "protobuf==3.16.0", "setuptools==46.1.3", ], deps = [ diff --git a/heron/stmgr/src/cpp/util/tuple-cache.cpp b/heron/stmgr/src/cpp/util/tuple-cache.cpp index 28b7415d522..6cb791ff027 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 51d8efd3433..aa05c7853da 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 14ed3bde775..44d3a034ea8 100644 --- a/heron/tools/tracker/src/python/BUILD +++ b/heron/tools/tracker/src/python/BUILD @@ -10,7 +10,7 @@ pex_library( "click==7.1.2", "javaobj-py3==0.4.1", "networkx==2.4", - "protobuf==3.8.0", + "protobuf==3.16.0", "tornado==4.0.2", ], deps = [ diff --git a/heronpy/proto/BUILD b/heronpy/proto/BUILD index ef9e679f09a..80455d6664a 100644 --- a/heronpy/proto/BUILD +++ b/heronpy/proto/BUILD @@ -27,7 +27,7 @@ pex_library( name = "proto-py", srcs = glob(["**/*.py"]), reqs = [ - "protobuf==3.8.0", + "protobuf==3.16.0", "setuptools==46.1.3", ], deps = [ @@ -50,7 +50,7 @@ pex_binary( name = "proto-py-package", srcs = glob(["**/*.py"]), reqs = [ - "protobuf==3.8.0", + "protobuf==3.16.0", "setuptools==18.8.1", ], deps = [ diff --git a/maven_install.json b/maven_install.json index d3b4a27aab7..179a8e5d155 100644 --- a/maven_install.json +++ b/maven_install.json @@ -1,6 +1,6 @@ { "dependency_tree": { - "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -1920493941, + "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -1070525844, "conflict_resolution": {}, "dependencies": [ { @@ -1727,7 +1727,7 @@ "url": "https://jcenter.bintray.com/com/google/oauth-client/google-oauth-client/1.22.0/google-oauth-client-1.22.0-sources.jar" }, { - "coord": "com.google.protobuf:protobuf-java:3.14.0", + "coord": "com.google.protobuf:protobuf-java:3.16.1", "dependencies": [], "directDependencies": [], "exclusions": [ @@ -1736,17 +1736,17 @@ "log4j:log4j", "commons-logging:commons-logging" ], - "file": "v1/https/jcenter.bintray.com/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0.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.14.0/protobuf-java-3.14.0.jar", - "https://maven.google.com/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0.jar", - "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0.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": "bc9d7feab02531e15322980647379afb039fc2dccbb8f79588d1e8652efa1e00", - "url": "https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0.jar" + "sha256": "7b845a34210acde78b7f77977b3724988b9c60b2dce7a93a9afbbb1fee7978c4", + "url": "https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.16.1/protobuf-java-3.16.1.jar" }, { - "coord": "com.google.protobuf:protobuf-java:jar:sources:3.14.0", + "coord": "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "dependencies": [], "directDependencies": [], "exclusions": [ @@ -1755,14 +1755,14 @@ "log4j:log4j", "commons-logging:commons-logging" ], - "file": "v1/https/jcenter.bintray.com/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-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.14.0/protobuf-java-3.14.0-sources.jar", - "https://maven.google.com/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-sources.jar", - "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-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": "719cdbb11164b3659f679e0f9bec3d0238d5ca161cb9b478710dc6884e8e50c0", - "url": "https://jcenter.bintray.com/com/google/protobuf/protobuf-java/3.14.0/protobuf-java-3.14.0-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.googlecode.json-simple:json-simple:1.1", @@ -2974,10 +2974,10 @@ { "coord": "io.kubernetes:client-java-proto:11.0.0", "dependencies": [ - "com.google.protobuf:protobuf-java:3.14.0" + "com.google.protobuf:protobuf-java:3.16.1" ], "directDependencies": [ - "com.google.protobuf:protobuf-java:3.14.0" + "com.google.protobuf:protobuf-java:3.16.1" ], "exclusions": [ "org.slf4j:slf4j-jdk14", @@ -2997,10 +2997,10 @@ { "coord": "io.kubernetes:client-java-proto:jar:sources:11.0.0", "dependencies": [ - "com.google.protobuf:protobuf-java:jar:sources:3.14.0" + "com.google.protobuf:protobuf-java:jar:sources:3.16.1" ], "directDependencies": [ - "com.google.protobuf:protobuf-java:jar:sources:3.14.0" + "com.google.protobuf:protobuf-java:jar:sources:3.16.1" ], "exclusions": [ "org.slf4j:slf4j-jdk14", @@ -3023,10 +3023,10 @@ "org.bouncycastle:bcprov-ext-jdk15on:1.66", "org.yaml:snakeyaml:1.15", "com.google.code.findbugs:jsr305:3.0.2", + "com.google.protobuf:protobuf-java:3.16.1", "commons-io:commons-io:2.4", "org.apache.commons:commons-compress:1.14", "org.bouncycastle:bcprov-jdk15on:jar:1.66", - "com.google.protobuf:protobuf-java:3.14.0", "io.swagger:swagger-annotations:1.6.2", "io.kubernetes:client-java-proto:11.0.0", "com.google.code.gson:gson:2.8.6", @@ -3048,9 +3048,9 @@ "directDependencies": [ "org.bouncycastle:bcprov-ext-jdk15on:1.66", "org.yaml:snakeyaml:1.15", + "com.google.protobuf:protobuf-java:3.16.1", "commons-io:commons-io:2.4", "org.apache.commons:commons-compress:1.14", - "com.google.protobuf:protobuf-java:3.14.0", "io.kubernetes:client-java-proto:11.0.0", "org.bouncycastle:bcpkix-jdk15on:1.66", "io.kubernetes:client-java-api:11.0.0", @@ -3087,7 +3087,6 @@ "org.yaml:snakeyaml:jar:sources:1.15", "org.bouncycastle:bcpkix-jdk15on:jar:sources:1.66", "org.joda:joda-convert:jar:sources:2.2.1", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "org.bouncycastle:bcprov-jdk15on:jar:sources:1.66", "io.kubernetes:client-java-api:jar:sources:11.0.0", "org.bitbucket.b_c:jose4j:jar:sources:0.7.3", @@ -3100,6 +3099,7 @@ "org.bouncycastle:bcprov-ext-jdk15on:jar:sources:1.66", "io.swagger:swagger-annotations:jar:sources:1.6.2", "com.squareup.okhttp3:logging-interceptor:jar:sources:3.14.9", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "javax.annotation:javax.annotation-api:jar:sources:1.3.2", "com.squareup.okio:okio:jar:sources:1.17.2" ], @@ -3111,12 +3111,12 @@ "commons-codec:commons-codec:jar:sources:1.15", "org.yaml:snakeyaml:jar:sources:1.15", "org.bouncycastle:bcpkix-jdk15on:jar:sources:1.66", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "io.kubernetes:client-java-api:jar:sources:11.0.0", "org.bitbucket.b_c:jose4j:jar:sources:0.7.3", "org.apache.commons:commons-compress:jar:sources:1.14", "commons-io:commons-io:jar:sources:2.4", - "org.bouncycastle:bcprov-ext-jdk15on:jar:sources:1.66" + "org.bouncycastle:bcprov-ext-jdk15on:jar:sources:1.66", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1" ], "exclusions": [ "org.slf4j:slf4j-jdk14", @@ -4739,11 +4739,11 @@ "dependencies": [ "commons-configuration:commons-configuration:1.10", "org.slf4j:slf4j-api:1.7.36", - "com.google.protobuf:protobuf-java:3.14.0", + "com.google.protobuf:protobuf-java:3.16.1", "commons-lang:commons-lang:2.6" ], "directDependencies": [ - "com.google.protobuf:protobuf-java:3.14.0", + "com.google.protobuf:protobuf-java:3.16.1", "commons-configuration:commons-configuration:1.10", "org.slf4j:slf4j-api:1.7.36" ], @@ -4765,13 +4765,13 @@ { "coord": "org.apache.bookkeeper:bookkeeper-proto:jar:sources:4.13.0", "dependencies": [ + "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "commons-configuration:commons-configuration:jar:sources:1.10", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "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.14.0", + "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" ], @@ -4801,6 +4801,7 @@ "io.netty:netty-codec:4.1.63.Final", "org.bouncycastle:bcprov-ext-jdk15on:1.66", "com.google.code.findbugs:jsr305:3.0.2", + "com.google.protobuf:protobuf-java:3.16.1", "io.netty:netty-handler:4.1.63.Final", "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.63.Final", "org.jctools:jctools-core:2.1.2", @@ -4810,7 +4811,6 @@ "io.netty:netty-resolver:4.1.63.Final", "com.google.guava:guava:23.6-jre", "org.bouncycastle:bcprov-jdk15on:jar:1.66", - "com.google.protobuf:protobuf-java:3.14.0", "io.netty:netty-buffer:4.1.63.Final", "org.apache.bookkeeper.http:http-server:4.13.0", "commons-configuration:commons-configuration:1.10", @@ -4906,7 +4906,6 @@ "org.checkerframework:checker-compat-qual:jar:sources:2.0.0", "org.bouncycastle:bcpkix-jdk15on:jar:sources:1.66", "org.codehaus.mojo:animal-sniffer-annotations:jar:sources:1.14", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "com.fasterxml.jackson.core:jackson-core:jar:sources:2.8.8", "io.netty:netty-resolver:jar:sources:4.1.63.Final", "org.bouncycastle:bcprov-jdk15on:jar:sources:1.66", @@ -4928,6 +4927,7 @@ "org.apache.httpcomponents:httpclient:jar:sources:4.5.2", "io.netty:netty-handler:jar:sources:4.1.63.Final", "org.apache.bookkeeper:circe-checksum:jar:sources:4.13.0", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "org.apache.bookkeeper.stats:bookkeeper-stats-api:jar:sources:4.13.0", "io.netty:netty-codec:jar:sources:4.1.63.Final", "commons-cli:commons-cli:jar:sources:1.3.1" @@ -5766,6 +5766,7 @@ "io.netty:netty-codec:4.1.63.Final", "org.bouncycastle:bcprov-ext-jdk15on:1.66", "com.google.code.findbugs:jsr305:3.0.2", + "com.google.protobuf:protobuf-java:3.16.1", "io.netty:netty-handler:4.1.63.Final", "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.63.Final", "org.apache.distributedlog:distributedlog-protocol:4.13.0", @@ -5776,7 +5777,6 @@ "io.netty:netty-resolver:4.1.63.Final", "com.google.guava:guava:23.6-jre", "org.bouncycastle:bcprov-jdk15on:jar:1.66", - "com.google.protobuf:protobuf-java:3.14.0", "io.netty:netty-buffer:4.1.63.Final", "org.apache.bookkeeper.http:http-server:4.13.0", "commons-configuration:commons-configuration:1.10", @@ -5861,7 +5861,6 @@ "org.checkerframework:checker-compat-qual:jar:sources:2.0.0", "org.bouncycastle:bcpkix-jdk15on:jar:sources:1.66", "org.codehaus.mojo:animal-sniffer-annotations:jar:sources:1.14", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "com.fasterxml.jackson.core:jackson-core:jar:sources:2.8.8", "io.netty:netty-resolver:jar:sources:4.1.63.Final", "org.bouncycastle:bcprov-jdk15on:jar:sources:1.66", @@ -5885,6 +5884,7 @@ "io.netty:netty-handler:jar:sources:4.1.63.Final", "org.apache.bookkeeper:bookkeeper-server:jar:sources:4.13.0", "org.apache.bookkeeper:circe-checksum:jar:sources:4.13.0", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "org.apache.bookkeeper.stats:bookkeeper-stats-api:jar:sources:4.13.0", "io.netty:netty-codec:jar:sources:4.1.63.Final", "commons-cli:commons-cli:jar:sources:1.3.1" @@ -6291,10 +6291,10 @@ { "coord": "org.apache.mesos:mesos:0.22.0", "dependencies": [ - "com.google.protobuf:protobuf-java:3.14.0" + "com.google.protobuf:protobuf-java:3.16.1" ], "directDependencies": [ - "com.google.protobuf:protobuf-java:3.14.0" + "com.google.protobuf:protobuf-java:3.16.1" ], "exclusions": [ "org.slf4j:slf4j-jdk14", @@ -6314,10 +6314,10 @@ { "coord": "org.apache.mesos:mesos:jar:sources:0.22.0", "dependencies": [ - "com.google.protobuf:protobuf-java:jar:sources:3.14.0" + "com.google.protobuf:protobuf-java:jar:sources:3.16.1" ], "directDependencies": [ - "com.google.protobuf:protobuf-java:jar:sources:3.14.0" + "com.google.protobuf:protobuf-java:jar:sources:3.16.1" ], "exclusions": [ "org.slf4j:slf4j-jdk14", @@ -6408,8 +6408,8 @@ "org.asynchttpclient:netty-codec-dns:2.0.31", "org.asynchttpclient:netty-resolver:2.0.31", "com.google.code.findbugs:jsr305:3.0.2", + "com.google.protobuf:protobuf-java:3.16.1", "com.google.guava:guava:23.6-jre", - "com.google.protobuf:protobuf-java:3.14.0", "org.reactivestreams:reactive-streams:1.0.0", "org.slf4j:slf4j-api:1.7.36", "org.codehaus.mojo:animal-sniffer-annotations:1.14", @@ -6468,7 +6468,6 @@ "org.checkerframework:checker-compat-qual:jar:sources:2.0.0", "org.asynchttpclient:netty-resolver:jar:sources:2.0.31", "org.codehaus.mojo:animal-sniffer-annotations:jar:sources:1.14", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "com.fasterxml.jackson.core:jackson-core:jar:sources:2.8.8", "org.asynchttpclient:netty-codec-dns:jar:sources:2.0.31", "org.apache.pulsar:pulsar-checksum:jar:sources:1.19.0-incubating", @@ -6477,6 +6476,7 @@ "com.google.j2objc:j2objc-annotations:jar:sources:1.1", "org.asynchttpclient:async-http-client-netty-utils:jar:sources:2.0.31", "org.reactivestreams:reactive-streams:jar:sources:1.0.0", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "com.typesafe.netty:netty-reactive-streams:jar:sources:1.0.8" ], "directDependencies": [ @@ -6510,8 +6510,8 @@ "org.checkerframework:checker-compat-qual:2.0.0", "io.netty:netty-all:4.1.50.Final", "com.google.code.findbugs:jsr305:3.0.2", + "com.google.protobuf:protobuf-java:3.16.1", "com.google.guava:guava:23.6-jre", - "com.google.protobuf:protobuf-java:3.14.0", "org.slf4j:slf4j-api:1.7.36", "org.codehaus.mojo:animal-sniffer-annotations:1.14", "com.google.j2objc:j2objc-annotations:1.1", @@ -6523,8 +6523,8 @@ "directDependencies": [ "org.apache.pulsar:pulsar-checksum:1.19.0-incubating", "io.netty:netty-all:4.1.50.Final", + "com.google.protobuf:protobuf-java:3.16.1", "com.google.guava:guava:23.6-jre", - "com.google.protobuf:protobuf-java:3.14.0", "org.slf4j:slf4j-api:1.7.36", "com.fasterxml.jackson.core:jackson-databind:2.8.8", "net.jpountz.lz4:lz4:1.3.0" @@ -6555,21 +6555,21 @@ "com.fasterxml.jackson.core:jackson-annotations:jar:sources:2.8.8", "org.checkerframework:checker-compat-qual:jar:sources:2.0.0", "org.codehaus.mojo:animal-sniffer-annotations:jar:sources:1.14", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "com.fasterxml.jackson.core:jackson-core:jar:sources:2.8.8", "org.apache.pulsar:pulsar-checksum:jar:sources:1.19.0-incubating", "com.fasterxml.jackson.core:jackson-databind:jar:sources:2.8.8", "io.netty:netty-all:jar:sources:4.1.50.Final", - "com.google.j2objc:j2objc-annotations:jar:sources:1.1" + "com.google.j2objc:j2objc-annotations:jar:sources:1.1", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1" ], "directDependencies": [ "org.slf4j:slf4j-api:jar:sources:1.7.36", "net.jpountz.lz4:lz4:jar:sources:1.3.0", "com.google.guava:guava:jar:sources:23.6-jre", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "org.apache.pulsar:pulsar-checksum:jar:sources:1.19.0-incubating", "com.fasterxml.jackson.core:jackson-databind:jar:sources:2.8.8", - "io.netty:netty-all:jar:sources:4.1.50.Final" + "io.netty:netty-all:jar:sources:4.1.50.Final", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1" ], "exclusions": [ "org.slf4j:slf4j-jdk14", @@ -6631,11 +6631,11 @@ "org.apache.reef:wake:0.14.0", "io.netty:netty-all:4.1.50.Final", "com.google.code.findbugs:jsr305:3.0.2", + "com.google.protobuf:protobuf-java:3.16.1", "org.ow2.asm:asm:5.0.3", "com.thoughtworks.paranamer:paranamer:2.3", "org.apache.commons:commons-compress:1.14", "commons-lang:commons-lang:2.6", - "com.google.protobuf:protobuf-java:3.14.0", "org.apache.reef:reef-annotations:0.14.0", "cglib:cglib:3.1", "commons-configuration:commons-configuration:1.10", @@ -6653,7 +6653,7 @@ "directDependencies": [ "org.apache.reef:wake:0.14.0", "com.google.code.findbugs:jsr305:3.0.2", - "com.google.protobuf:protobuf-java:3.14.0", + "com.google.protobuf:protobuf-java:3.16.1", "org.apache.reef:reef-annotations:0.14.0", "org.apache.reef:reef-utils:0.14.0", "org.apache.reef:tang:0.14.0", @@ -6690,7 +6690,6 @@ "commons-lang:commons-lang:jar:sources:2.6", "org.apache.reef:reef-utils:jar:sources:0.14.0", "commons-configuration:commons-configuration:jar:sources:1.10", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "org.apache.reef:wake:jar:sources:0.14.0", "org.xerial.snappy:snappy-java:jar:sources:1.1.7.2", "javax.inject:javax.inject:jar:sources:1", @@ -6699,6 +6698,7 @@ "org.apache.commons:commons-compress:jar:sources:1.14", "org.apache.reef:tang:jar:sources:0.14.0", "org.apache.avro:avro:jar:sources:1.7.4", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "commons-cli:commons-cli:jar:sources:1.3.1" ], "directDependencies": [ @@ -6707,9 +6707,9 @@ "net.jcip:jcip-annotations:jar:sources:1.0", "org.apache.reef:reef-annotations:jar:sources:0.14.0", "org.apache.reef:reef-utils:jar:sources:0.14.0", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "org.apache.reef:wake:jar:sources:0.14.0", - "org.apache.reef:tang:jar:sources:0.14.0" + "org.apache.reef:tang:jar:sources:0.14.0", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1" ], "exclusions": [ "org.slf4j:slf4j-jdk14", @@ -6733,11 +6733,11 @@ "org.apache.reef:wake:0.14.0", "io.netty:netty-all:4.1.50.Final", "com.google.code.findbugs:jsr305:3.0.2", + "com.google.protobuf:protobuf-java:3.16.1", "org.ow2.asm:asm:5.0.3", "com.thoughtworks.paranamer:paranamer:2.3", "org.apache.commons:commons-compress:1.14", "commons-lang:commons-lang:2.6", - "com.google.protobuf:protobuf-java:3.14.0", "org.apache.reef:reef-annotations:0.14.0", "cglib:cglib:3.1", "commons-configuration:commons-configuration:1.10", @@ -6786,7 +6786,6 @@ "commons-lang:commons-lang:jar:sources:2.6", "org.apache.reef:reef-utils:jar:sources:0.14.0", "commons-configuration:commons-configuration:jar:sources:1.10", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "org.apache.reef:wake:jar:sources:0.14.0", "org.xerial.snappy:snappy-java:jar:sources:1.1.7.2", "javax.inject:javax.inject:jar:sources:1", @@ -6796,6 +6795,7 @@ "org.apache.reef:reef-common:jar:sources:0.14.0", "org.apache.reef:tang:jar:sources:0.14.0", "org.apache.avro:avro:jar:sources:1.7.4", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "commons-cli:commons-cli:jar:sources:1.3.1" ], "directDependencies": [ @@ -6823,11 +6823,11 @@ "org.apache.reef:wake:0.14.0", "io.netty:netty-all:4.1.50.Final", "com.google.code.findbugs:jsr305:3.0.2", + "com.google.protobuf:protobuf-java:3.16.1", "org.ow2.asm:asm:5.0.3", "com.thoughtworks.paranamer:paranamer:2.3", "org.apache.commons:commons-compress:1.14", "commons-lang:commons-lang:2.6", - "com.google.protobuf:protobuf-java:3.14.0", "org.apache.reef:reef-annotations:0.14.0", "cglib:cglib:3.1", "org.apache.reef:reef-utils-hadoop:0.14.0", @@ -6878,7 +6878,6 @@ "commons-lang:commons-lang:jar:sources:2.6", "org.apache.reef:reef-utils:jar:sources:0.14.0", "commons-configuration:commons-configuration:jar:sources:1.10", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "org.apache.reef:wake:jar:sources:0.14.0", "org.xerial.snappy:snappy-java:jar:sources:1.1.7.2", "javax.inject:javax.inject:jar:sources:1", @@ -6889,6 +6888,7 @@ "org.apache.reef:reef-common:jar:sources:0.14.0", "org.apache.reef:tang:jar:sources:0.14.0", "org.apache.avro:avro:jar:sources:1.7.4", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "commons-cli:commons-cli:jar:sources:1.3.1" ], "directDependencies": [ @@ -6917,11 +6917,11 @@ "org.apache.reef:wake:0.14.0", "io.netty:netty-all:4.1.50.Final", "com.google.code.findbugs:jsr305:3.0.2", + "com.google.protobuf:protobuf-java:3.16.1", "org.ow2.asm:asm:5.0.3", "com.thoughtworks.paranamer:paranamer:2.3", "org.apache.commons:commons-compress:1.14", "commons-lang:commons-lang:2.6", - "com.google.protobuf:protobuf-java:3.14.0", "org.apache.reef:reef-annotations:0.14.0", "cglib:cglib:3.1", "commons-configuration:commons-configuration:1.10", @@ -6970,7 +6970,6 @@ "commons-lang:commons-lang:jar:sources:2.6", "org.apache.reef:reef-utils:jar:sources:0.14.0", "commons-configuration:commons-configuration:jar:sources:1.10", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "org.apache.reef:wake:jar:sources:0.14.0", "org.xerial.snappy:snappy-java:jar:sources:1.1.7.2", "javax.inject:javax.inject:jar:sources:1", @@ -6980,6 +6979,7 @@ "org.apache.reef:reef-common:jar:sources:0.14.0", "org.apache.reef:tang:jar:sources:0.14.0", "org.apache.avro:avro:jar:sources:1.7.4", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "commons-cli:commons-cli:jar:sources:1.3.1" ], "directDependencies": [ @@ -7054,10 +7054,10 @@ "coord": "org.apache.reef:tang:0.14.0", "dependencies": [ "org.apache.avro:avro:1.7.4", + "com.google.protobuf:protobuf-java:3.16.1", "com.thoughtworks.paranamer:paranamer:2.3", "org.apache.commons:commons-compress:1.14", "commons-lang:commons-lang:2.6", - "com.google.protobuf:protobuf-java:3.14.0", "commons-configuration:commons-configuration:1.10", "org.slf4j:slf4j-api:1.7.36", "org.xerial.snappy:snappy-java:1.1.7.2", @@ -7068,7 +7068,7 @@ ], "directDependencies": [ "org.apache.avro:avro:1.7.4", - "com.google.protobuf:protobuf-java:3.14.0", + "com.google.protobuf:protobuf-java:3.16.1", "commons-configuration:commons-configuration:1.10", "commons-cli:commons-cli:1.3.1", "javax.inject:javax.inject:1" @@ -7097,18 +7097,18 @@ "com.thoughtworks.paranamer:paranamer:jar:sources:2.3", "commons-lang:commons-lang:jar:sources:2.6", "commons-configuration:commons-configuration:jar:sources:1.10", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "org.xerial.snappy:snappy-java:jar:sources:1.1.7.2", "javax.inject:javax.inject:jar:sources:1", "org.apache.commons:commons-compress:jar:sources:1.14", "org.apache.avro:avro:jar:sources:1.7.4", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "commons-cli:commons-cli:jar:sources:1.3.1" ], "directDependencies": [ "commons-configuration:commons-configuration:jar:sources:1.10", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "javax.inject:javax.inject:jar:sources:1", "org.apache.avro:avro:jar:sources:1.7.4", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "commons-cli:commons-cli:jar:sources:1.3.1" ], "exclusions": [ @@ -7131,11 +7131,11 @@ "dependencies": [ "org.apache.avro:avro:1.7.4", "io.netty:netty-all:4.1.50.Final", + "com.google.protobuf:protobuf-java:3.16.1", "org.ow2.asm:asm:5.0.3", "com.thoughtworks.paranamer:paranamer:2.3", "org.apache.commons:commons-compress:1.14", "commons-lang:commons-lang:2.6", - "com.google.protobuf:protobuf-java:3.14.0", "cglib:cglib:3.1", "commons-configuration:commons-configuration:1.10", "org.slf4j:slf4j-api:1.7.36", @@ -7149,7 +7149,7 @@ ], "directDependencies": [ "io.netty:netty-all:4.1.50.Final", - "com.google.protobuf:protobuf-java:3.14.0", + "com.google.protobuf:protobuf-java:3.16.1", "cglib:cglib:3.1", "org.apache.reef:tang:0.14.0", "net.jcip:jcip-annotations:1.0" @@ -7180,7 +7180,6 @@ "net.jcip:jcip-annotations:jar:sources:1.0", "commons-lang:commons-lang:jar:sources:2.6", "commons-configuration:commons-configuration:jar:sources:1.10", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "org.xerial.snappy:snappy-java:jar:sources:1.1.7.2", "javax.inject:javax.inject:jar:sources:1", "cglib:cglib:jar:sources:3.1", @@ -7188,14 +7187,15 @@ "org.apache.commons:commons-compress:jar:sources:1.14", "org.apache.reef:tang:jar:sources:0.14.0", "org.apache.avro:avro:jar:sources:1.7.4", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1", "commons-cli:commons-cli:jar:sources:1.3.1" ], "directDependencies": [ "net.jcip:jcip-annotations:jar:sources:1.0", - "com.google.protobuf:protobuf-java:jar:sources:3.14.0", "cglib:cglib:jar:sources:3.1", "io.netty:netty-all:jar:sources:4.1.50.Final", - "org.apache.reef:tang:jar:sources:0.14.0" + "org.apache.reef:tang:jar:sources:0.14.0", + "com.google.protobuf:protobuf-java:jar:sources:3.16.1" ], "exclusions": [ "org.slf4j:slf4j-jdk14", diff --git a/scripts/packages/heronpy/requirements.txt b/scripts/packages/heronpy/requirements.txt index 6ce5b898a3e..a2de3c762dd 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