diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties index ee21d99f4c2..51f05c434c0 100644 --- a/lucene/ivy-versions.properties +++ b/lucene/ivy-versions.properties @@ -33,7 +33,7 @@ com.fasterxml.jackson.core.version = 2.9.6 /com.healthmarketscience.jackcess/jackcess-encrypt = 2.1.4 /com.ibm.icu/icu4j = 62.1 /com.jayway.jsonpath/json-path = 2.4.0 -/com.lmax/disruptor = 3.4.0 +/com.lmax/disruptor = 3.4.2 /com.pff/java-libpst = 0.8.1 com.rometools.version = 1.5.1 @@ -164,11 +164,12 @@ org.apache.kerby.version = 1.0.1 /org.apache.kerby/kerby-pkix = ${org.apache.kerby.version} /org.apache.kerby/kerby-util = ${org.apache.kerby.version} -org.apache.logging.log4j.version = 2.11.0 +org.apache.logging.log4j.version = 2.11.2 /org.apache.logging.log4j/log4j-1.2-api = ${org.apache.logging.log4j.version} /org.apache.logging.log4j/log4j-api = ${org.apache.logging.log4j.version} /org.apache.logging.log4j/log4j-core = ${org.apache.logging.log4j.version} /org.apache.logging.log4j/log4j-slf4j-impl = ${org.apache.logging.log4j.version} +/org.apache.logging.log4j/log4j-web = ${org.apache.logging.log4j.version} /org.apache.opennlp/opennlp-tools = 1.9.1 diff --git a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java index 8181ae5b8f1..67ae692e106 100644 --- a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java +++ b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java @@ -137,11 +137,12 @@ public final class StartupLoggingUtils { */ @SuppressForbidden(reason = "Legitimate log4j2 access") public static void shutdown() { - if (!isLog4jActive()) { - logNotSupported("Not running log4j2, could not call shutdown for async logging."); - return; - } - LogManager.shutdown(true); + +// if (!isLog4jActive()) { +// logNotSupported("Not running log4j2, could not call shutdown for async logging."); +// return; +// } +// LogManager.shutdown(true); } /** * Return a string representing the current static ROOT logging level diff --git a/solr/licenses/disruptor-3.4.0.jar.sha1 b/solr/licenses/disruptor-3.4.0.jar.sha1 deleted file mode 100644 index ba29f9c5949..00000000000 --- a/solr/licenses/disruptor-3.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -507e22993e3a78a3ba453e76a9756a294752648d diff --git a/solr/licenses/disruptor-3.4.2.jar.sha1 b/solr/licenses/disruptor-3.4.2.jar.sha1 new file mode 100644 index 00000000000..c2113364623 --- /dev/null +++ b/solr/licenses/disruptor-3.4.2.jar.sha1 @@ -0,0 +1 @@ +e2543a63086b4189fbe418d05d56633bc1a815f7 diff --git a/solr/licenses/log4j-1.2-api-2.11.0.jar.sha1 b/solr/licenses/log4j-1.2-api-2.11.0.jar.sha1 deleted file mode 100644 index 662cac2cdd7..00000000000 --- a/solr/licenses/log4j-1.2-api-2.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5e488f2c717964162016cd5138e2b1ea4dcc379f diff --git a/solr/licenses/log4j-1.2-api-2.11.2.jar.sha1 b/solr/licenses/log4j-1.2-api-2.11.2.jar.sha1 new file mode 100644 index 00000000000..4ad6f967664 --- /dev/null +++ b/solr/licenses/log4j-1.2-api-2.11.2.jar.sha1 @@ -0,0 +1 @@ +afb9ef0baba766725c3733e6a2626877dba72715 diff --git a/solr/licenses/log4j-api-2.11.0.jar.sha1 b/solr/licenses/log4j-api-2.11.0.jar.sha1 deleted file mode 100644 index 47ba9da300c..00000000000 --- a/solr/licenses/log4j-api-2.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bede79a3f150711634a3047985517431bf6499f2 diff --git a/solr/licenses/log4j-api-2.11.2.jar.sha1 b/solr/licenses/log4j-api-2.11.2.jar.sha1 new file mode 100644 index 00000000000..0cdea100b72 --- /dev/null +++ b/solr/licenses/log4j-api-2.11.2.jar.sha1 @@ -0,0 +1 @@ +f5e9a2ffca496057d6891a3de65128efc636e26e diff --git a/solr/licenses/log4j-core-2.11.0.jar.sha1 b/solr/licenses/log4j-core-2.11.0.jar.sha1 deleted file mode 100644 index 59e400d7ab5..00000000000 --- a/solr/licenses/log4j-core-2.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e6b751e02120c08702d98750f6a80bc25343b7f5 diff --git a/solr/licenses/log4j-core-2.11.2.jar.sha1 b/solr/licenses/log4j-core-2.11.2.jar.sha1 new file mode 100644 index 00000000000..ec2acae4df7 --- /dev/null +++ b/solr/licenses/log4j-core-2.11.2.jar.sha1 @@ -0,0 +1 @@ +6c2fb3f5b7cd27504726aef1b674b542a0c9cf53 diff --git a/solr/licenses/log4j-slf4j-impl-2.11.0.jar.sha1 b/solr/licenses/log4j-slf4j-impl-2.11.0.jar.sha1 deleted file mode 100644 index dc5221e27f5..00000000000 --- a/solr/licenses/log4j-slf4j-impl-2.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9ba207b78e470fe7765ebee14f1f0336c9cbcc18 diff --git a/solr/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 b/solr/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 new file mode 100644 index 00000000000..69bca4b80c0 --- /dev/null +++ b/solr/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 @@ -0,0 +1 @@ +4d44e4edc4a7fb39f09b95b09f560a15976fa1ba diff --git a/solr/licenses/log4j-web-2.11.2.jar.sha1 b/solr/licenses/log4j-web-2.11.2.jar.sha1 new file mode 100644 index 00000000000..cc4476efe49 --- /dev/null +++ b/solr/licenses/log4j-web-2.11.2.jar.sha1 @@ -0,0 +1 @@ +d11ebc03fdf773d32143e0f7ea0fc131c21311e7 diff --git a/solr/licenses/log4j-web-LICENSE-ASL.txt b/solr/licenses/log4j-web-LICENSE-ASL.txt new file mode 100644 index 00000000000..6279e5206de --- /dev/null +++ b/solr/licenses/log4j-web-LICENSE-ASL.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 1999-2005 The Apache Software Foundation + + 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/solr/licenses/log4j-web-NOTICE.txt b/solr/licenses/log4j-web-NOTICE.txt new file mode 100644 index 00000000000..bd95322f254 --- /dev/null +++ b/solr/licenses/log4j-web-NOTICE.txt @@ -0,0 +1,17 @@ +Apache Log4j +Copyright 1999-2017 Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +ResolverUtil.java +Copyright 2005-2006 Tim Fennell + +Dumbster SMTP test server +Copyright 2004 Jason Paul Kitchen + +TypeUtil.java +Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams + +picocli (http://picocli.info) +Copyright 2017 Remko Popma diff --git a/solr/server/ivy.xml b/solr/server/ivy.xml index cb41a12e9a3..6d1f11e4691 100644 --- a/solr/server/ivy.xml +++ b/solr/server/ivy.xml @@ -29,6 +29,7 @@ +