From c6d6eaef4d589d6f0a119e004431a31d290b9ca6 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Wed, 29 Jul 2015 14:21:43 -0400
Subject: [PATCH 1/3] Add a run.sh to run from current source code with
 debugger

The maven magic needed for this is now heavier
---
 core/pom.xml                                  | 20 -------------------
 .../main/resources/ant/integration-tests.xml  |  2 +-
 distribution/zip/pom.xml                      | 13 ++++++++++++
 run.sh                                        |  7 +++++++
 4 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100755 run.sh

diff --git a/core/pom.xml b/core/pom.xml
index b507a36707d..def0b5e14f0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -438,26 +438,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- execution and integration tests -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <!-- start up elasticsearch in foreground -->
-                    <execution>
-                        <id>execute</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target if="${run}">
-                                <ant antfile="${elasticsearch.integ.antfile}" target="start-foreground"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
       <pluginManagement>
         <plugins>
diff --git a/dev-tools/src/main/resources/ant/integration-tests.xml b/dev-tools/src/main/resources/ant/integration-tests.xml
index 0c67009dbdb..b190bca7476 100644
--- a/dev-tools/src/main/resources/ant/integration-tests.xml
+++ b/dev-tools/src/main/resources/ant/integration-tests.xml
@@ -141,7 +141,7 @@
   <!-- TODO: doesn't belong here, but we will figure it out -->
   <target name="start-foreground" depends="stop-external-cluster">
       <delete dir="${integ.scratch}"/>
-      <unzip src="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip" dest="${integ.scratch}"/>
+      <unzip src="${project.build.directory}/releases/elasticsearch-${project.version}.zip" dest="${integ.scratch}"/>
       <local name="home"/>
       <property name="home" location="${integ.scratch}/elasticsearch-${elasticsearch.version}"/>
       <run-script dir="${home}" script="bin/elasticsearch" spawn="false"
diff --git a/distribution/zip/pom.xml b/distribution/zip/pom.xml
index 1ca8ed117c0..462b967b380 100644
--- a/distribution/zip/pom.xml
+++ b/distribution/zip/pom.xml
@@ -98,6 +98,19 @@
                         </configuration>
                     </execution>
                     <!-- execution and integration tests -->
+                    <!-- start up elasticsearch in foreground -->
+                    <execution>
+                        <id>execute</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target if="${run}">
+                                <ant antfile="${elasticsearch.integ.antfile}" target="start-foreground"/>
+                            </target>
+                        </configuration>
+                    </execution>
                     <!-- start up external cluster -->
                     <execution>
                         <id>integ-setup</id>
diff --git a/run.sh b/run.sh
new file mode 100755
index 00000000000..407822f02c7
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# build zip package, but ensuring its from the current core/ source
+# turn off tests and other validation to speed it up
+# TODO: can be sped up more, if shading is moved out of core/
+# TODO: this will work on windows too. feel free to make a .bat
+mvn -pl core,distribution/zip package -DskipTests -Drun -Pdev

From cda613a5df764c2933559ca8f92eb4b89a8f3d38 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Wed, 29 Jul 2015 14:30:18 -0400
Subject: [PATCH 2/3] make this more bulletproof by using current
 dev-tools/poms/etc too

---
 run.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run.sh b/run.sh
index 407822f02c7..2dada65b742 100755
--- a/run.sh
+++ b/run.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
-# build zip package, but ensuring its from the current core/ source
+# build zip package, but ensuring its from the current source
 # turn off tests and other validation to speed it up
 # TODO: can be sped up more, if shading is moved out of core/
 # TODO: this will work on windows too. feel free to make a .bat
-mvn -pl core,distribution/zip package -DskipTests -Drun -Pdev
+mvn -am -pl distribution/zip package -DskipTests -Drun -Pdev

From bf579381a413bbce2ac99b13f8819fbc68b89973 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Wed, 29 Jul 2015 14:32:05 -0400
Subject: [PATCH 3/3] explicitly add dev-tools, it doesnt use our parent, which
 might be scarier

---
 run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run.sh b/run.sh
index 2dada65b742..4e8ac0dad08 100755
--- a/run.sh
+++ b/run.sh
@@ -4,4 +4,4 @@
 # turn off tests and other validation to speed it up
 # TODO: can be sped up more, if shading is moved out of core/
 # TODO: this will work on windows too. feel free to make a .bat
-mvn -am -pl distribution/zip package -DskipTests -Drun -Pdev
+mvn -am -pl dev-tools,distribution/zip package -DskipTests -Drun -Pdev