Apache Solr open-source search software
Update org.hamcrest:* to v3 (major) (#2617)
Solr Botf216c984d348
diff --git a/solr/licenses/hamcrest-2.2.jar.sha1 b/solr/licenses/hamcrest-2.2.jar.sha1deleted file mode 100644index 820b1fb33c6..00000000000--- a/solr/licenses/hamcrest-2.2.jar.sha1+++ /dev/null@@ -1 +0,0 @@-1820c0968dba3a11a1b30669bb1f01978a91dedcdiff --git a/solr/licenses/hamcrest-3.0.jar.sha1 b/solr/licenses/hamcrest-3.0.jar.sha1new file mode 100644index 00000000000..6ccdd785a66--- /dev/null+++ b/solr/licenses/hamcrest-3.0.jar.sha1@@ -0,0 +1 @@+8fd9b78a8e6a6510a078a9e30e9e86a6035cfaf7diff --git a/solr/licenses/hamcrest-LICENSE-BSD.txt b/solr/licenses/hamcrest-LICENSE-BSD.txtindex e3d4feb9cbb..c43f6b7b926 100644--- a/solr/licenses/hamcrest-LICENSE-BSD.txt+++ b/solr/licenses/hamcrest-LICENSE-BSD.txt@@ -1,27 +1,28 @@-BSD License+BSD 3-Clause License-Copyright (c) 2000-2006, www.hamcrest.org-All rights reserved.+Copyright (c) 2000-2024, www.hamcrest.orgRedistribution and use in source and binary forms, with or withoutmodification, are permitted provided that the following conditions are met:-Redistributions of source code must retain the above copyright notice, this list of-conditions and the following disclaimer. Redistributions in binary form must reproduce-the above copyright notice, this list of conditions and the following disclaimer in-the documentation and/or other materials provided with the distribution.+1. Redistributions of source code must retain the above copyright notice, this+ list of conditions and the following disclaimer.-Neither the name of Hamcrest nor the names of its contributors may be used to endorse-or promote products derived from this software without specific prior written-permission.+2. Redistributions in binary form must reproduce the above copyright notice,+ this list of conditions and the following disclaimer in the documentation+ and/or other materials provided with the distribution.-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY-WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH-DAMAGE.\ No newline at end of file+3. Neither the name of the copyright holder nor the names of its+ contributors may be used to endorse or promote products derived from+ this software without specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.diff --git a/solr/licenses/hamcrest-core-2.2.jar.sha1 b/solr/licenses/hamcrest-core-2.2.jar.sha1deleted file mode 100644index 8afb6048872..00000000000--- a/solr/licenses/hamcrest-core-2.2.jar.sha1+++ /dev/null@@ -1 +0,0 @@-3f2bd07716a31c395e2837254f37f21f0f0ab24bdiff --git a/solr/licenses/hamcrest-core-3.0.jar.sha1 b/solr/licenses/hamcrest-core-3.0.jar.sha1new file mode 100644index 00000000000..0801ceea637--- /dev/null+++ b/solr/licenses/hamcrest-core-3.0.jar.sha1@@ -0,0 +1 @@+254f69f4b0ca22198acfc19fcdd5f96140431c3ediff --git a/versions.lock b/versions.lockindex 7418e07bfd9..11c37b2acd7 100644--- a/versions.lock+++ b/versions.lock@@ -343,8 +343,8 @@ org.glassfish.jersey.core:jersey-server:3.1.9 (2 constraints: 491efe41)org.glassfish.jersey.ext:jersey-entity-filtering:3.1.9 (1 constraints: c3152bd3)org.glassfish.jersey.inject:jersey-hk2:3.1.9 (1 constraints: 0f050636)org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9 (1 constraints: 0f050636)-org.hamcrest:hamcrest:2.2 (3 constraints: 7620ce25)-org.hamcrest:hamcrest-core:2.2 (1 constraints: cc05fe3f)+org.hamcrest:hamcrest:3.0 (3 constraints: 74208125)+org.hamcrest:hamcrest-core:3.0 (1 constraints: cc05fe3f)org.immutables:value-annotations:2.10.1 (1 constraints: 3605303b)org.itadaki:bzip2:0.9.1 (2 constraints: bd0c4b2c)org.javassist:javassist:3.30.2-GA (1 constraints: 2811fff0)diff --git a/versions.props b/versions.propsindex 0433da0fc4f..b9bb03803c3 100644--- a/versions.props+++ b/versions.props@@ -62,7 +62,7 @@ org.glassfish.hk2*:*=3.1.1org.glassfish.hk2.external:jakarta.inject=2.6.1org.glassfish.jersey*:*=3.1.9org.glassfish.jersey.containers:jersey-container-jetty-http=2.39.1-org.hamcrest:*=2.2+org.hamcrest:*=3.0org.hsqldb:hsqldb=2.7.2org.immutables:value-annotations=2.10.1org.jctools:jctools-core=4.0.5