From 093791e82dfe7c3e16ddb1f199fede2cf86b6797 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Mon, 21 Sep 2015 21:57:51 -0700
Subject: [PATCH] Test: Move a couple more rest-api-spec resource dirs into
 resources

A couple were left behind. This fixes them and cleans up the test
resources for qa tests a little bit.
---
 qa/pom.xml                                    | 37 +------------------
 .../test/smoke_test_multinode/10_basic.yaml   |  0
 .../test/smoke_test_plugins/10_basic.yaml     |  0
 3 files changed, 1 insertion(+), 36 deletions(-)
 rename qa/smoke-test-multinode/{ => src/test/resources}/rest-api-spec/test/smoke_test_multinode/10_basic.yaml (100%)
 rename qa/smoke-test-plugins/{ => src/test/resources}/rest-api-spec/test/smoke_test_plugins/10_basic.yaml (100%)

diff --git a/qa/pom.xml b/qa/pom.xml
index e6bda144ebb..7cc28fe622e 100644
--- a/qa/pom.xml
+++ b/qa/pom.xml
@@ -38,47 +38,12 @@
 
     <!-- typical layout -->
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-
         <testResources>
-            <testResource>
-                <directory>src/test/java</directory>
-                <includes>
-                    <include>**/*.json</include>
-                    <include>**/*.txt</include>
-                </includes>
-            </testResource>
-            <testResource>
-                <directory>src/test/resources</directory>
-                <excludes>
-                    <exclude>elasticsearch.yml</exclude>
-                    <exclude>**/*.properties</exclude>
-                </excludes>
-            </testResource>
             <testResource>
                 <directory>src/test/resources</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>elasticsearch.yml</include>
-                    <include>**/*.properties</include>
-                </includes>
-            </testResource>
-            <!-- REST API specification and test suites -->
-            <testResource>
-                <directory>${project.basedir}/rest-api-spec</directory>
-                <filtering>true</filtering>
-                <targetPath>rest-api-spec</targetPath>
-                <includes>
-                    <include>api/*.json</include>
-                    <include>test/**/*.yaml</include>
+                    <include>rest-api-spec/**</include>
                 </includes>
             </testResource>
             <!-- REST API specifications copied from main Elasticsearch specs
diff --git a/qa/smoke-test-multinode/rest-api-spec/test/smoke_test_multinode/10_basic.yaml b/qa/smoke-test-multinode/src/test/resources/rest-api-spec/test/smoke_test_multinode/10_basic.yaml
similarity index 100%
rename from qa/smoke-test-multinode/rest-api-spec/test/smoke_test_multinode/10_basic.yaml
rename to qa/smoke-test-multinode/src/test/resources/rest-api-spec/test/smoke_test_multinode/10_basic.yaml
diff --git a/qa/smoke-test-plugins/rest-api-spec/test/smoke_test_plugins/10_basic.yaml b/qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yaml
similarity index 100%
rename from qa/smoke-test-plugins/rest-api-spec/test/smoke_test_plugins/10_basic.yaml
rename to qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yaml