Apache Solr open-source search software
Update org.apache.zookeeper:* to v3.9.0 (#1807)
Solr Botfc01a3d5f88a
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.javaindex 1e7c8de5124..f6e108e0bf5 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java@@ -17,6 +17,7 @@package org.apache.solr.cloud;import static org.apache.solr.cloud.AbstractDistribZkTestBase.verifyReplicaStatus;+import static org.apache.zookeeper.WatchedEvent.NO_ZXID;import static org.mockito.ArgumentMatchers.any;import static org.mockito.ArgumentMatchers.anyBoolean;import static org.mockito.ArgumentMatchers.anyInt;@@ -2129,7 +2130,7 @@ public class OverseerTest extends SolrTestCaseJ4 {assertTrue(TimeUnit.NANOSECONDS.toMillis(after - before) > 50);// Mostly to make sure the millis->nanos->millis is not brokenassertTrue(TimeUnit.NANOSECONDS.toMillis(after - before) < 500);- latch1.process(new WatchedEvent(new WatcherEvent(1, 1, "/foo/bar")));+ latch1.process(new WatchedEvent(new WatcherEvent(1, 1, "/foo/bar"), NO_ZXID));before = System.nanoTime();latch1.await(10000); // Expecting no waitafter = System.nanoTime();@@ -2145,14 +2146,16 @@ public class OverseerTest extends SolrTestCaseJ4 {// Process an event of a different type first, this shouldn't release the latchlatch2.process(new WatchedEvent(- new WatcherEvent(Event.EventType.NodeDeleted.getIntValue(), 1, "/foo/bar")));+ new WatcherEvent(Event.EventType.NodeDeleted.getIntValue(), 1, "/foo/bar"),+ NO_ZXID));assertFalse("Latch shouldn't have been released", doneWaiting.get());// Now process the correct type of eventexpectedEventProcessed.set(true);latch2.process(new WatchedEvent(- new WatcherEvent(Event.EventType.NodeCreated.getIntValue(), 1, "/foo/bar")));+ new WatcherEvent(Event.EventType.NodeCreated.getIntValue(), 1, "/foo/bar"),+ NO_ZXID));});t.start();before = System.nanoTime();diff --git a/solr/licenses/netty-buffer-LICENSE-ASL.txt b/solr/licenses/netty-LICENSE-ASL.txtsimilarity index 100%rename from solr/licenses/netty-buffer-LICENSE-ASL.txtrename to solr/licenses/netty-LICENSE-ASL.txtdiff --git a/solr/licenses/netty-buffer-NOTICE.txt b/solr/licenses/netty-NOTICE.txtsimilarity index 100%rename from solr/licenses/netty-buffer-NOTICE.txtrename to solr/licenses/netty-NOTICE.txtdiff --git a/solr/licenses/netty-codec-LICENSE-ASL.txt b/solr/licenses/netty-codec-LICENSE-ASL.txtdeleted file mode 100644index d6456956733..00000000000--- a/solr/licenses/netty-codec-LICENSE-ASL.txt+++ /dev/null@@ -1,202 +0,0 @@-- 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/solr/licenses/netty-codec-NOTICE.txt b/solr/licenses/netty-codec-NOTICE.txtdeleted file mode 100644index f973663670b..00000000000--- a/solr/licenses/netty-codec-NOTICE.txt+++ /dev/null@@ -1,223 +0,0 @@-- The Netty Project- =================--Please visit the Netty web site for more information:-- * http://netty.io/--Copyright 2014 The Netty Project--The Netty Project licenses this file to you 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.--Also, please refer to each LICENSE.<component>.txt file, which is located in-the 'license' directory of the distribution file, for the license terms of the-components that this product depends on.----------------------------------------------------------------------------------This product contains the extensions to Java Collections Framework which has-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:-- * LICENSE:- * license/LICENSE.jsr166y.txt (Public Domain)- * HOMEPAGE:- * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/- * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/--This product contains a modified version of Robert Harder's Public Domain-Base64 Encoder and Decoder, which can be obtained at:-- * LICENSE:- * license/LICENSE.base64.txt (Public Domain)- * HOMEPAGE:- * http://iharder.sourceforge.net/current/java/base64/--This product contains a modified portion of 'Webbit', an event based-WebSocket and HTTP server, which can be obtained at:-- * LICENSE:- * license/LICENSE.webbit.txt (BSD License)- * HOMEPAGE:- * https://github.com/joewalnes/webbit--This product contains a modified portion of 'SLF4J', a simple logging-facade for Java, which can be obtained at:-- * LICENSE:- * license/LICENSE.slf4j.txt (MIT License)- * HOMEPAGE:- * http://www.slf4j.org/--This product contains a modified portion of 'Apache Harmony', an open source-Java SE, which can be obtained at:-- * NOTICE:- * license/NOTICE.harmony.txt- * LICENSE:- * license/LICENSE.harmony.txt (Apache License 2.0)- * HOMEPAGE:- * http://archive.apache.org/dist/harmony/--This product contains a modified portion of 'jbzip2', a Java bzip2 compression-and decompression library written by Matthew J. Francis. It can be obtained at:-- * LICENSE:- * license/LICENSE.jbzip2.txt (MIT License)- * HOMEPAGE:- * https://code.google.com/p/jbzip2/--This product contains a modified portion of 'libdivsufsort', a C API library to construct-the suffix array and the Burrows-Wheeler transformed string for any input string of-a constant-size alphabet written by Yuta Mori. It can be obtained at:-- * LICENSE:- * license/LICENSE.libdivsufsort.txt (MIT License)- * HOMEPAGE:- * https://github.com/y-256/libdivsufsort--This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,- which can be obtained at:-- * LICENSE:- * license/LICENSE.jctools.txt (ASL2 License)- * HOMEPAGE:- * https://github.com/JCTools/JCTools--This product optionally depends on 'JZlib', a re-implementation of zlib in-pure Java, which can be obtained at:-- * LICENSE:- * license/LICENSE.jzlib.txt (BSD style License)- * HOMEPAGE:- * http://www.jcraft.com/jzlib/--This product optionally depends on 'Compress-LZF', a Java library for encoding and-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:-- * LICENSE:- * license/LICENSE.compress-lzf.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/ning/compress--This product optionally depends on 'lz4', a LZ4 Java compression-and decompression library written by Adrien Grand. It can be obtained at:-- * LICENSE:- * license/LICENSE.lz4.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/jpountz/lz4-java--This product optionally depends on 'lzma-java', a LZMA Java compression-and decompression library, which can be obtained at:-- * LICENSE:- * license/LICENSE.lzma-java.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/jponge/lzma-java--This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression-and decompression library written by William Kinney. It can be obtained at:-- * LICENSE:- * license/LICENSE.jfastlz.txt (MIT License)- * HOMEPAGE:- * https://code.google.com/p/jfastlz/--This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data-interchange format, which can be obtained at:-- * LICENSE:- * license/LICENSE.protobuf.txt (New BSD License)- * HOMEPAGE:- * https://github.com/google/protobuf--This product optionally depends on 'Bouncy Castle Crypto APIs' to generate-a temporary self-signed X.509 certificate when the JVM does not provide the-equivalent functionality. It can be obtained at:-- * LICENSE:- * license/LICENSE.bouncycastle.txt (MIT License)- * HOMEPAGE:- * http://www.bouncycastle.org/--This product optionally depends on 'Snappy', a compression library produced-by Google Inc, which can be obtained at:-- * LICENSE:- * license/LICENSE.snappy.txt (New BSD License)- * HOMEPAGE:- * https://github.com/google/snappy--This product optionally depends on 'JBoss Marshalling', an alternative Java-serialization API, which can be obtained at:-- * LICENSE:- * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)- * HOMEPAGE:- * http://www.jboss.org/jbossmarshalling--This product optionally depends on 'Caliper', Google's micro--benchmarking framework, which can be obtained at:-- * LICENSE:- * license/LICENSE.caliper.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/google/caliper--This product optionally depends on 'Apache Commons Logging', a logging-framework, which can be obtained at:-- * LICENSE:- * license/LICENSE.commons-logging.txt (Apache License 2.0)- * HOMEPAGE:- * http://commons.apache.org/logging/--This product optionally depends on 'Apache Log4J', a logging framework, which-can be obtained at:-- * LICENSE:- * license/LICENSE.log4j.txt (Apache License 2.0)- * HOMEPAGE:- * http://logging.apache.org/log4j/--This product optionally depends on 'Aalto XML', an ultra-high performance-non-blocking XML processor, which can be obtained at:-- * LICENSE:- * license/LICENSE.aalto-xml.txt (Apache License 2.0)- * HOMEPAGE:- * http://wiki.fasterxml.com/AaltoHome--This product contains a modified version of 'HPACK', a Java implementation of-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:-- * LICENSE:- * license/LICENSE.hpack.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/twitter/hpack--This product contains a modified portion of 'Apache Commons Lang', a Java library-provides utilities for the java.lang API, which can be obtained at:-- * LICENSE:- * license/LICENSE.commons-lang.txt (Apache License 2.0)- * HOMEPAGE:- * https://commons.apache.org/proper/commons-lang/---This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.-- * LICENSE:- * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/takari/maven-wrapperdiff --git a/solr/licenses/netty-common-LICENSE-ASL.txt b/solr/licenses/netty-common-LICENSE-ASL.txtdeleted file mode 100644index d6456956733..00000000000--- a/solr/licenses/netty-common-LICENSE-ASL.txt+++ /dev/null@@ -1,202 +0,0 @@-- 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/solr/licenses/netty-common-NOTICE.txt b/solr/licenses/netty-common-NOTICE.txtdeleted file mode 100644index f973663670b..00000000000--- a/solr/licenses/netty-common-NOTICE.txt+++ /dev/null@@ -1,223 +0,0 @@-- The Netty Project- =================--Please visit the Netty web site for more information:-- * http://netty.io/--Copyright 2014 The Netty Project--The Netty Project licenses this file to you 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.--Also, please refer to each LICENSE.<component>.txt file, which is located in-the 'license' directory of the distribution file, for the license terms of the-components that this product depends on.----------------------------------------------------------------------------------This product contains the extensions to Java Collections Framework which has-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:-- * LICENSE:- * license/LICENSE.jsr166y.txt (Public Domain)- * HOMEPAGE:- * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/- * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/--This product contains a modified version of Robert Harder's Public Domain-Base64 Encoder and Decoder, which can be obtained at:-- * LICENSE:- * license/LICENSE.base64.txt (Public Domain)- * HOMEPAGE:- * http://iharder.sourceforge.net/current/java/base64/--This product contains a modified portion of 'Webbit', an event based-WebSocket and HTTP server, which can be obtained at:-- * LICENSE:- * license/LICENSE.webbit.txt (BSD License)- * HOMEPAGE:- * https://github.com/joewalnes/webbit--This product contains a modified portion of 'SLF4J', a simple logging-facade for Java, which can be obtained at:-- * LICENSE:- * license/LICENSE.slf4j.txt (MIT License)- * HOMEPAGE:- * http://www.slf4j.org/--This product contains a modified portion of 'Apache Harmony', an open source-Java SE, which can be obtained at:-- * NOTICE:- * license/NOTICE.harmony.txt- * LICENSE:- * license/LICENSE.harmony.txt (Apache License 2.0)- * HOMEPAGE:- * http://archive.apache.org/dist/harmony/--This product contains a modified portion of 'jbzip2', a Java bzip2 compression-and decompression library written by Matthew J. Francis. It can be obtained at:-- * LICENSE:- * license/LICENSE.jbzip2.txt (MIT License)- * HOMEPAGE:- * https://code.google.com/p/jbzip2/--This product contains a modified portion of 'libdivsufsort', a C API library to construct-the suffix array and the Burrows-Wheeler transformed string for any input string of-a constant-size alphabet written by Yuta Mori. It can be obtained at:-- * LICENSE:- * license/LICENSE.libdivsufsort.txt (MIT License)- * HOMEPAGE:- * https://github.com/y-256/libdivsufsort--This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,- which can be obtained at:-- * LICENSE:- * license/LICENSE.jctools.txt (ASL2 License)- * HOMEPAGE:- * https://github.com/JCTools/JCTools--This product optionally depends on 'JZlib', a re-implementation of zlib in-pure Java, which can be obtained at:-- * LICENSE:- * license/LICENSE.jzlib.txt (BSD style License)- * HOMEPAGE:- * http://www.jcraft.com/jzlib/--This product optionally depends on 'Compress-LZF', a Java library for encoding and-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:-- * LICENSE:- * license/LICENSE.compress-lzf.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/ning/compress--This product optionally depends on 'lz4', a LZ4 Java compression-and decompression library written by Adrien Grand. It can be obtained at:-- * LICENSE:- * license/LICENSE.lz4.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/jpountz/lz4-java--This product optionally depends on 'lzma-java', a LZMA Java compression-and decompression library, which can be obtained at:-- * LICENSE:- * license/LICENSE.lzma-java.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/jponge/lzma-java--This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression-and decompression library written by William Kinney. It can be obtained at:-- * LICENSE:- * license/LICENSE.jfastlz.txt (MIT License)- * HOMEPAGE:- * https://code.google.com/p/jfastlz/--This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data-interchange format, which can be obtained at:-- * LICENSE:- * license/LICENSE.protobuf.txt (New BSD License)- * HOMEPAGE:- * https://github.com/google/protobuf--This product optionally depends on 'Bouncy Castle Crypto APIs' to generate-a temporary self-signed X.509 certificate when the JVM does not provide the-equivalent functionality. It can be obtained at:-- * LICENSE:- * license/LICENSE.bouncycastle.txt (MIT License)- * HOMEPAGE:- * http://www.bouncycastle.org/--This product optionally depends on 'Snappy', a compression library produced-by Google Inc, which can be obtained at:-- * LICENSE:- * license/LICENSE.snappy.txt (New BSD License)- * HOMEPAGE:- * https://github.com/google/snappy--This product optionally depends on 'JBoss Marshalling', an alternative Java-serialization API, which can be obtained at:-- * LICENSE:- * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)- * HOMEPAGE:- * http://www.jboss.org/jbossmarshalling--This product optionally depends on 'Caliper', Google's micro--benchmarking framework, which can be obtained at:-- * LICENSE:- * license/LICENSE.caliper.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/google/caliper--This product optionally depends on 'Apache Commons Logging', a logging-framework, which can be obtained at:-- * LICENSE:- * license/LICENSE.commons-logging.txt (Apache License 2.0)- * HOMEPAGE:- * http://commons.apache.org/logging/--This product optionally depends on 'Apache Log4J', a logging framework, which-can be obtained at:-- * LICENSE:- * license/LICENSE.log4j.txt (Apache License 2.0)- * HOMEPAGE:- * http://logging.apache.org/log4j/--This product optionally depends on 'Aalto XML', an ultra-high performance-non-blocking XML processor, which can be obtained at:-- * LICENSE:- * license/LICENSE.aalto-xml.txt (Apache License 2.0)- * HOMEPAGE:- * http://wiki.fasterxml.com/AaltoHome--This product contains a modified version of 'HPACK', a Java implementation of-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:-- * LICENSE:- * license/LICENSE.hpack.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/twitter/hpack--This product contains a modified portion of 'Apache Commons Lang', a Java library-provides utilities for the java.lang API, which can be obtained at:-- * LICENSE:- * license/LICENSE.commons-lang.txt (Apache License 2.0)- * HOMEPAGE:- * https://commons.apache.org/proper/commons-lang/---This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.-- * LICENSE:- * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/takari/maven-wrapperdiff --git a/solr/licenses/netty-handler-LICENSE-ASL.txt b/solr/licenses/netty-handler-LICENSE-ASL.txtdeleted file mode 100644index d6456956733..00000000000--- a/solr/licenses/netty-handler-LICENSE-ASL.txt+++ /dev/null@@ -1,202 +0,0 @@-- 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/solr/licenses/netty-handler-NOTICE.txt b/solr/licenses/netty-handler-NOTICE.txtdeleted file mode 100644index f973663670b..00000000000--- a/solr/licenses/netty-handler-NOTICE.txt+++ /dev/null@@ -1,223 +0,0 @@-- The Netty Project- =================--Please visit the Netty web site for more information:-- * http://netty.io/--Copyright 2014 The Netty Project--The Netty Project licenses this file to you 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.--Also, please refer to each LICENSE.<component>.txt file, which is located in-the 'license' directory of the distribution file, for the license terms of the-components that this product depends on.----------------------------------------------------------------------------------This product contains the extensions to Java Collections Framework which has-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:-- * LICENSE:- * license/LICENSE.jsr166y.txt (Public Domain)- * HOMEPAGE:- * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/- * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/--This product contains a modified version of Robert Harder's Public Domain-Base64 Encoder and Decoder, which can be obtained at:-- * LICENSE:- * license/LICENSE.base64.txt (Public Domain)- * HOMEPAGE:- * http://iharder.sourceforge.net/current/java/base64/--This product contains a modified portion of 'Webbit', an event based-WebSocket and HTTP server, which can be obtained at:-- * LICENSE:- * license/LICENSE.webbit.txt (BSD License)- * HOMEPAGE:- * https://github.com/joewalnes/webbit--This product contains a modified portion of 'SLF4J', a simple logging-facade for Java, which can be obtained at:-- * LICENSE:- * license/LICENSE.slf4j.txt (MIT License)- * HOMEPAGE:- * http://www.slf4j.org/--This product contains a modified portion of 'Apache Harmony', an open source-Java SE, which can be obtained at:-- * NOTICE:- * license/NOTICE.harmony.txt- * LICENSE:- * license/LICENSE.harmony.txt (Apache License 2.0)- * HOMEPAGE:- * http://archive.apache.org/dist/harmony/--This product contains a modified portion of 'jbzip2', a Java bzip2 compression-and decompression library written by Matthew J. Francis. It can be obtained at:-- * LICENSE:- * license/LICENSE.jbzip2.txt (MIT License)- * HOMEPAGE:- * https://code.google.com/p/jbzip2/--This product contains a modified portion of 'libdivsufsort', a C API library to construct-the suffix array and the Burrows-Wheeler transformed string for any input string of-a constant-size alphabet written by Yuta Mori. It can be obtained at:-- * LICENSE:- * license/LICENSE.libdivsufsort.txt (MIT License)- * HOMEPAGE:- * https://github.com/y-256/libdivsufsort--This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,- which can be obtained at:-- * LICENSE:- * license/LICENSE.jctools.txt (ASL2 License)- * HOMEPAGE:- * https://github.com/JCTools/JCTools--This product optionally depends on 'JZlib', a re-implementation of zlib in-pure Java, which can be obtained at:-- * LICENSE:- * license/LICENSE.jzlib.txt (BSD style License)- * HOMEPAGE:- * http://www.jcraft.com/jzlib/--This product optionally depends on 'Compress-LZF', a Java library for encoding and-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:-- * LICENSE:- * license/LICENSE.compress-lzf.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/ning/compress--This product optionally depends on 'lz4', a LZ4 Java compression-and decompression library written by Adrien Grand. It can be obtained at:-- * LICENSE:- * license/LICENSE.lz4.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/jpountz/lz4-java--This product optionally depends on 'lzma-java', a LZMA Java compression-and decompression library, which can be obtained at:-- * LICENSE:- * license/LICENSE.lzma-java.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/jponge/lzma-java--This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression-and decompression library written by William Kinney. It can be obtained at:-- * LICENSE:- * license/LICENSE.jfastlz.txt (MIT License)- * HOMEPAGE:- * https://code.google.com/p/jfastlz/--This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data-interchange format, which can be obtained at:-- * LICENSE:- * license/LICENSE.protobuf.txt (New BSD License)- * HOMEPAGE:- * https://github.com/google/protobuf--This product optionally depends on 'Bouncy Castle Crypto APIs' to generate-a temporary self-signed X.509 certificate when the JVM does not provide the-equivalent functionality. It can be obtained at:-- * LICENSE:- * license/LICENSE.bouncycastle.txt (MIT License)- * HOMEPAGE:- * http://www.bouncycastle.org/--This product optionally depends on 'Snappy', a compression library produced-by Google Inc, which can be obtained at:-- * LICENSE:- * license/LICENSE.snappy.txt (New BSD License)- * HOMEPAGE:- * https://github.com/google/snappy--This product optionally depends on 'JBoss Marshalling', an alternative Java-serialization API, which can be obtained at:-- * LICENSE:- * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)- * HOMEPAGE:- * http://www.jboss.org/jbossmarshalling--This product optionally depends on 'Caliper', Google's micro--benchmarking framework, which can be obtained at:-- * LICENSE:- * license/LICENSE.caliper.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/google/caliper--This product optionally depends on 'Apache Commons Logging', a logging-framework, which can be obtained at:-- * LICENSE:- * license/LICENSE.commons-logging.txt (Apache License 2.0)- * HOMEPAGE:- * http://commons.apache.org/logging/--This product optionally depends on 'Apache Log4J', a logging framework, which-can be obtained at:-- * LICENSE:- * license/LICENSE.log4j.txt (Apache License 2.0)- * HOMEPAGE:- * http://logging.apache.org/log4j/--This product optionally depends on 'Aalto XML', an ultra-high performance-non-blocking XML processor, which can be obtained at:-- * LICENSE:- * license/LICENSE.aalto-xml.txt (Apache License 2.0)- * HOMEPAGE:- * http://wiki.fasterxml.com/AaltoHome--This product contains a modified version of 'HPACK', a Java implementation of-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:-- * LICENSE:- * license/LICENSE.hpack.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/twitter/hpack--This product contains a modified portion of 'Apache Commons Lang', a Java library-provides utilities for the java.lang API, which can be obtained at:-- * LICENSE:- * license/LICENSE.commons-lang.txt (Apache License 2.0)- * HOMEPAGE:- * https://commons.apache.org/proper/commons-lang/---This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.-- * LICENSE:- * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/takari/maven-wrapperdiff --git a/solr/licenses/netty-resolver-LICENSE-ASL.txt b/solr/licenses/netty-resolver-LICENSE-ASL.txtdeleted file mode 100644index d6456956733..00000000000--- a/solr/licenses/netty-resolver-LICENSE-ASL.txt+++ /dev/null@@ -1,202 +0,0 @@-- 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/solr/licenses/netty-resolver-NOTICE.txt b/solr/licenses/netty-resolver-NOTICE.txtdeleted file mode 100644index f973663670b..00000000000--- a/solr/licenses/netty-resolver-NOTICE.txt+++ /dev/null@@ -1,223 +0,0 @@-- The Netty Project- =================--Please visit the Netty web site for more information:-- * http://netty.io/--Copyright 2014 The Netty Project--The Netty Project licenses this file to you 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.--Also, please refer to each LICENSE.<component>.txt file, which is located in-the 'license' directory of the distribution file, for the license terms of the-components that this product depends on.----------------------------------------------------------------------------------This product contains the extensions to Java Collections Framework which has-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:-- * LICENSE:- * license/LICENSE.jsr166y.txt (Public Domain)- * HOMEPAGE:- * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/- * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/--This product contains a modified version of Robert Harder's Public Domain-Base64 Encoder and Decoder, which can be obtained at:-- * LICENSE:- * license/LICENSE.base64.txt (Public Domain)- * HOMEPAGE:- * http://iharder.sourceforge.net/current/java/base64/--This product contains a modified portion of 'Webbit', an event based-WebSocket and HTTP server, which can be obtained at:-- * LICENSE:- * license/LICENSE.webbit.txt (BSD License)- * HOMEPAGE:- * https://github.com/joewalnes/webbit--This product contains a modified portion of 'SLF4J', a simple logging-facade for Java, which can be obtained at:-- * LICENSE:- * license/LICENSE.slf4j.txt (MIT License)- * HOMEPAGE:- * http://www.slf4j.org/--This product contains a modified portion of 'Apache Harmony', an open source-Java SE, which can be obtained at:-- * NOTICE:- * license/NOTICE.harmony.txt- * LICENSE:- * license/LICENSE.harmony.txt (Apache License 2.0)- * HOMEPAGE:- * http://archive.apache.org/dist/harmony/--This product contains a modified portion of 'jbzip2', a Java bzip2 compression-and decompression library written by Matthew J. Francis. It can be obtained at:-- * LICENSE:- * license/LICENSE.jbzip2.txt (MIT License)- * HOMEPAGE:- * https://code.google.com/p/jbzip2/--This product contains a modified portion of 'libdivsufsort', a C API library to construct-the suffix array and the Burrows-Wheeler transformed string for any input string of-a constant-size alphabet written by Yuta Mori. It can be obtained at:-- * LICENSE:- * license/LICENSE.libdivsufsort.txt (MIT License)- * HOMEPAGE:- * https://github.com/y-256/libdivsufsort--This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,- which can be obtained at:-- * LICENSE:- * license/LICENSE.jctools.txt (ASL2 License)- * HOMEPAGE:- * https://github.com/JCTools/JCTools--This product optionally depends on 'JZlib', a re-implementation of zlib in-pure Java, which can be obtained at:-- * LICENSE:- * license/LICENSE.jzlib.txt (BSD style License)- * HOMEPAGE:- * http://www.jcraft.com/jzlib/--This product optionally depends on 'Compress-LZF', a Java library for encoding and-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:-- * LICENSE:- * license/LICENSE.compress-lzf.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/ning/compress--This product optionally depends on 'lz4', a LZ4 Java compression-and decompression library written by Adrien Grand. It can be obtained at:-- * LICENSE:- * license/LICENSE.lz4.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/jpountz/lz4-java--This product optionally depends on 'lzma-java', a LZMA Java compression-and decompression library, which can be obtained at:-- * LICENSE:- * license/LICENSE.lzma-java.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/jponge/lzma-java--This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression-and decompression library written by William Kinney. It can be obtained at:-- * LICENSE:- * license/LICENSE.jfastlz.txt (MIT License)- * HOMEPAGE:- * https://code.google.com/p/jfastlz/--This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data-interchange format, which can be obtained at:-- * LICENSE:- * license/LICENSE.protobuf.txt (New BSD License)- * HOMEPAGE:- * https://github.com/google/protobuf--This product optionally depends on 'Bouncy Castle Crypto APIs' to generate-a temporary self-signed X.509 certificate when the JVM does not provide the-equivalent functionality. It can be obtained at:-- * LICENSE:- * license/LICENSE.bouncycastle.txt (MIT License)- * HOMEPAGE:- * http://www.bouncycastle.org/--This product optionally depends on 'Snappy', a compression library produced-by Google Inc, which can be obtained at:-- * LICENSE:- * license/LICENSE.snappy.txt (New BSD License)- * HOMEPAGE:- * https://github.com/google/snappy--This product optionally depends on 'JBoss Marshalling', an alternative Java-serialization API, which can be obtained at:-- * LICENSE:- * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)- * HOMEPAGE:- * http://www.jboss.org/jbossmarshalling--This product optionally depends on 'Caliper', Google's micro--benchmarking framework, which can be obtained at:-- * LICENSE:- * license/LICENSE.caliper.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/google/caliper--This product optionally depends on 'Apache Commons Logging', a logging-framework, which can be obtained at:-- * LICENSE:- * license/LICENSE.commons-logging.txt (Apache License 2.0)- * HOMEPAGE:- * http://commons.apache.org/logging/--This product optionally depends on 'Apache Log4J', a logging framework, which-can be obtained at:-- * LICENSE:- * license/LICENSE.log4j.txt (Apache License 2.0)- * HOMEPAGE:- * http://logging.apache.org/log4j/--This product optionally depends on 'Aalto XML', an ultra-high performance-non-blocking XML processor, which can be obtained at:-- * LICENSE:- * license/LICENSE.aalto-xml.txt (Apache License 2.0)- * HOMEPAGE:- * http://wiki.fasterxml.com/AaltoHome--This product contains a modified version of 'HPACK', a Java implementation of-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:-- * LICENSE:- * license/LICENSE.hpack.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/twitter/hpack--This product contains a modified portion of 'Apache Commons Lang', a Java library-provides utilities for the java.lang API, which can be obtained at:-- * LICENSE:- * license/LICENSE.commons-lang.txt (Apache License 2.0)- * HOMEPAGE:- * https://commons.apache.org/proper/commons-lang/---This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.-- * LICENSE:- * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/takari/maven-wrapperdiff --git a/solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1 b/solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1new file mode 100644index 00000000000..1c3e5f7d66f--- /dev/null+++ b/solr/licenses/netty-tcnative-boringssl-static-2.0.61.Final.jar.sha1@@ -0,0 +1 @@+944722ba2883fe5825a0c6b38dc727d7151a9371diff --git a/solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1 b/solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1new file mode 100644index 00000000000..ca1be9444d7--- /dev/null+++ b/solr/licenses/netty-tcnative-classes-2.0.61.Final.jar.sha1@@ -0,0 +1 @@+4c6ae851ed97921bc6c6b64e019c2b039f49131adiff --git a/solr/licenses/netty-transport-LICENSE-ASL.txt b/solr/licenses/netty-transport-LICENSE-ASL.txtdeleted file mode 100644index d6456956733..00000000000--- a/solr/licenses/netty-transport-LICENSE-ASL.txt+++ /dev/null@@ -1,202 +0,0 @@-- 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/solr/licenses/netty-transport-NOTICE.txt b/solr/licenses/netty-transport-NOTICE.txtdeleted file mode 100644index f973663670b..00000000000--- a/solr/licenses/netty-transport-NOTICE.txt+++ /dev/null@@ -1,223 +0,0 @@-- The Netty Project- =================--Please visit the Netty web site for more information:-- * http://netty.io/--Copyright 2014 The Netty Project--The Netty Project licenses this file to you 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.--Also, please refer to each LICENSE.<component>.txt file, which is located in-the 'license' directory of the distribution file, for the license terms of the-components that this product depends on.----------------------------------------------------------------------------------This product contains the extensions to Java Collections Framework which has-been derived from the works by JSR-166 EG, Doug Lea, and Jason T. Greene:-- * LICENSE:- * license/LICENSE.jsr166y.txt (Public Domain)- * HOMEPAGE:- * http://gee.cs.oswego.edu/cgi-bin/viewcvs.cgi/jsr166/- * http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbosscache/experimental/jsr166/--This product contains a modified version of Robert Harder's Public Domain-Base64 Encoder and Decoder, which can be obtained at:-- * LICENSE:- * license/LICENSE.base64.txt (Public Domain)- * HOMEPAGE:- * http://iharder.sourceforge.net/current/java/base64/--This product contains a modified portion of 'Webbit', an event based-WebSocket and HTTP server, which can be obtained at:-- * LICENSE:- * license/LICENSE.webbit.txt (BSD License)- * HOMEPAGE:- * https://github.com/joewalnes/webbit--This product contains a modified portion of 'SLF4J', a simple logging-facade for Java, which can be obtained at:-- * LICENSE:- * license/LICENSE.slf4j.txt (MIT License)- * HOMEPAGE:- * http://www.slf4j.org/--This product contains a modified portion of 'Apache Harmony', an open source-Java SE, which can be obtained at:-- * NOTICE:- * license/NOTICE.harmony.txt- * LICENSE:- * license/LICENSE.harmony.txt (Apache License 2.0)- * HOMEPAGE:- * http://archive.apache.org/dist/harmony/--This product contains a modified portion of 'jbzip2', a Java bzip2 compression-and decompression library written by Matthew J. Francis. It can be obtained at:-- * LICENSE:- * license/LICENSE.jbzip2.txt (MIT License)- * HOMEPAGE:- * https://code.google.com/p/jbzip2/--This product contains a modified portion of 'libdivsufsort', a C API library to construct-the suffix array and the Burrows-Wheeler transformed string for any input string of-a constant-size alphabet written by Yuta Mori. It can be obtained at:-- * LICENSE:- * license/LICENSE.libdivsufsort.txt (MIT License)- * HOMEPAGE:- * https://github.com/y-256/libdivsufsort--This product contains a modified portion of Nitsan Wakart's 'JCTools', Java Concurrency Tools for the JVM,- which can be obtained at:-- * LICENSE:- * license/LICENSE.jctools.txt (ASL2 License)- * HOMEPAGE:- * https://github.com/JCTools/JCTools--This product optionally depends on 'JZlib', a re-implementation of zlib in-pure Java, which can be obtained at:-- * LICENSE:- * license/LICENSE.jzlib.txt (BSD style License)- * HOMEPAGE:- * http://www.jcraft.com/jzlib/--This product optionally depends on 'Compress-LZF', a Java library for encoding and-decoding data in LZF format, written by Tatu Saloranta. It can be obtained at:-- * LICENSE:- * license/LICENSE.compress-lzf.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/ning/compress--This product optionally depends on 'lz4', a LZ4 Java compression-and decompression library written by Adrien Grand. It can be obtained at:-- * LICENSE:- * license/LICENSE.lz4.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/jpountz/lz4-java--This product optionally depends on 'lzma-java', a LZMA Java compression-and decompression library, which can be obtained at:-- * LICENSE:- * license/LICENSE.lzma-java.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/jponge/lzma-java--This product contains a modified portion of 'jfastlz', a Java port of FastLZ compression-and decompression library written by William Kinney. It can be obtained at:-- * LICENSE:- * license/LICENSE.jfastlz.txt (MIT License)- * HOMEPAGE:- * https://code.google.com/p/jfastlz/--This product contains a modified portion of and optionally depends on 'Protocol Buffers', Google's data-interchange format, which can be obtained at:-- * LICENSE:- * license/LICENSE.protobuf.txt (New BSD License)- * HOMEPAGE:- * https://github.com/google/protobuf--This product optionally depends on 'Bouncy Castle Crypto APIs' to generate-a temporary self-signed X.509 certificate when the JVM does not provide the-equivalent functionality. It can be obtained at:-- * LICENSE:- * license/LICENSE.bouncycastle.txt (MIT License)- * HOMEPAGE:- * http://www.bouncycastle.org/--This product optionally depends on 'Snappy', a compression library produced-by Google Inc, which can be obtained at:-- * LICENSE:- * license/LICENSE.snappy.txt (New BSD License)- * HOMEPAGE:- * https://github.com/google/snappy--This product optionally depends on 'JBoss Marshalling', an alternative Java-serialization API, which can be obtained at:-- * LICENSE:- * license/LICENSE.jboss-marshalling.txt (GNU LGPL 2.1)- * HOMEPAGE:- * http://www.jboss.org/jbossmarshalling--This product optionally depends on 'Caliper', Google's micro--benchmarking framework, which can be obtained at:-- * LICENSE:- * license/LICENSE.caliper.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/google/caliper--This product optionally depends on 'Apache Commons Logging', a logging-framework, which can be obtained at:-- * LICENSE:- * license/LICENSE.commons-logging.txt (Apache License 2.0)- * HOMEPAGE:- * http://commons.apache.org/logging/--This product optionally depends on 'Apache Log4J', a logging framework, which-can be obtained at:-- * LICENSE:- * license/LICENSE.log4j.txt (Apache License 2.0)- * HOMEPAGE:- * http://logging.apache.org/log4j/--This product optionally depends on 'Aalto XML', an ultra-high performance-non-blocking XML processor, which can be obtained at:-- * LICENSE:- * license/LICENSE.aalto-xml.txt (Apache License 2.0)- * HOMEPAGE:- * http://wiki.fasterxml.com/AaltoHome--This product contains a modified version of 'HPACK', a Java implementation of-the HTTP/2 HPACK algorithm written by Twitter. It can be obtained at:-- * LICENSE:- * license/LICENSE.hpack.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/twitter/hpack--This product contains a modified portion of 'Apache Commons Lang', a Java library-provides utilities for the java.lang API, which can be obtained at:-- * LICENSE:- * license/LICENSE.commons-lang.txt (Apache License 2.0)- * HOMEPAGE:- * https://commons.apache.org/proper/commons-lang/---This product contains the Maven wrapper scripts from 'Maven Wrapper', that provides an easy way to ensure a user has everything necessary to run the Maven build.-- * LICENSE:- * license/LICENSE.mvn-wrapper.txt (Apache License 2.0)- * HOMEPAGE:- * https://github.com/takari/maven-wrapperdiff --git a/solr/licenses/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar.sha1new file mode 100644index 00000000000..04eae401ac3--- /dev/null+++ b/solr/licenses/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar.sha1@@ -0,0 +1 @@+3f8904e072cfc9a8d67c6fe567c39bcbce5c9c55diff --git a/solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1 b/solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1deleted file mode 100644index 21a85fa4799..00000000000--- a/solr/licenses/netty-transport-native-epoll-4.1.96.Final.jar.sha1+++ /dev/null@@ -1 +0,0 @@-9faf365396c933f1b39b60d129391c6c6c43fb86diff --git a/solr/licenses/zookeeper-3.8.1-tests.jar.sha1 b/solr/licenses/zookeeper-3.8.1-tests.jar.sha1deleted file mode 100644index 9f92a4f13fb..00000000000--- a/solr/licenses/zookeeper-3.8.1-tests.jar.sha1+++ /dev/null@@ -1 +0,0 @@-15d43384e216f03166439f06584c78d35355a10cdiff --git a/solr/licenses/zookeeper-3.8.1.jar.sha1 b/solr/licenses/zookeeper-3.8.1.jar.sha1deleted file mode 100644index 02c7bc328f6..00000000000--- a/solr/licenses/zookeeper-3.8.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-edb7d70db4390b9f54a92994577a9e344ade5c9ddiff --git a/solr/licenses/zookeeper-3.9.0-tests.jar.sha1 b/solr/licenses/zookeeper-3.9.0-tests.jar.sha1new file mode 100644index 00000000000..09eb33247b7--- /dev/null+++ b/solr/licenses/zookeeper-3.9.0-tests.jar.sha1@@ -0,0 +1 @@+71c696e7390a443e4cfd9c2c5b7f25c8a0ab1852diff --git a/solr/licenses/zookeeper-3.9.0.jar.sha1 b/solr/licenses/zookeeper-3.9.0.jar.sha1new file mode 100644index 00000000000..b88faa06754--- /dev/null+++ b/solr/licenses/zookeeper-3.9.0.jar.sha1@@ -0,0 +1 @@+d8c7c5450c91e272aaac3b908fff96262fd52694diff --git a/solr/licenses/zookeeper-jute-3.8.1.jar.sha1 b/solr/licenses/zookeeper-jute-3.8.1.jar.sha1deleted file mode 100644index 087f7233f08..00000000000--- a/solr/licenses/zookeeper-jute-3.8.1.jar.sha1+++ /dev/null@@ -1 +0,0 @@-aeb9b21ed9d2b99da9e0e3d1fd24d54f85fbf840diff --git a/solr/licenses/zookeeper-jute-3.9.0.jar.sha1 b/solr/licenses/zookeeper-jute-3.9.0.jar.sha1new file mode 100644index 00000000000..15b498ddfaa--- /dev/null+++ b/solr/licenses/zookeeper-jute-3.9.0.jar.sha1@@ -0,0 +1 @@+224f476a950054a6c84b2476a1b5216b32ea7140diff --git a/versions.lock b/versions.lockindex f6cfd5ecc34..adb9555b9d5 100644--- a/versions.lock+++ b/versions.lock@@ -114,12 +114,14 @@ io.netty:netty-codec-http:4.1.96.Final (3 constraints: 582436ee)io.netty:netty-codec-http2:4.1.96.Final (1 constraints: ed0a94cb)io.netty:netty-codec-socks:4.1.96.Final (1 constraints: 160fb96c)io.netty:netty-common:4.1.96.Final (12 constraints: 3cb3817d)-io.netty:netty-handler:4.1.96.Final (3 constraints: 732b553d)+io.netty:netty-handler:4.1.96.Final (3 constraints: 722b4f3d)io.netty:netty-handler-proxy:4.1.96.Final (1 constraints: ed0a94cb)io.netty:netty-resolver:4.1.96.Final (2 constraints: 5c1a8332)+io.netty:netty-tcnative-boringssl-static:2.0.61.Final (1 constraints: d10fc38e)+io.netty:netty-tcnative-classes:2.0.61.Final (1 constraints: d113ea5d)io.netty:netty-transport:4.1.96.Final (9 constraints: 0b8c6f3f)io.netty:netty-transport-classes-epoll:4.1.96.Final (1 constraints: b312061f)-io.netty:netty-transport-native-epoll:4.1.96.Final (1 constraints: db0f188f)+io.netty:netty-transport-native-epoll:4.1.96.Final (1 constraints: da0f128f)io.netty:netty-transport-native-unix-common:4.1.96.Final (4 constraints: 5e3d1997)io.opencensus:opencensus-api:0.31.1 (5 constraints: 924d4692)io.opencensus:opencensus-contrib-http-util:0.31.1 (3 constraints: 7232a9fc)@@ -253,8 +255,8 @@ org.apache.tika:tika-core:1.28.5 (2 constraints: d8118f11)org.apache.tika:tika-parsers:1.28.5 (1 constraints: 42054a3b)org.apache.tomcat:annotations-api:6.0.53 (1 constraints: 40054e3b)org.apache.xmlbeans:xmlbeans:5.0.3 (2 constraints: 72173075)-org.apache.zookeeper:zookeeper:3.8.1 (2 constraints: a0134c5f)-org.apache.zookeeper:zookeeper-jute:3.8.1 (2 constraints: 99125b23)+org.apache.zookeeper:zookeeper:3.9.0 (2 constraints: a0134e5f)+org.apache.zookeeper:zookeeper-jute:3.9.0 (2 constraints: 99125f23)org.apiguardian:apiguardian-api:1.1.2 (2 constraints: 601bd5a8)org.bitbucket.b_c:jose4j:0.9.3 (1 constraints: 0e050936)org.bouncycastle:bcmail-jdk15on:1.70 (1 constraints: 310c8af5)diff --git a/versions.props b/versions.propsindex f96ebda77ca..17af2f9c60c 100644--- a/versions.props+++ b/versions.props@@ -50,7 +50,7 @@ org.apache.logging.log4j:*=2.20.0org.apache.lucene:*=9.7.0org.apache.tika:*=1.28.5org.apache.tomcat:annotations-api=6.0.53-org.apache.zookeeper:*=3.8.1+org.apache.zookeeper:*=3.9.0org.bitbucket.b_c:jose4j=0.9.3org.carrot2:carrot2-core=4.5.1org.codehaus.woodstox:stax2-api=4.2.1