From b8067fa4233f80932772494d1bccca0415ab0ead Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Tue, 1 Jul 2014 11:59:44 +0000 Subject: [PATCH] LUCENE-5786: Unflushed/ truncated events file (hung testing subprocess). Updating RR to 2.1.6 git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1607058 13f79535-47bb-0310-9956-ffa450edef68 --- dev-tools/idea/.idea/libraries/JUnit.xml | 2 +- lucene/CHANGES.txt | 5 +++++ lucene/common-build.xml | 2 +- lucene/ivy-versions.properties | 2 +- lucene/licenses/junit4-ant-2.1.5.jar.sha1 | 1 - lucene/licenses/junit4-ant-2.1.6.jar.sha1 | 1 + lucene/licenses/randomizedtesting-runner-2.1.5.jar.sha1 | 1 - lucene/licenses/randomizedtesting-runner-2.1.6.jar.sha1 | 1 + solr/licenses/junit4-ant-2.1.5.jar.sha1 | 1 - solr/licenses/junit4-ant-2.1.6.jar.sha1 | 1 + solr/licenses/randomizedtesting-runner-2.1.5.jar.sha1 | 1 - solr/licenses/randomizedtesting-runner-2.1.6.jar.sha1 | 1 + 12 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 lucene/licenses/junit4-ant-2.1.5.jar.sha1 create mode 100644 lucene/licenses/junit4-ant-2.1.6.jar.sha1 delete mode 100644 lucene/licenses/randomizedtesting-runner-2.1.5.jar.sha1 create mode 100644 lucene/licenses/randomizedtesting-runner-2.1.6.jar.sha1 delete mode 100644 solr/licenses/junit4-ant-2.1.5.jar.sha1 create mode 100644 solr/licenses/junit4-ant-2.1.6.jar.sha1 delete mode 100644 solr/licenses/randomizedtesting-runner-2.1.5.jar.sha1 create mode 100644 solr/licenses/randomizedtesting-runner-2.1.6.jar.sha1 diff --git a/dev-tools/idea/.idea/libraries/JUnit.xml b/dev-tools/idea/.idea/libraries/JUnit.xml index 95523925839..464206165f3 100644 --- a/dev-tools/idea/.idea/libraries/JUnit.xml +++ b/dev-tools/idea/.idea/libraries/JUnit.xml @@ -2,7 +2,7 @@ - + diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 3d7e71f761f..d6de0d8d076 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -115,6 +115,11 @@ Optimizations * LUCENE-5798: Optimize MultiDocsEnum reuse. (Robert Muir) +Test Framework + +* LUCENE-5786: Unflushed/ truncated events file (hung testing subprocess). + (Dawid Weiss) + ======================= Lucene 4.9.0 ======================= Changes in Runtime Behavior diff --git a/lucene/common-build.xml b/lucene/common-build.xml index b50d3e20760..73122b8dfc1 100644 --- a/lucene/common-build.xml +++ b/lucene/common-build.xml @@ -918,7 +918,7 @@ heartbeat="${tests.heartbeat}" uniqueSuiteNames="false" - debugstream="true" + debugstream="false" > diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties index c032230d01c..0d57a0058d8 100644 --- 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.1.5 +com.carrotsearch.randomizedtesting.version = 2.1.6 /com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version} /com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version} diff --git a/lucene/licenses/junit4-ant-2.1.5.jar.sha1 b/lucene/licenses/junit4-ant-2.1.5.jar.sha1 deleted file mode 100644 index 438f85508ca..00000000000 --- a/lucene/licenses/junit4-ant-2.1.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -861e15520a0c96ef7483699c6053545d3506f558 diff --git a/lucene/licenses/junit4-ant-2.1.6.jar.sha1 b/lucene/licenses/junit4-ant-2.1.6.jar.sha1 new file mode 100644 index 00000000000..75c45e75b77 --- /dev/null +++ b/lucene/licenses/junit4-ant-2.1.6.jar.sha1 @@ -0,0 +1 @@ +8fa2802ca13d34e357b13850de7d8ffb8e6d1976 diff --git a/lucene/licenses/randomizedtesting-runner-2.1.5.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.1.5.jar.sha1 deleted file mode 100644 index 4e4f30723f3..00000000000 --- a/lucene/licenses/randomizedtesting-runner-2.1.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d472d36acdf8c324c733f1bc58a67d33b79b6c54 diff --git a/lucene/licenses/randomizedtesting-runner-2.1.6.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.1.6.jar.sha1 new file mode 100644 index 00000000000..38769956af5 --- /dev/null +++ b/lucene/licenses/randomizedtesting-runner-2.1.6.jar.sha1 @@ -0,0 +1 @@ +804c4bf7af0c56cdcb6fab9d99a30ae9b29e4bb1 diff --git a/solr/licenses/junit4-ant-2.1.5.jar.sha1 b/solr/licenses/junit4-ant-2.1.5.jar.sha1 deleted file mode 100644 index 438f85508ca..00000000000 --- a/solr/licenses/junit4-ant-2.1.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -861e15520a0c96ef7483699c6053545d3506f558 diff --git a/solr/licenses/junit4-ant-2.1.6.jar.sha1 b/solr/licenses/junit4-ant-2.1.6.jar.sha1 new file mode 100644 index 00000000000..75c45e75b77 --- /dev/null +++ b/solr/licenses/junit4-ant-2.1.6.jar.sha1 @@ -0,0 +1 @@ +8fa2802ca13d34e357b13850de7d8ffb8e6d1976 diff --git a/solr/licenses/randomizedtesting-runner-2.1.5.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.1.5.jar.sha1 deleted file mode 100644 index 4e4f30723f3..00000000000 --- a/solr/licenses/randomizedtesting-runner-2.1.5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d472d36acdf8c324c733f1bc58a67d33b79b6c54 diff --git a/solr/licenses/randomizedtesting-runner-2.1.6.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.1.6.jar.sha1 new file mode 100644 index 00000000000..38769956af5 --- /dev/null +++ b/solr/licenses/randomizedtesting-runner-2.1.6.jar.sha1 @@ -0,0 +1 @@ +804c4bf7af0c56cdcb6fab9d99a30ae9b29e4bb1