Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr

2016-04-05 00:37:11 -04:00 · 2016-04-05 00:37:11 -04:00 · 885d567bed
parent 7289bc36f6 b0af7a4adf
commit 885d567bed
9 changed files with 9 additions and 4 deletions
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@ -66,6 +66,10 @@ Bug Fixes
 * LUCENE-7166: Fix corner case bugs in LatLonPoint/GeoPointField bounding box
  queries. (Robert Muir)

+Other
+
+* LUCENE-7174: Upgrade randomizedtesting to 2.3.4. (Uwe Schindler, Dawid Weiss)
+
 ======================= Lucene 6.0.0 =======================

 System Requirements
--- a/lucene/core/src/java/org/apache/lucene/codecs/package-info.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/package-info.java
@ -25,6 +25,7 @@
 *   <li>DocValues - see {@link org.apache.lucene.codecs.DocValuesFormat}</li>
 *   <li>Stored fields - see {@link org.apache.lucene.codecs.StoredFieldsFormat}</li>
 *   <li>Term vectors - see {@link org.apache.lucene.codecs.TermVectorsFormat}</li>
+ *   <li>Points - see {@link org.apache.lucene.codecs.PointsFormat}</li>
 *   <li>FieldInfos - see {@link org.apache.lucene.codecs.FieldInfosFormat}</li>
 *   <li>SegmentInfo - see {@link org.apache.lucene.codecs.SegmentInfoFormat}</li>
 *   <li>Norms - see {@link org.apache.lucene.codecs.NormsFormat}</li>
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@ -7,7 +7,7 @@
 /cglib/cglib-nodep = 2.2
 /com.adobe.xmp/xmpcore = 5.1.2

-com.carrotsearch.randomizedtesting.version = 2.3.2
+com.carrotsearch.randomizedtesting.version = 2.3.4
 /com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version}
 /com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version}

--- a/lucene/licenses/randomizedtesting-runner-2.3.2.jar.sha1
+++ b/lucene/licenses/randomizedtesting-runner-2.3.2.jar.sha1
@ -1 +0,0 @@
-307965917fe8a22b7ee72deba39ef4b8e6ebc069
--- a/lucene/licenses/randomizedtesting-runner-2.3.4.jar.sha1
+++ b/lucene/licenses/randomizedtesting-runner-2.3.4.jar.sha1
@ -0,0 +1 @@
+9f4c0e1de0837092115c89a38c12ae57db6983e7
--- a/solr/licenses/junit4-ant-2.3.2.jar.sha1
+++ b/solr/licenses/junit4-ant-2.3.2.jar.sha1
@ -1 +0,0 @@
-dc8f03f6111974092491f35b8269eb0fc57f52f7
--- a/solr/licenses/junit4-ant-2.3.4.jar.sha1
+++ b/solr/licenses/junit4-ant-2.3.4.jar.sha1
@ -0,0 +1 @@
+aafd329c4ddd57c539bdea9e4e5a4a688e142181
--- a/solr/licenses/randomizedtesting-runner-2.3.2.jar.sha1
+++ b/solr/licenses/randomizedtesting-runner-2.3.2.jar.sha1
@ -1 +0,0 @@
-307965917fe8a22b7ee72deba39ef4b8e6ebc069
--- a/solr/licenses/randomizedtesting-runner-2.3.4.jar.sha1
+++ b/solr/licenses/randomizedtesting-runner-2.3.4.jar.sha1
@ -0,0 +1 @@
+9f4c0e1de0837092115c89a38c12ae57db6983e7