From f26a84adcacd9b1d7d9f1dc78b3499f37e6ba83d Mon Sep 17 00:00:00 2001
From: Dawid Weiss <dweiss@apache.org>
Date: Mon, 10 Dec 2012 08:41:16 +0000
Subject: [PATCH] LUCENE-4603: Upgrade randomized testing to version 2.0.5:
 print forked JVM PIDs on heartbeat from hung tests (Dawid Weiss)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1419261 13f79535-47bb-0310-9956-ffa450edef68
---
 dev-tools/eclipse/dot.classpath                         | 2 +-
 dev-tools/idea/.idea/libraries/JUnit.xml                | 2 +-
 dev-tools/maven/pom.xml.template                        | 2 +-
 lucene/CHANGES.txt                                      | 3 +++
 lucene/licenses/junit4-ant-2.0.4.jar.sha1               | 1 -
 lucene/licenses/junit4-ant-2.0.5.jar.sha1               | 1 +
 lucene/licenses/randomizedtesting-runner-2.0.4.jar.sha1 | 1 -
 lucene/licenses/randomizedtesting-runner-2.0.5.jar.sha1 | 1 +
 lucene/test-framework/ivy.xml                           | 4 ++--
 solr/licenses/junit4-ant-2.0.4.jar.sha1                 | 1 -
 solr/licenses/junit4-ant-2.0.5.jar.sha1                 | 1 +
 solr/licenses/randomizedtesting-runner-2.0.4.jar.sha1   | 1 -
 solr/licenses/randomizedtesting-runner-2.0.5.jar.sha1   | 1 +
 solr/test-framework/ivy.xml                             | 4 ++--
 14 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 lucene/licenses/junit4-ant-2.0.4.jar.sha1
 create mode 100644 lucene/licenses/junit4-ant-2.0.5.jar.sha1
 delete mode 100644 lucene/licenses/randomizedtesting-runner-2.0.4.jar.sha1
 create mode 100644 lucene/licenses/randomizedtesting-runner-2.0.5.jar.sha1
 delete mode 100644 solr/licenses/junit4-ant-2.0.4.jar.sha1
 create mode 100644 solr/licenses/junit4-ant-2.0.5.jar.sha1
 delete mode 100644 solr/licenses/randomizedtesting-runner-2.0.4.jar.sha1
 create mode 100644 solr/licenses/randomizedtesting-runner-2.0.5.jar.sha1

diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath
index 867a669affd..09772edf8b9 100644
--- a/dev-tools/eclipse/dot.classpath
+++ b/dev-tools/eclipse/dot.classpath
@@ -171,7 +171,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.4.jar"/>
+  <classpathentry kind="lib" path="lucene/test-framework/lib/randomizedtesting-runner-2.0.5.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"/>
diff --git a/dev-tools/idea/.idea/libraries/JUnit.xml b/dev-tools/idea/.idea/libraries/JUnit.xml
index 592cf0090ef..3d069a90c3d 100644
--- 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.4.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.0.5.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index f2d220b29f2..e6f5262906e 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -444,7 +444,7 @@
       <dependency>
         <groupId>com.carrotsearch.randomizedtesting</groupId>
         <artifactId>randomizedtesting-runner</artifactId>
-        <version>2.0.4</version>
+        <version>2.0.5</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index ac4146c7e3a..e2692548ae6 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -306,6 +306,9 @@ Documentation
 
 Build
 
+* LUCENE-4603: Upgrade randomized testing to version 2.0.5: print forked
+  JVM PIDs on heartbeat from hung tests (Dawid Weiss)
+
 * 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)
diff --git a/lucene/licenses/junit4-ant-2.0.4.jar.sha1 b/lucene/licenses/junit4-ant-2.0.4.jar.sha1
deleted file mode 100644
index 5f2d8a93507..00000000000
--- a/lucene/licenses/junit4-ant-2.0.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6feed9f7b79b3a9fa2cf52a2ac171e87a261de56
diff --git a/lucene/licenses/junit4-ant-2.0.5.jar.sha1 b/lucene/licenses/junit4-ant-2.0.5.jar.sha1
new file mode 100644
index 00000000000..3422b74d9ba
--- /dev/null
+++ b/lucene/licenses/junit4-ant-2.0.5.jar.sha1
@@ -0,0 +1 @@
+f744c50364e7c07567f5b9a0af068c8dd134ae62
diff --git a/lucene/licenses/randomizedtesting-runner-2.0.4.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.0.4.jar.sha1
deleted file mode 100644
index d8031bfd110..00000000000
--- a/lucene/licenses/randomizedtesting-runner-2.0.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-aefbd9ebaae63716d9182fcce221ec4bb2528dfc
diff --git a/lucene/licenses/randomizedtesting-runner-2.0.5.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.0.5.jar.sha1
new file mode 100644
index 00000000000..77da5f177a8
--- /dev/null
+++ b/lucene/licenses/randomizedtesting-runner-2.0.5.jar.sha1
@@ -0,0 +1 @@
+8a5be67e2cb2798850ecf2609115d660d85b98bc
diff --git a/lucene/test-framework/ivy.xml b/lucene/test-framework/ivy.xml
index 47b639b0b03..81fc4fbaac2 100644
--- 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.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->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.5" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.5" transitive="false" conf="default->*;junit4-stdalone->*" />
 
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
     </dependencies>
diff --git a/solr/licenses/junit4-ant-2.0.4.jar.sha1 b/solr/licenses/junit4-ant-2.0.4.jar.sha1
deleted file mode 100644
index 5f2d8a93507..00000000000
--- a/solr/licenses/junit4-ant-2.0.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6feed9f7b79b3a9fa2cf52a2ac171e87a261de56
diff --git a/solr/licenses/junit4-ant-2.0.5.jar.sha1 b/solr/licenses/junit4-ant-2.0.5.jar.sha1
new file mode 100644
index 00000000000..3422b74d9ba
--- /dev/null
+++ b/solr/licenses/junit4-ant-2.0.5.jar.sha1
@@ -0,0 +1 @@
+f744c50364e7c07567f5b9a0af068c8dd134ae62
diff --git a/solr/licenses/randomizedtesting-runner-2.0.4.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.0.4.jar.sha1
deleted file mode 100644
index d8031bfd110..00000000000
--- a/solr/licenses/randomizedtesting-runner-2.0.4.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-aefbd9ebaae63716d9182fcce221ec4bb2528dfc
diff --git a/solr/licenses/randomizedtesting-runner-2.0.5.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.0.5.jar.sha1
new file mode 100644
index 00000000000..77da5f177a8
--- /dev/null
+++ b/solr/licenses/randomizedtesting-runner-2.0.5.jar.sha1
@@ -0,0 +1 @@
+8a5be67e2cb2798850ecf2609115d660d85b98bc
diff --git a/solr/test-framework/ivy.xml b/solr/test-framework/ivy.xml
index 63d827668a8..1682fc4a443 100644
--- 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.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->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="junit4-ant" rev="2.0.5" transitive="false" conf="default->*;junit4-stdalone->*" />
+      <dependency org="com.carrotsearch.randomizedtesting" name="randomizedtesting-runner" rev="2.0.5" transitive="false" conf="default->*;junit4-stdalone->*" />
 
       <exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/> 
     </dependencies>