Return-Path: X-Original-To: apmail-asterixdb-dev-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 48BF11751B for ; Wed, 9 Sep 2015 23:03:23 +0000 (UTC) Received: (qmail 78745 invoked by uid 500); 9 Sep 2015 23:03:23 -0000 Delivered-To: apmail-asterixdb-dev-archive@asterixdb.apache.org Received: (qmail 78694 invoked by uid 500); 9 Sep 2015 23:03:23 -0000 Mailing-List: contact dev-help@asterixdb.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.incubator.apache.org Delivered-To: mailing list dev@asterixdb.incubator.apache.org Received: (qmail 78682 invoked by uid 99); 9 Sep 2015 23:03:22 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Sep 2015 23:03:22 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 7EA05E1D8C for ; Wed, 9 Sep 2015 23:03:22 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.241 X-Spam-Level: * X-Spam-Status: No, score=1.241 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, KAM_LOTSOFHASH=0.25, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id wgi5f3ES5dRK for ; Wed, 9 Sep 2015 23:03:12 +0000 (UTC) Received: from unhygienix.ics.uci.edu (unhygienix.ics.uci.edu [128.195.14.130]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with ESMTP id C12FD42B0C for ; Wed, 9 Sep 2015 23:03:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by unhygienix.ics.uci.edu (Postfix) with ESMTP id 3A793240901; Wed, 9 Sep 2015 16:00:57 -0700 (PDT) Date: Wed, 9 Sep 2015 16:00:57 -0700 From: "Ian Maxon (Code Review)" Message-ID: Reply-To: imaxon@apache.org X-Gerrit-MessageType: newchange Subject: Change in asterixdb[master]: PLEASE EDIT to provide a meaningful commit message! X-Gerrit-Change-Id: I7ea02258cd6bbf63fc085a8be10bcd141468cf20 X-Gerrit-ChangeURL: X-Gerrit-Commit: 9813b6a8e0f788ba6dab7962950ad0fa59b8d981 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/2.8.4 To: undisclosed-recipients:; Ian Maxon has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/382 Change subject: PLEASE EDIT to provide a meaningful commit message! ...................................................................... PLEASE EDIT to provide a meaningful commit message! The following commits from your working branch will be included: commit 5e2ad1755c8557eca354bd8b0c4c43eb37b14b5a Author: Ian Maxon Date: Wed Sep 9 15:53:12 2015 -0700 add stuff to license commit 0553c9c5ba0217e102ed13e797e8712324932579 Author: Ian Maxon Date: Wed Sep 9 15:38:07 2015 -0700 fix source assembly commit fc738fd2d1739fe694f9b739e6b6b41740e77818 Author: Ian Maxon Date: Wed Sep 2 20:42:09 2015 -1000 Depend on stable Hyracks version Here I am depending on the next Hyracks version, by fetching from the Apache staging repository. I'm also propagating changes made on the Hyracks side that are needed for release, such as adding the incubator DISCLAIMER file, as well as removing the un-needed dependency on the maven release plugin. Reviewed-on: https://asterix-gerrit.ics.uci.edu/377 Reviewed-by: Ian Maxon Tested-by: Jenkins Change-Id: I7ea02258cd6bbf63fc085a8be10bcd141468cf20 --- A DISCLAIMER M LICENSE.txt A NOTICE M pom.xml A src/main/assembly/source.xml 5 files changed, 214 insertions(+), 11 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/82/382/1 diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 0000000..3b9db89 --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1,10 @@ +Apache AsterixDB is an effort undergoing incubation at the Apache Software +Foundation (ASF), sponsored by the Apache Incubator PMC. + +Incubation is required of all newly accepted projects until a further review +indicates that the infrastructure, communications, and decision making process +have stabilized in a manner consistent with other successful ASF projects. + +While incubation status is not necessarily a reflection of the completeness +or stability of the code, it does indicate that the project has yet to be +fully endorsed by the ASF. diff --git a/LICENSE.txt b/LICENSE.txt index d645695..5465b54 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -200,3 +200,108 @@ 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 AsterixDB WebUI at: +asterix-app/src/main/resources/webui/static/js/jquery.min.js +and +asterix-app/src/main/resources/webui/static/js/jquery.autosize-min.js + + 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. + +as well as portions of the WebUI at: +asterix-app/src/main/resources/webui/static/js/bootstrap.min.js + + The MIT License (MIT) + + Copyright (c) 2011-2015 Twitter, Inc + + 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 portions of the WebUI at: +asterix-app/src/main/resources/webui/static/js/smoothie.js +and +asterix-app/src/main/resources/feed/smoothie.js + + MIT License + ----------- + + Copyright (c) 2010-2013, Joe Walnes + 2013-2014, Drew Noakes + + 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. diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..6285a2e --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +Apache AsterixDB +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 f756fce..22113e8 100644 --- a/pom.xml +++ b/pom.xml @@ -52,8 +52,8 @@ **/*TestSuite.java,**/*Test.java,${execution.tests} ${optimizer.tests},${metadata.tests},${invalid.tests},${repeated.tests} - 0.2.16-SNAPSHOT - 0.2.16-SNAPSHOT + 0.2.16-incubating + 0.2.16-incubating 2.2.0 4.11 2.4 @@ -63,14 +63,6 @@ - - org.apache.maven.plugins - maven-release-plugin - 2.5.2 - - package source:jar javadoc:jar deploy:deploy - - org.apache.maven.plugins maven-surefire-plugin @@ -150,7 +142,31 @@ - + + org.apache.maven.plugins + maven-assembly-plugin + + + + + source-release-assembly + package + + single + + + + true + + src/main/assembly/source.xml + + + + + @@ -289,6 +305,15 @@ algebricks-snapshots http://obelix.ics.uci.edu/nexus/content/repositories/algebricks-snapshots/ + + + true + always + fail + + apache-staging + https://repository.apache.org/content/repositories/orgapacheasterix-1005/ + diff --git a/src/main/assembly/source.xml b/src/main/assembly/source.xml new file mode 100644 index 0000000..f879f80 --- /dev/null +++ b/src/main/assembly/source.xml @@ -0,0 +1,58 @@ + + + source-release + + zip + + + + ${project.basedir} + / + true + + **/DISCLAIMER + **/LICENSE + **/NOTICE + **/README + **/src/** + **/results/** + **/pom.xml + **/build*.xml + **/findbugs*.xml + **/*site.xml + **/*.adm + **/*.json + **/*.aql + **/*.ddl + **/*.seq + **/*.rc + **/*.big + **/*textFileS + **/*large_text + **/*.csv* + **/*.tbl + **/*.txt + **/part-* + **/*.cleaned + + + **/${project.build.directory}/** + + + + -- To view, visit https://asterix-gerrit.ics.uci.edu/382 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ea02258cd6bbf63fc085a8be10bcd141468cf20 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon