diff --git a/third_party/BUILD b/third_party/BUILD index c7d92b1ee608f2..8c9e303dedbb39 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -304,8 +304,8 @@ java_import( java_import( name = "checker_framework_annotations", - jars = ["checker_framework_annotations/checker-qual-3.0.0.jar"], - srcjar = "checker_framework_annotations/checker-qual-3.0.0-sources.jar", + jars = ["checker_framework_annotations/checker-qual-3.2.0.jar"], + srcjar = "checker_framework_annotations/checker-qual-3.2.0-sources.jar", ) java_import( @@ -319,37 +319,51 @@ distrib_java_import( enable_distributions = ["debian"], ) +java_import( + name = "caffeine", + jars = ["caffeine/caffeine-2.8.0.jar"], +) + java_import( name = "hungarian_algorithm", jars = ["hungarian_algorithm/software-and-algorithms-1.0.jar"], srcjar = "hungarian_algorithm/software-and-algorithms-1.0-src.jar", ) +java_import( + name = "threeten", + jars = [ + "error_prone/threeten-extra-1.5.0.jar", + ], +) + java_import( name = "error_prone_annotations", jars = [ - "error_prone/error_prone_annotations-2.2.0.jar", - "error_prone/error_prone_type_annotations-2.3.2-SNAPSHOT.jar", + "error_prone/error_prone_annotations-2.4.0.jar", + "error_prone/error_prone_type_annotations-2.4.0.jar", ], ) java_import( name = "error_prone", jars = [ - "error_prone/error_prone_annotation-2.3.2-SNAPSHOT.jar", - "error_prone/error_prone_check_api-2.3.2-SNAPSHOT.jar", - "error_prone/error_prone_core-2.3.2-SNAPSHOT.jar", + "error_prone/error_prone_annotation-2.4.0.jar", + "error_prone/error_prone_check_api-2.4.0.jar", + "error_prone/error_prone_core-2.4.0.jar", ], exports = [ ":error_prone_annotations", ], deps = [ ":auto_common", + ":caffeine", ":guava", ":hungarian_algorithm", ":jcip_annotations", ":jsr305", ":pcollections", + ":threeten", "//third_party/checker_framework_dataflow", "//third_party/jformatstring", ], @@ -391,7 +405,8 @@ java_import( filegroup( name = "bootstrap_guava_and_error_prone-jars", srcs = [ - "error_prone/error_prone_annotations-2.2.0.jar", + "error_prone/error_prone_annotations-2.4.0.jar", + "error_prone/threeten-extra-1.5.0.jar", ":guava-jars", ":jcip_annotations-jars", ":jsr305-jars", diff --git a/third_party/caffeine/LICENSE b/third_party/caffeine/LICENSE new file mode 100644 index 00000000000000..d645695673349e --- /dev/null +++ b/third_party/caffeine/LICENSE @@ -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/caffeine/caffeine-2.8.0.jar b/third_party/caffeine/caffeine-2.8.0.jar new file mode 100644 index 00000000000000..29d78258317457 Binary files /dev/null and b/third_party/caffeine/caffeine-2.8.0.jar differ diff --git a/third_party/checker_framework_annotations/checker-qual-3.0.0-sources.jar b/third_party/checker_framework_annotations/checker-qual-3.0.0-sources.jar deleted file mode 100644 index 788b3f2fd01596..00000000000000 Binary files a/third_party/checker_framework_annotations/checker-qual-3.0.0-sources.jar and /dev/null differ diff --git a/third_party/checker_framework_annotations/checker-qual-3.0.0.jar b/third_party/checker_framework_annotations/checker-qual-3.0.0.jar deleted file mode 100644 index c64ec424564697..00000000000000 Binary files a/third_party/checker_framework_annotations/checker-qual-3.0.0.jar and /dev/null differ diff --git a/third_party/checker_framework_annotations/checker-qual-3.2.0-sources.jar b/third_party/checker_framework_annotations/checker-qual-3.2.0-sources.jar new file mode 100644 index 00000000000000..bca8744b3af6e3 Binary files /dev/null and b/third_party/checker_framework_annotations/checker-qual-3.2.0-sources.jar differ diff --git a/third_party/checker_framework_annotations/checker-qual-3.2.0.jar b/third_party/checker_framework_annotations/checker-qual-3.2.0.jar new file mode 100644 index 00000000000000..8bad1c93b31794 Binary files /dev/null and b/third_party/checker_framework_annotations/checker-qual-3.2.0.jar differ diff --git a/third_party/checker_framework_dataflow/BUILD b/third_party/checker_framework_dataflow/BUILD index b32f7199232504..86db8280dce9d2 100644 --- a/third_party/checker_framework_dataflow/BUILD +++ b/third_party/checker_framework_dataflow/BUILD @@ -11,8 +11,8 @@ filegroup( java_import( name = "checker_framework_dataflow", - jars = ["dataflow-2.5.3.jar"], - srcjar = "dataflow-2.5.3-sources.jar", + jars = ["dataflow-shaded-3.1.2.jar"], + srcjar = "dataflow-shaded-3.1.2-sources.jar", deps = [ "//third_party/checker_framework_javacutil", ], @@ -20,5 +20,5 @@ java_import( filegroup( name = "bootstrap", - srcs = ["dataflow-2.5.3.jar"], + srcs = ["dataflow-shaded-3.1.2.jar"], ) diff --git a/third_party/checker_framework_dataflow/dataflow-2.5.3-sources.jar b/third_party/checker_framework_dataflow/dataflow-2.5.3-sources.jar deleted file mode 100644 index 490c98249db107..00000000000000 Binary files a/third_party/checker_framework_dataflow/dataflow-2.5.3-sources.jar and /dev/null differ diff --git a/third_party/checker_framework_dataflow/dataflow-2.5.3.jar b/third_party/checker_framework_dataflow/dataflow-2.5.3.jar deleted file mode 100644 index 7a93aafdcab5ec..00000000000000 Binary files a/third_party/checker_framework_dataflow/dataflow-2.5.3.jar and /dev/null differ diff --git a/third_party/checker_framework_dataflow/dataflow-shaded-3.1.2-sources.jar b/third_party/checker_framework_dataflow/dataflow-shaded-3.1.2-sources.jar new file mode 100644 index 00000000000000..8ede650e646036 Binary files /dev/null and b/third_party/checker_framework_dataflow/dataflow-shaded-3.1.2-sources.jar differ diff --git a/third_party/checker_framework_dataflow/dataflow-shaded-3.1.2.jar b/third_party/checker_framework_dataflow/dataflow-shaded-3.1.2.jar new file mode 100644 index 00000000000000..ca0008b042fc06 Binary files /dev/null and b/third_party/checker_framework_dataflow/dataflow-shaded-3.1.2.jar differ diff --git a/third_party/checker_framework_javacutil/BUILD b/third_party/checker_framework_javacutil/BUILD index 51b9b707f5a5f9..f697ca1cf58877 100644 --- a/third_party/checker_framework_javacutil/BUILD +++ b/third_party/checker_framework_javacutil/BUILD @@ -11,11 +11,11 @@ filegroup( java_import( name = "checker_framework_javacutil", - jars = ["javacutil-2.5.3.jar"], - srcjar = "javacutil-2.5.3-sources.jar", + jars = ["javacutil-3.2.0.jar"], + srcjar = "javacutil-3.2.0-sources.jar", ) filegroup( name = "bootstrap", - srcs = ["javacutil-2.5.3.jar"], + srcs = ["javacutil-3.2.0.jar"], ) diff --git a/third_party/checker_framework_javacutil/javacutil-2.5.3-sources.jar b/third_party/checker_framework_javacutil/javacutil-2.5.3-sources.jar deleted file mode 100644 index 9a634784663226..00000000000000 Binary files a/third_party/checker_framework_javacutil/javacutil-2.5.3-sources.jar and /dev/null differ diff --git a/third_party/checker_framework_javacutil/javacutil-2.5.3.jar b/third_party/checker_framework_javacutil/javacutil-2.5.3.jar deleted file mode 100644 index 4a324a8598ffa2..00000000000000 Binary files a/third_party/checker_framework_javacutil/javacutil-2.5.3.jar and /dev/null differ diff --git a/third_party/checker_framework_javacutil/javacutil-3.2.0-sources.jar b/third_party/checker_framework_javacutil/javacutil-3.2.0-sources.jar new file mode 100644 index 00000000000000..c8321053f357b6 Binary files /dev/null and b/third_party/checker_framework_javacutil/javacutil-3.2.0-sources.jar differ diff --git a/third_party/checker_framework_javacutil/javacutil-3.2.0.jar b/third_party/checker_framework_javacutil/javacutil-3.2.0.jar new file mode 100644 index 00000000000000..be10e0f907a794 Binary files /dev/null and b/third_party/checker_framework_javacutil/javacutil-3.2.0.jar differ diff --git a/third_party/error_prone/error_prone_annotation-2.3.2-SNAPSHOT.jar b/third_party/error_prone/error_prone_annotation-2.3.2-SNAPSHOT.jar deleted file mode 100644 index 2336125e7a2a41..00000000000000 Binary files a/third_party/error_prone/error_prone_annotation-2.3.2-SNAPSHOT.jar and /dev/null differ diff --git a/third_party/error_prone/error_prone_annotation-2.4.0.jar b/third_party/error_prone/error_prone_annotation-2.4.0.jar new file mode 100644 index 00000000000000..8d27a94bdb4148 Binary files /dev/null and b/third_party/error_prone/error_prone_annotation-2.4.0.jar differ diff --git a/third_party/error_prone/error_prone_annotations-2.2.0.jar b/third_party/error_prone/error_prone_annotations-2.2.0.jar deleted file mode 100644 index c8e27b53b00b11..00000000000000 Binary files a/third_party/error_prone/error_prone_annotations-2.2.0.jar and /dev/null differ diff --git a/third_party/error_prone/error_prone_annotations-2.4.0.jar b/third_party/error_prone/error_prone_annotations-2.4.0.jar new file mode 100644 index 00000000000000..902c7b10ef1386 Binary files /dev/null and b/third_party/error_prone/error_prone_annotations-2.4.0.jar differ diff --git a/third_party/error_prone/error_prone_check_api-2.3.2-SNAPSHOT.jar b/third_party/error_prone/error_prone_check_api-2.3.2-SNAPSHOT.jar deleted file mode 100644 index e050de608ac70e..00000000000000 Binary files a/third_party/error_prone/error_prone_check_api-2.3.2-SNAPSHOT.jar and /dev/null differ diff --git a/third_party/error_prone/error_prone_check_api-2.4.0.jar b/third_party/error_prone/error_prone_check_api-2.4.0.jar new file mode 100644 index 00000000000000..e3caa1ec9e17c4 Binary files /dev/null and b/third_party/error_prone/error_prone_check_api-2.4.0.jar differ diff --git a/third_party/error_prone/error_prone_core-2.3.2-SNAPSHOT.jar b/third_party/error_prone/error_prone_core-2.3.2-SNAPSHOT.jar deleted file mode 100644 index 4678b946d94ea3..00000000000000 Binary files a/third_party/error_prone/error_prone_core-2.3.2-SNAPSHOT.jar and /dev/null differ diff --git a/third_party/error_prone/error_prone_core-2.4.0.jar b/third_party/error_prone/error_prone_core-2.4.0.jar new file mode 100644 index 00000000000000..35d6d506ad8bee Binary files /dev/null and b/third_party/error_prone/error_prone_core-2.4.0.jar differ diff --git a/third_party/error_prone/error_prone_type_annotations-2.3.2-SNAPSHOT.jar b/third_party/error_prone/error_prone_type_annotations-2.3.2-SNAPSHOT.jar deleted file mode 100644 index f26d3e77d95d83..00000000000000 Binary files a/third_party/error_prone/error_prone_type_annotations-2.3.2-SNAPSHOT.jar and /dev/null differ diff --git a/third_party/error_prone/error_prone_type_annotations-2.4.0.jar b/third_party/error_prone/error_prone_type_annotations-2.4.0.jar new file mode 100644 index 00000000000000..ce90baf6ce9fdc Binary files /dev/null and b/third_party/error_prone/error_prone_type_annotations-2.4.0.jar differ diff --git a/third_party/error_prone/threeten-extra-1.5.0.jar b/third_party/error_prone/threeten-extra-1.5.0.jar new file mode 100644 index 00000000000000..45f8c3d8d5a818 Binary files /dev/null and b/third_party/error_prone/threeten-extra-1.5.0.jar differ