lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

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

Browse Source
This commit is contained in:
leesf
2020-05-24 18:28:13 +08:00
committed by GitHub
parent f22c3e933e
commit 492f324bc7
8 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NOTICE
View File

@@ -1,4 +1,4 @@
Apache Hudi (incubating) Apache Hudi
Copyright 2019-2020 The Apache Software Foundation Copyright 2019-2020 The Apache Software Foundation
This product includes software developed at This product includes software developed at

6
README.md
View File

@@ -21,7 +21,7 @@ Hudi manages the storage of large analytical datasets on DFS (Cloud stores, HDFS
<https://hudi.apache.org/> <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) [![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) [![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) [![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 # 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 mvn clean package -DskipTests -DskipITs
# Start command # Start command
@@ -82,7 +82,7 @@ The default hudi-jar bundles spark-avro module. To build without spark-avro modu
``` ```
# Checkout code and build # 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 mvn clean package -DskipTests -DskipITs -Pspark-shade-unbundle-avro
# Start command # Start command

7
doap_HUDI.rdf
View File

@@ -26,7 +26,6 @@
<license rdf:resource="http://usefulinc.com/doap/licenses/asl20" /> <license rdf:resource="http://usefulinc.com/doap/licenses/asl20" />
<name>Apache Hudi</name> <name>Apache Hudi</name>
<homepage rdf:resource="https://hudi.apache.org" /> <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> <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> <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" /> <bug-database rdf:resource="https://issues.apache.org/jira/browse/HUDI" />
@@ -54,13 +53,13 @@
</release> </release>
<repository> <repository>
<GitRepository> <GitRepository>
<location rdf:resource="https://github.com/apache/incubator-hudi.git"/> <location rdf:resource="https://github.com/apache/hudi.git"/>
<browse rdf:resource="https://github.com/apache/incubator-hudi"/> <browse rdf:resource="https://github.com/apache/hudi"/>
</GitRepository> </GitRepository>
</repository> </repository>
<maintainer> <maintainer>
<foaf:Person> <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:mbox rdf:resource="mailto:dev@hudi.apache.org"/>
</foaf:Person> </foaf:Person>
</maintainer> </maintainer>

2
hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestHoodieDemo.java
View File

@@ -27,7 +27,7 @@ import java.util.Collections;
import java.util.List; 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 * 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. * `docker/setup_demo.sh` and then run the test class as you would do normally.

14
pom.xml
View File

@@ -30,8 +30,8 @@
<artifactId>hudi</artifactId> <artifactId>hudi</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>0.6.0-SNAPSHOT</version> <version>0.6.0-SNAPSHOT</version>
<description>Apache Hudi (incubating) brings stream style processing on big data</description> <description>Apache Hudi brings stream style processing on big data</description>
<url>https://github.com/apache/incubator-hudi</url> <url>https://github.com/apache/hudi</url>
<name>Hudi</name> <name>Hudi</name>
<modules> <modules>
@@ -122,9 +122,9 @@
</properties> </properties>
<scm> <scm>
<connection>scm:git:git@github.com:apache/incubator-hudi.git</connection> <connection>scm:git:git@github.com:apache/hudi.git</connection>
<developerConnection>scm:git:git@github.com:apache/incubator-hudi.git</developerConnection> <developerConnection>scm:git:git@github.com:apache/hudi.git</developerConnection>
<url>git@github.com:apache/incubator-hudi.git</url> <url>git@github.com:apache/hudi.git</url>
<tag>HEAD</tag> <tag>HEAD</tag>
</scm> </scm>
@@ -1111,8 +1111,4 @@
</profile> </profile>
</profiles> </profiles>
<issueManagement>
<system>GitHub</system>
<url>https://github.com/apache/incubator-hudi/issues</url>
</issueManagement>
</project> </project>

12
scripts/release/cut_release_branch.sh
View File

@@ -16,7 +16,7 @@
# limitations under the License. # 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. # and cut release branch for current development version.
# Parse parameters passing into the script # Parse parameters passing into the script
@@ -34,7 +34,7 @@ function clean_up(){
} }
if [[ $# -eq 1 && $1 = "-h" ]]; then 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 "There are 3 params required:"
echo "--release=\${CURRENT_RELEASE_VERSION}" echo "--release=\${CURRENT_RELEASE_VERSION}"
echo "--next_release=\${NEXT_RELEASE_VERSION}" echo "--next_release=\${NEXT_RELEASE_VERSION}"
@@ -63,8 +63,8 @@ fi
MASTER_BRANCH=master MASTER_BRANCH=master
RELEASE_BRANCH=release-${RELEASE} RELEASE_BRANCH=release-${RELEASE}
GITHUB_REPO_URL=git@github.com:apache/incubator-hudi.git GITHUB_REPO_URL=git@github.com:apache/hudi.git
HUDI_ROOT_DIR=incubator-hudi HUDI_ROOT_DIR=hudi
LOCAL_CLONE_DIR=hudi_release_${RELEASE} LOCAL_CLONE_DIR=hudi_release_${RELEASE}
echo "=====================Environment Variables=====================" echo "=====================Environment Variables====================="
@@ -119,9 +119,9 @@ else
exit exit
fi fi
# Checkout and update release branch - Add incubating and remove snapshot # Checkout and update release branch
git checkout ${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 "==================Current working branch======================="
echo ${RELEASE_BRANCH} echo ${RELEASE_BRANCH}

4
scripts/release/preparation_before_release.sh
View File

@@ -22,8 +22,8 @@ set -e
LOCAL_SVN_DIR=local_svn_dir LOCAL_SVN_DIR=local_svn_dir
ROOT_SVN_URL=https://dist.apache.org/repos/dist/ ROOT_SVN_URL=https://dist.apache.org/repos/dist/
DEV_REPO=dev/incubator DEV_REPO=dev
RELEASE_REPO=release/incubator RELEASE_REPO=release
HUDI_REPO=hudi HUDI_REPO=hudi
cd ~ cd ~

22
scripts/release/validate_staged_release.sh
View File

@@ -31,7 +31,7 @@ fi
REDIRECT=' > /dev/null 2>&1' REDIRECT=' > /dev/null 2>&1'
if [[ $# -lt 2 ]]; then 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 "There are two params required:"
echo "--release=\${CURRENT_RELEASE_VERSION}" echo "--release=\${CURRENT_RELEASE_VERSION}"
echo "--rc_num=\${RC_NUM}" echo "--rc_num=\${RC_NUM}"
@@ -65,11 +65,11 @@ rm -rf $WORK_DIR
mkdir $WORK_DIR mkdir $WORK_DIR
pushd $WORK_DIR pushd $WORK_DIR
# Checkout dist incubator repo # Checkout dist repo
LOCAL_SVN_DIR=local_svn_dir LOCAL_SVN_DIR=local_svn_dir
ROOT_SVN_URL=https://dist.apache.org/repos/dist/ ROOT_SVN_URL=https://dist.apache.org/repos/dist/
DEV_REPO=dev/incubator DEV_REPO=dev
#RELEASE_REPO=release/incubator #RELEASE_REPO=release
HUDI_REPO=hudi HUDI_REPO=hudi
rm -rf $LOCAL_SVN_DIR rm -rf $LOCAL_SVN_DIR
@@ -77,23 +77,23 @@ mkdir $LOCAL_SVN_DIR
cd $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) (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} cd ${HUDI_REPO}/hudi-${RELEASE_VERSION}-rc${RC_NUM}
$SHASUM hudi-${RELEASE_VERSION}-incubating-rc${RC_NUM}.src.tgz > got.sha512 $SHASUM hudi-${RELEASE_VERSION}-rc${RC_NUM}.src.tgz > got.sha512
echo "Checking Checksum of Source Release" 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" echo -e "\t\tChecksum Check of Source Release - [OK]\n"
# Download KEYS file # 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 # GPG Check
echo "Checking Signature" 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 # 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) (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}-incubating-rc${RC_NUM} cd hudi-${RELEASE_VERSION}-rc${RC_NUM}
### BEGIN: Binary Files Check ### BEGIN: Binary Files Check
echo "Checking for binary files in source release" echo "Checking for binary files in source release"