From 6b88093f78aec0df7ded2e73f1827c73539c1b7e Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Tue, 8 Sep 2015 01:15:46 -0700
Subject: [PATCH] Add back filtering for build properties, and remove unused
 resource file.

---
 core/pom.xml                                     | 16 ++++++++++++++++
 .../elasticsearch/common/io/rootdir.properties   |  1 -
 2 files changed, 16 insertions(+), 1 deletion(-)
 delete mode 100644 core/src/test/resources/org/elasticsearch/common/io/rootdir.properties

diff --git a/core/pom.xml b/core/pom.xml
index c9a74c4d385..fa8e352bd66 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -195,6 +195,22 @@
 
     <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>
diff --git a/core/src/test/resources/org/elasticsearch/common/io/rootdir.properties b/core/src/test/resources/org/elasticsearch/common/io/rootdir.properties
deleted file mode 100644
index d816feb074e..00000000000
--- a/core/src/test/resources/org/elasticsearch/common/io/rootdir.properties
+++ /dev/null
@@ -1 +0,0 @@
-copyappend.root.dir=${basedir}/src/test/resources/org/elasticsearch/common/io/copyappend