HAWQ-1647. Update HAWQ version to 2.4.0.0

- Update HAWQ version from 2.3.0.0 to 2.4.0.0. - Removed incubating/incubator strings from HAWQ versions.
apache · Sep 7, 2018 · a741655 · a741655
1 parent 24e36c9
commit a741655
Show file tree

Hide file tree

Showing 42 changed files with 10,521 additions and 63 deletions.
diff --git a/LICENSE b/LICENSE
@@ -202,9 +202,9 @@
 
 =======================================================================
 
-Apache HAWQ (incubating) Subcomponents:
+Apache HAWQ Subcomponents:
 
-  The Apache HAWQ (incubating) project contains subcomponents with
+  The Apache HAWQ project contains subcomponents with
   separate copyright notices and license terms. Your use of the source
   code for these subcomponents is subject to the terms and conditions
   of the following licenses.

diff --git a/NOTICE b/NOTICE
@@ -1,4 +1,4 @@
-Apache HAWQ (incubating) 
+Apache HAWQ
 Copyright 2017 The Apache Software Foundation.
 
 This product includes software developed at

diff --git a/README.md b/README.md
@@ -1,20 +1,20 @@
-![HAWQ](http://hawq.incubator.apache.org/images/logo-hawq.png)
+![HAWQ](http://hawq.apache.org/images/logo-hawq.png)
 
 ---
 
 |CI Process|Status|
 |---|---|
-|Travis CI Build|[![https://travis-ci.org/apache/incubator-hawq.svg?branch=master](https://travis-ci.org/apache/incubator-hawq.png?branch=master)](https://travis-ci.org/apache/incubator-hawq?branch=master)|
+|Travis CI Build|[![https://travis-ci.org/apache/hawq.svg?branch=master](https://travis-ci.org/apache/hawq.png?branch=master)](https://travis-ci.org/apache/hawq?branch=master)|
 |Apache Release Audit Tool ([RAT](https://creadur.apache.org/rat/))|[![Rat Status](https://builds.apache.org/buildStatus/icon?job=HAWQ-rat)](https://builds.apache.org/view/HAWQ/job/HAWQ-rat/)|
 |Coverity Static Analysis   |[![Coverity Scan Build](https://scan.coverity.com/projects/apache-incubator-hawq/badge.svg)](https://scan.coverity.com/projects/apache-incubator-hawq)|
 
 ---
 
-[Website](http://hawq.incubator.apache.org/) |
+[Website](http://hawq.apache.org/) |
 [Wiki](https://cwiki.apache.org/confluence/display/HAWQ) |
-[Documentation](http://hawq.incubator.apache.org/docs/userguide/2.1.0.0-incubating/overview/HAWQOverview.html) |
-[Developer Mailing List](mailto:dev@hawq.incubator.apache.org) |
-[User Mailing List](mailto:user@hawq.incubator.apache.org) |
+[Documentation](http://hawq.apache.org/docs/userguide/latest/) |
+[Developer Mailing List](mailto:[email protected]) |
+[User Mailing List](mailto:[email protected]) |
 [Q&A Collections](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=65144284) |
 [Open Defect](https://issues.apache.org/jira/browse/HAWQ)
 

diff --git a/contrib/hawq-ambari-plugin/README.md b/contrib/hawq-ambari-plugin/README.md
@@ -57,7 +57,7 @@ Properties specified in the [build.properties](build.properties) file:
 To build the rpm for hawq-ambari-plugin, change the [build.properties](build.properties) file with the required parameters and run ```mvn install``` command under hawq-ambari-plugin directory:
 ```
 $ pwd
-incubator-hawq/contrib/hawq-ambari-plugin
+hawq/contrib/hawq-ambari-plugin
 $ mvn clean resources:copy-resources rpm:rpm -Dbuild_number=1
 ```
 
@@ -95,4 +95,4 @@ $ ./add-hawq.py --user <ambari-username> --password <ambari-password> --stack HD
 **Please restart ambari-server after running the script so that the changes take effect:**
 ```
 $ ambari-server restart
-```
+```
diff --git a/contrib/hawq-ambari-plugin/build.properties b/contrib/hawq-ambari-plugin/build.properties
@@ -1,8 +1,8 @@
-hawq.release.version=2.3.0
+hawq.release.version=2.4.0
 hawq.common.services.version=2.0.0
 pxf.release.version=3.2.1
 pxf.common.services.version=3.0.0
 hawq.repo.prefix=hawq
 hawq.addons.repo.prefix=hawq-add-ons
-repository.version=2.3.0.0
+repository.version=2.4.0.0
 default.stack=HDP-2.5
diff --git a/contrib/hawq-ambari-plugin/pom.xml b/contrib/hawq-ambari-plugin/pom.xml
@@ -21,7 +21,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.hawq</groupId>
   <artifactId>hawq-ambari-plugin</artifactId>
-  <version>2.3.0.0</version>
+  <version>2.4.0.0</version>
   <name>hawq-ambari-plugin</name>
   <url>http://maven.apache.org</url>
 

diff --git a/contrib/hawq-docker/README.md b/contrib/hawq-docker/README.md
@@ -14,8 +14,8 @@ https://docs.docker.com/
 # Setup build and test environment
 * clone hawq repository
 ```
-git clone https://github.com/apache/incubator-hawq.git .
-cd incubator-hawq/contrib/hawq-docker
+git clone https://github.com/apache/hawq.git .
+cd hawq/contrib/hawq-docker
 ```
 * Build the docker images
 ```
@@ -49,7 +49,7 @@ sudo -u hdfs hdfs dfsadmin -report
 ```
 * clone Apache HAWQ code to /data direcotry
 ```
-git clone https://github.com/apache/incubator-hawq.git /data/hawq
+git clone https://github.com/apache/hawq.git /data/hawq
 ```
 * build Apache HAWQ
 ```

diff --git a/contrib/hawq-package/README b/contrib/hawq-package/README
@@ -20,9 +20,9 @@ Build HAWQ rpm package tarball steps:
 
 1. Prepare a HAWQ source code tarball for rpm building.
    a) Make sure the source code tarball name format is: 
-      apache-hawq-src-%{hawq_version}-incubating.tar.gz
+      apache-hawq-src-%{hawq_version}-.tar.gz
    b) Make sure the extracted directory name format is:
-      apache-hawq-src-%{hawq_version}-incubating
+      apache-hawq-src-%{hawq_version}
    c) Put the HAWQ source tarball to %{top_dir}/contrib/hawq-package folder.
       Or use "HAWQ_SOURCE_TARBALL_PATH" to specify the find path of HAWQ source tarball.
 
@@ -35,4 +35,4 @@ Build HAWQ rpm package tarball steps:
    You can set environment variable "HAWQ_RELEASE_VERSION" to specify HAWQ version.
 
 5. You can find HAWQ/PXF/Ranger-plugin rpms tarball as:
-   %{top_dir}/contrib/hawq-package/apache-hawq-rpm-%{hawq_version}-incubating.tar.gz 
+   %{top_dir}/contrib/hawq-package/apache-hawq-rpm-%{hawq_version}.tar.gz 
diff --git a/contrib/hawq-package/build_hawq_rpm.sh b/contrib/hawq-package/build_hawq_rpm.sh
@@ -45,7 +45,7 @@ mkdir -p rpmbuild/BUILD rpmbuild/RPMS rpmbuild/SOURCES rpmbuild/SPECS rpmbuild/S
 # Copy HAWQ RPM configuration file for the build
 cp hawq.spec rpmbuild/SPECS/
 
-HAWQ_SOURCE_TARBALL_FILE=apache-hawq-src-${HAWQ_RELEASE_VERSION}-incubating.tar.gz
+HAWQ_SOURCE_TARBALL_FILE=apache-hawq-src-${HAWQ_RELEASE_VERSION}.tar.gz
 
 # Get PATH where to find HAWQ source code tarball
 if [ -z ${HAWQ_SOURCE_TARBALL_PATH} ]; then

diff --git a/contrib/hawq-package/hawq.spec b/contrib/hawq-package/hawq.spec
@@ -25,15 +25,15 @@
 %define    installdir             /usr/local/%{name}
 
 Name:       apache-hawq
-Summary:    Hadoop Native SQL powered by Apache HAWQ (incubating)
+Summary:    Hadoop Native SQL powered by Apache HAWQ
 Version:    %{hawq_version}
 Release:    %{rpm_os_version}
 License:    ASL 2.0
 Group:      Applications/Databases
-URL:        http://hawq.incubator.apache.org
+URL:        http://hawq.apache.org
 Prefix:     /usr/local
 BuildArch:  %{arch}
-SOURCE0 :   apache-hawq-src-%{hawq_version}-incubating.tar.gz
+SOURCE0 :   apache-hawq-src-%{hawq_version}.tar.gz
 Requires:   libgsasl, krb5-libs, libicu, protobuf >= 2.5.0, json-c >= 0.9, net-snmp-libs, thrift >= 0.9.1, boost >= 1.53.0
 %if %{rpm_os_version} == el6
 Requires: openssl
@@ -45,7 +45,7 @@ Requires(pre): shadow-utils
 AutoReqProv:    no
 
 %description
-Apache HAWQ (incubating) combines exceptional MPP-based analytics
+Apache HAWQ combines exceptional MPP-based analytics
 performance, robust ANSI SQL compliance, Hadoop ecosystem
 integration and manageability, and flexible data-store format
 support, all natively in Hadoop, no connectors required.
@@ -56,7 +56,7 @@ source Greenplum® Database and PostgreSQL, HAWQ enables you to
 swiftly and interactively query Hadoop data, natively via HDFS.
 
 %prep
-%setup -n %{name}-src-%{version}-incubating
+%setup -n %{name}-src-%{version}
 
 %build
 export CFLAGS="-O3 -g"

diff --git a/contrib/hawq-package/make_rpm_tarball.sh b/contrib/hawq-package/make_rpm_tarball.sh
@@ -69,15 +69,15 @@ echo "Copied all the HAWQ/PXF/Range-plugin rpm packages."
 ls ${RPM_PKG_DIR}/
 
 # Make tarball for all the HAWQ/PXF/RANGER rpms
-tar czvf apache-hawq-rpm-${HAWQ_RELEASE_VERSION}-incubating.tar.gz  hawq_rpm_packages
+tar czvf apache-hawq-rpm-${HAWQ_RELEASE_VERSION}.tar.gz  hawq_rpm_packages
 if [ $? != 0 ]; then
     echo "Make HAWQ/PXF/Ranger-plugin rpm tarball failed."
     exit $?
 else
     echo "Make HAWQ/PXF/Ranger-plugin rpm tarball successfully."
     echo "You can find the rpm binary tarball at:"
-    echo "${CUR_DIR}/apache-hawq-rpm-${HAWQ_RELEASE_VERSION}-incubating.tar.gz"
-    ls -l apache-hawq-rpm-${HAWQ_RELEASE_VERSION}-incubating.tar.gz
+    echo "${CUR_DIR}/apache-hawq-rpm-${HAWQ_RELEASE_VERSION}.tar.gz"
+    ls -l apache-hawq-rpm-${HAWQ_RELEASE_VERSION}.tar.gz
 fi
 
 exit 0
diff --git a/dist/hawq/LICENSE b/dist/hawq/LICENSE
@@ -202,9 +202,9 @@
 
 =======================================================================
 
-Apache HAWQ (incubating) Subcomponents:
+Apache HAWQ Subcomponents:
 
-  The Apache HAWQ (incubating) project contains subcomponents with
+  The Apache HAWQ project contains subcomponents with
   separate copyright notices and license terms. Your use of the source
   code for these subcomponents is subject to the terms and conditions
   of the following licenses.

diff --git a/dist/hawq/NOTICE b/dist/hawq/NOTICE
@@ -1,4 +1,4 @@
-Apache HAWQ (incubating) 
+Apache HAWQ
 Copyright 2017 The Apache Software Foundation.
 
 This product includes software developed at

diff --git a/getversion b/getversion
@@ -18,7 +18,7 @@
 # under the License.
 #
 
-GP_VERSION="2.3.0.0-incubating"
+GP_VERSION="2.4.0.0"
 
 GP_BUILDNUMBER=dev
 if [ -f BUILD_NUMBER ] ; then

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.apache.hawq</groupId>
   <artifactId>hawq</artifactId>
-  <version>2.3</version>
+  <version>2.4</version>
   <packaging>pom</packaging>
 
   <build>  

diff --git a/pxf/resources/META-INF/LICENSE b/pxf/resources/META-INF/LICENSE
@@ -202,7 +202,7 @@
 
 =======================================================================
 
-Apache HAWQ (incubating) - contained works supporting PXF components:
+Apache HAWQ - contained works supporting PXF components:
 
 This product contains additional works that are distributed under
 Apache License, Version 2.0 (ALv2).
@@ -211,9 +211,9 @@ Apache License, Version 2.0 (ALv2).
 
 =======================================================================
 
-Apache HAWQ (incubating) PXF runtime dependent subcomponents:
+Apache HAWQ PXF runtime dependent subcomponents:
 
-  The Apache HAWQ (incubating) project contains PXF. It is an
+  The Apache HAWQ project contains PXF. It is an
   extensible framework that allows HAWQ to query external data files,
   whose metadata is not managed by HAWQ. PXF includes built-in
   connectors for accessing data that exists inside HDFS files, Hive
@@ -377,4 +377,4 @@ Apache HAWQ (incubating) PXF runtime dependent subcomponents:
     xmlenc, 0.52
     xz, 1.0
     zookeeper, 3.4.6
-
+
diff --git a/pxf/resources/META-INF/NOTICE b/pxf/resources/META-INF/NOTICE
@@ -1,4 +1,4 @@
-Apache HAWQ (incubating) 
+Apache HAWQ
 Copyright 2017 The Apache Software Foundation.
 
 This product includes software developed at

diff --git a/ranger-plugin/admin-plugin/pom.xml b/ranger-plugin/admin-plugin/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.hawq</groupId>
         <artifactId>ranger-plugin</artifactId>
-        <version>2.3.0.0</version>
+        <version>2.4.0.0</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/ranger-plugin/integration/admin/pom.xml b/ranger-plugin/integration/admin/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.hawq</groupId>
         <artifactId>ranger-plugin-integration</artifactId>
-        <version>2.3.0.0</version>
+        <version>2.4.0.0</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/ranger-plugin/integration/pom.xml b/ranger-plugin/integration/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.hawq</groupId>
         <artifactId>ranger-plugin</artifactId>
-        <version>2.3.0.0</version>
+        <version>2.4.0.0</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/ranger-plugin/integration/service/pom.xml b/ranger-plugin/integration/service/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.apache.hawq</groupId>
         <artifactId>ranger-plugin-integration</artifactId>
-        <version>2.3.0.0</version>
+        <version>2.4.0.0</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/ranger-plugin/pom.xml b/ranger-plugin/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.hawq</groupId>
     <artifactId>ranger-plugin</artifactId>
-    <version>2.3.0.0</version>
+    <version>2.4.0.0</version>
     <packaging>pom</packaging>
     <name>HAWQ Ranger Plugin</name>
     <description>HAWQ Ranger Plugin</description>

diff --git a/ranger-plugin/service/pom.xml b/ranger-plugin/service/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.apache.hawq</groupId>
         <artifactId>ranger-plugin</artifactId>
-        <version>2.3.0.0</version>
+        <version>2.4.0.0</version>
         <relativePath>..</relativePath>
     </parent>
     <build>

diff --git a/src/include/catalog/calico.pl b/src/include/catalog/calico.pl
@@ -191,7 +191,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 # SLZY_POD_HDR_END

diff --git a/src/include/catalog/caqltrack.pl b/src/include/catalog/caqltrack.pl
@@ -146,7 +146,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 # SLZY_POD_HDR_END

diff --git a/src/include/catalog/caqluniqdef.pl b/src/include/catalog/caqluniqdef.pl
@@ -95,7 +95,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 # SLZY_POD_HDR_END

diff --git a/src/include/catalog/catullus.pl b/src/include/catalog/catullus.pl
@@ -115,7 +115,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 # SLZY_POD_HDR_END

diff --git a/src/include/catalog/pablopcatso.pl b/src/include/catalog/pablopcatso.pl
@@ -135,7 +135,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

diff --git a/src/include/catalog/sleazy.pl b/src/include/catalog/sleazy.pl
@@ -277,7 +277,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 # SLZY_POD_HDR_END

diff --git a/src/include/catalog/tidycat.pl b/src/include/catalog/tidycat.pl
@@ -327,7 +327,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 # SLZY_POD_HDR_END

diff --git a/src/test/regress/atmsort.pl b/src/test/regress/atmsort.pl
@@ -376,7 +376,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

diff --git a/src/test/regress/dld.pl b/src/test/regress/dld.pl
@@ -87,7 +87,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
 

diff --git a/src/test/regress/explain.pl b/src/test/regress/explain.pl
@@ -268,7 +268,7 @@ =head1 AUTHORS
 
 Apache HAWQ
 
-Address bug reports and comments to: dev@hawq.incubator.apache.org
+Address bug reports and comments to: [email protected]
 
 =cut
-Original file line number
+Diff line change
@@ Expand Up / @@ -135,7 +135,7 @@ =head1 AUTHORS @@
     Apache HAWQ
-    Address bug reports and comments to: dev@hawq.incubator.apache.org
+    Address bug reports and comments to: [email protected]
     =cut
@@ Expand Down @@