Upgrade randomized testing to version 2.0.4: avoid hangs on shutdown

hooks hanging forever by calling Runtime.halt() in addition to Runtime.exit() after a short delay to allow graceful shutdown (Dawid Weiss) git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1402952 13f79535-47bb-0310-9956-ffa450edef68
2012-10-28 08:34:26 +00:00 · 2012-10-28 08:34:26 +00:00 · e0e91d252f
parent 72f44f7b16
commit e0e91d252f
14 changed files with 15 additions and 11 deletions
--- a/dev-tools/eclipse/dot.classpath
+++ b/dev-tools/eclipse/dot.classpath
@ -168,7 +168,7 @@
  <classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-beanutils-1.7.0.jar"/>
  <classpathentry kind="lib" path="solr/contrib/velocity/lib/commons-collections-3.2.1.jar"/>
  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-  <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.3.jar"/>
+  <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.4.jar"/>
  <classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-core-0.7.2.jar"/>
  <classpathentry kind="lib" path="solr/contrib/extraction/lib/apache-mime4j-dom-0.7.2.jar"/>
  <classpathentry kind="lib" path="solr/contrib/extraction/lib/fontbox-1.7.0.jar"/>
--- a/dev-tools/idea/.idea/libraries/JUnit.xml
+++ b/dev-tools/idea/.idea/libraries/JUnit.xml
@ -2,7 +2,7 @@
  <library name="JUnit">
    <CLASSES>
      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
-      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.4.jar!/" />
    </CLASSES>
    <JAVADOC />
    <SOURCES />
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@ -434,7 +434,7 @@
      <dependency>
        <groupId>com.carrotsearch.randomizedtesting</groupId>
        <artifactId>randomizedtesting-runner</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
      </dependency>
    </dependencies>
  </dependencyManagement>
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@ -117,6 +117,10 @@ Optimizations

 Build

+* Upgrade randomized testing to version 2.0.4: avoid hangs on shutdown
+  hooks hanging forever by calling Runtime.halt() in addition to 
+  Runtime.exit() after a short delay to allow graceful shutdown (Dawid Weiss)
+
 * LUCENE-4451: Memory leak per unique thread caused by 
  RandomizedContext.contexts static map. Upgrade randomized testing
  to version 2.0.2 (Mike McCandless, Dawid Weiss)
--- a/lucene/licenses/junit4-ant-2.0.3.jar.sha1
+++ b/lucene/licenses/junit4-ant-2.0.3.jar.sha1
@ -1 +0,0 @@
-c9b5b280935fda44bb2c905572cfab0192879bcb
--- a/lucene/licenses/junit4-ant-2.0.4.jar.sha1
+++ b/lucene/licenses/junit4-ant-2.0.4.jar.sha1
@ -0,0 +1 @@
+6feed9f7b79b3a9fa2cf52a2ac171e87a261de56
--- a/lucene/licenses/randomizedtesting-runner-2.0.3.jar.sha1
+++ b/lucene/licenses/randomizedtesting-runner-2.0.3.jar.sha1
@ -1 +0,0 @@
-c31bc570c1e2f7584a09aa4853de7f3e3785a7ef
--- a/lucene/licenses/randomizedtesting-runner-2.0.4.jar.sha1
+++ b/lucene/licenses/randomizedtesting-runner-2.0.4.jar.sha1
@ -0,0 +1 @@
+aefbd9ebaae63716d9182fcce221ec4bb2528dfc
--- a/lucene/test-framework/ivy.xml
+++ b/lucene/test-framework/ivy.xml
@ -32,8 +32,8 @@
      <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />

      <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.3" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.3" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.4" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.4" transitive="false" conf="default->*;junit4-stdalone->*" />

      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
    </dependencies>
--- a/solr/licenses/junit4-ant-2.0.3.jar.sha1
+++ b/solr/licenses/junit4-ant-2.0.3.jar.sha1
@ -1 +0,0 @@
-c9b5b280935fda44bb2c905572cfab0192879bcb
--- a/solr/licenses/junit4-ant-2.0.4.jar.sha1
+++ b/solr/licenses/junit4-ant-2.0.4.jar.sha1
@ -0,0 +1 @@
+6feed9f7b79b3a9fa2cf52a2ac171e87a261de56
--- a/solr/licenses/randomizedtesting-runner-2.0.3.jar.sha1
+++ b/solr/licenses/randomizedtesting-runner-2.0.3.jar.sha1
@ -1 +0,0 @@
-c31bc570c1e2f7584a09aa4853de7f3e3785a7ef
--- a/solr/licenses/randomizedtesting-runner-2.0.4.jar.sha1
+++ b/solr/licenses/randomizedtesting-runner-2.0.4.jar.sha1
@ -0,0 +1 @@
+aefbd9ebaae63716d9182fcce221ec4bb2528dfc
--- a/solr/test-framework/ivy.xml
+++ b/solr/test-framework/ivy.xml
@ -32,8 +32,8 @@
      <dependency org="org.apache.ant" name="ant" rev="1.8.2" transitive="false" />

      <dependency org="junit" name="junit" rev="4.10" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.3" transitive="false" conf="default->*;junit4-stdalone->*" />
-      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.3" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.4" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.4" transitive="false" conf="default->*;junit4-stdalone->*" />

      <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
    </dependencies>