phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeffr...@apache.org
Subject git commit: Fix tar ball file pulls wrong tests jars
Date Sat, 15 Feb 2014 00:29:52 GMT
Repository: incubator-phoenix
Updated Branches:
  refs/heads/4.0 b25161590 -> b709a5ab0


Fix tar ball file pulls wrong tests jars


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/b709a5ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/b709a5ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/b709a5ab

Branch: refs/heads/4.0
Commit: b709a5ab0f2ba02e2831aa890df01261a8b4cdeb
Parents: b251615
Author: Jeffrey Zhong <jzhong@JZhongs-MacBook-Pro.local>
Authored: Fri Feb 14 16:19:48 2014 -0800
Committer: Jeffrey Zhong <jzhong@JZhongs-MacBook-Pro.local>
Committed: Fri Feb 14 16:19:48 2014 -0800

----------------------------------------------------------------------
 phoenix-assembly/src/build/all.xml | 62 +++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b709a5ab/phoenix-assembly/src/build/all.xml
----------------------------------------------------------------------
diff --git a/phoenix-assembly/src/build/all.xml b/phoenix-assembly/src/build/all.xml
index 36910d5..8660610 100644
--- a/phoenix-assembly/src/build/all.xml
+++ b/phoenix-assembly/src/build/all.xml
@@ -29,11 +29,6 @@
           </fileSet>
         </fileSets>
       </sources>
-      <!-- Binaries for the dependencies also go in the lib directory -->
-      <binaries>
-        <outputDirectory>lib</outputDirectory>
-        <unpack>false</unpack>
-      </binaries>
     </moduleSet>
   </moduleSets>
 
@@ -97,6 +92,61 @@
         <include>phoenix-*-client.jar</include>
       </includes>
     </fileSet>
+    <!-- This is only necessary until maven fixes the intra-project dependency bug
+      in maven 3.0. Until then, we have to include the jars for sub-projects explicitly.
+      Otherwise, test jars are pulled in wrongly.
+     -->
+    <fileSet>
+      <directory>${project.basedir}/../phoenix-hadoop-compat/target/</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>phoenix-*.jar</include>
+      </includes>
+      <fileMode>0644</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/../phoenix-hadoop1-compat/target/</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>phoenix-*.jar</include>
+      </includes>
+      <fileMode>0644</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/../phoenix-hadoop2-compat/target/</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>phoenix-*.jar</include>
+      </includes>
+      <fileMode>0644</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/../phoenix-pig/target/</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>phoenix-*.jar</include>
+      </includes>
+      <fileMode>0644</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/../phoenix-flume/target/</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>phoenix-*.jar</include>
+      </includes>
+      <fileMode>0644</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/../phoenix-core/target/</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>phoenix-*.jar</include>
+      </includes>
+      <excludes>
+        <exclude></exclude>
+      </excludes>
+      <fileMode>0644</fileMode>
+    </fileSet>
   </fileSets>
 
   <!-- And add all of our dependencies -->
@@ -136,4 +186,4 @@
       </includes>
     </dependencySet>
   </dependencySets>
-</assembly>
\ No newline at end of file
+</assembly>


Mime
View raw message