You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2019/12/13 14:33:41 UTC
[lucene-solr] branch master updated (1812b36 -> e5df183)
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 1812b36 LUCENE-9089: FST Builder renamed FSTCompiler with fluent-style Builder.
new d130bff LUCENE-9092: Upgrade randomizedtesting to 2.7.5 and Carrot2 to 3.16.2
new e5df183 Remove slf4j from dependencies. Clean up dangling files.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
lucene/CHANGES.txt | 2 +
lucene/ivy-versions.properties | 4 +-
lucene/licenses/jcl-over-slf4j-LICENSE-MIT.txt | 21 ---
lucene/licenses/jcl-over-slf4j-NOTICE.txt | 25 ---
lucene/licenses/log4j-LICENSE-ASL.txt | 202 ---------------------
lucene/licenses/log4j-NOTICE.txt | 5 -
.../randomizedtesting-runner-2.7.2.jar.sha1 | 1 -
.../randomizedtesting-runner-2.7.5.jar.sha1 | 1 +
lucene/licenses/slf4j-LICENSE-MIT.txt | 21 ---
lucene/licenses/slf4j-NOTICE.txt | 25 ---
lucene/licenses/slf4j-api-1.7.24.jar.sha1 | 1 -
lucene/spatial-extras/ivy.xml | 4 +-
solr/CHANGES.txt | 4 +-
solr/licenses/carrot2-mini-3.16.0.jar.sha1 | 1 -
solr/licenses/carrot2-mini-3.16.2.jar.sha1 | 1 +
solr/licenses/junit4-ant-2.7.2.jar.sha1 | 1 -
solr/licenses/junit4-ant-2.7.5.jar.sha1 | 1 +
.../randomizedtesting-runner-2.7.2.jar.sha1 | 1 -
.../randomizedtesting-runner-2.7.5.jar.sha1 | 1 +
19 files changed, 13 insertions(+), 309 deletions(-)
delete mode 100644 lucene/licenses/jcl-over-slf4j-LICENSE-MIT.txt
delete mode 100644 lucene/licenses/jcl-over-slf4j-NOTICE.txt
delete mode 100644 lucene/licenses/log4j-LICENSE-ASL.txt
delete mode 100644 lucene/licenses/log4j-NOTICE.txt
delete mode 100644 lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1
create mode 100644 lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1
delete mode 100644 lucene/licenses/slf4j-LICENSE-MIT.txt
delete mode 100644 lucene/licenses/slf4j-NOTICE.txt
delete mode 100644 lucene/licenses/slf4j-api-1.7.24.jar.sha1
delete mode 100644 solr/licenses/carrot2-mini-3.16.0.jar.sha1
create mode 100644 solr/licenses/carrot2-mini-3.16.2.jar.sha1
delete mode 100644 solr/licenses/junit4-ant-2.7.2.jar.sha1
create mode 100644 solr/licenses/junit4-ant-2.7.5.jar.sha1
delete mode 100644 solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1
create mode 100644 solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1
[lucene-solr] 02/02: Remove slf4j from dependencies. Clean up
dangling files.
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit e5df183a42967c0eb79b5c2c65cd3ab618318f23
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 13 14:02:50 2019 +0100
Remove slf4j from dependencies. Clean up dangling files.
---
lucene/licenses/jcl-over-slf4j-LICENSE-MIT.txt | 21 ---
lucene/licenses/jcl-over-slf4j-NOTICE.txt | 25 ---
lucene/licenses/log4j-LICENSE-ASL.txt | 202 -------------------------
lucene/licenses/log4j-NOTICE.txt | 5 -
lucene/licenses/slf4j-LICENSE-MIT.txt | 21 ---
lucene/licenses/slf4j-NOTICE.txt | 25 ---
lucene/licenses/slf4j-api-1.7.24.jar.sha1 | 1 -
lucene/spatial-extras/ivy.xml | 4 +-
8 files changed, 2 insertions(+), 302 deletions(-)
diff --git a/lucene/licenses/jcl-over-slf4j-LICENSE-MIT.txt b/lucene/licenses/jcl-over-slf4j-LICENSE-MIT.txt
deleted file mode 100644
index f5ecafa..0000000
--- a/lucene/licenses/jcl-over-slf4j-LICENSE-MIT.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (c) 2004-2008 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lucene/licenses/jcl-over-slf4j-NOTICE.txt b/lucene/licenses/jcl-over-slf4j-NOTICE.txt
deleted file mode 100644
index cf43894..0000000
--- a/lucene/licenses/jcl-over-slf4j-NOTICE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-=========================================================================
-== SLF4J Notice -- http://www.slf4j.org/license.html ==
-=========================================================================
-
-Copyright (c) 2004-2008 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lucene/licenses/log4j-LICENSE-ASL.txt b/lucene/licenses/log4j-LICENSE-ASL.txt
deleted file mode 100644
index d645695..0000000
--- a/lucene/licenses/log4j-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/lucene/licenses/log4j-NOTICE.txt b/lucene/licenses/log4j-NOTICE.txt
deleted file mode 100644
index d697542..0000000
--- a/lucene/licenses/log4j-NOTICE.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache log4j
-Copyright 2010 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/lucene/licenses/slf4j-LICENSE-MIT.txt b/lucene/licenses/slf4j-LICENSE-MIT.txt
deleted file mode 100644
index f5ecafa..0000000
--- a/lucene/licenses/slf4j-LICENSE-MIT.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (c) 2004-2008 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lucene/licenses/slf4j-NOTICE.txt b/lucene/licenses/slf4j-NOTICE.txt
deleted file mode 100644
index cf43894..0000000
--- a/lucene/licenses/slf4j-NOTICE.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-=========================================================================
-== SLF4J Notice -- http://www.slf4j.org/license.html ==
-=========================================================================
-
-Copyright (c) 2004-2008 QOS.ch
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lucene/licenses/slf4j-api-1.7.24.jar.sha1 b/lucene/licenses/slf4j-api-1.7.24.jar.sha1
deleted file mode 100644
index e2722e7..0000000
--- a/lucene/licenses/slf4j-api-1.7.24.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3f6b4bd4f8dbe8d4bea06d107a3826469b85c3e9
diff --git a/lucene/spatial-extras/ivy.xml b/lucene/spatial-extras/ivy.xml
index c3d982f..f8dba4e 100644
--- a/lucene/spatial-extras/ivy.xml
+++ b/lucene/spatial-extras/ivy.xml
@@ -33,8 +33,8 @@
<dependency org="org.locationtech.jts" name="jts-core" rev="${/org.locationtech.jts/jts-core}" conf="test" />
- <dependency org="org.slf4j" name="slf4j-api" rev="${/org.slf4j/slf4j-api}" conf="test"/>
+ <!-- <dependency org="org.slf4j" name="slf4j-api" rev="${/org.slf4j/slf4j-api}" conf="test"/> -->
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
-</ivy-module>
\ No newline at end of file
+</ivy-module>
[lucene-solr] 01/02: LUCENE-9092: Upgrade randomizedtesting to
2.7.5 and Carrot2 to 3.16.2
Posted by dw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit d130bffa8f969d027f985f47124bf9d72f5bb7e2
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Fri Dec 13 15:13:26 2019 +0100
LUCENE-9092: Upgrade randomizedtesting to 2.7.5 and Carrot2 to 3.16.2
---
lucene/CHANGES.txt | 2 ++
lucene/ivy-versions.properties | 4 ++--
lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1 | 1 -
lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1 | 1 +
solr/CHANGES.txt | 4 +++-
solr/licenses/carrot2-mini-3.16.0.jar.sha1 | 1 -
solr/licenses/carrot2-mini-3.16.2.jar.sha1 | 1 +
solr/licenses/junit4-ant-2.7.2.jar.sha1 | 1 -
solr/licenses/junit4-ant-2.7.5.jar.sha1 | 1 +
solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1 | 1 -
solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1 | 1 +
11 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 6f67e6e..39daefe 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -67,6 +67,8 @@ Other
* LUCENE-8768: Fix Javadocs build in Java 11. (Namgyu Kim)
+* LUCENE-9092: upgrade randomizedtesting to 2.7.5 (Dawid Weiss)
+
======================= Lucene 8.5.0 =======================
API Changes
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 160a4cd..d096153 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -4,7 +4,7 @@
/com.adobe.xmp/xmpcore = 5.1.3
-com.carrotsearch.randomizedtesting.version = 2.7.2
+com.carrotsearch.randomizedtesting.version = 2.7.5
/com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version}
/com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version}
@@ -244,7 +244,7 @@ org.bouncycastle.version = 1.60
/org.carrot2.attributes/attributes-binder = 1.3.3
/org.carrot2.shaded/carrot2-guava = 18.0
-/org.carrot2/carrot2-mini = 3.16.0
+/org.carrot2/carrot2-mini = 3.16.2
org.carrot2.morfologik.version = 2.1.5
/org.carrot2/morfologik-fsa = ${org.carrot2.morfologik.version}
diff --git a/lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1
deleted file mode 100644
index 9eeaf24..0000000
--- a/lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-84ed6b5f70906f9ef173db67ccde657b43ea60df
diff --git a/lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1
new file mode 100644
index 0000000..197a8c0
--- /dev/null
+++ b/lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1
@@ -0,0 +1 @@
+967e89a9a46a5b15ce8bef199f01be4830af1a31
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0e26813..944ba09 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -23,7 +23,7 @@ Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this r
Versions of Major Components
---------------------
Apache Tika 1.19.1
-Carrot2 3.16.0
+Carrot2 3.16.2
Velocity 2.0 and Velocity Tools 3.0
Apache ZooKeeper 3.5.5
Jetty 9.4.19.v20190610
@@ -89,6 +89,8 @@ Other Changes
* SOLR-13797: SolrResourceLoader no longer caches bad results when asked for wrong type (Mike Drob)
+* LUCENE-9092: Upgrade Carrot2 to 3.16.2 (Dawid Weiss).
+
================== 8.5.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/licenses/carrot2-mini-3.16.0.jar.sha1 b/solr/licenses/carrot2-mini-3.16.0.jar.sha1
deleted file mode 100644
index 0b34d73..0000000
--- a/solr/licenses/carrot2-mini-3.16.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6bb27fd0dfe24a5671d9751a943728a54be48ed7
diff --git a/solr/licenses/carrot2-mini-3.16.2.jar.sha1 b/solr/licenses/carrot2-mini-3.16.2.jar.sha1
new file mode 100644
index 0000000..3aaeaa1
--- /dev/null
+++ b/solr/licenses/carrot2-mini-3.16.2.jar.sha1
@@ -0,0 +1 @@
+decabb42b88a8d40c1894984f4af8adb833f766b
diff --git a/solr/licenses/junit4-ant-2.7.2.jar.sha1 b/solr/licenses/junit4-ant-2.7.2.jar.sha1
deleted file mode 100644
index f51d140..0000000
--- a/solr/licenses/junit4-ant-2.7.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b9e4fce45b3ee7bb14c5b72804dc1e483e61340d
diff --git a/solr/licenses/junit4-ant-2.7.5.jar.sha1 b/solr/licenses/junit4-ant-2.7.5.jar.sha1
new file mode 100644
index 0000000..e14ef45
--- /dev/null
+++ b/solr/licenses/junit4-ant-2.7.5.jar.sha1
@@ -0,0 +1 @@
+e044cdd1aeaafe12df7808a3d9295a03a2717f12
diff --git a/solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1
deleted file mode 100644
index 9eeaf24..0000000
--- a/solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-84ed6b5f70906f9ef173db67ccde657b43ea60df
diff --git a/solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1
new file mode 100644
index 0000000..197a8c0
--- /dev/null
+++ b/solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1
@@ -0,0 +1 @@
+967e89a9a46a5b15ce8bef199f01be4830af1a31