From d68e27f6e3083e7beb26a2f4cf1ae4275c9a57d4 Mon Sep 17 00:00:00 2001
From: Julien Le Dem <julien@ledem.net>
Date: Tue, 18 Aug 2015 22:24:52 -0700
Subject: [PATCH 1/2] fix missing indirect dependency

---
 exec/java-exec/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 601f5cafa40..cb48567fefb 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -21,6 +21,12 @@
   <name>exec/Java Execution Engine</name>
 
   <dependencies>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
     <!-- <dependency> -->
     <!-- <groupId>org.ow2.asm</groupId> -->
     <!-- <artifactId>asm-util</artifactId> -->

From dfaa7a75fb45460ed8fd18e0acbc2fc6262cf49e Mon Sep 17 00:00:00 2001
From: Julien Le Dem <julien@ledem.net>
Date: Tue, 25 Aug 2015 12:01:52 -0700
Subject: [PATCH 2/2] add extra resources to the resource list instead of
 copying them to the target

---
 contrib/data/tpch-sample-data/pom.xml | 25 +++++++++++++++++++--
 exec/java-exec/pom.xml                | 32 ++++++---------------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/contrib/data/tpch-sample-data/pom.xml b/contrib/data/tpch-sample-data/pom.xml
index e37ea8f5eb8..6c9b0c2acd8 100644
--- a/contrib/data/tpch-sample-data/pom.xml
+++ b/contrib/data/tpch-sample-data/pom.xml
@@ -33,7 +33,7 @@
         <executions>
           <execution>
             <id>install-tgz</id>
-            <phase>prepare-package</phase>
+            <phase>generate-resources</phase>
             <goals>
               <goal>wget</goal>
             </goals>
@@ -41,7 +41,28 @@
               <url>http://apache-drill.s3.amazonaws.com/files/sf-0.01_tpc-h_parquet_typed.tgz</url>
               <outputFileName>tpch.tgz</outputFileName>
               <unpack>true</unpack>
-              <outputDirectory>${project.build.directory}/classes/tpch</outputDirectory>
+              <outputDirectory>${project.build.directory}/downloaded-resources/tpch</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.9.1</version>
+        <executions>
+          <execution>
+            <id>add-resource</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>add-resource</goal>
+            </goals>
+            <configuration>
+              <resources>
+                <resource>
+                  <directory>${project.build.directory}/downloaded-resources</directory>
+                </resource>
+              </resources>
             </configuration>
           </execution>
         </executions>
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index cb48567fefb..e897b595861 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -482,31 +482,6 @@
               </resources>
             </configuration>
           </execution>
-          <execution>
-            <id>copy-java-sources</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}/target/classes/</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>src/main/java</directory>
-                  <filtering>true</filtering>
-                </resource>
-                <resource>
-                  <directory>src/test/java</directory>
-                  <filtering>true</filtering>
-                </resource>
-                <resource>
-                  <directory>target/generated-sources</directory>
-                  <!-- <include>*/org</include> -->
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -590,6 +565,13 @@
               <sources>
                 <source>${project.build.directory}/generated-sources</source>
               </sources>
+              <resources>
+                <resource>
+                  <directory>${project.build.directory}/generated-resources</directory>
+                  <directory>src/main/java</directory>
+                  <directory>src/test/java</directory>
+                </resource>
+              </resources>
             </configuration>
           </execution>
         </executions>