incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [1/2] git commit: Src artifact extracs to different directory than the binary artifact
Date Tue, 10 Sep 2013 18:39:31 GMT
Updated Branches:
  refs/heads/master c97c74d77 -> 47124decc


Src artifact extracs to different directory than the binary artifact


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

Branch: refs/heads/master
Commit: 4bdbcceaee3ce23416bc8de327acabee829c839e
Parents: c97c74d
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Tue Sep 10 14:05:53 2013 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Tue Sep 10 14:05:53 2013 -0400

----------------------------------------------------------------------
 distribution/src/assemble/bin.xml | 14 +++++++-------
 distribution/src/assemble/src.xml |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4bdbccea/distribution/src/assemble/bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml
index c84f478..73965b2 100644
--- a/distribution/src/assemble/bin.xml
+++ b/distribution/src/assemble/bin.xml
@@ -28,7 +28,7 @@ under the License.
   <dependencySets>
     <dependencySet>
       <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>apache-blur-${project.version}/lib</outputDirectory>
+      <outputDirectory>apache-blur-${project.version}-bin/lib</outputDirectory>
       <unpack>false</unpack>
       <includes>
         <include>org.apache.blur:*</include>
@@ -51,7 +51,7 @@ under the License.
     </dependencySet>
     <dependencySet>
       <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>apache-blur-${project.version}/lib/hadoop-${hadoop.version}</outputDirectory>
+      <outputDirectory>apache-blur-${project.version}-bin/lib/hadoop-${hadoop.version}</outputDirectory>
       <unpack>false</unpack>
 	<includes>
 	  <include>org.apache.hadoop:*</include>
@@ -59,7 +59,7 @@ under the License.
     </dependencySet>
     <dependencySet>
       <useProjectArtifact>false</useProjectArtifact>
-      <outputDirectory>apache-blur-${project.version}/lib/hadoop-${hadoop.version}/lib</outputDirectory>
+      <outputDirectory>apache-blur-${project.version}-bin/lib/hadoop-${hadoop.version}/lib</outputDirectory>
       <unpack>false</unpack>
 	<excludes>
 	  <exclude>org.apache.blur:*</exclude>
@@ -90,28 +90,28 @@ under the License.
      -->
     <fileSet>
       <directory>${project.build.scriptSourceDirectory}</directory>
-      <outputDirectory>apache-blur-${project.version}</outputDirectory>
+      <outputDirectory>apache-blur-${project.version}-bin</outputDirectory>
       <excludes>
         <exclude>**/.empty</exclude>
       </excludes>
     </fileSet>
     <fileSet>
       <directory>${project.build.scriptSourceDirectory}/../../../../docs</directory>
-      <outputDirectory>apache-blur-${project.version}/docs</outputDirectory>
+      <outputDirectory>apache-blur-${project.version}-bin/docs</outputDirectory>
       <excludes>
         <exclude>**/.empty</exclude>
       </excludes>
     </fileSet>
     <fileSet>
       <directory>${project.build.scriptSourceDirectory}/../../../../target/staging</directory>
-      <outputDirectory>apache-blur-${project.version}/docs/site</outputDirectory>
+      <outputDirectory>apache-blur-${project.version}-bin/docs/site</outputDirectory>
       <excludes>
         <exclude>**/.empty</exclude>
       </excludes>
     </fileSet>
     <fileSet>
       <directory>${project.build.scriptSourceDirectory}/../../../../</directory>
-      <outputDirectory>apache-blur-${project.version}/</outputDirectory>
+      <outputDirectory>apache-blur-${project.version}-bin/</outputDirectory>
       <includes>
         <include>DISCLAIMER</include>
         <include>NOTICE</include>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4bdbccea/distribution/src/assemble/src.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/src.xml b/distribution/src/assemble/src.xml
index d3f11a4..ad9a49e 100644
--- a/distribution/src/assemble/src.xml
+++ b/distribution/src/assemble/src.xml
@@ -27,7 +27,7 @@ under the License.
   <fileSets>
     <fileSet>
       <directory>${project.parent.basedir}</directory>
-      <outputDirectory>apache-blur-${project.version}</outputDirectory>
+      <outputDirectory>apache-blur-${project.version}-src</outputDirectory>
       <excludes>
         <exclude>**/.empty</exclude>
         <exclude>**/target/**</exclude>
@@ -37,12 +37,12 @@ under the License.
   <files>
     <file>
       <source>src/main/resources/NOTICE-src.txt</source>
-      <outputDirectory>apache-blur-${project.version}</outputDirectory>
+      <outputDirectory>apache-blur-${project.version}-src</outputDirectory>
       <destName>NOTICE</destName>
     </file>
     <file>
       <source>src/main/resources/LICENSE-src.txt</source>
-      <outputDirectory>apache-blur-${project.version}</outputDirectory> 
+      <outputDirectory>apache-blur-${project.version}-src</outputDirectory>
       <destName>LICENSE</destName>
     </file>
   </files>    


Mime
View raw message