Hook in x-dev-tools properly

Original commit: elastic/x-pack-elasticsearch@1f439bb5e9

pom.xml

@@ -18,10 +18,8 @@
     </parent>
 
     <properties>
-        <xplugins.basedir>${basedir}</xplugins.basedir>
-        <x-dev-tools.dir>${xplugins.basedir}/x-dev-tools</x-dev-tools.dir>
-        <elasticsearch.license.header>${x-dev-tools.dir}/license-check/elasticsearch_license_header.txt</elasticsearch.license.header>
-        <elasticsearch.license.headerDefinition>${x-dev-tools.dir}/license-check/license_header_definition.xml</elasticsearch.license.headerDefinition>
+        <elasticsearch.license.header>${elasticsearch.tools.directory}/commercial-license-check/elasticsearch_license_header.txt</elasticsearch.license.header>
+        <elasticsearch.license.headerDefinition>${elasticsearch.tools.directory}/commercial-license-check/license_header_definition.xml</elasticsearch.license.headerDefinition>
     </properties>
 
     <scm>
@@ -93,6 +91,23 @@
 
     </dependencies>
 
+    <build>
+      <pluginManagement>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-remote-resources-plugin</artifactId>
+            <configuration>
+              <!-- include x-dev-tools resources bundle -->
+              <resourceBundles combine.children="append">
+                <resourceBundle>org.elasticsearch:elasticsearch-x-dev-tools:${elasticsearch.version}</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </plugin>
+        </plugins>
+      </pluginManagement>
+    </build>
+
     <profiles>
         <profile>
             <id>deploy-internal</id>
@@ -128,6 +143,7 @@
     </profiles>
 
     <modules>
+        <module>x-dev-tools</module>
         <module>license</module>
         <module>shield</module>
         <module>watcher</module>

shield/pom.xml

@@ -16,7 +16,6 @@
     </parent>
 
     <properties>
-        <xplugins.basedir>${project.parent.basedir}</xplugins.basedir>
         <tests.rest.blacklist>indices.get/10_basic/*allow_no_indices*,cat.count/10_basic/Test cat count output,cat.aliases/10_basic/Empty cluster,indices.segments/10_basic/no segments test,indices.clear_cache/10_basic/clear_cache test,indices.status/10_basic/Indices status test,cat.indices/10_basic/Test cat indices output,cat.recovery/10_basic/Test cat recovery output,cat.shards/10_basic/Test cat shards output,termvector/20_issue7121/*,index/10_with_id/Index with ID,indices.get_alias/20_emtpy/*,cat.segments/10_basic/Test cat segments output,indices.put_settings/10_basic/Test indices settings allow_no_indices,indices.put_settings/10_basic/Test indices settings ignore_unavailable,indices.refresh/10_basic/Indices refresh test no-match wildcard,indices.stats/10_index/Index - star*,indices.recovery/10_basic/Indices recovery test*,template/30_render_search_template/*</tests.rest.blacklist>
          <!-- TODO: refactor -->
          <elasticsearch.integ.antfile>${basedir}/dev-tools/integration-tests.xml</elasticsearch.integ.antfile>

watcher/pom.xml

@@ -16,7 +16,6 @@
     </parent>
 
     <properties>
-        <xplugins.basedir>${project.parent.basedir}</xplugins.basedir>
         <elasticsearch.integ.antfile>dev-tools/integration-tests.xml</elasticsearch.integ.antfile>
         <tests.rest.load_packaged>false</tests.rest.load_packaged>
         <tests.timewarp>true</tests.timewarp>

x-dev-tools/pom.xml

@@ -0,0 +1,38 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.elasticsearch</groupId>
+  <artifactId>elasticsearch-x-dev-tools</artifactId>
+  <version>2.0.0-beta1-SNAPSHOT</version>
+  <name>Elasticsearch Commercial Plugin Build Resources</name>
+  <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>
+  </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>
+</project>
+