This is an automated email from the ASF dual-hosted git repository.
huor pushed a commit to branch HAWQ-1800
in repository https://gitbox.apache.org/repos/asf/hawq.git
The following commit(s) were added to refs/heads/HAWQ-1800 by this push:
new c5b7617 HAWQ-1800. set version for 3.0.0.0 release
c5b7617 is described below
commit c5b7617fd4fbff1a1b83d18039c7b21f4d51e986
Author: huor <[email protected]>
AuthorDate: Wed Aug 11 10:36:25 2021 +0800
HAWQ-1800. set version for 3.0.0.0 release
---
contrib/hawq-ambari-plugin/build.properties | 4 ++--
contrib/hawq-ambari-plugin/pom.xml | 6 +++---
contrib/hawq-package/README | 6 +++---
contrib/hawq-package/build_hawq_rpm.sh | 2 +-
contrib/hawq-package/hawq.spec | 8 ++++----
contrib/hawq-package/make_rpm_tarball.sh | 6 +++---
dist/hawq/LICENSE | 4 ++--
dist/hawq/NOTICE | 2 +-
getversion | 2 +-
pom.xml | 2 +-
ranger-plugin/admin-plugin/pom.xml | 2 +-
ranger-plugin/integration/admin/pom.xml | 2 +-
ranger-plugin/integration/pom.xml | 2 +-
ranger-plugin/integration/service/pom.xml | 2 +-
ranger-plugin/pom.xml | 2 +-
ranger-plugin/service/pom.xml | 2 +-
16 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/contrib/hawq-ambari-plugin/build.properties
b/contrib/hawq-ambari-plugin/build.properties
index 808b6b4..344430e 100644
--- a/contrib/hawq-ambari-plugin/build.properties
+++ b/contrib/hawq-ambari-plugin/build.properties
@@ -1,8 +1,8 @@
-hawq.release.version=4.0.0.0
+hawq.release.version=3.0.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=4.0.0.0
+repository.version=3.0.0.0
default.stack=HDP-2.5
diff --git a/contrib/hawq-ambari-plugin/pom.xml
b/contrib/hawq-ambari-plugin/pom.xml
index 5dfe393..4b8320f 100644
--- a/contrib/hawq-ambari-plugin/pom.xml
+++ b/contrib/hawq-ambari-plugin/pom.xml
@@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.hawq</groupId>
- <artifactId>oushu-database-ambari-plugin</artifactId>
- <version>4.0.0.0</version>
- <name>oushu-database-ambari-plugin</name>
+ <artifactId>hawq-ambari-plugin</artifactId>
+ <version>3.0.0.0</version>
+ <name>hawq-ambari-plugin</name>
<url>http://maven.apache.org</url>
<properties>
diff --git a/contrib/hawq-package/README b/contrib/hawq-package/README
index 8fb34fd..e33c4d2 100644
--- 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
index c3c3309..7b569b4 100755
--- 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
index a478ee3..e33eb4a 100644
--- a/contrib/hawq-package/hawq.spec
+++ b/contrib/hawq-package/hawq.spec
@@ -25,7 +25,7 @@
%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
@@ -33,7 +33,7 @@ Group: Applications/Databases
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
index 8501534..33ca573 100755
--- 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
index 3da3ea4..be8d1f2 100644
--- 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
index 1b1b2e7..20ee60c 100644
--- 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
index 07d356f..2a54c17 100755
--- a/getversion
+++ b/getversion
@@ -18,7 +18,7 @@
# under the License.
#
-GP_VERSION="4.0.0.0"
+GP_VERSION="3.0.0.0"
# GP_BUILDNUMBER=dev
if [ -f BUILD_NUMBER ] ; then
diff --git a/pom.xml b/pom.xml
index cafa56a..528b257 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.hawq</groupId>
<artifactId>hawq</artifactId>
- <version>2.3</version>
+ <version>3.0</version>
<packaging>pom</packaging>
<build>
diff --git a/ranger-plugin/admin-plugin/pom.xml
b/ranger-plugin/admin-plugin/pom.xml
index 4be1625..28f0899 100644
--- 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>4.0.0.0</version>
+ <version>3.0.0.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/ranger-plugin/integration/admin/pom.xml
b/ranger-plugin/integration/admin/pom.xml
index 0564b0b..7bb31eb 100644
--- 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>4.0.0.0</version>
+ <version>3.0.0.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/ranger-plugin/integration/pom.xml
b/ranger-plugin/integration/pom.xml
index 14ef942..c9ce517 100644
--- 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>4.0.0.0</version>
+ <version>3.0.0.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/ranger-plugin/integration/service/pom.xml
b/ranger-plugin/integration/service/pom.xml
index 18e3239..f21b5af 100644
--- 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>4.0.0.0</version>
+ <version>3.0.0.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/ranger-plugin/pom.xml b/ranger-plugin/pom.xml
index 9f9d46d..44b02a8 100644
--- 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>4.0.0.0</version>
+ <version>3.0.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
index 7beb1a1..b73e69b 100644
--- 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>4.0.0.0</version>
+ <version>3.0.0.0</version>
<relativePath>..</relativePath>
</parent>
<build>
