This is an automated email from the ASF dual-hosted git repository.
malliaridis pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 2ff209a88a9 Update org.hamcrest:* to v3 (major) (#2845)
2ff209a88a9 is described below
commit 2ff209a88a9ff1a9104ca4a553db4aa48b7b35c5
Author: Christos Malliaridis <[email protected]>
AuthorDate: Tue Nov 5 12:37:18 2024 +0100
Update org.hamcrest:* to v3 (major) (#2845)
* Update org.hamcrest:* to v3
* Update hamcrest license file
---------
Co-authored-by: Christos Malliaridis <[email protected]>
(cherry picked from commit f216c984d348c12cc4c4c24e24ee6bf014cc9b01)
---
solr/licenses/hamcrest-2.2.jar.sha1 | 1 -
solr/licenses/hamcrest-3.0.jar.sha1 | 1 +
solr/licenses/hamcrest-LICENSE-BSD.txt | 41 ++++++++++++++++----------------
solr/licenses/hamcrest-core-2.2.jar.sha1 | 1 -
solr/licenses/hamcrest-core-3.0.jar.sha1 | 1 +
versions.lock | 4 ++--
versions.props | 2 +-
7 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/solr/licenses/hamcrest-2.2.jar.sha1
b/solr/licenses/hamcrest-2.2.jar.sha1
deleted file mode 100644
index 820b1fb33c6..00000000000
--- a/solr/licenses/hamcrest-2.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-1820c0968dba3a11a1b30669bb1f01978a91dedc
diff --git a/solr/licenses/hamcrest-3.0.jar.sha1
b/solr/licenses/hamcrest-3.0.jar.sha1
new file mode 100644
index 00000000000..6ccdd785a66
--- /dev/null
+++ b/solr/licenses/hamcrest-3.0.jar.sha1
@@ -0,0 +1 @@
+8fd9b78a8e6a6510a078a9e30e9e86a6035cfaf7
diff --git a/solr/licenses/hamcrest-LICENSE-BSD.txt
b/solr/licenses/hamcrest-LICENSE-BSD.txt
index 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.org
Redistribution and use in source and binary forms, with or without
modification, 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.sha1
deleted file mode 100644
index 8afb6048872..00000000000
--- a/solr/licenses/hamcrest-core-2.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-3f2bd07716a31c395e2837254f37f21f0f0ab24b
diff --git a/solr/licenses/hamcrest-core-3.0.jar.sha1
b/solr/licenses/hamcrest-core-3.0.jar.sha1
new file mode 100644
index 00000000000..0801ceea637
--- /dev/null
+++ b/solr/licenses/hamcrest-core-3.0.jar.sha1
@@ -0,0 +1 @@
+254f69f4b0ca22198acfc19fcdd5f96140431c3e
diff --git a/versions.lock b/versions.lock
index ef3cf0216ff..372a904aa37 100644
--- a/versions.lock
+++ b/versions.lock
@@ -349,8 +349,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.props
index 8fc2ea4eef4..5de55ba2483 100644
--- a/versions.props
+++ b/versions.props
@@ -64,7 +64,7 @@ org.glassfish.hk2*:*=3.1.1
org.glassfish.hk2.external:jakarta.inject=2.6.1
org.glassfish.jersey*:*=3.1.9
org.glassfish.jersey.containers:jersey-container-jetty-http=2.39.1
-org.hamcrest:*=2.2
+org.hamcrest:*=3.0
org.hsqldb:hsqldb=2.7.2
org.immutables:value-annotations=2.10.1
org.jctools:jctools-core=4.0.5
