You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2020/08/11 09:56:05 UTC
[lucene-solr] branch master updated: LUCENE-9454: upgrade hamcrest
to version 2.2. (#1738)
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/master by this push:
new 5375a2d LUCENE-9454: upgrade hamcrest to version 2.2. (#1738)
5375a2d is described below
commit 5375a2d2ada2bb3bd94cffcb49a730ec234c8649
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Tue Aug 11 11:55:52 2020 +0200
LUCENE-9454: upgrade hamcrest to version 2.2. (#1738)
---
lucene/ivy-versions.properties | 2 +-
lucene/licenses/hamcrest-2.2.jar.sha1 | 1 +
.../licenses/hamcrest-LICENSE-BSD.txt | 0
.../licenses/hamcrest-NOTICE.txt | 0
lucene/licenses/hamcrest-core-1.3.jar.sha1 | 1 -
lucene/test-framework/build.gradle | 10 +++++++---
lucene/test-framework/ivy.xml | 2 +-
solr/licenses/hamcrest-2.2.jar.sha1 | 1 +
.../licenses/hamcrest-LICENSE-BSD.txt | 0
.../licenses/hamcrest-NOTICE.txt | 0
solr/licenses/hamcrest-core-1.3.jar.sha1 | 1 -
solr/test-framework/ivy.xml | 2 +-
versions.lock | 4 ++--
versions.props | 2 +-
14 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 6e90ffd..6c8e51c 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -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
diff --git a/lucene/licenses/hamcrest-2.2.jar.sha1 b/lucene/licenses/hamcrest-2.2.jar.sha1
new file mode 100644
index 0000000..820b1fb
--- /dev/null
+++ b/lucene/licenses/hamcrest-2.2.jar.sha1
@@ -0,0 +1 @@
+1820c0968dba3a11a1b30669bb1f01978a91dedc
diff --git a/solr/licenses/hamcrest-core-LICENSE-BSD.txt b/lucene/licenses/hamcrest-LICENSE-BSD.txt
similarity index 100%
rename from solr/licenses/hamcrest-core-LICENSE-BSD.txt
rename to lucene/licenses/hamcrest-LICENSE-BSD.txt
diff --git a/solr/licenses/hamcrest-core-NOTICE.txt b/lucene/licenses/hamcrest-NOTICE.txt
similarity index 100%
rename from solr/licenses/hamcrest-core-NOTICE.txt
rename to lucene/licenses/hamcrest-NOTICE.txt
diff --git a/lucene/licenses/hamcrest-core-1.3.jar.sha1 b/lucene/licenses/hamcrest-core-1.3.jar.sha1
deleted file mode 100644
index 67add77..0000000
--- a/lucene/licenses/hamcrest-core-1.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-42a25dc3219429f0e5d060061f71acb49bf010a0
diff --git a/lucene/test-framework/build.gradle b/lucene/test-framework/build.gradle
index 4b0cade..ce9355b 100644
--- a/lucene/test-framework/build.gradle
+++ b/lucene/test-framework/build.gradle
@@ -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')
}
diff --git a/lucene/test-framework/ivy.xml b/lucene/test-framework/ivy.xml
index 9b2932d..984e494 100644
--- a/lucene/test-framework/ivy.xml
+++ b/lucene/test-framework/ivy.xml
@@ -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}"/>
diff --git a/solr/licenses/hamcrest-2.2.jar.sha1 b/solr/licenses/hamcrest-2.2.jar.sha1
new file mode 100644
index 0000000..820b1fb
--- /dev/null
+++ b/solr/licenses/hamcrest-2.2.jar.sha1
@@ -0,0 +1 @@
+1820c0968dba3a11a1b30669bb1f01978a91dedc
diff --git a/lucene/licenses/hamcrest-core-LICENSE-BSD.txt b/solr/licenses/hamcrest-LICENSE-BSD.txt
similarity index 100%
rename from lucene/licenses/hamcrest-core-LICENSE-BSD.txt
rename to solr/licenses/hamcrest-LICENSE-BSD.txt
diff --git a/lucene/licenses/hamcrest-core-NOTICE.txt b/solr/licenses/hamcrest-NOTICE.txt
similarity index 100%
rename from lucene/licenses/hamcrest-core-NOTICE.txt
rename to solr/licenses/hamcrest-NOTICE.txt
diff --git a/solr/licenses/hamcrest-core-1.3.jar.sha1 b/solr/licenses/hamcrest-core-1.3.jar.sha1
deleted file mode 100644
index 67add77..0000000
--- a/solr/licenses/hamcrest-core-1.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-42a25dc3219429f0e5d060061f71acb49bf010a0
diff --git a/solr/test-framework/ivy.xml b/solr/test-framework/ivy.xml
index 174915b..eb1295f 100644
--- a/solr/test-framework/ivy.xml
+++ b/solr/test-framework/ivy.xml
@@ -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"/>
diff --git a/versions.lock b/versions.lock
index eea9b9c..c6b0adb 100644
--- a/versions.lock
+++ b/versions.lock
@@ -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)
diff --git a/versions.props b/versions.props
index 35f9bbf..d76f0bf 100644
--- a/versions.props
+++ b/versions.props
@@ -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