Ian Maxon has submitted this change and it was merged. Change subject: Fix source packaging, address misc. release issues ......................................................................
Fix source packaging, address misc. release issues Change-Id: I98b18f24a20dcd8dc75e828e47fb0ab88179a4ef Reviewed-on: https://asterix-gerrit.ics.uci.edu/381 Tested-by: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]> --- M LICENSE M NOTICE M pom.xml M src/main/assembly/source.xml 4 files changed, 133 insertions(+), 27 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified diff --git a/LICENSE b/LICENSE index d645695..868d71d 100644 --- a/LICENSE +++ b/LICENSE @@ -200,3 +200,102 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + +ASTERIXDB COMPONENTS: + +AsterixDB includes a number of subcomponents with separate copyright +notices and license terms. Your use of the source code for these +subcomponents is subject to the terms and condition of the following +licenses. + +For portions of the Hyracks admin console at +hyracks/hyracks-control/hyracks-control-cc/src/main/resources/javascript/flot/ + + Copyright (c) 2007-2014 IOLA and Ole Laursen + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + +As well as the Hyracks adminconsole resources at: +hyracks/hyracks-control/hyracks-control-cc/src/main/resources/javascript/jsplumb/ + + Copyright (c) 2010 - 2014 jsPlumb, http://jsplumbtoolkit.com/ + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +and also the Hyracks adminconsole resources at: +hyracks/hyracks-control/hyracks-control-cc/src/main/resources/javascript/jquery +and +hyracks/hyracks-control/hyracks-control-cc/src/main/resources/stylesheets/jquery-ui + + Copyright jQuery Foundation and other contributors, https://jquery.org/ + + This software consists of voluntary contributions made by many + individuals. For exact contribution history, see the revision history + available at https://github.com/jquery/jquery + + The following license applies to all parts of this software except as + documented below: + + ==== + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + ==== + + All files located in the node_modules and external directories are + externally maintained libraries used by this software which have their + own licenses; we recommend you read them, as their terms may differ from + the terms above. diff --git a/NOTICE b/NOTICE index 317d8fa..723b9bd 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache AsterixDB Hyracks and Algebricks -Copyright 2009-2015 The Apache Software Foundation +Copyright 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: merged Gerrit-Change-Id: I98b18f24a20dcd8dc75e828e47fb0ab88179a4ef Gerrit-PatchSet: 4 Gerrit-Project: hyracks Gerrit-Branch: master Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
