LUCENE-9454: upgrade hamcrest to version 2.2. (#1738)

This commit is contained in:
Dawid Weiss 2020-08-11 11:55:52 +02:00 committed by GitHub
parent 15ae014c59
commit 5375a2d2ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 15 additions and 11 deletions

View File

@ -290,7 +290,7 @@ org.gagravarr.vorbis.java.version = 0.8
/org.gagravarr/vorbis-java-core = ${org.gagravarr.vorbis.java.version}
/org.gagravarr/vorbis-java-tika = ${org.gagravarr.vorbis.java.version}
/org.hamcrest/hamcrest-core = 1.3
/org.hamcrest/hamcrest = 2.2
/org.hsqldb/hsqldb = 2.4.0
/org.jdom/jdom2 = 2.0.6

View File

@ -0,0 +1 @@
1820c0968dba3a11a1b30669bb1f01978a91dedc

View File

@ -1 +0,0 @@
42a25dc3219429f0e5d060061f71acb49bf010a0

View File

@ -22,9 +22,13 @@ description = 'Framework for testing Lucene-based applications'
dependencies {
api project(':lucene:core')
api ("com.carrotsearch.randomizedtesting:randomizedtesting-runner")
api ('org.hamcrest:hamcrest-core')
api ("junit:junit")
api ("com.carrotsearch.randomizedtesting:randomizedtesting-runner", {
exclude group: "junit"
})
api ("junit:junit", {
exclude group: "org.hamcrest"
})
api ('org.hamcrest:hamcrest')
implementation project(':lucene:codecs')
}

View File

@ -25,7 +25,7 @@
<dependencies>
<dependency org="junit" name="junit" rev="${/junit/junit}" conf="compile"/>
<dependency org="org.hamcrest" name="hamcrest-core" rev="${/org.hamcrest/hamcrest-core}" conf="compile"/>
<dependency org="org.hamcrest" name="hamcrest" rev="${/org.hamcrest/hamcrest}" conf="compile"/>
<dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="${/com.carrotsearch.randomizedtesting/randomizedtesting-runner}" conf="compile"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>

View File

@ -0,0 +1 @@
1820c0968dba3a11a1b30669bb1f01978a91dedc

View File

@ -1 +0,0 @@
42a25dc3219429f0e5d060061f71acb49bf010a0

View File

@ -32,7 +32,7 @@
<dependency org="org.apache.ant" name="ant" rev="${/org.apache.ant/ant}" conf="compile" />
<dependency org="junit" name="junit" rev="${/junit/junit}" conf="compile;junit4-stdalone" />
<dependency org="org.hamcrest" name="hamcrest-core" rev="${/org.hamcrest/hamcrest-core}" conf="compile;junit4-stdalone" />
<dependency org="org.hamcrest" name="hamcrest" rev="${/org.hamcrest/hamcrest}" conf="compile;junit4-stdalone" />
<dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="${/com.carrotsearch.randomizedtesting/junit4-ant}" conf="compile;junit4-stdalone" />
<dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="${/com.carrotsearch.randomizedtesting/randomizedtesting-runner}" conf="compile;junit4-stdalone" />
<dependency org="io.opentracing" name="opentracing-mock" rev="${/io.opentracing/opentracing-mock}" conf="compile;junit4-stdalone"/>

View File

@ -80,7 +80,7 @@ io.sgr:s2-geometry-library-java:1.0.0 (1 constraints: 0305f035)
javax.activation:activation:1.1.1 (3 constraints: 1017445c)
javax.servlet:javax.servlet-api:3.1.0 (3 constraints: 75209943)
joda-time:joda-time:2.9.9 (1 constraints: 8a0972a1)
junit:junit:4.12 (2 constraints: 3e1e6104)
junit:junit:4.12 (1 constraints: db04ff30)
net.arnx:jsonic:1.2.7 (2 constraints: db10d4d1)
net.hydromatic:eigenbase-properties:1.1.5 (1 constraints: 0905f835)
net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165)
@ -189,7 +189,7 @@ org.eclipse.jetty.http2:http2-http-client-transport:9.4.27.v20200227 (1 constrai
org.eclipse.jetty.http2:http2-server:9.4.27.v20200227 (1 constraints: 7b071d7d)
org.gagravarr:vorbis-java-core:0.8 (1 constraints: ac041f2c)
org.gagravarr:vorbis-java-tika:0.8 (1 constraints: ac041f2c)
org.hamcrest:hamcrest-core:1.3 (2 constraints: 730ad9bf)
org.hamcrest:hamcrest:2.2 (1 constraints: a8041f2c)
org.jdom:jdom2:2.0.6 (1 constraints: 0a05fb35)
org.jruby:dirgra:0.3 (1 constraints: 1b098b8e)
org.jruby:jruby:9.2.6.0 (1 constraints: 490d7d28)

View File

@ -89,7 +89,7 @@ org.codehaus.woodstox:woodstox-core-asl=4.4.1
org.eclipse.jetty.http2:*=9.4.27.v20200227
org.eclipse.jetty:*=9.4.27.v20200227
org.gagravarr:*=0.8
org.hamcrest:*=1.3
org.hamcrest:*=2.2
org.hsqldb:hsqldb=2.4.0
org.jdom:jdom2=2.0.6
org.jsoup:jsoup=1.12.1