Browse Source

Merge pull request #14375 from rjernst/sweep_up_maven

Remove maven pom files and supporting ant files
Ryan Ernst 10 years ago
parent
commit
b6dee6bd43
40 changed files with 0 additions and 5483 deletions
  1. 0 368
      core/pom.xml
  2. 0 68
      dev-tools/pom.xml
  3. 0 406
      dev-tools/src/main/resources/ant/integration-tests.xml
  4. 0 33
      dev-tools/src/main/resources/plugin-metadata/plugin-assembly.xml
  5. 0 332
      distribution/deb/pom.xml
  6. 0 255
      distribution/pom.xml
  7. 0 402
      distribution/rpm/pom.xml
  8. 0 71
      distribution/src/main/assemblies/common-bin.xml
  9. 0 86
      distribution/tar/pom.xml
  10. 0 103
      distribution/zip/pom.xml
  11. 0 57
      plugins/analysis-icu/pom.xml
  12. 0 39
      plugins/analysis-kuromoji/pom.xml
  13. 0 40
      plugins/analysis-phonetic/pom.xml
  14. 0 39
      plugins/analysis-smartcn/pom.xml
  15. 0 39
      plugins/analysis-stempel/pom.xml
  16. 0 44
      plugins/delete-by-query/pom.xml
  17. 0 73
      plugins/discovery-azure/pom.xml
  18. 0 50
      plugins/discovery-ec2/pom.xml
  19. 0 67
      plugins/discovery-gce/pom.xml
  20. 0 34
      plugins/discovery-multicast/pom.xml
  21. 0 41
      plugins/jvm-example/pom.xml
  22. 0 33
      plugins/jvm-example/src/main/assemblies/plugin.xml
  23. 0 41
      plugins/lang-expression/pom.xml
  24. 0 42
      plugins/lang-groovy/pom.xml
  25. 0 41
      plugins/lang-javascript/pom.xml
  26. 0 42
      plugins/lang-python/pom.xml
  27. 0 44
      plugins/mapper-murmur3/pom.xml
  28. 0 43
      plugins/mapper-size/pom.xml
  29. 0 437
      plugins/pom.xml
  30. 0 54
      plugins/repository-azure/pom.xml
  31. 0 50
      plugins/repository-s3/pom.xml
  32. 0 48
      plugins/site-example/pom.xml
  33. 0 23
      plugins/site-example/src/main/assemblies/plugin-assembly.xml
  34. 0 47
      plugins/store-smb/pom.xml
  35. 0 1058
      pom.xml
  36. 0 131
      qa/pom.xml
  37. 0 129
      qa/smoke-test-client/pom.xml
  38. 0 27
      qa/smoke-test-plugins/integration-tests.xml
  39. 0 478
      qa/smoke-test-plugins/pom.xml
  40. 0 68
      rest-api-spec/pom.xml

+ 0 - 368
core/pom.xml

@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.elasticsearch</groupId>
-        <artifactId>parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.elasticsearch</groupId>
-    <artifactId>elasticsearch</artifactId>
-
-    <name>Elasticsearch: Core</name>
-    <description>Elasticsearch - Open Source, Distributed, RESTful Search Engine</description>
-
-    <properties>
-        <xlint.options>-Xlint:-cast,-deprecation,-fallthrough,-overrides,-rawtypes,-serial,-try,-unchecked</xlint.options>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.carrotsearch.randomizedtesting</groupId>
-            <artifactId>randomizedtesting-runner</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-test-framework</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.jimfs</groupId>
-            <artifactId>jimfs</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-backward-codecs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-queries</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-memory</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-highlighter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-queryparser</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-suggest</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-join</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-spatial</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.spatial4j</groupId>
-            <artifactId>spatial4j</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.vividsolutions</groupId>
-            <artifactId>jts</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <!-- needed for templating -->
-        <dependency>
-            <groupId>com.github.spullara.mustache.java</groupId>
-            <artifactId>compiler</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <!-- Lucene spatial -->
-
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>securesm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.carrotsearch</groupId>
-            <artifactId>hppc</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.joda</groupId>
-            <artifactId>joda-convert</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-smile</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-cbor</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.ning</groupId>
-            <artifactId>compress-lzf</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.tdunning</groupId>
-            <artifactId>t-digest</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hdrhistogram</groupId>
-            <artifactId>HdrHistogram</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>apache-log4j-extras</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-                <includes>
-                    <include>es-build.properties</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-                <includes>
-                    <include>**/*.*</include>
-                </includes>
-            </resource>
-        </resources>
-
-        <testResources>
-            <testResource>
-                <directory>${project.basedir}/src/test/resources</directory>
-                <includes>
-                    <include>**/*.*</include>
-                </includes>
-            </testResource>
-            <testResource>
-                <directory>${elasticsearch.tools.directory}/rest-api-spec</directory>
-                <targetPath>rest-api-spec</targetPath>
-                <includes>
-                    <include>api/*.json</include>
-                    <include>test/**/*.yaml</include>
-                </includes>
-            </testResource>
-             <!-- shared test resources like log4j.properties -->
-            <testResource>
-                <directory>${elasticsearch.tools.directory}/shared-test-resources</directory>
-                <filtering>false</filtering>
-            </testResource>
-        </testResources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-test-sources</id>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>org/elasticsearch/test/**/*</include>
-                                <include>org/elasticsearch/bootstrap/BootstrapForTesting.class</include>
-                                <include>org/elasticsearch/bootstrap/BootstrapForTesting$*.class</include>
-                                <include>org/elasticsearch/common/cli/CliToolTestCase.class</include>
-                                <include>org/elasticsearch/common/cli/CliToolTestCase$*.class</include>
-                            </includes>
-                            <excludes>
-                                <!-- unit tests for yaml suite parser & rest spec parser need to be excluded -->
-                                <exclude>org/elasticsearch/test/rest/test/**/*</exclude>
-                                <!-- unit tests for test framework classes-->
-                                <exclude>org/elasticsearch/test/test/**/*</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                        <configuration>
-                            <includes>
-                                <include>rest-api-spec/**/*</include>
-                                <include>org/elasticsearch/test/**/*</include>
-                                <include>org/elasticsearch/bootstrap/BootstrapForTesting.class</include>
-                                <include>org/elasticsearch/bootstrap/BootstrapForTesting$*.class</include>
-                                <include>org/elasticsearch/common/cli/CliToolTestCase.class</include>
-                                <include>org/elasticsearch/common/cli/CliToolTestCase$*.class</include>
-                                <include>org/elasticsearch/cluster/MockInternalClusterInfoService.class</include>
-                                <include>org/elasticsearch/cluster/MockInternalClusterInfoService$*.class</include>
-                                <include>org/elasticsearch/cluster/routing/TestShardRouting.class</include>
-                                <include>org/elasticsearch/cluster/routing/TestShardRouting$*.class</include>
-                                <include>org/elasticsearch/index/MockEngineFactoryPlugin.class</include>
-                                <include>org/elasticsearch/search/MockSearchService.class</include>
-                                <include>org/elasticsearch/search/MockSearchService$*.class</include>
-                                <include>org/elasticsearch/search/aggregations/bucket/AbstractTermsTestCase.class</include>
-                                <include>org/elasticsearch/search/aggregations/bucket/script/NativeSignificanceScoreScriptNoParams.class</include>
-                                <include>org/elasticsearch/search/aggregations/bucket/script/NativeSignificanceScoreScriptNoParams$*.class</include>
-                                <include>org/elasticsearch/search/aggregations/bucket/script/NativeSignificanceScoreScriptWithParams.class</include>
-                                <include>org/elasticsearch/search/aggregations/bucket/script/NativeSignificanceScoreScriptWithParams$*.class</include>
-                                <include>org/elasticsearch/search/aggregations/bucket/script/TestScript.class</include>
-                                <include>org/elasticsearch/search/aggregations/metrics/AbstractNumericTestCase.class</include>
-                                <include>org/elasticsearch/percolator/PercolatorTestUtil.class</include>
-                                <include>org/elasticsearch/cache/recycler/MockPageCacheRecycler.class</include>
-                                <include>org/elasticsearch/cache/recycler/MockPageCacheRecycler$*.class</include>
-                                <include>org/elasticsearch/common/util/MockBigArrays.class</include>
-                                <include>org/elasticsearch/common/util/MockBigArrays$*.class</include>
-                                <include>org/elasticsearch/node/NodeMocksPlugin.class</include>
-                                <include>org/elasticsearch/node/MockNode.class</include>
-                                <include>org/elasticsearch/common/io/PathUtilsForTesting.class</include>
-                            </includes>
-                            <excludes>
-                                <!-- unit tests for yaml suite parser & rest spec parser need to be excluded -->
-                                <exclude>org/elasticsearch/test/rest/test/**/*</exclude>
-                                <!-- unit tests for test framework classes-->
-                                <exclude>org/elasticsearch/test/test/**/*</exclude>
-                            </excludes>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <!-- Don't run the license checker in core -->
-                        <id>check-license</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-      <pluginManagement>
-        <plugins>
-            <plugin>
-               <groupId>org.jacoco</groupId>
-               <artifactId>jacoco-maven-plugin</artifactId>
-               <configuration>
-                 <excludes>
-                   <exclude>org/apache/lucene/**</exclude>
-                 </excludes>
-               </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <!-- Guice -->
-                        <exclude>src/main/java/org/elasticsearch/common/inject/**</exclude>
-                        <!-- Forks of Lucene classes -->
-                        <exclude>src/main/java/org/apache/lucene/**/X*.java</exclude>
-                        <!-- netty pipelining -->
-                        <exclude>src/main/java/org/elasticsearch/http/netty/pipelining/**</exclude>
-                        <!-- Guava -->
-                        <exclude>src/main/java/org/elasticsearch/common/network/InetAddresses.java</exclude>
-                        <exclude>src/test/java/org/elasticsearch/common/network/InetAddressesTests.java</exclude>
-                        <exclude>src/test/java/org/elasticsearch/common/collect/EvictingQueueTests.java</exclude>
-                        <!-- Joda -->
-                        <exclude>src/main/java/org/joda/time/base/BaseDateTime.java</exclude>
-                        <exclude>src/main/java/org/joda/time/format/StrictISODateTimeFormat.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-      </pluginManagement>
-    </build>
-    <profiles>
-        <!-- license profile, to generate third party license file -->
-        <profile>
-            <id>license</id>
-            <activation>
-                <property>
-                    <name>license.generation</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <!-- not including license-maven-plugin is sufficent to expose default license -->
-        </profile>
-    </profiles>
-</project>

+ 0 - 68
dev-tools/pom.xml

@@ -1,68 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.elasticsearch</groupId>
-  <artifactId>dev-tools</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
-  <name>Build Tools and Resources</name>
-  <description>Tools to assist in building and developing in the Elasticsearch project</description>
-  <parent>
-      <groupId>org.sonatype.oss</groupId>
-      <artifactId>oss-parent</artifactId>
-      <version>7</version>
-      <relativePath></relativePath>
-  </parent>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <elasticsearch.s3.repository>s3://download.elasticsearch.org/elasticsearch/staging/</elasticsearch.s3.repository>
-  </properties>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.5</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>bundle</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <includes>
-            <include>**/*</include>
-          </includes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <!-- sign the artifacts with GPG -->
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-                <configuration>
-                  <keyname>${gpg.keyname}</keyname>
-                  <passphrase>${gpg.passphrase}</passphrase>
-                  <defaultKeyring>${gpg.keyring}</defaultKeyring>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>

+ 0 - 406
dev-tools/src/main/resources/ant/integration-tests.xml

@@ -1,406 +0,0 @@
-<?xml version="1.0"?>
-<project name="elasticsearch-integration-tests">
-  <!-- our pid file for easy cleanup -->
-  <property name="integ.pidfile" location="${integ.scratch}/es.pid"/>
-
-  <!-- if this exists, ES is running (maybe) -->
-  <available property="integ.pidfile.exists" file="${integ.pidfile}"/>
-
-  <!-- name of our cluster, maybe needs changing -->
-  <property name="integ.cluster.name" value="prepare_release"/>
-
-  <!-- runs an OS script -->
-  <macrodef name="run-script">
-      <attribute name="script"/>
-      <attribute name="spawn" default="false"/>
-      <element name="nested" optional="true"/>
-    <sequential>
-      <local name="failonerror"/>
-      <condition property="failonerror">
-          <isfalse value="@{spawn}"/>
-      </condition>
-
-      <!-- create a temp CWD, to enforce that commands don't rely on CWD -->
-      <local name="temp.cwd"/>
-      <tempfile property="temp.cwd" destDir="${integ.temp}"/>
-      <mkdir dir="${temp.cwd}"/>
-
-      <!-- print commands we run -->
-      <local name="script.base"/>
-      <basename file="@{script}" property="script.base"/>
-      <!-- crappy way to output, but we need it. make it nice later -->
-      <echoxml><exec script="${script.base}"><nested/></exec></echoxml>
-      <exec executable="cmd" osfamily="winnt" dir="${temp.cwd}" failonerror="${failonerror}" spawn="@{spawn}" taskname="${script.base}">
-        <arg value="/c"/>
-        <arg value="&quot;"/>
-        <arg value="@{script}.bat"/>
-        <nested/>
-        <arg value="&quot;"/>
-      </exec>
-
-      <exec executable="sh" osfamily="unix" dir="${temp.cwd}" failonerror="${failonerror}" spawn="@{spawn}" taskname="${script.base}">
-        <arg value="@{script}"/>
-        <nested/>
-      </exec>
-    </sequential>
-  </macrodef>
-
-  <!-- extracts PID from file -->
-  <macrodef name="extract-pid">
-      <attribute name="file"/>
-      <attribute name="property"/>
-    <sequential>
-      <loadfile srcFile="@{file}" property="@{property}">
-        <filterchain>
-          <striplinebreaks/>
-        </filterchain>
-      </loadfile>
-    </sequential>
-  </macrodef>
-
-  <!-- applies transformations to src and stores in dst -->
-  <macrodef name="filter-property">
-      <attribute name="src"/>
-      <attribute name="dest"/>
-      <element name="chain"/>
-    <sequential>
-      <loadresource property="@{dest}">
-        <propertyresource name="@{src}"/>
-        <filterchain>
-          <tokenfilter>
-            <chain/>
-          </tokenfilter>
-        </filterchain>
-      </loadresource>
-    </sequential>
-  </macrodef>
-
-  <!-- installs a plugin into elasticsearch -->
-  <macrodef name="install-plugin">
-      <attribute name="home" default="${integ.scratch}/elasticsearch-${elasticsearch.version}"/>
-      <attribute name="name"/>
-      <attribute name="file"/>
-    <sequential>
-      <local name="url"/>
-      <makeurl property="url" file="@{file}"/>
-
-      <!-- install plugin -->
-      <echo>Installing plugin @{name}...</echo>
-      <run-script script="@{home}/bin/plugin">
-        <nested>
-          <arg value="install"/>
-          <arg value="${url}"/>
-        </nested>
-      </run-script>
-
-      <fail message="did not find plugin installed as @{name}">
-        <condition>
-          <not>
-            <resourceexists>
-              <file file="@{home}/plugins/@{name}"/>
-            </resourceexists>
-          </not>
-        </condition>
-      </fail>
-    </sequential>
-  </macrodef>
-
-  <!-- waits for elasticsearch to start -->
-  <macrodef name="waitfor-elasticsearch">
-      <attribute name="port"/>
-      <attribute name="timeoutproperty"/>
-    <sequential>
-      <echo>Waiting for elasticsearch to become available on port @{port}...</echo>
-      <waitfor maxwait="30" maxwaitunit="second"
-               checkevery="500" checkeveryunit="millisecond"
-               timeoutproperty="@{timeoutproperty}">
-        <http url="http://localhost:@{port}"/>
-      </waitfor>
-    </sequential>
-  </macrodef>
-
-  <!-- waits for cluster to form and have exactly two nodes -->
-  <macrodef name="waitfor-two-nodes">
-    <attribute name="port"/>
-    <attribute name="timeoutproperty"/>
-    <sequential>
-      <echo>Waiting for elasticsearch to form a cluster of two...</echo>
-      <waitfor maxwait="30" maxwaitunit="second"
-               checkevery="500" checkeveryunit="millisecond"
-               timeoutproperty="@{timeoutproperty}">
-        <http url="http://localhost:@{port}/_cluster/health?wait_for_nodes=2"/>
-      </waitfor>
-    </sequential>
-  </macrodef>
-
-  <!-- start elasticsearch and wait until its ready -->
-  <macrodef name="startup-elasticsearch">
-      <attribute name="home" default="${integ.scratch}/elasticsearch-${elasticsearch.version}"/>
-      <attribute name="spawn" default="true"/>
-      <attribute name="args" default="${integ.args}"/>
-      <attribute name="es.unicast.hosts" default="localhost:${integ.transport.port}"/>
-      <attribute name="es.cluster.name" default="${integ.cluster.name}"/>
-      <attribute name="es.http.port" default="${integ.http.port}"/>
-      <attribute name="es.transport.tcp.port" default="${integ.transport.port}"/>
-      <attribute name="es.pidfile" default="${integ.pidfile}"/>
-      <attribute name="jvm.args" default="${tests.jvm.argline}"/>
-      <element name="additional-args" optional="true"/>
-    <sequential>
-      <!-- make sure no elasticsearch instance is currently running and listening on the port we need -->
-      <fail message="This test expects port @{es.http.port} to be free but an elasticsearch instance is already running and listening on that port.
-      Maybe the last test run did not manage to shut down the node correctly?
-      You must kill it before tests can run.">
-        <condition>
-          <socket server="localhost" port="@{es.http.port}"></socket>
-        </condition>
-      </fail>
-      <!-- run bin/elasticsearch with args -->
-      <echo>Starting up external cluster...</echo>
-
-      <run-script script="@{home}/bin/elasticsearch"
-                  spawn="@{spawn}">
-        <nested>
-          <env key="JAVA_HOME" value="${java.home}"/>
-          <!-- we pass these as gc options, even if they arent, to avoid conflicting gc options -->
-          <env key="ES_GC_OPTS" value="@{jvm.args}"/>
-          <arg value="-Des.cluster.name=@{es.cluster.name}"/>
-          <arg value="-Des.http.port=@{es.http.port}"/>
-          <arg value="-Des.transport.tcp.port=@{es.transport.tcp.port}"/>
-          <arg value="-Des.pidfile=@{es.pidfile}"/>
-          <arg value="-Des.discovery.zen.ping.unicast.hosts=@{es.unicast.hosts}"/>
-          <arg value="-Des.path.repo=@{home}/repo"/>
-          <arg value="-Des.path.shared_data=@{home}/../"/>
-          <arg value="-Des.script.inline=on"/>
-          <arg value="-Des.script.indexed=on"/>
-          <!-- Define a node attribute so we can test that it exists -->
-          <arg value="-Des.node.testattr=test"/>
-          <arg value="-Des.repositories.url.allowed_urls=http://snapshot.test*"/>
-          <additional-args/>
-        </nested>
-      </run-script>
-
-      <!-- wait for startup -->
-      <local name="failed.to.start"/>
-      <waitfor-elasticsearch port="@{es.http.port}"
-                             timeoutproperty="failed.to.start"/>
-
-      <!-- best effort, print console log. useful if it fails especially -->
-      <local name="log.contents"/>
-      <loadfile srcFile="@{home}/logs/@{es.cluster.name}.log"
-                property="log.contents"
-                failonerror="false"/>
-      <echo message="${log.contents}" taskname="elasticsearch"/>
-
-      <fail message="ES instance did not start" if="failed.to.start"/>
-
-      <local name="integ.pid"/>
-      <extract-pid file="@{es.pidfile}" property="integ.pid"/>
-      <echo>External node started PID ${integ.pid}</echo>
-    </sequential>
-  </macrodef>
-
-  <!-- Takes a plugin zip file and return the plugin name. For instance
-       'analysis-icu-2.0.0.zip' would return
-       'analysis-icu'. -->
-  <macrodef name="convert-plugin-name">
-      <attribute name="file"/>
-      <attribute name="outputproperty"/>
-    <sequential>
-      <local name="file.base"/>
-      <basename file="@{file}" property="file.base"/>
-      <filter-property src="file.base" dest="@{outputproperty}">
-        <chain>
-          <replacestring from="-${elasticsearch.version}.zip" to=""/>
-        </chain>
-      </filter-property>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="stop-node">
-    <attribute name="es.pidfile" default="${integ.pidfile}"/>
-    <sequential>
-      <local name="integ.pid"/>
-
-      <extract-pid file="@{es.pidfile}" property="integ.pid"/>
-      <echo>Shutting down external node PID ${integ.pid}</echo>
-      <!-- verify with jps that this actually is the correct pid.
-      See if we can find the line "pid org.elasticsearch.bootstrap.Elasticsearch" in the output of jps -l.-->
-      <local name="jps.pidline"/>
-      <local name="jps.executable"/>
-      <local name="environment"/>
-      <property environment="environment"/>
-      <property name="jps.executable" location="${environment.JAVA_HOME}/bin/jps"/>
-      <exec executable="${jps.executable}" failonerror="true">
-        <arg value="-l"/>
-        <redirector outputproperty="jps.pidline">
-          <outputfilterchain>
-            <linecontains>
-              <contains value="${integ.pid} org.elasticsearch.bootstrap.Elasticsearch"/>
-            </linecontains>
-          </outputfilterchain>
-        </redirector>
-      </exec>
-      <fail
-          message="pid file at @{es.pidfile} is ${integ.pid} but jps -l did not report any process with org.elasticsearch.bootstrap.Elasticsearch and this pid.
-          Did you run mvn clean? Maybe an old pid file is still lying around.">
-        <condition>
-          <equals arg1="${jps.pidline}" arg2=""/>
-        </condition>
-      </fail>
-
-      <exec executable="taskkill" failonerror="true" osfamily="winnt">
-        <arg value="/F"/>
-        <arg value="/PID"/>
-        <arg value="${integ.pid}"/>
-      </exec>
-      <exec executable="kill" failonerror="true" osfamily="unix">
-        <arg value="-9"/>
-        <arg value="${integ.pid}"/>
-      </exec>
-      <delete file="@{es.pidfile}"/>
-    </sequential>
-  </macrodef>
-
-  <!-- starts a unicast node on an already setup workspace-->
-  <macrodef name="start-unicast-node">
-    <attribute name="es.http.port" default="${integ.http.port}"/>
-    <attribute name="es.transport.port" default="${integ.transport.port}"/>
-    <attribute name="es.pidfile" default="${integ.pidfile}"/>
-    <attribute name="es.peer.list" />
-    <sequential>
-    <startup-elasticsearch es.pidfile="@{es.pidfile}"
-                           es.transport.tcp.port="@{es.transport.port}" es.http.port="@{es.http.port}"
-                           es.unicast.hosts="@{es.peer.list}"/>
-    </sequential>
-  </macrodef>
-
-  <!-- unzip the elasticsearch zip -->
-  <target name="setup-workspace" depends="stop-external-cluster">
-    <sequential>
-      <delete dir="${integ.scratch}"/>
-      <unzip src="${integ.deps}/elasticsearch-${elasticsearch.version}.zip" dest="${integ.scratch}"/>
-    </sequential>
-  </target>
-
-  <!-- run elasticsearch in the foreground (for debugging etc) -->
-  <!-- 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}"/>
-      <local name="home"/>
-      <property name="home" location="${integ.scratch}/${project.artifactId}-${elasticsearch.version}"/>
-      <startup-elasticsearch spawn="false" home="${home}"
-                             jvm.args="${tests.jvm.argline} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000"/>
-  </target>
-
-  <!-- unzip core release artifact, install plugin, then start ES -->
-  <target name="start-external-cluster-with-plugin" depends="setup-workspace">
-    <install-plugin name="${project.artifactId}" file="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip"/>
-    <startup-elasticsearch/>
-  </target>
-
-  <!-- unzip core release artifact then start ES -->
-  <target name="start-external-cluster" depends="setup-workspace">
-    <startup-elasticsearch/>
-  </target>
-
-  <target name="stop-external-cluster" if="integ.pidfile.exists">
-    <stop-node/>
-  </target>
-
-  <!-- distribution tests: .zip -->
-
-  <target name="setup-workspace-zip" depends="stop-external-cluster">
-    <sequential>
-      <delete dir="${integ.scratch}"/>
-      <unzip src="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip"
-             dest="${integ.scratch}"/>
-    </sequential>
-  </target>
-
-  <target name="start-external-cluster-zip" depends="setup-workspace-zip">
-    <startup-elasticsearch/>
-  </target>
-
-
-  <!-- distribution tests: .tar.gz -->
-
-  <target name="setup-workspace-tar" depends="stop-external-cluster">
-    <sequential>
-      <delete dir="${integ.scratch}"/>
-      <untar src="${project.build.directory}/releases/${project.artifactId}-${project.version}.tar.gz"
-             dest="${integ.scratch}"
-             compression="gzip"/>
-    </sequential>
-  </target>
-
-  <target name="start-external-cluster-tar" depends="setup-workspace-tar">
-    <startup-elasticsearch/>
-  </target>
-
-  <!-- distribution tests: .deb -->
-
-  <target name="setup-workspace-deb" depends="stop-external-cluster">
-    <sequential>
-      <delete dir="${integ.scratch}"/>
-      <mkdir dir="${integ.scratch}/deb-extracted"/>
-      <local name="debfile"/>
-      <property name="debfile" location="${project.build.directory}/releases/${project.artifactId}-${project.version}.deb"/>
-      <!-- print some basic package info -->
-      <exec executable="dpkg-deb" failonerror="true" taskname="deb-info">
-         <arg value="-I"/>
-         <arg value="${debfile}"/>
-      </exec>
-      <!-- extract contents from .deb package -->
-      <exec executable="dpkg-deb" failonerror="true">
-         <arg value="-x"/>
-         <arg value="${debfile}"/>
-         <arg value="${integ.scratch}/deb-extracted"/>
-      </exec>
-    </sequential>
-  </target>
-
-  <target name="start-external-cluster-deb" depends="setup-workspace-deb">
-    <startup-elasticsearch home="${integ.scratch}/deb-extracted/usr/share/elasticsearch/"/>
-  </target>
-
-  <!-- distribution tests: .rpm -->
-  <target name="setup-workspace-rpm" depends="stop-external-cluster">
-    <sequential>
-      <delete dir="${integ.scratch}"/>
-      <!-- use full paths with paranoia, we will be doing relocations -->
-      <local name="rpm.file"/>
-      <local name="rpm.database"/>
-      <local name="rpm.extracted"/>
-      <property name="rpm.file" location="${project.build.directory}/releases/${project.artifactId}-${project.version}.rpm"/>
-      <property name="rpm.database" location="${integ.scratch}/rpm-database"/>
-      <property name="rpm.extracted" location="${integ.scratch}/rpm-extracted"/>
-      <mkdir dir="${rpm.database}"/>
-      <mkdir dir="${rpm.extracted}"/>
-      <!-- print some basic package info -->
-      <exec executable="rpm" failonerror="true" taskname="rpm-info">
-         <arg value="-q"/>
-         <arg value="-i"/>
-         <arg value="-p"/>
-         <arg value="${rpm.file}"/>
-      </exec>
-      <!-- extract contents from .rpm package -->
-      <exec executable="rpm" failonerror="true" taskname="rpm">
-         <arg value="--dbpath"/>
-         <arg value="${rpm.database}"/>
-         <arg value="--badreloc"/>
-         <arg value="--relocate"/>
-         <arg value="/=${rpm.extracted}"/>
-         <arg value="--nodeps"/>
-         <arg value="--noscripts"/>
-         <arg value="--notriggers"/>
-         <arg value="-i"/>
-         <arg value="${rpm.file}"/>
-      </exec>
-    </sequential>
-  </target>
-
-  <target name="start-external-cluster-rpm" depends="setup-workspace-rpm">
-    <startup-elasticsearch home="${integ.scratch}/rpm-extracted/usr/share/elasticsearch/"/>
-  </target>
-</project>

+ 0 - 33
dev-tools/src/main/resources/plugin-metadata/plugin-assembly.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<assembly>
-    <id>plugin</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/src/main/plugin-metadata</directory>
-            <includes>
-              <include>plugin-security.policy</include>
-            </includes>
-            <outputDirectory></outputDirectory>
-            <filtered>false</filtered>
-        </fileSet>
-    </fileSets>
-    <files>
-        <file>
-            <source>${elasticsearch.tools.directory}/plugin-metadata/plugin-descriptor.properties</source>
-            <outputDirectory></outputDirectory>
-            <filtered>true</filtered>
-        </file>
-    </files>
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/</outputDirectory>
-            <useProjectArtifact>true</useProjectArtifact>
-            <useTransitiveFiltering>true</useTransitiveFiltering>
-            <useTransitiveDependencies>true</useTransitiveDependencies>
-        </dependencySet>
-    </dependencySets>
-</assembly>

+ 0 - 332
distribution/deb/pom.xml

@@ -1,332 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.elasticsearch.distribution</groupId>
-        <artifactId>distributions</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.elasticsearch.distribution.deb</groupId>
-    <artifactId>elasticsearch</artifactId>
-    <name>Distribution: Deb</name>
-    <!--
-        We should use deb packaging here because we don't want to publish any jar.
-        But if you do this, then maven lifecycle does not execute any test (nor compile any test)
-     -->
-    <!--packaging>deb</packaging-->
-    <description>The Debian distribution of Elasticsearch</description>
-
-    <properties>
-        <deb.sign>false</deb.sign>
-        <deb.sign.method>dpkg-sig</deb.sign.method>
-    </properties>
-
-    <build>
-
-        <filters>
-            <filter>${project.basedir}/src/main/packaging/packaging.properties</filter>
-        </filters>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <!-- Filters some files and uses packaging.properties when building the .deb package -->
-                    <execution>
-                        <id>copy-resources-deb</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/generated-packaging/deb/</outputDirectory>
-                            <filters>
-                                <filter>${project.basedir}/../src/main/packaging/packaging.properties</filter>
-                                <filter>${project.basedir}/src/main/packaging/packaging.properties</filter>
-                            </filters>
-                            <resources>
-                                <resource>
-                                    <directory>${project.basedir}/../src/main/packaging/</directory>
-                                    <filtering>true</filtering>
-                                    <includes>
-                                        <include>**/*</include>
-                                    </includes>
-                                    <excludes>
-                                        <exclude>packaging.properties</exclude>
-                                    </excludes>
-                                </resource>
-                                <resource>
-                                    <directory>${project.basedir}/src/main/packaging/</directory>
-                                    <filtering>true</filtering>
-                                    <includes>
-                                        <include>**/*</include>
-                                    </includes>
-                                    <excludes>
-                                        <exclude>packaging.properties</exclude>
-                                    </excludes>
-                                </resource>
-                                <resource>
-                                    <directory>${project.basedir}/../src/main/resources</directory>
-                                    <filtering>true</filtering>
-                                    <includes>
-                                        <include>bin/elasticsearch</include>
-                                        <include>bin/elasticsearch.in.sh</include>
-                                        <include>bin/plugin</include>
-                                        <include>bin/elasticsearch-systemd-pre-exec</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <!-- some infos https://github.com/tcurdt/jdeb/blob/master/docs/maven.md -->
-                <artifactId>jdeb</artifactId>
-                <groupId>org.vafer</groupId>
-                <configuration>
-                    <!-- By default it should generates target/${artifactId}_${version}.deb but we get elasticsearch_2.0.0~SNAPSHOT_all.deb -->
-                    <deb>${project.build.directory}/releases/elasticsearch-${project.version}.deb</deb>
-                    <controlDir>${project.build.directory}/generated-packaging/deb/scripts</controlDir>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>jdeb</goal>
-                        </goals>
-                        <configuration>
-                            <signPackage>${deb.sign}</signPackage>
-                            <keyring>${gpg.keyring}</keyring>
-                            <key>${gpg.key}</key>
-                            <passphrase>${gpg.passphrase}</passphrase>
-                            <signMethod>${deb.sign.method}</signMethod>
-                            <dataSet>
-                                <!-- Add bin directory -->
-                                <data>
-                                    <src>${project.build.directory}/generated-packaging/deb/bin</src>
-                                    <type>directory</type>
-                                    <includes>elasticsearch,elasticsearch.in.sh,plugin,elasticsearch-systemd-pre-exec</includes>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>${packaging.elasticsearch.bin.dir}</prefix>
-                                        <filemode>755</filemode>
-                                        <user>root</user>
-                                        <group>root</group>
-                                    </mapper>
-                                </data>
-                                <!-- create the conf dir manually so it gets proper permissions -->
-                                <data>
-                                    <type>template</type>
-                                    <paths>
-                                        <path>${packaging.elasticsearch.conf.dir}</path>
-                                    </paths>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <filemode>750</filemode>
-                                        <user>root</user>
-                                        <group>elasticsearch</group>
-                                    </mapper>
-                                </data>
-                                <!-- Add configuration files -->
-                                <data>
-                                    <src>${project.basedir}/../src/main/resources/config</src>
-                                    <type>directory</type>
-                                    <excludes>.DS_Store</excludes>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>${packaging.elasticsearch.conf.dir}</prefix>
-                                        <filemode>750</filemode>
-                                        <user>root</user>
-                                        <group>elasticsearch</group>
-                                    </mapper>
-                                </data>
-                                <data>
-                                    <type>template</type>
-                                    <paths>
-                                        <path>${packaging.elasticsearch.conf.dir}/scripts</path>
-                                    </paths>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <filemode>750</filemode>
-                                        <user>root</user>
-                                        <group>elasticsearch</group>
-                                    </mapper>
-                                </data>
-                                <!-- Add environment vars file -->
-                                <data>
-                                    <src>${project.build.directory}/generated-packaging/deb/env/elasticsearch</src>
-                                    <type>file</type>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>/etc/default</prefix>
-                                        <filemode>644</filemode>
-                                        <user>root</user>
-                                        <group>root</group>
-                                    </mapper>
-                                </data>
-                                <!-- Add libs -->
-                                <data>
-                                    <src>${project.build.directory}/</src>
-                                    <includes>elasticsearch-${project.version}.jar</includes>
-                                    <type>directory</type>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>${packaging.elasticsearch.home.dir}/lib</prefix>
-                                        <user>root</user>
-                                        <group>root</group>
-                                    </mapper>
-                                </data>
-                                <data>
-                                    <src>${project.build.directory}/../target/lib</src>
-                                    <excludes>${project.build.finalName}-sources.jar,${project.build.finalName}-tests.jar,${project.build.finalName}-test-sources.jar,slf4j-api-*.jar</excludes>
-                                    <type>directory</type>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>${packaging.elasticsearch.home.dir}/lib</prefix>
-                                        <user>root</user>
-                                        <group>root</group>
-                                    </mapper>
-                                </data>
-                                <!-- Add init.d files  -->
-                                <data>
-                                    <src>${project.build.directory}/generated-packaging/deb/init.d/</src>
-                                    <type>directory</type>
-                                    <excludes>.DS_Store</excludes>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>/etc/init.d</prefix>
-                                        <filemode>755</filemode>
-                                        <user>root</user>
-                                        <group>root</group>
-                                    </mapper>
-                                </data>
-                                <!-- Adds systemd file -->
-                                <data>
-                                    <src>${project.build.directory}/generated-packaging/deb/systemd/elasticsearch.service</src>
-                                    <dst>${packaging.elasticsearch.systemd.dir}/elasticsearch.service</dst>
-                                    <type>file</type>
-                                </data>
-                                <!-- Adds systemd/sysctl.d configuration file -->
-                                <data>
-                                    <src>${project.build.directory}/generated-packaging/deb/systemd/sysctl/elasticsearch.conf</src>
-                                    <dst>${packaging.elasticsearch.systemd.sysctl.dir}/elasticsearch.conf</dst>
-                                    <type>file</type>
-                                </data>
-                                <!-- Adds systemd/tmpfiles.d configuration file -->
-                                <data>
-                                    <src>${project.build.directory}/generated-packaging/deb/systemd/elasticsearch.conf</src>
-                                    <dst>${packaging.elasticsearch.tmpfilesd.dir}/elasticsearch.conf</dst>
-                                    <type>file</type>
-                                </data>
-                                <!-- Add lintian files  -->
-                                <data>
-                                    <src>${project.build.directory}/generated-packaging/deb/lintian</src>
-                                    <type>directory</type>
-                                    <excludes>.DS_Store</excludes>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>/usr/share/lintian/overrides</prefix>
-                                        <user>root</user>
-                                        <group>root</group>
-                                    </mapper>
-                                </data>
-                                <!-- Add readme files  -->
-                                <data>
-                                    <src>${project.basedir}/../src/main/resources/</src>
-                                    <includes>*.txt, *.textile</includes>
-                                    <excludes>LICENSE.txt, .DS_Store</excludes>
-                                    <type>directory</type>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <prefix>${packaging.elasticsearch.home.dir}</prefix>
-                                        <user>root</user>
-                                        <group>root</group>
-                                    </mapper>
-                                </data>
-                                <!-- Add license files  -->
-                                <data>
-                                    <src>${project.build.directory}/generated-packaging/deb/copyright</src>
-                                    <dst>/usr/share/doc/elasticsearch/copyright</dst>
-                                    <type>file</type>
-                                </data>
-                                <!-- Adds and sets permission on default directories -->
-                                <data>
-                                    <type>template</type>
-                                    <paths>
-                                        <path>${packaging.elasticsearch.data.dir}</path>
-                                        <path>${packaging.elasticsearch.log.dir}</path>
-                                        <path>${packaging.elasticsearch.plugins.dir}</path>
-                                        <path>${packaging.elasticsearch.pid.dir}</path>
-                                    </paths>
-                                    <mapper>
-                                        <type>perm</type>
-                                        <dirmode>755</dirmode>
-                                        <user>${packaging.elasticsearch.user}</user>
-                                        <group>${packaging.elasticsearch.group}</group>
-                                    </mapper>
-                                </data>
-                            </dataSet>
-
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <!-- start up external cluster -->
-                    <execution>
-                        <id>integ-setup</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skip.integ.tests}</skip>
-                            <target>
-                                <ant antfile="${elasticsearch.integ.antfile}" target="start-external-cluster-deb">
-                                    <property name="tests.jvm.argline" value="${tests.jvm.argline}"/>
-                                </ant>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- shut down external cluster -->
-                    <execution>
-                        <id>integ-teardown</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skip.integ.tests}</skip>
-                            <target>
-                                <ant antfile="${elasticsearch.integ.antfile}" target="stop-external-cluster"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-       <!-- we run integration test with real dpkg utils, you must have them -->
-       <profile>
-           <id>has_dpkg</id>
-           <activation>
-              <file><missing>/usr/bin/dpkg-deb</missing></file>
-           </activation>
-           <properties>
-               <skip.integ.tests>true</skip.integ.tests>
-           </properties>
-       </profile>
-    </profiles>
-</project>

+ 0 - 255
distribution/pom.xml

@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.elasticsearch</groupId>
-        <artifactId>parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.elasticsearch.distribution</groupId>
-    <artifactId>distributions</artifactId>
-    <packaging>pom</packaging>
-    <name>Distribution: Parent POM</name>
-
-    <properties>
-        <!-- Properties used for building RPM & DEB packages (see common/packaging.properties) -->
-        <packaging.elasticsearch.home.dir>/usr/share/elasticsearch</packaging.elasticsearch.home.dir>
-        <packaging.elasticsearch.bin.dir>/usr/share/elasticsearch/bin</packaging.elasticsearch.bin.dir>
-        <packaging.elasticsearch.conf.dir>/etc/elasticsearch</packaging.elasticsearch.conf.dir>
-        <packaging.elasticsearch.data.dir>/var/lib/elasticsearch</packaging.elasticsearch.data.dir>
-        <packaging.elasticsearch.user>elasticsearch</packaging.elasticsearch.user>
-        <packaging.elasticsearch.group>elasticsearch</packaging.elasticsearch.group>
-        <packaging.elasticsearch.log.dir>/var/log/elasticsearch</packaging.elasticsearch.log.dir>
-        <packaging.elasticsearch.plugins.dir>${packaging.elasticsearch.home.dir}/plugins</packaging.elasticsearch.plugins.dir>
-        <packaging.elasticsearch.pid.dir>/var/run/elasticsearch</packaging.elasticsearch.pid.dir>
-        <packaging.elasticsearch.systemd.dir>/usr/lib/systemd/system</packaging.elasticsearch.systemd.dir>
-        <packaging.elasticsearch.systemd.sysctl.dir>/usr/lib/sysctl.d</packaging.elasticsearch.systemd.sysctl.dir>
-        <packaging.elasticsearch.tmpfilesd.dir>/usr/lib/tmpfiles.d</packaging.elasticsearch.tmpfilesd.dir>
-
-        <!-- Properties for the license checker -->
-        <project.licenses.dir>${project.basedir}/../licenses</project.licenses.dir>
-        <project.licenses.check_target>${integ.scratch}</project.licenses.check_target>
-
-        <!-- we expect packaging formats to have integration tests, but not unit tests -->
-        <skip.unit.tests>true</skip.unit.tests>
-    </properties>
-
-    <!-- PUT TEST ONLY DEPS HERE. Let individual distributions figure out what they want -->
-    <dependencies>
-        <dependency>
-            <groupId>com.carrotsearch.randomizedtesting</groupId>
-            <artifactId>randomizedtesting-runner</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-test-framework</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Embedded components in any distribution -->
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.spatial4j</groupId>
-            <artifactId>spatial4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.vividsolutions</groupId>
-            <artifactId>jts</artifactId>
-        </dependency>
-
-        <!-- needed for templating -->
-        <dependency>
-            <groupId>com.github.spullara.mustache.java</groupId>
-            <artifactId>compiler</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>apache-log4j-extras</artifactId>
-        </dependency>
-
-        <!-- we intentionally do not want slf4j in the distro by default, we use log4j
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-        </dependency>
-        -->
-
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!-- We copy libs for deb and rpm -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                            <includeScope>runtime</includeScope>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <!-- Many of the modules in this build have the artifactId "elasticsearch"
-                      which break importing into Eclipse without this. -->
-                    <projectNameTemplate>[groupId].[artifactId]</projectNameTemplate>
-                </configuration>
-            </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <!-- checks integration test scratch area (where we extract the distribution) -->
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>copy-resources</id>
-                            <phase>prepare-package</phase>
-                            <goals>
-                                <goal>copy-resources</goal>
-                            </goals>
-                            <configuration>
-                                <outputDirectory>${project.build.directory}/bin</outputDirectory>
-                                <resources>
-                                    <resource>
-                                        <directory>${project.basedir}/../src/main/resources/bin</directory>
-                                        <filtering>true</filtering>
-                                        <excludes>
-                                            <exclude>*.exe</exclude>
-                                        </excludes>
-                                    </resource>
-                                    <resource>
-                                        <directory>${project.basedir}/../src/main/resources/bin</directory>
-                                        <filtering>false</filtering>
-                                        <includes>
-                                            <include>*.exe</include>
-                                        </includes>
-                                    </resource>
-                                </resources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <configuration>
-                        <!-- distribution modules don't provide any jar. No need to upload empty jars to maven central -->
-                        <skipIfEmpty>true</skipIfEmpty>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>com.carrotsearch.randomizedtesting</groupId>
-                    <artifactId>junit4-maven-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>integ-tests</id>
-                            <configuration>
-                                <!-- currently only 1 cpu works, because integ tests don't make "unique" test directories? -->
-                                <parallelism>1</parallelism>
-                                <systemProperties>
-                                    <!-- use external cluster -->
-                                    <tests.cluster>localhost:${integ.transport.port}</tests.cluster>
-                                </systemProperties>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <modules>
-        <module>tar</module>
-        <module>zip</module>
-        <module>deb</module>
-    </modules>
-
-    <profiles>
-        <!--
-            We include automatically RPM module when it's available in common locations.
-            If your rpmbuild is in another location (but in path), run maven with rpm profile:
-             mvn deploy -Prpm
-        -->
-        <profile>
-            <id>macos_brew</id>
-            <activation>
-                <file>
-                    <!-- Folks having /usr/local/bin/rpmbuild available will be able to build the rpm module -->
-                    <exists>/usr/local/bin/rpmbuild</exists>
-                </file>
-            </activation>
-            <modules>
-                <module>rpm</module>
-            </modules>
-        </profile>
-
-        <profile>
-            <id>rpm</id>
-            <activation>
-                <file>
-                    <!-- Folks having /usr/bin/rpmbuild available will be able to build the rpm module -->
-                    <exists>/usr/bin/rpmbuild</exists>
-                </file>
-            </activation>
-            <modules>
-                <module>rpm</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</project>

+ 0 - 402
distribution/rpm/pom.xml

@@ -1,402 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.elasticsearch.distribution</groupId>
-        <artifactId>distributions</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.elasticsearch.distribution.rpm</groupId>
-    <artifactId>elasticsearch</artifactId>
-    <name>Distribution: RPM</name>
-    <packaging>rpm</packaging>
-    <description>The RPM distribution of Elasticsearch</description>
-
-    <properties>
-        <skip.unit.tests>true</skip.unit.tests>
-        <rpm.outputDirectory>${project.build.directory}/releases/</rpm.outputDirectory>
-    </properties>
-
-    <build>
-
-        <filters>
-            <filter>${project.basedir}/src/main/packaging/packaging.properties</filter>
-        </filters>
-
-        <plugins>
-            <!-- No need to have some source jar for the RPM -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.4</version>
-                <configuration><skipSource>true</skipSource></configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <!-- Filters some files and uses packaging.properties when building the .rpm package -->
-                    <execution>
-                        <id>copy-resources-rpm</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/generated-packaging/rpm/</outputDirectory>
-                            <filters>
-                                <filter>${project.basedir}/../src/main/packaging/packaging.properties</filter>
-                                <filter>${project.basedir}/src/main/packaging/packaging.properties</filter>
-                            </filters>
-                            <resources>
-                                <resource>
-                                    <directory>${project.basedir}/../src/main/packaging/</directory>
-                                    <filtering>true</filtering>
-                                    <includes>
-                                        <include>**/*</include>
-                                    </includes>
-                                    <excludes>
-                                        <exclude>packaging.properties</exclude>
-                                    </excludes>
-                                </resource>
-                                <resource>
-                                    <directory>${project.basedir}/src/main/packaging/</directory>
-                                    <filtering>true</filtering>
-                                    <includes>
-                                        <include>**/*</include>
-                                    </includes>
-                                    <excludes>
-                                        <exclude>packaging.properties</exclude>
-                                    </excludes>
-                                </resource>
-                                <resource>
-                                    <directory>${project.basedir}/../src/main/resources</directory>
-                                    <filtering>true</filtering>
-                                    <includes>
-                                        <include>bin/elasticsearch</include>
-                                        <include>bin/elasticsearch.in.sh</include>
-                                        <include>bin/plugin</include>
-                                        <include>bin/elasticsearch-systemd-pre-exec</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- Rpm Packaging -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>rpm-maven-plugin</artifactId>
-                <configuration>
-                    <disabled>false</disabled>
-                    <name>elasticsearch</name>
-                    <distribution>Elasticsearch</distribution>
-                    <group>Application/Internet</group>
-                    <packager>Elasticsearch</packager>
-                    <prefix>/usr</prefix>
-                    <!-- To get rpm-maven-plugin to pickup targetOS you need
-                         to specify needarch too.... If you don't specify
-                         targetOS then it'll just use whatever the current
-                         machine's OS is which means you can't build rpms for
-                         linux on OSX even if you have rpmbuild.... -->
-                    <needarch>noarch</needarch>
-                    <targetOS>linux</targetOS>
-                    <changelogFile>src/changelog</changelogFile>
-                    <defineStatements>
-                        <defineStatement>_unpackaged_files_terminate_build 0</defineStatement>
-                        <defineStatement>_binaries_in_noarch_packages_terminate_build 0</defineStatement>
-                    </defineStatements>
-                    <defaultFilemode>644</defaultFilemode>
-                    <defaultDirmode>755</defaultDirmode>
-                    <defaultUsername>root</defaultUsername>
-                    <defaultGroupname>root</defaultGroupname>
-                    <icon>${project.basedir}/src/main/resources/logo/elastic.gif</icon>
-                    <description>Elasticsearch is a distributed RESTful search engine built for the cloud. Reference documentation can be found at https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html and the 'Elasticsearch: The Definitive Guide' book can be found at https://www.elastic.co/guide/en/elasticsearch/guide/current/index.html</description>
-                    <mappings>
-                        <!-- Add bin directory -->
-                        <mapping>
-                            <directory>${packaging.elasticsearch.bin.dir}/</directory>
-                            <filemode>755</filemode>
-                            <sources>
-                                <source>
-                                    <location>${project.build.directory}/generated-packaging/rpm/bin</location>
-                                    <includes>
-                                        <include>elasticsearch</include>
-                                        <include>elasticsearch.in.sh</include>
-                                        <include>plugin</include>
-                                        <include>elasticsearch-systemd-pre-exec</include>
-                                    </includes>
-                                </source>
-                            </sources>
-                        </mapping>
-                        <!-- Add configuration files -->
-                        <mapping>
-                            <!-- Explicitly add conf.dir to the file list so
-                                 that it is removed when the package is removed.
-                                 This is required because the scripts
-                                 subdirectory is created outside of the mapping
-                                 that creates the conf.dir.-->
-                            <directory>${packaging.elasticsearch.conf.dir}</directory>
-                            <configuration>noreplace</configuration>
-                            <groupname>elasticsearch</groupname>
-                            <filemode>750</filemode>
-                        </mapping>
-                        <mapping>
-                            <directory>${packaging.elasticsearch.conf.dir}/</directory>
-                            <configuration>noreplace</configuration>
-                            <groupname>elasticsearch</groupname>
-                            <filemode>750</filemode>
-                            <sources>
-                                <source>
-                                    <location>${project.basedir}/../src/main/resources/config/</location>
-                                    <includes>
-                                        <include>*.yml</include>
-                                    </includes>
-                                </source>
-                            </sources>
-                        </mapping>
-                        <mapping>
-                            <directory>${packaging.elasticsearch.conf.dir}/scripts</directory>
-                            <configuration>noreplace</configuration>
-                            <groupname>elasticsearch</groupname>
-                            <filemode>750</filemode>
-                        </mapping>
-                        <!-- Add environment vars file -->
-                        <mapping>
-                            <directory>/etc/sysconfig/</directory>
-                            <directoryIncluded>false</directoryIncluded>
-                            <configuration>noreplace</configuration>
-                            <sources>
-                                <source>
-                                    <location>${project.build.directory}/generated-packaging/rpm/env/</location>
-                                    <includes>
-                                        <include>elasticsearch</include>
-                                    </includes>
-                                </source>
-                            </sources>
-                        </mapping>
-                        <!-- Add libs -->
-                        <mapping>
-                            <directory>${packaging.elasticsearch.home.dir}/lib</directory>
-                            <sources>
-                                <source>
-                                    <location>target/lib/</location>
-                                    <excludes>
-                                        <exclude>${project.build.finalName}-sources.jar</exclude>
-                                        <exclude>${project.build.finalName}-tests.jar</exclude>
-                                        <exclude>${project.build.finalName}-test-sources.jar</exclude>
-                                        <exclude>slf4j-api-*.jar</exclude>
-                                    </excludes>
-                                </source>
-                            </sources>
-                        </mapping>
-                        <!-- Add init.d files  -->
-                        <mapping>
-                            <directory>/etc/init.d</directory>
-                            <directoryIncluded>false</directoryIncluded>
-                            <filemode>755</filemode>
-                            <configuration>true</configuration>
-                            <sources>
-                                <source>
-                                    <location>${project.build.directory}/generated-packaging/rpm/init.d</location>
-                                    <includes>
-                                        <include>elasticsearch</include>
-                                    </includes>
-                                </source>
-                            </sources>
-                        </mapping>
-                        <!-- Adds systemd file -->
-                        <mapping>
-                            <directory>${packaging.elasticsearch.systemd.dir}</directory>
-                            <directoryIncluded>false</directoryIncluded>
-                            <configuration>true</configuration>
-                            <sources>
-                                <source>
-                                    <location>${project.build.directory}/generated-packaging/rpm/systemd</location>
-                                    <includes>
-                                        <include>elasticsearch.service</include>
-                                    </includes>
-                                </source>
-                            </sources>
-                        </mapping>
-                        <!-- Adds systemd/sysctl.d configuration file -->
-                        <mapping>
-                            <directory>${packaging.elasticsearch.systemd.sysctl.dir}</directory>
-                            <configuration>true</configuration>
-                            <sources>
-                                <source>
-                                    <location>${project.build.directory}/generated-packaging/rpm/systemd/sysctl</location>
-                                    <includes>
-                                        <include>elasticsearch.conf</include>
-                                    </includes>
-                                </source>
-                            </sources>
-                        </mapping>
-                        <!-- Adds systemd/tmpfiles.d configuration file -->
-                        <mapping>
-                            <directory>${packaging.elasticsearch.tmpfilesd.dir}</directory>
-                            <configuration>true</configuration>
-                            <sources>
-                                <source>
-                                    <location>${project.build.directory}/generated-packaging/rpm/systemd/</location>
-                                    <includes>
-                                        <include>elasticsearch.conf</include>
-                                    </includes>
-                                </source>
-                            </sources>
-                        </mapping>
-                        <!-- Add readme files  -->
-                        <mapping>
-                            <directory>${packaging.elasticsearch.home.dir}</directory>
-                            <sources>
-                                <source>
-                                    <location>${project.basedir}/../src/main/resources/</location>
-                                    <includes>
-                                        <include>LICENSE.txt</include>
-                                        <include>NOTICE.txt</include>
-                                        <include>README.textile</include>
-                                    </includes>
-                                </source>
-                            </sources>
-                        </mapping>
-                        <!-- Add and sets permission on default directories -->
-                        <mapping>
-                            <directory>${packaging.elasticsearch.data.dir}</directory>
-                            <filemode>755</filemode>
-                            <username>${packaging.elasticsearch.user}</username>
-                            <groupname>${packaging.elasticsearch.group}</groupname>
-                        </mapping>
-                        <mapping>
-                            <directory>${packaging.elasticsearch.log.dir}</directory>
-                            <filemode>755</filemode>
-                            <username>${packaging.elasticsearch.user}</username>
-                            <groupname>${packaging.elasticsearch.group}</groupname>
-                        </mapping>
-                        <mapping>
-                            <directory>${packaging.elasticsearch.plugins.dir}</directory>
-                            <filemode>755</filemode>
-                            <username>${packaging.elasticsearch.user}</username>
-                            <groupname>${packaging.elasticsearch.group}</groupname>
-                        </mapping>
-                        <mapping>
-                            <directory>${packaging.elasticsearch.pid.dir}</directory>
-                            <filemode>755</filemode>
-                            <username>${packaging.elasticsearch.user}</username>
-                            <groupname>${packaging.elasticsearch.group}</groupname>
-                        </mapping>
-                    </mappings>
-                    <preinstallScriptlet>
-                        <scriptFile>${project.build.directory}/generated-packaging/rpm/scripts/preinst</scriptFile>
-                        <fileEncoding>utf-8</fileEncoding>
-                    </preinstallScriptlet>
-                    <postinstallScriptlet>
-                        <scriptFile>${project.build.directory}/generated-packaging/rpm/scripts/postinst</scriptFile>
-                        <fileEncoding>utf-8</fileEncoding>
-                    </postinstallScriptlet>
-                    <preremoveScriptlet>
-                        <scriptFile>${project.build.directory}/generated-packaging/rpm/scripts/prerm</scriptFile>
-                        <fileEncoding>utf-8</fileEncoding>
-                    </preremoveScriptlet>
-                    <postremoveScriptlet>
-                        <scriptFile>${project.build.directory}/generated-packaging/rpm/scripts/postrm</scriptFile>
-                        <fileEncoding>utf-8</fileEncoding>
-                    </postremoveScriptlet>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-rpm</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>${project.groupId}</groupId>
-                                    <artifactId>${project.artifactId}</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>${project.packaging}</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${rpm.outputDirectory}</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <!-- start up external cluster -->
-                    <execution>
-                        <id>integ-setup</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skip.integ.tests}</skip>
-                            <target>
-                                <ant antfile="${elasticsearch.integ.antfile}" target="start-external-cluster-rpm">
-                                    <property name="tests.jvm.argline" value="${tests.jvm.argline}"/>
-                                </ant>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- shut down external cluster -->
-                    <execution>
-                        <id>integ-teardown</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skip.integ.tests}</skip>
-                            <target>
-                                <ant antfile="${elasticsearch.integ.antfile}" target="stop-external-cluster"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>sign-rpm</id>
-            <activation>
-                <property>
-                    <name>rpm.sign</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>rpm-maven-plugin</artifactId>
-                        <configuration>
-                            <group>Application/Internet</group>
-                            <keyname>${gpg.key}</keyname>
-                            <keypath>${gpg.keyring}</keypath>
-                            <keyPassphrase>
-                                <passphrase>${gpg.passphrase}</passphrase>
-                            </keyPassphrase>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>

+ 0 - 71
distribution/src/main/assemblies/common-bin.xml

@@ -1,71 +0,0 @@
-<component>
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/lib</outputDirectory>
-            <useTransitiveDependencies>true</useTransitiveDependencies>
-            <useTransitiveFiltering>false</useTransitiveFiltering>
-            <useProjectArtifact>false</useProjectArtifact>
-            <excludes>
-              <!-- don't include our POMs etc that we use internally -->
-              <!-- otherwise, don't filter here. mark deps properly instead -->
-              <exclude>*:pom</exclude>
-            </excludes>
-        </dependencySet>
-    </dependencySets>
-    <fileSets>
-        <fileSet>
-            <directory>../src/main/resources/config</directory>
-            <outputDirectory>config</outputDirectory>
-            <includes>
-                <include>*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <filtered>true</filtered>
-            <directory>../src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <lineEnding>dos</lineEnding>
-            <includes>
-                <include>elasticsearch.in.bat</include>
-                <include>elasticsearch.bat</include>
-                <include>plugin.bat</include>
-                <include>service.bat</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <filtered>false</filtered>
-            <directory>../src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <includes>
-                <include>*.exe</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <filtered>true</filtered>
-            <directory>../src/main/resources/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-            <fileMode>0755</fileMode>
-            <directoryMode>0755</directoryMode>
-            <lineEnding>unix</lineEnding>
-            <includes>
-                <include>elasticsearch.in.sh</include>
-                <include>elasticsearch</include>
-                <include>plugin</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-    <files>
-        <file>
-            <source>../src/main/resources/README.textile</source>
-            <outputDirectory></outputDirectory>
-        </file>
-        <file>
-            <source>../src/main/resources/LICENSE.txt</source>
-            <outputDirectory></outputDirectory>
-        </file>
-        <file>
-            <source>../src/main/resources/NOTICE.txt</source>
-            <outputDirectory></outputDirectory>
-        </file>
-    </files>
-</component>

+ 0 - 86
distribution/tar/pom.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.elasticsearch.distribution</groupId>
-        <artifactId>distributions</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.elasticsearch.distribution.tar</groupId>
-    <artifactId>elasticsearch</artifactId>
-    <name>Distribution: TAR</name>
-    <!--
-        We should use pom packaging here because we don't want to publish any jar.
-        But if you do this, then maven lifecycle does not execute any test (nor compile any test)
-     -->
-    <!--packaging>pom</packaging-->
-    <description>The TAR distribution of Elasticsearch</description>
-
-    <build>
-        <filters>
-            <filter>${project.basedir}/../src/main/packaging/packaging.properties</filter>
-        </filters>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <outputDirectory>${project.build.directory}/releases/</outputDirectory>
-                    <descriptors>
-                        <descriptor>${project.basedir}/src/main/assemblies/targz-bin.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <!-- integration tests -->
-                    <!-- start up external cluster -->
-                    <execution>
-                        <id>integ-setup</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skip.integ.tests}</skip>
-                            <target>
-                                <ant antfile="${elasticsearch.integ.antfile}" target="start-external-cluster-tar">
-                                    <property name="tests.jvm.argline" value="${tests.jvm.argline}"/>
-                                </ant>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- shut down external cluster -->
-                    <execution>
-                        <id>integ-teardown</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skip.integ.tests}</skip>
-                            <target>
-                                <ant antfile="${elasticsearch.integ.antfile}" target="stop-external-cluster"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

+ 0 - 103
distribution/zip/pom.xml

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.elasticsearch.distribution</groupId>
-        <artifactId>distributions</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.elasticsearch.distribution.zip</groupId>
-    <artifactId>elasticsearch</artifactId>
-    <name>Distribution: ZIP</name>
-    <!--
-        We should use pom packaging here because we don't want to publish any jar.
-        But if you do this, then maven lifecycle does not execute any test (nor compile any test)
-     -->
-    <!--packaging>pom</packaging-->
-    <description>The ZIP distribution of Elasticsearch</description>
-
-    <build>
-        <filters>
-            <filter>${project.basedir}/../src/main/packaging/packaging.properties</filter>
-        </filters>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <outputDirectory>${project.build.directory}/releases/</outputDirectory>
-                    <descriptors>
-                        <descriptor>${project.basedir}/src/main/assemblies/zip-bin.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <!-- 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}">
-                                <!-- use conventional port numbers -->
-                                <ant antfile="${elasticsearch.integ.antfile}" target="start-foreground">
-                                    <property name="integ.http.port" value="9200"/>
-                                    <property name="integ.transport.port" value="9300"/>
-                                </ant>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- start up external cluster -->
-                    <execution>
-                        <id>integ-setup</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skip.integ.tests}</skip>
-                            <target>
-                                <ant antfile="${elasticsearch.integ.antfile}" target="start-external-cluster-zip">
-                                    <property name="tests.jvm.argline" value="${tests.jvm.argline}"/>
-                                </ant>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- shut down external cluster -->
-                    <execution>
-                        <id>integ-teardown</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skip.integ.tests}</skip>
-                            <target>
-                                <ant antfile="${elasticsearch.integ.antfile}" target="stop-external-cluster"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

+ 0 - 57
plugins/analysis-icu/pom.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>analysis-icu</artifactId>
-    <name>Plugin: Analysis: ICU</name>
-    <description>The ICU Analysis plugin integrates Lucene ICU module into elasticsearch, adding ICU relates analysis components.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.analysis.icu.AnalysisICUPlugin</elasticsearch.plugin.classname>
-        <tests.rest.suite>analysis_icu</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <xlint.options>-Xlint:-deprecation</xlint.options>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-icu</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-         </plugins>
-
-         <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>com.mycila</groupId>
-                    <artifactId>license-maven-plugin</artifactId>
-                    <configuration>
-                        <excludes>
-                            <!-- TODO: https://github.com/elastic/elasticsearch-analysis-icu/issues/29 -->
-                            <exclude>**/IndexableBinaryStringTools.java</exclude>
-                            <exclude>**/ICUCollationKeyFilter.java</exclude>
-                            <exclude>**/TestIndexableBinaryStringTools.java</exclude>
-                        </excludes>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-</project>

+ 0 - 39
plugins/analysis-kuromoji/pom.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>analysis-kuromoji</artifactId>
-    <name>Plugin: Analysis: Japanese (kuromoji)</name>
-    <description>The Japanese (kuromoji) Analysis plugin integrates Lucene kuromoji analysis module into elasticsearch.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.analysis.kuromoji.AnalysisKuromojiPlugin</elasticsearch.plugin.classname>
-        <tests.rest.suite>analysis_kuromoji</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-kuromoji</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 40
plugins/analysis-phonetic/pom.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>analysis-phonetic</artifactId>
-    <name>Plugin: Analysis: Phonetic</name>
-    <description>The Phonetic Analysis plugin integrates phonetic token filter analysis with elasticsearch.</description>
-
-    <properties>
-       <elasticsearch.plugin.classname>org.elasticsearch.plugin.analysis.AnalysisPhoneticPlugin</elasticsearch.plugin.classname>
-       <tests.rest.suite>analysis_phonetic</tests.rest.suite>
-       <tests.rest.load_packaged>false</tests.rest.load_packaged>
-       <xlint.options>-Xlint:-rawtypes,-unchecked</xlint.options>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-phonetic</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 39
plugins/analysis-smartcn/pom.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>analysis-smartcn</artifactId>
-    <name>Plugin: Analysis: Smart Chinese (smartcn)</name>
-    <description>Smart Chinese Analysis plugin integrates Lucene Smart Chinese analysis module into elasticsearch.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.analysis.smartcn.AnalysisSmartChinesePlugin</elasticsearch.plugin.classname>
-        <tests.rest.suite>analysis_smartcn</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-smartcn</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 39
plugins/analysis-stempel/pom.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>analysis-stempel</artifactId>
-    <name>Plugin: Analysis: Polish (stempel)</name>
-    <description>The Stempel (Polish) Analysis plugin integrates Lucene stempel (polish) analysis module into elasticsearch.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.analysis.stempel.AnalysisStempelPlugin</elasticsearch.plugin.classname>
-        <tests.rest.suite>analysis_stempel</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-stempel</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 44
plugins/delete-by-query/pom.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to Elasticsearch under one or more contributor
-license agreements. See the NOTICE file distributed with this work for additional
-information regarding copyright ownership. ElasticSearch licenses this file to you
-under the Apache License, Version 2.0 (the "License"); you may not use this
-file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the License
-is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the specific language
-governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>delete-by-query</artifactId>
-    <name>Plugin: Delete By Query</name>
-    <description>The Delete By Query plugin allows to delete documents in Elasticsearch with a single query.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.deletebyquery.DeleteByQueryPlugin</elasticsearch.plugin.classname>
-        <tests.ifNoTests>warn</tests.ifNoTests>
-        <tests.rest.suite>delete_by_query</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 73
plugins/discovery-azure/pom.xml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to Elasticsearch under one or more contributor
-license agreements. See the NOTICE file distributed with this work for additional
-information regarding copyright ownership. ElasticSearch licenses this file to you
-under the Apache License, Version 2.0 (the "License"); you may not use this
-file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the License
-is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the specific language
-governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>discovery-azure</artifactId>
-    <name>Plugin: Discovery: Azure</name>
-    <description>The Azure Discovery plugin allows to use Azure API for the unicast discovery mechanism.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.discovery.azure.AzureDiscoveryPlugin</elasticsearch.plugin.classname>
-        <tests.jvms>1</tests.jvms>
-        <tests.rest.suite>discovery_azure</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <!-- need -path because there is no resources dir... -->
-        <xlint.options>-Xlint:-path,-serial,-static,-unchecked</xlint.options>
-    </properties>
-
-    <dependencies>
-        <!-- Azure Management API -->
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-management-compute</artifactId>
-            <version>0.7.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-management</artifactId>
-            <version>0.7.0</version>
-        </dependency>
-        <!-- We need to force here the compile scope as it was defined as test scope in plugins/pom.xml -->
-        <!-- TODO: remove this dependency when we will have a REST Test module -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 50
plugins/discovery-ec2/pom.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>discovery-ec2</artifactId>
-    <name>Plugin: Discovery: EC2</name>
-    <description>The EC2 discovery plugin allows to use AWS API for the unicast discovery mechanism.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.discovery.ec2.Ec2DiscoveryPlugin</elasticsearch.plugin.classname>
-        <tests.jvms>1</tests.jvms>
-        <tests.rest.suite>discovery_ec2</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <xlint.options>-Xlint:-rawtypes</xlint.options>
-    </properties>
-
-    <dependencies>
-        <!-- AWS SDK -->
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-ec2</artifactId>
-            <version>${amazonaws.version}</version>
-        </dependency>
-        <!-- We need to force here the compile scope as it was defined as test scope in plugins/pom.xml -->
-        <!-- TODO: remove this dependency when we will have a REST Test module -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 67
plugins/discovery-gce/pom.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to Elasticsearch under one or more contributor
-license agreements. See the NOTICE file distributed with this work for additional
-information regarding copyright ownership. Elasticsearch licenses this file to you
-under the Apache License, Version 2.0 (the "License"); you may not use this
-file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the License
-is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the specific language
-governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>discovery-gce</artifactId>
-    <name>Plugin: Discovery: Google Compute Engine</name>
-    <description>The Google Compute Engine (GCE) Discovery plugin allows to use GCE API for the unicast discovery mechanism.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.discovery.gce.GceDiscoveryPlugin</elasticsearch.plugin.classname>
-        <google.gce.version>v1-rev71-1.20.0</google.gce.version>
-        <tests.rest.suite>discovery_gce</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <xlint.options>-Xlint:-rawtypes,-unchecked</xlint.options>
-    </properties>
-
-    <dependencies>
-        <!-- Google APIs -->
-        <dependency>
-          <groupId>com.google.apis</groupId>
-          <artifactId>google-api-services-compute</artifactId>
-          <version>${google.gce.version}</version>
-          <exclusions>
-              <exclusion>
-                 <groupId>com.google.guava</groupId>
-                 <artifactId>guava-jdk5</artifactId>
-              </exclusion>
-          </exclusions>
-        </dependency>
-        <!-- We need to force here the compile scope as it was defined as test scope in plugins/pom.xml -->
-        <!-- TODO: remove this dependency when we will have a REST Test module -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 34
plugins/discovery-multicast/pom.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>discovery-multicast</artifactId>
-    <name>Plugin: Discovery: Multicast</name>
-    <description>The Multicast Discovery plugin allows discovery other nodes using multicast requests</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.discovery.multicast.MulticastDiscoveryPlugin</elasticsearch.plugin.classname>
-        <tests.jvms>1</tests.jvms>
-        <tests.rest.suite>discovery_multicast</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <xlint.options>-Xlint:-deprecation</xlint.options>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 41
plugins/jvm-example/pom.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>jvm-example</artifactId>
-    <name>Plugin: JVM example</name>
-    <description>Demonstrates all the pluggable Java entry points in Elasticsearch</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.example.JvmExamplePlugin</elasticsearch.plugin.classname>
-        <tests.rest.suite>jvm_example</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <skip.unit.tests>true</skip.unit.tests>
-        <xlint.options>-Xlint:-rawtypes</xlint.options>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <!-- This plugin bundles a config so it can't use the standard
-                     assembly for plugins. -->
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assemblies/plugin.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 33
plugins/jvm-example/src/main/assemblies/plugin.xml

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<assembly>
-    <id>plugin</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <files>
-        <file>
-            <source>${elasticsearch.tools.directory}/plugin-metadata/plugin-descriptor.properties</source>
-            <outputDirectory></outputDirectory>
-            <filtered>true</filtered>
-        </file>
-    </files>
-    <fileSets>
-        <fileSet>
-            <directory>src/main/config</directory>
-            <outputDirectory>config</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-        </fileSet>
-    </fileSets>
-    <dependencySets>
-        <dependencySet>
-            <outputDirectory>/</outputDirectory>
-            <useProjectArtifact>true</useProjectArtifact>
-            <useTransitiveFiltering>true</useTransitiveFiltering>
-            <useTransitiveDependencies>true</useTransitiveDependencies>
-        </dependencySet>
-    </dependencySets>
-</assembly>

+ 0 - 41
plugins/lang-expression/pom.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>lang-expression</artifactId>
-    <name>Plugin: Language: Expression</name>
-    <description>Lucene expressions integration for Elasticsearch</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.script.expression.ExpressionPlugin</elasticsearch.plugin.classname>
-        <tests.rest.suite>lang_expression</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <xlint.options>-Xlint:-rawtypes</xlint.options>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-expressions</artifactId>
-            <version>${lucene.maven.version}</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 42
plugins/lang-groovy/pom.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>lang-groovy</artifactId>
-    <name>Plugin: Language: Groovy</name>
-    <description>Groovy scripting integration for Elasticsearch</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.script.groovy.GroovyPlugin</elasticsearch.plugin.classname>
-        <tests.rest.suite>lang_groovy</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <xlint.options>-Xlint:-rawtypes,-unchecked,-cast,-deprecation</xlint.options>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-all</artifactId>
-            <classifier>indy</classifier>
-            <version>2.4.4</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 41
plugins/lang-javascript/pom.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>lang-javascript</artifactId>
-    <name>Plugin: Language: JavaScript</name>
-    <description>The JavaScript language plugin allows to have javascript as the language of scripts to execute.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.javascript.JavaScriptPlugin</elasticsearch.plugin.classname>
-        <tests.rest.suite>lang_javascript</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <xlint.options>-Xlint:-rawtypes,-unchecked</xlint.options>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.mozilla</groupId>
-            <artifactId>rhino</artifactId>
-            <version>1.7R4</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 42
plugins/lang-python/pom.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>lang-python</artifactId>
-    <name>Plugin: Language: Python</name>
-    <description>The Python language plugin allows to have python as the language of scripts to execute.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.python.PythonPlugin</elasticsearch.plugin.classname>
-        <tests.rest.suite>lang_python</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <xlint.options>-Xlint:-unchecked</xlint.options>
-    </properties>
-
-    <dependencies>
-        <!-- Jython -->
-        <dependency>
-            <groupId>org.python</groupId>
-            <artifactId>jython-standalone</artifactId>
-            <version>2.7.0</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 44
plugins/mapper-murmur3/pom.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to Elasticsearch under one or more contributor
-license agreements. See the NOTICE file distributed with this work for additional
-information regarding copyright ownership. ElasticSearch licenses this file to you
-under the Apache License, Version 2.0 (the "License"); you may not use this
-file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the License
-is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the specific language
-governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>mapper-murmur3</artifactId>
-    <name>Plugin: Mapper: Murmur3</name>
-    <description>The Mapper Murmur3 plugin allows to compute hashes of a field's values at index-time and to store them in the index.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.mapper.MapperMurmur3Plugin</elasticsearch.plugin.classname>
-        <tests.rest.suite>mapper_murmur3</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <xlint.options>-Xlint:-rawtypes</xlint.options>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 43
plugins/mapper-size/pom.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to Elasticsearch under one or more contributor
-license agreements. See the NOTICE file distributed with this work for additional
-information regarding copyright ownership. ElasticSearch licenses this file to you
-under the Apache License, Version 2.0 (the "License"); you may not use this
-file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the License
-is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the specific language
-governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>mapper-size</artifactId>
-    <name>Plugin: Mapper: Size</name>
-    <description>The Mapper Size plugin allows document to record their uncompressed size at index time.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.mapper.MapperSizePlugin</elasticsearch.plugin.classname>
-        <tests.rest.suite>mapper_size</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 437
plugins/pom.xml

@@ -1,437 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.elasticsearch.plugin</groupId>
-    <artifactId>plugins</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>Plugin: Parent POM</name>
-    <inceptionYear>2009</inceptionYear>
-    <description>A parent project for Elasticsearch plugins</description>
-
-    <parent>
-        <groupId>org.elasticsearch</groupId>
-        <artifactId>parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-        <elasticsearch.assembly.descriptor>${elasticsearch.tools.directory}/plugin-metadata/plugin-assembly.xml</elasticsearch.assembly.descriptor>
-        <elasticsearch.assembly.appendId>false</elasticsearch.assembly.appendId>
-        <elasticsearch.plugin.name>${project.artifactId}</elasticsearch.plugin.name>
-        <elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>
-        <elasticsearch.plugin.isolated>true</elasticsearch.plugin.isolated>
-        <elasticsearch.plugin.site>false</elasticsearch.plugin.site>
-        <amazonaws.version>1.10.19</amazonaws.version>
-    </properties>
-
-    <dependencies>
-        <!-- elasticsearch and its test framework -->
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-test-framework</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- Provided dependencies by elasticsearch itself  -->
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-backward-codecs</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-analyzers-common</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-queries</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-memory</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-highlighter</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-queryparser</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-suggest</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-join</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-spatial</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.spatial4j</groupId>
-            <artifactId>spatial4j</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.vividsolutions</groupId>
-            <artifactId>jts</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.github.spullara.mustache.java</groupId>
-            <artifactId>compiler</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.carrotsearch</groupId>
-            <artifactId>hppc</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.joda</groupId>
-            <artifactId>joda-convert</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-smile</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-yaml</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-cbor</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.ning</groupId>
-            <artifactId>compress-lzf</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.tdunning</groupId>
-            <artifactId>t-digest</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>apache-log4j-extras</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Required by the REST test framework -->
-        <!-- TODO: remove this dependency when we will have a REST Test module -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <!-- typical layout for plugins -->
-    <build>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </testResource>
-            <!-- REST API specifications copied from main Elasticsearch specs
-                 because they are required to execute the REST tests in plugins  -->
-            <testResource>
-                <directory>${elasticsearch.tools.directory}/rest-api-spec</directory>
-                <targetPath>rest-api-spec</targetPath>
-                <includes>
-                    <!-- required by the test framework -->
-                    <include>api/info.json</include>
-                    <include>api/cluster.health.json</include>
-                    <include>api/cluster.state.json</include>
-                    <!-- used in plugin REST tests -->
-                    <include>api/index.json</include>
-                    <include>api/get.json</include>
-                    <include>api/get_script.json</include>
-                    <include>api/put_script.json</include>
-                    <include>api/delete_script.json</include>
-                    <include>api/update.json</include>
-                    <include>api/search.json</include>
-                    <include>api/indices.analyze.json</include>
-                    <include>api/indices.create.json</include>
-                    <include>api/indices.refresh.json</include>
-                    <include>api/nodes.info.json</include>
-                    <include>api/count.json</include>
-                    <!-- used in repository plugin REST tests -->
-                    <include>api/snapshot.create_repository.json</include>
-                    <include>api/snapshot.get_repository.json</include>
-                </includes>
-            </testResource>
-            <!-- shared test resources like log4j.properties -->
-            <testResource>
-                <directory>${elasticsearch.tools.directory}/shared-test-resources</directory>
-                <filtering>false</filtering>
-            </testResource>
-            <!-- plugin metadata as a test resource -->
-            <testResource>
-                <directory>${basedir}/target/metadata-test-resources</directory>
-                <filtering>false</filtering>
-            </testResource>
-        </testResources>
-
-        <plugins>
-           <!-- we don't have a proper .zip plugin structure for tests, but we need the metadata as test resource -->
-           <plugin>
-              <artifactId>maven-resources-plugin</artifactId>
-              <executions>
-                  <execution>
-                      <id>copy-resources</id>
-                      <!-- process-resources makes more sense, but is not done by e.g. mvn eclipse:eclipse! -->
-                      <phase>generate-resources</phase>
-                      <goals>
-                          <goal>copy-resources</goal>
-                      </goals>
-                      <configuration>
-                          <outputDirectory>${basedir}/target/metadata-test-resources</outputDirectory>
-                          <resources>
-                              <resource>
-                                  <directory>src/main/plugin-metadata</directory>
-                                  <filtering>false</filtering>
-                              </resource>
-                              <resource>
-                                  <directory>${elasticsearch.tools.directory}/plugin-metadata</directory>
-                                  <filtering>true</filtering>
-                              </resource>
-                          </resources>
-                      </configuration>
-                  </execution>
-              </executions>
-           </plugin>
-           <!-- integration tests -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <executions>
-                        <!-- start up external cluster -->
-                        <execution>
-                            <id>integ-setup</id>
-                            <phase>pre-integration-test</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <skip>${skip.integ.tests}</skip>
-                                <target>
-                                    <ant antfile="${elasticsearch.integ.antfile}" target="start-external-cluster-with-plugin">
-                                        <property name="tests.jvm.argline" value="${tests.jvm.argline}"/>
-                                    </ant>
-                                </target>
-                            </configuration>
-                        </execution>
-                        <!-- shut down external cluster -->
-                        <execution>
-                            <id>integ-teardown</id>
-                            <phase>post-integration-test</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <skip>${skip.integ.tests}</skip>
-                                <target>
-                                    <ant antfile="${elasticsearch.integ.antfile}" target="stop-external-cluster"/>
-                                </target>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <configuration>
-                        <appendAssemblyId>${elasticsearch.assembly.appendId}</appendAssemblyId>
-                        <outputDirectory>${project.build.directory}/releases/</outputDirectory>
-                        <descriptors>
-                            <descriptor>${elasticsearch.assembly.descriptor}</descriptor>
-                        </descriptors>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>single</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>enforce-plugin-classname</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <requireProperty>
-                                        <property>elasticsearch.plugin.classname</property>
-                                        <property>elasticsearch.plugin.name</property>
-                                    </requireProperty>
-                                </rules>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </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>
-                                <skip>${skip.integ.tests}</skip>
-                                <artifactItems>
-                                    <artifactItem>
-                                        <groupId>org.elasticsearch.distribution.zip</groupId>
-                                        <artifactId>elasticsearch</artifactId>
-                                        <version>${elasticsearch.version}</version>
-                                        <type>zip</type>
-                                        <overWrite>true</overWrite>
-                                    </artifactItem>
-                                </artifactItems>
-                                <useBaseVersion>true</useBaseVersion>
-                                <outputDirectory>${integ.deps}</outputDirectory>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>com.carrotsearch.randomizedtesting</groupId>
-                    <artifactId>junit4-maven-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>integ-tests</id>
-                            <configuration>
-                                <!-- currently only 1 cpu works, because integ tests don't make "unique" test directories? -->
-                                <parallelism>1</parallelism>
-                                <systemProperties>
-                                    <!-- use external cluster -->
-                                    <tests.cluster>localhost:${integ.transport.port}</tests.cluster>
-                                </systemProperties>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <modules>
-        <module>analysis-icu</module>
-        <module>analysis-kuromoji</module>
-        <module>analysis-phonetic</module>
-        <module>analysis-smartcn</module>
-        <module>analysis-stempel</module>
-        <module>delete-by-query</module>
-        <module>discovery-azure</module>
-        <module>discovery-ec2</module>
-        <module>discovery-gce</module>
-        <module>discovery-multicast</module>
-        <module>lang-expression</module>
-        <module>lang-groovy</module>
-        <module>lang-javascript</module>
-        <module>lang-python</module>
-        <module>mapper-murmur3</module>
-        <module>mapper-size</module>
-        <module>repository-azure</module>
-        <module>repository-s3</module>
-        <module>store-smb</module>
-
-        <!-- Internal plugins for test only -->
-        <module>jvm-example</module>
-        <module>site-example</module>
-    </modules>
-</project>

+ 0 - 54
plugins/repository-azure/pom.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to Elasticsearch under one or more contributor
-license agreements. See the NOTICE file distributed with this work for additional
-information regarding copyright ownership. ElasticSearch licenses this file to you
-under the Apache License, Version 2.0 (the "License"); you may not use this
-file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the License
-is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the specific language
-governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>repository-azure</artifactId>
-    <name>Plugin: Repository: Azure</name>
-    <description>The Azure Repository plugin adds support for Azure storage repositories.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.repository.azure.AzureRepositoryPlugin</elasticsearch.plugin.classname>
-        <tests.jvms>1</tests.jvms>
-        <tests.rest.suite>repository_azure</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <xlint.options>-Xlint:-deprecation,-serial</xlint.options>
-    </properties>
-
-    <dependencies>
-        <!-- Azure Storage API -->
-        <dependency>
-            <groupId>com.microsoft.azure</groupId>
-            <artifactId>azure-storage</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 50
plugins/repository-s3/pom.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>repository-s3</artifactId>
-    <name>Plugin: Repository: S3</name>
-    <description>The S3 repository plugin adds S3 repositories.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.repository.s3.S3RepositoryPlugin</elasticsearch.plugin.classname>
-        <tests.jvms>1</tests.jvms>
-        <tests.rest.suite>repository_s3</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <xlint.options>-Xlint:-rawtypes,-deprecation</xlint.options>
-    </properties>
-
-    <dependencies>
-        <!-- AWS SDK -->
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk-s3</artifactId>
-            <version>${amazonaws.version}</version>
-        </dependency>
-        <!-- We need to force here the compile scope as it was defined as test scope in plugins/pom.xml -->
-        <!-- TODO: remove this dependency when we will have a REST Test module -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 48
plugins/site-example/pom.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>site-example</artifactId>
-    <name>Plugin: Example site</name>
-    <description>Demonstrates how to serve resources via elasticsearch.</description>
-
-    <properties>
-        <elasticsearch.assembly.descriptor>${project.basedir}/src/main/assemblies/plugin-assembly.xml</elasticsearch.assembly.descriptor>
-        <elasticsearch.plugin.site>true</elasticsearch.plugin.site>
-        <elasticsearch.plugin.classname>NA</elasticsearch.plugin.classname>
-        <elasticsearch.plugin.jvm>false</elasticsearch.plugin.jvm>
-
-        <tests.rest.suite>example</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-        <skip.unit.tests>true</skip.unit.tests>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-            <!-- disable jar plugin, we have no jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-jar</id>
-                        <phase>none</phase>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 23
plugins/site-example/src/main/assemblies/plugin-assembly.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<assembly>
-    <id>plugin</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <!-- _site/ directory containing contents -->
-    <fileSets>
-        <fileSet>
-            <directory>${project.basedir}/src/site</directory>
-            <outputDirectory></outputDirectory>
-        </fileSet>
-    </fileSets>
-    <!-- plugin descriptor -->
-    <files>
-        <file>
-            <source>${elasticsearch.tools.directory}/plugin-metadata/plugin-descriptor.properties</source>
-            <outputDirectory></outputDirectory>
-            <filtered>true</filtered>
-        </file>
-    </files>
-</assembly>

+ 0 - 47
plugins/store-smb/pom.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to Elasticsearch under one or more contributor
-license agreements. See the NOTICE file distributed with this work for additional
-information regarding copyright ownership. ElasticSearch licenses this file to you
-under the Apache License, Version 2.0 (the "License"); you may not use this
-file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-applicable law or agreed to in writing, software distributed under the License
-is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the specific language
-governing permissions and limitations under the License. -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.elasticsearch.plugin</groupId>
-        <artifactId>plugins</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>store-smb</artifactId>
-    <name>Plugin: Store: SMB</name>
-    <description>The Store SMB plugin adds support for SMB stores.</description>
-
-    <properties>
-        <elasticsearch.plugin.classname>org.elasticsearch.plugin.store.smb.SMBStorePlugin</elasticsearch.plugin.classname>
-        <tests.jvms>1</tests.jvms>
-        <tests.rest.suite>store_smb</tests.rest.suite>
-        <tests.rest.load_packaged>false</tests.rest.load_packaged>
-    </properties>
-
-    <dependencies>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

File diff suppressed because it is too large
+ 0 - 1058
pom.xml


+ 0 - 131
qa/pom.xml

@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.elasticsearch.qa</groupId>
-    <artifactId>elasticsearch-qa</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>QA: Parent POM</name>
-    <inceptionYear>2015</inceptionYear>
-
-    <parent>
-        <groupId>org.elasticsearch</groupId>
-        <artifactId>parent</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-
-    <properties>
-    </properties>
-
-    <dependencies>
-        <!-- elasticsearch and its test framework -->
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-test-framework</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <!-- typical layout -->
-    <build>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>rest-api-spec/**</include>
-                </includes>
-            </testResource>
-            <!-- REST API specifications copied from main Elasticsearch specs
-                 because they are required to execute the REST tests in here  -->
-            <testResource>
-                <directory>${elasticsearch.tools.directory}/rest-api-spec</directory>
-                <targetPath>rest-api-spec</targetPath>
-                <includes>
-                    <!-- required by the test framework -->
-                    <include>api/info.json</include>
-                    <include>api/cluster.health.json</include>
-                    <include>api/cluster.state.json</include>
-                    <!-- used in plugin REST tests -->
-                    <include>api/index.json</include>
-                    <include>api/get.json</include>
-                    <include>api/update.json</include>
-                    <include>api/search.json</include>
-                    <include>api/indices.analyze.json</include>
-                    <include>api/indices.create.json</include>
-                    <include>api/indices.refresh.json</include>
-                    <include>api/nodes.info.json</include>
-                    <include>api/count.json</include>
-                </includes>
-            </testResource>
-            <!-- shared test resources like log4j.properties -->
-            <testResource>
-                <directory>${elasticsearch.tools.directory}/shared-test-resources</directory>
-                <filtering>false</filtering>
-            </testResource>
-        </testResources>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>com.carrotsearch.randomizedtesting</groupId>
-                    <artifactId>junit4-maven-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>integ-tests</id>
-                            <configuration>
-                                <!-- currently only 1 cpu works, because integ tests don't make "unique" test directories? -->
-                                <parallelism>1</parallelism>
-                                <systemProperties>
-                                    <!-- use external cluster -->
-                                    <tests.cluster>127.0.0.1:${integ.transport.port}</tests.cluster>
-                                </systemProperties>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-antrun-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <!-- Don't run the license checker in qa -->
-                            <id>check-license</id>
-                            <phase>none</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <modules>
-        <module>smoke-test-plugins</module>
-        <module>smoke-test-multinode</module>
-        <module>smoke-test-client</module>
-    </modules>
-
-    <profiles>
-        <profile>
-            <id>vagrant</id>
-            <activation>
-                <property>
-                    <name>tests.vagrant</name>
-                </property>
-            </activation>
-            <modules>
-                <module>vagrant</module>
-            </modules>
-        </profile>
-    </profiles>
-</project>

+ 0 - 129
qa/smoke-test-client/pom.xml

@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>elasticsearch-qa</artifactId>
-        <groupId>org.elasticsearch.qa</groupId>
-        <version>3.0.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <!--
-      This test unzips and starts elasticsearch.
-      It then creates a Java Client and makes sure simple
-      Java API calls works nicely
-
-      It will also helps to better document the Java API reference guide
-      and keep it up-to-date when API is changing.
-    -->
-
-    <artifactId>smoke-test-client</artifactId>
-    <name>QA: Smoke Test Client</name>
-    <description>Test the Java Client against a running cluster</description>
-
-    <properties>
-        <skip.unit.tests>true</skip.unit.tests>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-            <!-- shared test resources like log4j.properties -->
-            <testResource>
-                <directory>${elasticsearch.tools.directory}/shared-test-resources</directory>
-                <filtering>false</filtering>
-            </testResource>
-        </testResources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-remote-resources-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>
-                            <skip>${skip.integ.tests}</skip>
-                            <useBaseVersion>true</useBaseVersion>
-                            <outputDirectory>${integ.deps}/plugins</outputDirectory>
-
-                            <artifactItems>
-                                <!-- elasticsearch distribution -->
-                                <artifactItem>
-                                    <groupId>org.elasticsearch.distribution.zip</groupId>
-                                    <artifactId>elasticsearch</artifactId>
-                                    <version>${elasticsearch.version}</version>
-                                    <type>zip</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>${integ.deps}</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <!-- start up external cluster -->
-                    <execution>
-                        <id>integ-setup</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skip.integ.tests}</skip>
-                            <target>
-                                <ant antfile="${elasticsearch.integ.antfile}" target="start-external-cluster">
-                                    <property name="tests.jvm.argline" value="${tests.jvm.argline}"/>
-                                </ant>
-                            </target>
-                        </configuration>
-                    </execution>
-                    <!-- shut down external cluster -->
-                    <execution>
-                        <id>integ-teardown</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <skip>${skip.integ.tests}</skip>
-                            <target>
-                                <ant antfile="${elasticsearch.integ.antfile}" target="stop-external-cluster"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 27
qa/smoke-test-plugins/integration-tests.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<project name="smoke-test-plugins"
-         xmlns:ac="antlib:net.sf.antcontrib">
-
-  <import file="${elasticsearch.integ.antfile.default}"/>
-
-  <target name="start-external-cluster-with-plugins" depends="setup-workspace" unless="${shouldskip}">
-    <fail message="Expected ${expected.plugin.count} dependencies, are plugins missing from this pom.xml?">
-      <condition>
-        <resourcecount count="${expected.plugin.count}" when="ne">
-          <fileset dir="${integ.deps}/plugins"/>
-        </resourcecount>
-      </condition>
-    </fail>
-    <ac:for param="file">
-      <path>
-        <fileset dir="${integ.deps}/plugins"/>
-      </path>
-      <sequential>
-        <local name="plugin.name"/>
-        <convert-plugin-name file="@{file}" outputproperty="plugin.name"/>
-        <install-plugin name="${plugin.name}" file="@{file}"/>
-      </sequential>
-    </ac:for>
-    <startup-elasticsearch/>
-  </target>
-</project>

+ 0 - 478
qa/smoke-test-plugins/pom.xml

@@ -1,478 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.elasticsearch.qa</groupId>
-    <artifactId>elasticsearch-qa</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-  </parent>
-
-  <!-- 
-    This test unzips elasticsearch, installs each plugin,
-    starts elasticsearch, verifies loaded plugin count.
-
-    "expected plugin count" is computed from plugins/, 
-    currently any folder having a pom.xml file.
- 
-    our yaml file uses property filtering to populate it.
-  -->
-
-  <artifactId>smoke-test-plugins</artifactId>
-  <name>QA: Smoke Test Plugins</name>
-  <description>Loads up all of our plugins</description>
-
-  <properties>
-    <skip.unit.tests>true</skip.unit.tests>
-    <elasticsearch.integ.antfile>${project.basedir}/integration-tests.xml</elasticsearch.integ.antfile>
-    <tests.rest.suite>smoke_test_plugins</tests.rest.suite>
-    <tests.rest.load_packaged>false</tests.rest.load_packaged>
-  </properties>
-  <dependencies>
-    <dependency>
-      <groupId>org.elasticsearch</groupId>
-      <artifactId>elasticsearch</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Provided dependencies by elasticsearch itself  -->
-    <dependency>
-      <groupId>org.elasticsearch</groupId>
-      <artifactId>elasticsearch</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-backward-codecs</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-queries</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-memory</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-highlighter</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-queryparser</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-suggest</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-join</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-spatial</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.spatial4j</groupId>
-      <artifactId>spatial4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.vividsolutions</groupId>
-      <artifactId>jts</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.github.spullara.mustache.java</groupId>
-      <artifactId>compiler</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.carrotsearch</groupId>
-      <artifactId>hppc</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.joda</groupId>
-      <artifactId>joda-convert</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-smile</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-yaml</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-cbor</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.ning</groupId>
-      <artifactId>compress-lzf</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.tdunning</groupId>
-      <artifactId>t-digest</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>apache-log4j-extras</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.java.dev.jna</groupId>
-      <artifactId>jna</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <!-- Required by the REST test framework -->
-    <!-- TODO: remove this dependency when we will have a REST Test module -->
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <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>
-               <skip>${skip.integ.tests}</skip>
-               <useBaseVersion>true</useBaseVersion>
-               <outputDirectory>${integ.deps}/plugins</outputDirectory>
-
-               <artifactItems>
-                 <!-- elasticsearch distribution -->
-                 <artifactItem>
-                   <groupId>org.elasticsearch.distribution.zip</groupId>
-                   <artifactId>elasticsearch</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                   <outputDirectory>${integ.deps}</outputDirectory>
-                 </artifactItem>
-
-                 <!-- plugins -->
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>analysis-icu</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>analysis-kuromoji</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>analysis-phonetic</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>analysis-smartcn</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>analysis-stempel</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>discovery-gce</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>delete-by-query</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>discovery-azure</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>discovery-ec2</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>discovery-multicast</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>lang-expression</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>lang-groovy</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>lang-javascript</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>lang-python</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>mapper-murmur3</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>mapper-size</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>repository-azure</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>repository-s3</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>store-smb</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <!-- Internal plugins for test purpose only -->
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>jvm-example</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-                 <artifactItem>
-                   <groupId>org.elasticsearch.plugin</groupId>
-                   <artifactId>site-example</artifactId>
-                   <version>${elasticsearch.version}</version>
-                   <type>zip</type>
-                   <overWrite>true</overWrite>
-                 </artifactItem>
-
-               </artifactItems>
-             </configuration>
-           </execution>
-         </executions>
-      </plugin>
-      <!-- integration tests -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>count-expected-plugins</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <property name="plugins.dir" location="${project.basedir}/../../plugins"/>
-                <resourcecount property="expected.plugin.count">
-                  <fileset dir="${plugins.dir}" includes="*/pom.xml"/>
-                </resourcecount>
-                <echo>Found ${expected.plugin.count} plugins in ${plugins.dir}</echo>
-              </target>
-              <exportAntProperties>true</exportAntProperties>
-            </configuration>
-          </execution>
-          <!-- start up external cluster -->
-          <execution>
-            <id>integ-setup</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <ant antfile="${elasticsearch.integ.antfile}" target="start-external-cluster-with-plugins">
-                  <property name="tests.jvm.argline" value="${tests.jvm.argline}"/>
-                  <property name="plugins.dir" value="${plugins.dir}"/>
-                  <property name="expected.plugin.count" value="${expected.plugin.count}"/>
-                </ant>
-              </target>
-              <skip>${skip.integ.tests}</skip>
-            </configuration>
-          </execution>
-          <!-- shut down external cluster -->
-          <execution>
-            <id>integ-teardown</id>
-            <phase>post-integration-test</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <ant antfile="${elasticsearch.integ.antfile}" target="stop-external-cluster"/>
-              </target>
-              <skip>${skip.integ.tests}</skip>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>ant-contrib</groupId>
-            <artifactId>ant-contrib</artifactId>
-            <version>1.0b3</version>
-            <exclusions>
-              <exclusion>
-                <groupId>ant</groupId>
-                <artifactId>ant</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-nodeps</artifactId>
-            <version>1.8.1</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

+ 0 - 68
rest-api-spec/pom.xml

@@ -1,68 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.elasticsearch</groupId>
-  <artifactId>rest-api-spec</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
-  <name>Rest API Specification</name>
-  <description>REST API Specification and tests for use with the Elasticsearch REST Test framework</description>
-  <parent>
-      <groupId>org.sonatype.oss</groupId>
-      <artifactId>oss-parent</artifactId>
-      <version>7</version>
-      <relativePath></relativePath>
-  </parent>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <elasticsearch.s3.repository>s3://download.elasticsearch.org/elasticsearch/staging/</elasticsearch.s3.repository>
-  </properties>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.5</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>bundle</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <includes>
-            <include>**/*</include>
-          </includes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <!-- sign the artifacts with GPG -->
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-                <configuration>
-                  <keyname>${gpg.keyname}</keyname>
-                  <passphrase>${gpg.passphrase}</passphrase>
-                  <defaultKeyring>${gpg.keyring}</defaultKeyring>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>

Some files were not shown because too many files changed in this diff