minor revision for maven build in ubuntu 14.04 and in Eclipse Luna 4.4.2

szhang1 · Mar 6, 2016 · 367992d · 367992d
1 parent fbb2c9e
commit 367992d
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 4 deletions.
diff --git a/parquet-avro/pom.xml b/parquet-avro/pom.xml
@@ -126,7 +126,7 @@
                 </goals>
                 <configuration>
                     <sourceDirectory>${project.basedir}/src/test/resources</sourceDirectory>
-                    <outputDirectory>${project.build.directory}/generated-test-sources</outputDirectory>
+                    <outputDirectory>${project.build.directory}/generated-test-sources/avro</outputDirectory>
                     <stringType>String</stringType>
                 </configuration>
             </execution>
@@ -146,7 +146,7 @@
             </goals>
             <configuration>
               <sources>
-                <source>${project.build.directory}/generated-test-sources</source>
+                <source>${project.build.directory}/generated-test-sources/avro</source>
               </sources>
             </configuration>
           </execution>

diff --git a/parquet-column/pom.xml b/parquet-column/pom.xml
@@ -148,6 +148,26 @@
           <sourceRoot>${basedir}/target/generated-src</sourceRoot>
         </configuration>
       </plugin>
+      <plugin>
+        <!-- Ensure that the specific classes are available during test compile but not included in jar -->
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <id>add-test-sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-src</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/parquet-common/pom.xml b/parquet-common/pom.xml
@@ -94,6 +94,26 @@
           <sourceRoot>${basedir}/target/generated-src</sourceRoot>
         </configuration>
       </plugin>
+      <plugin>
+        <!-- Ensure that the specific classes are available during test compile but not included in jar -->
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <id>add-test-sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-src</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/parquet-protobuf/pom.xml b/parquet-protobuf/pom.xml
@@ -138,7 +138,7 @@
             </goals>
             <configuration>
               <sources>
-                <source>${project.build.directory}/generated-test-sources</source>
+                <source>${project.build.directory}/generated-test-sources/java</source>
               </sources>
             </configuration>
           </execution>

diff --git a/parquet-scrooge/pom.xml b/parquet-scrooge/pom.xml
@@ -229,6 +229,28 @@
             </executions>
         </plugin>
         <!--end for scrooge and thrift-->
+
+      <plugin>
+        <!-- Ensure that the specific classes are available during test compile but not included in jar -->
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <id>add-test-sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-test-sources/scrooge/scrooge</source>
+                <source>${project.build.directory}/generated-test-sources/thrift</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/parquet-thrift/pom.xml b/parquet-thrift/pom.xml
@@ -151,6 +151,25 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <id>add-test-sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-test-sources/thrift</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -88,7 +88,7 @@
     <scala.maven.test.skip>false</scala.maven.test.skip>
     <pig.version>0.11.1</pig.version>
     <pig.classifier/>
-    <thrift.version>0.7.0</thrift.version>
+    <thrift.version>0.9.0</thrift.version>
     <fastutil.version>6.5.7</fastutil.version>
     <semver.api.version>0.9.33</semver.api.version>
     <slf4j.version>1.7.5</slf4j.version>