asterixdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Ian Maxon (Code Review)" <do-not-re...@asterix-gerrit.ics.uci.edu>
Subject Change in hyracks[master]: Fix source packaging, address misc. release issues
Date Wed, 09 Sep 2015 02:25:15 GMT
Ian Maxon has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/381

Change subject: Fix source packaging, address misc. release issues
......................................................................

Fix source packaging, address misc. release issues

Change-Id: I98b18f24a20dcd8dc75e828e47fb0ab88179a4ef
---
M LICENSE
D NOTICE
M pom.xml
M src/main/assembly/source.xml
4 files changed, 43 insertions(+), 31 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/hyracks refs/changes/81/381/1

diff --git a/LICENSE b/LICENSE
index d645695..8983360 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,13 @@
+---
+This product bundles JQuery, which is available under a MIT license.
+For details, see https://jquery.org/license/
+---
+This product bundles jsPlumb, which is available under a MIT license.
+For details, see https://jsplumbtoolkit.com/license
+---
+This product bundles flot, which is available under a MIT license.
+For details, see https://github.com/flot/flot/blob/master/LICENSE.txt
+---
 
                                  Apache License
                            Version 2.0, January 2004
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index 317d8fa..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache AsterixDB Hyracks and Algebricks
-Copyright 2009-2015 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
diff --git a/pom.xml b/pom.xml
index 3d9586a..b6678d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,32 +137,33 @@
             </licenseFamily>
           </licenseFamilies>
           <excludes>
-            <exclude>**/dist.all*</exclude>
-            <exclude>**/data/file**</exclude>
-            <exclude>**/ClusterControllerService/*</exclude>
-            <exclude>**/*.txt</exclude>
-            <exclude>**/*.tbl</exclude>
-            <exclude>**/*.tsv</exclude>
-            <exclude>**/*.ddl</exclude>
-            <exclude>**/*.out</exclude>
-            <exclude>**/*.piglet</exclude>
-            <exclude>**/*.js</exclude>
-            <exclude>**/device_id_0/*</exclude>
-            <exclude>**/part-*</exclude>
-            <exclude>**/conf/local_cluster.conf</exclude>
-            <exclude>**/wordcount/wordcount.job</exclude>
-            <exclude>**/ClusterControllerService/**</exclude>
-            <exclude>**/*.log*</exclude>
-            <exclude>**/*.xml*</exclude>
-            <exclude>**/seen_txid</exclude>
-            <exclude>**/fsimage*</exclude>
-            <exclude>**/current/VERSION</exclude>
-            <exclude>**/blk_*</exclude>
-            <exclude>**/resources/conf/*</exclude>
-            <exclude>**/target/*</exclude>
-            <exclude>**/*.iml</exclude>
-            <exclude>.*/*</exclude>
-          </excludes>
+           <exclude>**/algebricks-tests/src/test/resources/results/**</exclude>
+           <exclude>**/javascript/flot/*.js</exclude>
+           <exclude>**/javascript/jsplumb/*.js</exclude>
+           <exclude>**/javascript/jquery/*.js</exclude>
+           <exclude>**/javascript/adminconsole/*.js</exclude>
+           <exclude>**/stylesheet/jquery-ui/**</exclude>
+           <exclude>**/hyracks-dist/src/main/resources/conf/**</exclude>
+           <exclude>**/src/test/resources/data/**</exclude>
+           <exclude>**/src/test/resources/results/**</exclude>
+           <exclude>**/src/test/resources/expected/**</exclude>
+           <exclude>**/testcases/*.piglet</exclude>
+           <exclude>**/data/**/*.txt</exclude>
+           <exclude>**/data/**/*.tbl</exclude>
+           <exclude>**/data/**/*.ddl</exclude>
+           <exclude>**/data/**/*.tsv</exclude>
+           <exclude>**/actual/conf.xml</exclude>
+           <exclude>**/actual/customer_result/part-*</exclude>
+           <exclude>**/src/main/resources/conf/*</exclude>
+           <exclude>**/data/dfs/**</exclude>
+           <exclude>**/invIndex*/**</exclude>
+           <exclude>**/*.job</exclude>
+           <exclude>**/*.conf</exclude>
+           <exclude>**/src/main/resources/*.cleaned</exclude>
+           <exclude>**/ClusterControllerService/**</exclude>
+           <exclude>**/output/**</exclude>
+           <exclude>**/*.iml</exclude>
+      </excludes>
         </configuration>
       </plugin>
       <plugin>
diff --git a/src/main/assembly/source.xml b/src/main/assembly/source.xml
index 210c49a..fc28713 100644
--- a/src/main/assembly/source.xml
+++ b/src/main/assembly/source.xml
@@ -34,6 +34,12 @@
         <include>**/pom.xml</include>
         <include>**/build*.xml</include>
         <include>**/findbugs*.xml</include>
+        <include>**/*.tbl</include>
+        <include>**/*.tsv</include>
+        <include>**/*.js</include>
+        <include>**/*.txt</include>
+        <include>**/*.piglet</include>
+        <include>**/*.ddl</include>
       </includes>
       <excludes>
         <exclude>**/${project.build.directory}/**</exclude>

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/381
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I98b18f24a20dcd8dc75e828e47fb0ab88179a4ef
Gerrit-PatchSet: 1
Gerrit-Project: hyracks
Gerrit-Branch: master
Gerrit-Owner: Ian Maxon <imaxon@apache.org>

Mime
View raw message