You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2016/03/18 07:36:40 UTC
[06/27] incubator-asterixdb-hyracks git commit: Fix licenses in
Hyracks binary assemblies
Fix licenses in Hyracks binary assemblies
Change-Id: I2a6c4fb809b6fcad578007b8f48bf8bce179cd81
Reviewed-on: https://asterix-gerrit.ics.uci.edu/569
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Chris Hillery <ce...@lambda.nu>
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/commit/167beef1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/tree/167beef1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/diff/167beef1
Branch: refs/heads/master
Commit: 167beef19cb41b7fb437a496c1e9af7c97cd7ef5
Parents: 9e37c96
Author: Ian Maxon <im...@apache.org>
Authored: Mon Jan 4 17:28:27 2016 -0800
Committer: Ian Maxon <im...@apache.org>
Committed: Tue Jan 5 17:19:12 2016 -0800
----------------------------------------------------------------------
.../btreeclient/src/main/assembly/binary-assembly.xml | 10 ++++++++++
.../btreeserver/src/main/assembly/binary-assembly.xml | 10 ++++++++++
.../src/main/assembly/binary-assembly.xml | 12 +++++++++++-
.../textclient/src/main/assembly/binary-assembly.xml | 10 ++++++++++
.../textserver/src/main/assembly/binary-assembly.xml | 12 +++++++++++-
.../tpchserver/src/main/assembly/binary-assembly.xml | 10 ++++++++++
.../src/main/assembly/binary-assembly.xml | 12 +++++++++++-
7 files changed, 73 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/167beef1/hyracks/hyracks-examples/btree-example/btreeclient/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/hyracks/hyracks-examples/btree-example/btreeclient/src/main/assembly/binary-assembly.xml b/hyracks/hyracks-examples/btree-example/btreeclient/src/main/assembly/binary-assembly.xml
index d4a2ea1..9c53c81 100644
--- a/hyracks/hyracks-examples/btree-example/btreeclient/src/main/assembly/binary-assembly.xml
+++ b/hyracks/hyracks-examples/btree-example/btreeclient/src/main/assembly/binary-assembly.xml
@@ -34,5 +34,15 @@
<directory>target/appassembler/lib</directory>
<outputDirectory>lib</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/167beef1/hyracks/hyracks-examples/btree-example/btreeserver/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/hyracks/hyracks-examples/btree-example/btreeserver/src/main/assembly/binary-assembly.xml b/hyracks/hyracks-examples/btree-example/btreeserver/src/main/assembly/binary-assembly.xml
index d7f678d..e443c5f 100644
--- a/hyracks/hyracks-examples/btree-example/btreeserver/src/main/assembly/binary-assembly.xml
+++ b/hyracks/hyracks-examples/btree-example/btreeserver/src/main/assembly/binary-assembly.xml
@@ -38,5 +38,15 @@
<directory>docs</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/167beef1/hyracks/hyracks-examples/hyracks-shutdown-test/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/hyracks/hyracks-examples/hyracks-shutdown-test/src/main/assembly/binary-assembly.xml b/hyracks/hyracks-examples/hyracks-shutdown-test/src/main/assembly/binary-assembly.xml
index d7f678d..7ef6fd0 100644
--- a/hyracks/hyracks-examples/hyracks-shutdown-test/src/main/assembly/binary-assembly.xml
+++ b/hyracks/hyracks-examples/hyracks-shutdown-test/src/main/assembly/binary-assembly.xml
@@ -38,5 +38,15 @@
<directory>docs</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
- </fileSets>
+ <fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/167beef1/hyracks/hyracks-examples/text-example/textclient/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/hyracks/hyracks-examples/text-example/textclient/src/main/assembly/binary-assembly.xml b/hyracks/hyracks-examples/text-example/textclient/src/main/assembly/binary-assembly.xml
index d4a2ea1..9c53c81 100644
--- a/hyracks/hyracks-examples/text-example/textclient/src/main/assembly/binary-assembly.xml
+++ b/hyracks/hyracks-examples/text-example/textclient/src/main/assembly/binary-assembly.xml
@@ -34,5 +34,15 @@
<directory>target/appassembler/lib</directory>
<outputDirectory>lib</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/167beef1/hyracks/hyracks-examples/text-example/textserver/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/hyracks/hyracks-examples/text-example/textserver/src/main/assembly/binary-assembly.xml b/hyracks/hyracks-examples/text-example/textserver/src/main/assembly/binary-assembly.xml
index d7f678d..7ef6fd0 100644
--- a/hyracks/hyracks-examples/text-example/textserver/src/main/assembly/binary-assembly.xml
+++ b/hyracks/hyracks-examples/text-example/textserver/src/main/assembly/binary-assembly.xml
@@ -38,5 +38,15 @@
<directory>docs</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
- </fileSets>
+ <fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/167beef1/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/assembly/binary-assembly.xml b/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/assembly/binary-assembly.xml
index d7f678d..e443c5f 100644
--- a/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/assembly/binary-assembly.xml
+++ b/hyracks/hyracks-examples/tpch-example/tpchserver/src/main/assembly/binary-assembly.xml
@@ -38,5 +38,15 @@
<directory>docs</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/167beef1/hyracks/hyracks-server/src/main/assembly/binary-assembly.xml
----------------------------------------------------------------------
diff --git a/hyracks/hyracks-server/src/main/assembly/binary-assembly.xml b/hyracks/hyracks-server/src/main/assembly/binary-assembly.xml
index d7f678d..7ef6fd0 100644
--- a/hyracks/hyracks-server/src/main/assembly/binary-assembly.xml
+++ b/hyracks/hyracks-server/src/main/assembly/binary-assembly.xml
@@ -38,5 +38,15 @@
<directory>docs</directory>
<outputDirectory>docs</outputDirectory>
</fileSet>
- </fileSets>
+ <fileSet>
+ <directory>target/classes/META-INF</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DISCLAIMER*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</assembly>