[HUDI-938] Removing incubating/incubator from project (#1658)

2020-05-24 18:28:13 +08:00
parent f22c3e933e
commit 492f324bc7
8 changed files with 32 additions and 37 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Apache Hudi (incubating)
+Apache Hudi
 Copyright 2019-2020 The Apache Software Foundation

 This product includes software developed at
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Hudi manages the storage of large analytical datasets on DFS (Cloud stores, HDFS

 <https://hudi.apache.org/>

-[![Build Status](https://travis-ci.org/apache/incubator-hudi.svg?branch=master)](https://travis-ci.org/apache/incubator-hudi)
+[![Build Status](https://travis-ci.org/apache/hudi.svg?branch=master)](https://travis-ci.org/apache/hudi)
 [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.apache.hudi/hudi/badge.svg)](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.apache.hudi%22)
 [![Join on Slack](https://img.shields.io/badge/slack-%23hudi-72eff8?logo=slack&color=48c628&label=Join%20on%20Slack)](https://join.slack.com/t/apache-hudi/shared_invite/enQtODYyNDAxNzc5MTg2LTE5OTBlYmVhYjM0N2ZhOTJjOWM4YzBmMWU2MjZjMGE4NDc5ZDFiOGQ2N2VkYTVkNzU3ZDQ4OTI1NmFmYWQ0NzE)
@@ -53,7 +53,7 @@ Prerequisites for building Apache Hudi:

 ```
 # Checkout code and build
-git clone https://github.com/apache/incubator-hudi.git && cd incubator-hudi
+git clone https://github.com/apache/hudi.git && cd hudi
 mvn clean package -DskipTests -DskipITs

 # Start command
@@ -82,7 +82,7 @@ The default hudi-jar bundles spark-avro module. To build without spark-avro modu

 ```
 # Checkout code and build
-git clone https://github.com/apache/incubator-hudi.git && cd incubator-hudi
+git clone https://github.com/apache/hudi.git && cd hudi
 mvn clean package -DskipTests -DskipITs -Pspark-shade-unbundle-avro

 # Start command
--- a/doap_HUDI.rdf
+++ b/doap_HUDI.rdf
@@ -26,7 +26,6 @@
    <license rdf:resource="http://usefulinc.com/doap/licenses/asl20" />
    <name>Apache Hudi</name>
    <homepage rdf:resource="https://hudi.apache.org" />
-    <asfext:pmc rdf:resource="https://incubator.apache.org" />
    <shortdesc>Ingests and Manages storage of large analytical datasets</shortdesc>
    <description>Hudi (pronounced “Hoodie”) brings stream processing to big data, providing upserts, deletes and incremental data streams.</description>
    <bug-database rdf:resource="https://issues.apache.org/jira/browse/HUDI" />
@@ -54,13 +53,13 @@
    </release>
    <repository>
      <GitRepository>
-        <location rdf:resource="https://github.com/apache/incubator-hudi.git"/>
-        <browse rdf:resource="https://github.com/apache/incubator-hudi"/>
+        <location rdf:resource="https://github.com/apache/hudi.git"/>
+        <browse rdf:resource="https://github.com/apache/hudi"/>
      </GitRepository>
    </repository>
    <maintainer>
      <foaf:Person>
-        <foaf:name>Apache Hudi-incubating PPMC</foaf:name>
+        <foaf:name>Apache Hudi PMC</foaf:name>
          <foaf:mbox rdf:resource="mailto:dev@hudi.apache.org"/>
      </foaf:Person>
    </maintainer>
--- a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java
+++ b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java
@@ -27,7 +27,7 @@ import java.util.Collections;
 import java.util.List;

 /**
- * Goes through steps described in https://hudi.incubator.apache.org/docker_demo.html
+ * Goes through steps described in https://hudi.apache.org/docker_demo.html
 *
 * To run this as a standalone test in the IDE or command line. First bring up the demo setup using
 * `docker/setup_demo.sh` and then run the test class as you would do normally.
--- a/pom.xml
+++ b/pom.xml
@@ -30,8 +30,8 @@
  <artifactId>hudi</artifactId>
  <packaging>pom</packaging>
  <version>0.6.0-SNAPSHOT</version>
-  <description>Apache Hudi (incubating) brings stream style processing on big data</description>
-  <url>https://github.com/apache/incubator-hudi</url>
+  <description>Apache Hudi brings stream style processing on big data</description>
+  <url>https://github.com/apache/hudi</url>
  <name>Hudi</name>

  <modules>
@@ -122,9 +122,9 @@
  </properties>

  <scm>
-    <connection>scm:git:git@github.com:apache/incubator-hudi.git</connection>
-    <developerConnection>scm:git:git@github.com:apache/incubator-hudi.git</developerConnection>
-    <url>git@github.com:apache/incubator-hudi.git</url>
+    <connection>scm:git:git@github.com:apache/hudi.git</connection>
+    <developerConnection>scm:git:git@github.com:apache/hudi.git</developerConnection>
+    <url>git@github.com:apache/hudi.git</url>
    <tag>HEAD</tag>
  </scm>

@@ -1111,8 +1111,4 @@
    </profile>
  </profiles>

-  <issueManagement>
-    <system>GitHub</system>
-    <url>https://github.com/apache/incubator-hudi/issues</url>
-  </issueManagement>
 </project>
--- a/scripts/release/cut_release_branch.sh
+++ b/scripts/release/cut_release_branch.sh
@@ -16,7 +16,7 @@
 #    limitations under the License.
 #

-# This script will update apache hudi (incubating) master branch with next release version
+# This script will update apache hudi master branch with next release version
 # and cut release branch for current development version.

 # Parse parameters passing into the script
@@ -34,7 +34,7 @@ function clean_up(){
 }

 if [[ $# -eq 1 && $1 = "-h" ]]; then
-	echo "This script will update apache hudi(incubating) master branch with next release version and cut release branch for current development version."
+	echo "This script will update apache hudi master branch with next release version and cut release branch for current development version."
 	echo "There are 3 params required:"
 	echo "--release=\${CURRENT_RELEASE_VERSION}"
 	echo "--next_release=\${NEXT_RELEASE_VERSION}"
@@ -63,8 +63,8 @@ fi

 MASTER_BRANCH=master
 RELEASE_BRANCH=release-${RELEASE}
-GITHUB_REPO_URL=git@github.com:apache/incubator-hudi.git
-HUDI_ROOT_DIR=incubator-hudi
+GITHUB_REPO_URL=git@github.com:apache/hudi.git
+HUDI_ROOT_DIR=hudi
 LOCAL_CLONE_DIR=hudi_release_${RELEASE}

 echo "=====================Environment Variables====================="
@@ -119,9 +119,9 @@ else
  exit
 fi

-# Checkout and update release branch - Add incubating and remove snapshot
+# Checkout and update release branch
 git checkout ${RELEASE_BRANCH}
-mvn versions:set -DnewVersion=${RELEASE}-incubating-rc${RC_NUM}
+mvn versions:set -DnewVersion=${RELEASE}-rc${RC_NUM}

 echo "==================Current working branch======================="
 echo ${RELEASE_BRANCH}
--- a/scripts/release/preparation_before_release.sh
+++ b/scripts/release/preparation_before_release.sh
@@ -22,8 +22,8 @@ set -e

 LOCAL_SVN_DIR=local_svn_dir
 ROOT_SVN_URL=https://dist.apache.org/repos/dist/
-DEV_REPO=dev/incubator
-RELEASE_REPO=release/incubator
+DEV_REPO=dev
+RELEASE_REPO=release
 HUDI_REPO=hudi

 cd ~
--- a/scripts/release/validate_staged_release.sh
+++ b/scripts/release/validate_staged_release.sh
@@ -31,7 +31,7 @@ fi

 REDIRECT=' > /dev/null 2>&1'
 if [[ $# -lt 2 ]]; then
-    echo "This script will validate source release candidate published in dist for apache hudi(incubating)"
+    echo "This script will validate source release candidate published in dist for apache hudi"
    echo "There are two params required:"
    echo "--release=\${CURRENT_RELEASE_VERSION}"
    echo "--rc_num=\${RC_NUM}"
@@ -65,11 +65,11 @@ rm -rf $WORK_DIR
 mkdir $WORK_DIR
 pushd $WORK_DIR

-# Checkout dist incubator repo
+# Checkout dist repo
 LOCAL_SVN_DIR=local_svn_dir
 ROOT_SVN_URL=https://dist.apache.org/repos/dist/
-DEV_REPO=dev/incubator
-#RELEASE_REPO=release/incubator
+DEV_REPO=dev
+#RELEASE_REPO=release
 HUDI_REPO=hudi

 rm -rf $LOCAL_SVN_DIR
@@ -77,23 +77,23 @@ mkdir $LOCAL_SVN_DIR
 cd $LOCAL_SVN_DIR
 (bash -c "svn co ${ROOT_SVN_URL}/${DEV_REPO}/${HUDI_REPO} $REDIRECT") || (echo -e "\t\t Unable to checkout  ${ROOT_SVN_URL}/${DEV_REPO}/${HUDI_REPO} . Please run with --verbose to get details\n" && exit -1)

-cd ${HUDI_REPO}/hudi-${RELEASE_VERSION}-incubating-rc${RC_NUM}
-$SHASUM hudi-${RELEASE_VERSION}-incubating-rc${RC_NUM}.src.tgz > got.sha512 
+cd ${HUDI_REPO}/hudi-${RELEASE_VERSION}-rc${RC_NUM}
+$SHASUM hudi-${RELEASE_VERSION}-rc${RC_NUM}.src.tgz > got.sha512

 echo "Checking Checksum of Source Release"
-diff -u hudi-${RELEASE_VERSION}-incubating-rc${RC_NUM}.src.tgz.sha512 got.sha512 
+diff -u hudi-${RELEASE_VERSION}-rc${RC_NUM}.src.tgz.sha512 got.sha512
 echo -e "\t\tChecksum Check of Source Release - [OK]\n"

 # Download KEYS file
-curl https://dist.apache.org/repos/dist/release/incubator/hudi/KEYS > ../KEYS
+curl https://dist.apache.org/repos/dist/release/hudi/KEYS > ../KEYS

 # GPG Check
 echo "Checking Signature"
-(bash -c "gpg --import ../KEYS $REDIRECT" && bash -c "gpg --verify hudi-${RELEASE_VERSION}-incubating-rc${RC_NUM}.src.tgz.asc hudi-${RELEASE_VERSION}-incubating-rc${RC_NUM}.src.tgz $REDIRECT" && echo -e "\t\tSignature Check - [OK]\n") || (echo -e "\t\tSignature Check - [FAILED] - Run with --verbose to get details\n" && exit -1)
+(bash -c "gpg --import ../KEYS $REDIRECT" && bash -c "gpg --verify hudi-${RELEASE_VERSION}-rc${RC_NUM}.src.tgz.asc hudi-${RELEASE_VERSION}-rc${RC_NUM}.src.tgz $REDIRECT" && echo -e "\t\tSignature Check - [OK]\n") || (echo -e "\t\tSignature Check - [FAILED] - Run with --verbose to get details\n" && exit -1)

 # Untar 
-(bash -c "tar -zxf hudi-${RELEASE_VERSION}-incubating-rc${RC_NUM}.src.tgz $REDIRECT") || (echo -e "\t\t Unable to untar hudi-${RELEASE_VERSION}-incubating-rc${RC_NUM}.src.tgz . Please run with --verbose to get details\n" && exit -1)
-cd hudi-${RELEASE_VERSION}-incubating-rc${RC_NUM}
+(bash -c "tar -zxf hudi-${RELEASE_VERSION}-rc${RC_NUM}.src.tgz $REDIRECT") || (echo -e "\t\t Unable to untar hudi-${RELEASE_VERSION}-rc${RC_NUM}.src.tgz . Please run with --verbose to get details\n" && exit -1)
+cd hudi-${RELEASE_VERSION}-rc${RC_NUM}

 ### BEGIN: Binary Files Check
 echo "Checking for binary files in source release"