Repository: trafodion Updated Branches: refs/heads/master 42c1d2070 -> 6be0b22c8
http://git-wip-us.apache.org/repos/asf/trafodion/blob/5dc33bf0/licenses/lic-server-src ---------------------------------------------------------------------- diff --git a/licenses/lic-server-src b/licenses/lic-server-src index dbe56af..fe1cf85 100644 --- a/licenses/lic-server-src +++ b/licenses/lic-server-src @@ -4,8 +4,8 @@ The core component of Apache Trafodion uses several BSD-like, MIT-like and Postg +++++++++++++++++++++++++++++ BSD-3 clause for files: - incubator-trafodion/core/sql/common/swsprintf.cpp - incubator-trafodion/core/sql/common/swscanf.cpp + trafodion/core/sql/common/swsprintf.cpp + trafodion/core/sql/common/swscanf.cpp Copyright (c) 1990, 1993 The Regents of the University of California. All rights reserved. @@ -39,7 +39,7 @@ Copyright (c) 1990, 1993 +++++++++++++++++++++++++++++ -BSD-3 clause for file incubator-trafodion/core/sql/parser/ulexer.h +BSD-3 clause for file trafodion/core/sql/parser/ulexer.h Copyright (c) 1993 The Regents of the University of California. @@ -59,7 +59,7 @@ BSD-3 clause for file incubator-trafodion/core/sql/parser/ulexer.h +++++++++++++++++++++++++++++ -MIT-Expat for files in: incubator-trafodion/core/sql/qmscommon/expat +MIT-Expat for files in: trafodion/core/sql/qmscommon/expat Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper @@ -68,7 +68,7 @@ MIT-Expat for files in: incubator-trafodion/core/sql/qmscommon/expat Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers. Copyright 2000, Clark Cooper - For details see incubator-trafodion/core/sql/qmscommon/expat/COPYING + For details see trafodion/core/sql/qmscommon/expat/COPYING +++++++++++++++++++++++++++++ @@ -79,18 +79,18 @@ MIT-like licenses: +++++++++++++++++++++++++++++ BSD-3 clause for files in: - incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/datatables + trafodion/dcs/src/main/resources/dcs-webapps/master/datatables Copyright 2009 Allan Jardine. All Rights Reserved Copyright 2008-2012 Allan Jardine, all rights reserved. For details see: - incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/datatables/license-bsd.txt + trafodion/dcs/src/main/resources/dcs-webapps/master/datatables/license-bsd.txt +++++++++++++++++++++++++++++ MIT-Expat for files in: - incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jit.js + trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jit.js Copyright (c) 2011 Sencha Inc. - Author: Nicolas Garcia Belmonte (http://philogb.github.com/) Copyright (c) 2006-2010 Valerio Proietti @@ -116,8 +116,8 @@ MIT-Expat for files in: +++++++++++++++++++++++++++++ MIT-Expat for files in: - incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/jquery-ui - incubator-trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jquery-1.11.0.js + trafodion/dcs/src/main/resources/dcs-webapps/master/jquery-ui + trafodion/dcs/src/main/resources/dcs-webapps/master/js/lib/jquery-1.11.0.js Copyright 2014 jQuery Foundation and other contributors (c) 2005, 2014 jQuery Foundation, Inc. @@ -142,11 +142,11 @@ MIT-Expat for files in: ++++++++++++++++++++++++++++++ The PostgreSQL Licence (PostgreSQL) for files in: - incubator-trafodion/core/sql/common/ComJSON.cpp - incubator-trafodion/core/sql/common/ComJSON.h - incubator-trafodion/core/sql/common/ComJSONFuncs.cpp - incubator-trafodion/core/sql/common/ComJSONStringInfo.cpp - incubator-trafodion/core/sql/common/ComJSONStringInfo.h + trafodion/core/sql/common/ComJSON.cpp + trafodion/core/sql/common/ComJSON.h + trafodion/core/sql/common/ComJSONFuncs.cpp + trafodion/core/sql/common/ComJSONStringInfo.cpp + trafodion/core/sql/common/ComJSONStringInfo.h PostgreSQL License is a liberal Open Source license, similar to the BSD or MIT licenses. @@ -167,4 +167,4 @@ $ORGANISATION SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND $ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. -++++++++++++++++++++++++++++++ \ No newline at end of file +++++++++++++++++++++++++++++++ http://git-wip-us.apache.org/repos/asf/trafodion/blob/5dc33bf0/licenses/lic-test-src ---------------------------------------------------------------------- diff --git a/licenses/lic-test-src b/licenses/lic-test-src index e60863d..a487c84 100644 --- a/licenses/lic-test-src +++ b/licenses/lic-test-src @@ -2,7 +2,7 @@ Software used to test Apache Trafodion bundles source with BSD-like licenses: BSD-3 clause for files in: - incubator-trafodion/tests/phx/src/test/java/org/trafodion/phoenix/end2end + trafodion/tests/phx/src/test/java/org/trafodion/phoenix/end2end Apache Trafodion changed these files to work within its test environment @@ -37,7 +37,7 @@ As part of testing large objects (LOBs), the testware needs some object files. Two pictures were donated for this purpose by Christophe LeRouzo. He has formally given Apache Trafodion to permission to use these picturs. - incubator-trafodion/core/sql/regress/executor/anoush.jpg - incubator-trafodion/core/sql/regress/executor/deep.jpg + trafodion/core/sql/regress/executor/anoush.jpg + trafodion/core/sql/regress/executor/deep.jpg +++++++++++++++++++++++++++++ http://git-wip-us.apache.org/repos/asf/trafodion/blob/5dc33bf0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 4045b79..58257eb 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ <packaging>pom</packaging> <name>Apache Trafodion</name> <description>Trafodion is a webscale SQL-on-Hadoop solution enabling transactional or operational workloads on Hadoop.</description> - <url>http://trafodion.incubator.apache.org</url> + <url>http://trafodion.apache.org</url> <inceptionYear>2015</inceptionYear> <licenses> @@ -281,9 +281,9 @@ <distributionManagement> <site> - <id>trafodion.incubator.apache.org</id> - <name>Trafodion Website at incubator.apache.org</name> - <!-- On why this is the tmp dir and not trafodion.incubator.apache.org, see + <id>trafodion.apache.org</id> + <name>Trafodion Website at apache.org</name> + <!-- On why this is the tmp dir and not trafodion.apache.org, see https://issues.apache.org/jira/browse/HBASE-7593?focusedCommentId=13555866&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13555866 --> <url>file:///tmp</url> http://git-wip-us.apache.org/repos/asf/trafodion/blob/5dc33bf0/tools/docker/Dockerfile ---------------------------------------------------------------------- diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index be75b9b..21cb98e 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -17,7 +17,7 @@ FROM centos:centos6.6 MAINTAINER Trafodion Community <d...@trafodion.incubator.apache.org> -LABEL Vendor="Apache Trafodion (incubating)" +LABEL Vendor="Apache Trafodion" LABEL version=unstable # download and install environment dependencies
