From 99dc9784cc5bbdd2ec23cd46f0cddd8161c36f81 Mon Sep 17 00:00:00 2001
From: Tanguy Leroux <tlrx.dev@gmail.com>
Date: Tue, 21 Jul 2015 14:51:00 +0200
Subject: [PATCH] Marvel: add configuration for integration tests

Original commit: elastic/x-pack-elasticsearch@6161a64d13c0ed486a14e7c7cec6e566a98d23ce
---
 marvel/dev-tools/integration-tests.xml | 11 ++++++++
 marvel/pom.xml                         | 35 ++++++++++++++++++++++++++
 marvel/src/main/assemblies/plugin.xml  |  1 +
 3 files changed, 47 insertions(+)
 create mode 100644 marvel/dev-tools/integration-tests.xml

diff --git a/marvel/dev-tools/integration-tests.xml b/marvel/dev-tools/integration-tests.xml
new file mode 100644
index 00000000000..45de62992c3
--- /dev/null
+++ b/marvel/dev-tools/integration-tests.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<project name="commercial-integration-tests">
+
+  <import file="${elasticsearch.integ.antfile.default}"/>
+
+  <target name="start-external-cluster-with-plugin" depends="setup-workspace" unless="${shouldskip}">
+    <install-plugin name="elasticsearch-license" file="${integ.deps}/elasticsearch-license-plugin-${project.version}.zip" />
+    <install-plugin name="${project.artifactId}" file="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip"/>
+    <startup-elasticsearch/>
+  </target>
+</project>
diff --git a/marvel/pom.xml b/marvel/pom.xml
index ce6514867ad..655753ae847 100644
--- a/marvel/pom.xml
+++ b/marvel/pom.xml
@@ -15,6 +15,10 @@
         <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <elasticsearch.integ.antfile>dev-tools/integration-tests.xml</elasticsearch.integ.antfile>
+    </properties>
+
     <dependencies>
 
         <dependency>
@@ -37,6 +41,37 @@
                 </includes>
             </resource>
         </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>integ-setup-dependencies</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems combine.children="append">
+                                <artifactItem>
+                                    <groupId>org.elasticsearch</groupId>
+                                    <artifactId>elasticsearch-license-plugin</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
 </project>
diff --git a/marvel/src/main/assemblies/plugin.xml b/marvel/src/main/assemblies/plugin.xml
index 2ccfc875e9c..8e8e42e7c05 100644
--- a/marvel/src/main/assemblies/plugin.xml
+++ b/marvel/src/main/assemblies/plugin.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <assembly>
     <id>plugin</id>
     <formats>