diff options
author | Jakob Buchgraber <buchgr@google.com> | 2017-09-01 12:09:28 +0200 |
---|---|---|
committer | Jakob Buchgraber <buchgr@google.com> | 2017-09-07 13:15:20 +0200 |
commit | 8c8633610a948846244494e2e3dad91eb0536a58 (patch) | |
tree | dc8f529b699eaf69e3ebf5b85852bb0877ea76e5 /third_party | |
parent | 312578105fdf73ce56eed1de06ab2950cfbea0f5 (diff) |
third_party: Update grpc-java, netty and netty-tcnative
gRPC Java to 1.6.1
Netty to 4.1.14.Final
Netty TCNative to 2.0.5.Final
Introduce new dependency OpenCensus at version 0.5.1, which is a runtime
dependency of gRPC.
Change-Id: Ifc3eca855584ffa9db6b809b40f4bb3541a29449
Diffstat (limited to 'third_party')
27 files changed, 226 insertions, 13 deletions
diff --git a/third_party/BUILD b/third_party/BUILD index b2be51013f..4cae538b78 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -378,7 +378,14 @@ java_import( java_import( name = "instrumentation", jars = [ - "instrumentation/instrumentation-api-0.3.0.jar", + "instrumentation/instrumentation-api-0.4.3.jar", + ], +) + +java_import( + name = "opencensus-api", + jars = [ + "opencensus/opencensus-api-0.5.1.jar", ], ) @@ -441,12 +448,12 @@ java_import( java_import( name = "netty", - jars = ["netty/netty-all-4.1.8.Final.jar"], + jars = ["netty/netty-all-4.1.14.Final.jar"], ) java_import( name = "netty_tcnative", - jars = ["netty_tcnative/netty-tcnative-boringssl-static-1.1.33.Fork26.jar"], + jars = ["netty_tcnative/netty-tcnative-boringssl-static-2.0.5.Final.jar"], ) java_import( diff --git a/third_party/grpc/BUILD b/third_party/grpc/BUILD index 1a09b09d2c..e262b31218 100644 --- a/third_party/grpc/BUILD +++ b/third_party/grpc/BUILD @@ -20,13 +20,13 @@ config_setting( filegroup( name = "bootstrap-grpc-jars", srcs = [ - "grpc-auth-1.3.0.jar", - "grpc-netty-1.3.0.jar", - "grpc-protobuf-1.3.0.jar", - "grpc-protobuf-lite-1.3.0.jar", - "grpc-stub-1.3.0.jar", - "grpc-core-1.3.0.jar", - "grpc-context-1.3.0.jar", + "grpc-auth-1.6.1.jar", + "grpc-netty-1.6.1.jar", + "grpc-protobuf-1.6.1.jar", + "grpc-protobuf-lite-1.6.1.jar", + "grpc-stub-1.6.1.jar", + "grpc-core-1.6.1.jar", + "grpc-context-1.6.1.jar", ], ) @@ -37,7 +37,9 @@ java_import( "//third_party:guava", "//third_party:instrumentation", ], - runtime_deps = ["//third_party:netty"], + runtime_deps = ["//third_party:netty", + "//third_party:opencensus-api", + ], ) cc_binary( diff --git a/third_party/grpc/grpc-auth-1.3.0.jar b/third_party/grpc/grpc-auth-1.3.0.jar Binary files differdeleted file mode 100644 index ba0b54cd45..0000000000 --- a/third_party/grpc/grpc-auth-1.3.0.jar +++ /dev/null diff --git a/third_party/grpc/grpc-auth-1.6.1.jar b/third_party/grpc/grpc-auth-1.6.1.jar Binary files differnew file mode 100644 index 0000000000..e39f6bc348 --- /dev/null +++ b/third_party/grpc/grpc-auth-1.6.1.jar diff --git a/third_party/grpc/grpc-context-1.3.0.jar b/third_party/grpc/grpc-context-1.3.0.jar Binary files differdeleted file mode 100644 index 77e334c0ed..0000000000 --- a/third_party/grpc/grpc-context-1.3.0.jar +++ /dev/null diff --git a/third_party/grpc/grpc-context-1.6.1.jar b/third_party/grpc/grpc-context-1.6.1.jar Binary files differnew file mode 100644 index 0000000000..f6660b4b15 --- /dev/null +++ b/third_party/grpc/grpc-context-1.6.1.jar diff --git a/third_party/grpc/grpc-core-1.3.0.jar b/third_party/grpc/grpc-core-1.3.0.jar Binary files differdeleted file mode 100644 index eef70b6910..0000000000 --- a/third_party/grpc/grpc-core-1.3.0.jar +++ /dev/null diff --git a/third_party/grpc/grpc-core-1.6.1.jar b/third_party/grpc/grpc-core-1.6.1.jar Binary files differnew file mode 100644 index 0000000000..397af7e95b --- /dev/null +++ b/third_party/grpc/grpc-core-1.6.1.jar diff --git a/third_party/grpc/grpc-netty-1.3.0.jar b/third_party/grpc/grpc-netty-1.3.0.jar Binary files differdeleted file mode 100644 index f513e55d69..0000000000 --- a/third_party/grpc/grpc-netty-1.3.0.jar +++ /dev/null diff --git a/third_party/grpc/grpc-netty-1.6.1.jar b/third_party/grpc/grpc-netty-1.6.1.jar Binary files differnew file mode 100644 index 0000000000..2ed7a4513a --- /dev/null +++ b/third_party/grpc/grpc-netty-1.6.1.jar diff --git a/third_party/grpc/grpc-protobuf-1.3.0.jar b/third_party/grpc/grpc-protobuf-1.3.0.jar Binary files differdeleted file mode 100644 index 6290d218cd..0000000000 --- a/third_party/grpc/grpc-protobuf-1.3.0.jar +++ /dev/null diff --git a/third_party/grpc/grpc-protobuf-1.6.1.jar b/third_party/grpc/grpc-protobuf-1.6.1.jar Binary files differnew file mode 100644 index 0000000000..ef1fe6bbd5 --- /dev/null +++ b/third_party/grpc/grpc-protobuf-1.6.1.jar diff --git a/third_party/grpc/grpc-protobuf-lite-1.3.0.jar b/third_party/grpc/grpc-protobuf-lite-1.3.0.jar Binary files differdeleted file mode 100644 index e098967f75..0000000000 --- a/third_party/grpc/grpc-protobuf-lite-1.3.0.jar +++ /dev/null diff --git a/third_party/grpc/grpc-protobuf-lite-1.6.1.jar b/third_party/grpc/grpc-protobuf-lite-1.6.1.jar Binary files differnew file mode 100644 index 0000000000..af60539aaa --- /dev/null +++ b/third_party/grpc/grpc-protobuf-lite-1.6.1.jar diff --git a/third_party/grpc/grpc-stub-1.3.0.jar b/third_party/grpc/grpc-stub-1.3.0.jar Binary files differdeleted file mode 100644 index 2d5a740e55..0000000000 --- a/third_party/grpc/grpc-stub-1.3.0.jar +++ /dev/null diff --git a/third_party/grpc/grpc-stub-1.6.1.jar b/third_party/grpc/grpc-stub-1.6.1.jar Binary files differnew file mode 100644 index 0000000000..b33e4d7c85 --- /dev/null +++ b/third_party/grpc/grpc-stub-1.6.1.jar diff --git a/third_party/instrumentation/README.bazel.md b/third_party/instrumentation/README.bazel.md index e61f3250f4..765ce2ee6f 100644 --- a/third_party/instrumentation/README.bazel.md +++ b/third_party/instrumentation/README.bazel.md @@ -1,2 +1,2 @@ You can get newer versions of this jar from maven central. The artifact id is -instrumentation-api. We currently use version 0.3.0 +instrumentation-api. We currently use version 0.4.3. diff --git a/third_party/instrumentation/instrumentation-api-0.3.0.jar b/third_party/instrumentation/instrumentation-api-0.3.0.jar Binary files differdeleted file mode 100644 index 16622bb49b..0000000000 --- a/third_party/instrumentation/instrumentation-api-0.3.0.jar +++ /dev/null diff --git a/third_party/instrumentation/instrumentation-api-0.4.3.jar b/third_party/instrumentation/instrumentation-api-0.4.3.jar Binary files differnew file mode 100644 index 0000000000..fd8baee04f --- /dev/null +++ b/third_party/instrumentation/instrumentation-api-0.4.3.jar diff --git a/third_party/netty/README.bazel.md b/third_party/netty/README.bazel.md index f57f299d83..4ca2527525 100644 --- a/third_party/netty/README.bazel.md +++ b/third_party/netty/README.bazel.md @@ -1,2 +1,2 @@ -To reproduce this tree, download `netty-4.1.8.Final.jar` from Maven Central. It's under the path +To reproduce this tree, download `netty-4.1.14.Final.jar` from Maven Central. It's under the path `io.netty / netty-all` . diff --git a/third_party/netty/netty-all-4.1.14.Final.jar b/third_party/netty/netty-all-4.1.14.Final.jar Binary files differnew file mode 100644 index 0000000000..e5c81377a7 --- /dev/null +++ b/third_party/netty/netty-all-4.1.14.Final.jar diff --git a/third_party/netty/netty-all-4.1.8.Final.jar b/third_party/netty/netty-all-4.1.8.Final.jar Binary files differdeleted file mode 100644 index 5be0c9d18e..0000000000 --- a/third_party/netty/netty-all-4.1.8.Final.jar +++ /dev/null diff --git a/third_party/netty_tcnative/netty-tcnative-boringssl-static-1.1.33.Fork26.jar b/third_party/netty_tcnative/netty-tcnative-boringssl-static-1.1.33.Fork26.jar Binary files differdeleted file mode 100644 index e2f35ce883..0000000000 --- a/third_party/netty_tcnative/netty-tcnative-boringssl-static-1.1.33.Fork26.jar +++ /dev/null diff --git a/third_party/netty_tcnative/netty-tcnative-boringssl-static-2.0.5.Final.jar b/third_party/netty_tcnative/netty-tcnative-boringssl-static-2.0.5.Final.jar Binary files differnew file mode 100644 index 0000000000..b37e274526 --- /dev/null +++ b/third_party/netty_tcnative/netty-tcnative-boringssl-static-2.0.5.Final.jar diff --git a/third_party/opencensus/LICENSE-2.0.txt b/third_party/opencensus/LICENSE-2.0.txt new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/third_party/opencensus/LICENSE-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/third_party/opencensus/README.md b/third_party/opencensus/README.md new file mode 100644 index 0000000000..0ebb0b90fc --- /dev/null +++ b/third_party/opencensus/README.md @@ -0,0 +1,2 @@ +Download the opencensus-api artifact from maven central. We currently use +version 0.5.1. diff --git a/third_party/opencensus/opencensus-api-0.5.1.jar b/third_party/opencensus/opencensus-api-0.5.1.jar Binary files differnew file mode 100644 index 0000000000..9d0fae693e --- /dev/null +++ b/third_party/opencensus/opencensus-api-0.5.1.jar |