honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13704 from rjernst/more_rest_spec_cleanup 

Move a couple more rest-api-spec resource dirs into resources
This commit is contained in:
Ryan Ernst 2015-09-21 22:10:58 -07:00
parent b582de79ae 093791e82d
commit de2566a023
3 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
qa/pom.xml
View File

@ -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

0
qa/smoke-test-multinode/rest-api-spec/test/smoke_test_multinode/10_basic.yaml → qa/smoke-test-multinode/src/test/resources/rest-api-spec/test/smoke_test_multinode/10_basic.yaml
View File

0
qa/smoke-test-plugins/rest-api-spec/test/smoke_test_plugins/10_basic.yaml → qa/smoke-test-plugins/src/test/resources/rest-api-spec/test/smoke_test_plugins/10_basic.yaml
View File