Skip to content

Commit

Permalink
Update org.hamcrest:* to v3 (major) (#2617)
Browse files Browse the repository at this point in the history
* Update org.hamcrest:* to v3

* Update hamcrest license file

---------

Co-authored-by: Christos Malliaridis <c.malliaridis@gmail.com>
  • Loading branch information
solrbot and malliaridis authored Nov 4, 2024
1 parent cd681c0 commit f216c98
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 25 deletions.
1 change: 0 additions & 1 deletion solr/licenses/hamcrest-2.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/hamcrest-3.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8fd9b78a8e6a6510a078a9e30e9e86a6035cfaf7
41 changes: 21 additions & 20 deletions solr/licenses/hamcrest-LICENSE-BSD.txt
Original file line number Diff line number Diff line change
@@ -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.
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.
1 change: 0 additions & 1 deletion solr/licenses/hamcrest-core-2.2.jar.sha1

This file was deleted.

1 change: 1 addition & 0 deletions solr/licenses/hamcrest-core-3.0.jar.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
254f69f4b0ca22198acfc19fcdd5f96140431c3e
4 changes: 2 additions & 2 deletions versions.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,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
Expand Down

0 comments on commit f216c98

Please sign in to comment.