Skip to content

Commit f216c98

Browse files
solrbotmalliaridis
andauthored
Update org.hamcrest:* to v3 (major) (#2617)
* Update org.hamcrest:* to v3 * Update hamcrest license file --------- Co-authored-by: Christos Malliaridis <[email protected]>
1 parent cd681c0 commit f216c98

File tree

7 files changed

+26
-25
lines changed

7 files changed

+26
-25
lines changed

solr/licenses/hamcrest-2.2.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8fd9b78a8e6a6510a078a9e30e9e86a6035cfaf7
Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
1-
BSD License
1+
BSD 3-Clause License
22

3-
Copyright (c) 2000-2006, www.hamcrest.org
4-
All rights reserved.
3+
Copyright (c) 2000-2024, www.hamcrest.org
54

65
Redistribution and use in source and binary forms, with or without
76
modification, are permitted provided that the following conditions are met:
87

9-
Redistributions of source code must retain the above copyright notice, this list of
10-
conditions and the following disclaimer. Redistributions in binary form must reproduce
11-
the above copyright notice, this list of conditions and the following disclaimer in
12-
the documentation and/or other materials provided with the distribution.
8+
1. Redistributions of source code must retain the above copyright notice, this
9+
list of conditions and the following disclaimer.
1310

14-
Neither the name of Hamcrest nor the names of its contributors may be used to endorse
15-
or promote products derived from this software without specific prior written
16-
permission.
11+
2. Redistributions in binary form must reproduce the above copyright notice,
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
1714

18-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
19-
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
20-
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
21-
SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
22-
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
23-
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
24-
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
26-
WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
27-
DAMAGE.
15+
3. Neither the name of the copyright holder nor the names of its
16+
contributors may be used to endorse or promote products derived from
17+
this software without specific prior written permission.
18+
19+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
23+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
25+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
26+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
27+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

solr/licenses/hamcrest-core-2.2.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
254f69f4b0ca22198acfc19fcdd5f96140431c3e

versions.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,8 +343,8 @@ org.glassfish.jersey.core:jersey-server:3.1.9 (2 constraints: 491efe41)
343343
org.glassfish.jersey.ext:jersey-entity-filtering:3.1.9 (1 constraints: c3152bd3)
344344
org.glassfish.jersey.inject:jersey-hk2:3.1.9 (1 constraints: 0f050636)
345345
org.glassfish.jersey.media:jersey-media-json-jackson:3.1.9 (1 constraints: 0f050636)
346-
org.hamcrest:hamcrest:2.2 (3 constraints: 7620ce25)
347-
org.hamcrest:hamcrest-core:2.2 (1 constraints: cc05fe3f)
346+
org.hamcrest:hamcrest:3.0 (3 constraints: 74208125)
347+
org.hamcrest:hamcrest-core:3.0 (1 constraints: cc05fe3f)
348348
org.immutables:value-annotations:2.10.1 (1 constraints: 3605303b)
349349
org.itadaki:bzip2:0.9.1 (2 constraints: bd0c4b2c)
350350
org.javassist:javassist:3.30.2-GA (1 constraints: 2811fff0)

versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ org.glassfish.hk2*:*=3.1.1
6262
org.glassfish.hk2.external:jakarta.inject=2.6.1
6363
org.glassfish.jersey*:*=3.1.9
6464
org.glassfish.jersey.containers:jersey-container-jetty-http=2.39.1
65-
org.hamcrest:*=2.2
65+
org.hamcrest:*=3.0
6666
org.hsqldb:hsqldb=2.7.2
6767
org.immutables:value-annotations=2.10.1
6868
org.jctools:jctools-core=4.0.5

0 commit comments

Comments
 (0)