Skip to content

Commit

Permalink
[KYUUBI #4020] remove incubating from kyuubi source code
Browse files Browse the repository at this point in the history
### _Why are the changes needed?_

### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible

- [ ] Add screenshots for manual tests if appropriate

- [ ] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request

Closes #4069 from lightning-L/kyuubi-4020.

Closes #4020

97406ca [Tianlin Liao] [KYUUBI #4020] remove incubating from kyuubi source code

Authored-by: Tianlin Liao <[email protected]>
Signed-off-by: ulysses-you <[email protected]>
  • Loading branch information
lightning-L authored and ulysses-you committed Jan 4, 2023
1 parent 2c6f17d commit 8e8d8be
Show file tree
Hide file tree
Showing 40 changed files with 103 additions and 213 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Thanks for sending a pull request!

Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://kyuubi.readthedocs.io/en/latest/community/CONTRIBUTING.html
2. If the PR is related to an issue in https://github.com/apache/incubator-kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
2. If the PR is related to an issue in https://github.com/apache/kyuubi/issues, add '[KYUUBI #XXXX]' in your PR title, e.g., '[KYUUBI #XXXX] Your PR title ...'.
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][KYUUBI #XXXX] Your PR title ...'.
-->

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/greetings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ jobs:
issue-message: |
Hello @${{ github.actor }},
Thanks for finding the time to report the issue!
We really appreciate the community's efforts to improve Apache Kyuubi (Incubating).
We really appreciate the community's efforts to improve Apache Kyuubi.
pr-message: |
Hello @${{ github.actor }},
Thanks for finding the time to submit the Pull request, the Kyuubi community thanks you!
We really appreciate the community's efforts to improve Apache Kyuubi (Incubating).
We really appreciate the community's efforts to improve Apache Kyuubi.
If you are new to Apache Kyuubi for code changes, please take some time to read our [contributing guide](https://kyuubi.apache.org/contributing.html).
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ In the process of using Apache Kyuubi, if you have any questions, suggestions, o

- Join the [Mailing Lists](https://kyuubi.apache.org/mailing_lists.html) - the best way to keep up-to-date with the community.
- [Issue Tracker](https://kyuubi.apache.org/issue_tracking.html) - tracking bugs, ideas, plans, etc.
- [Github Discussions](https://github.com/apache/incubator-kyuubi/discussions) - second to mailing list for anything else you want to share or ask
- [Github Discussions](https://github.com/apache/kyuubi/discussions) - second to mailing list for anything else you want to share or ask
- [Slack](https://join.slack.com/t/apachekyuubi/shared_invite/zt-1e1qw68g4-yE5HJsVVDin~ABtZISyuxg) - chat with our community User && Developer anytime!

## Contributing Guide
Expand All @@ -44,10 +44,10 @@ There are many ways to make valuable contributions to the project and community.
You can make various types of contributions to Kyuubi, including the following but not limited to,

- Answer questions in the [Mailing Lists](https://kyuubi.apache.org/mailing_lists.html)
- [Share your success stories with us](https://github.com/apache/incubator-kyuubi/discussions/925)
- [Share your success stories with us](https://github.com/apache/kyuubi/discussions/925)
- Improve Documentation - [![Documentation Status](https://readthedocs.org/projects/kyuubi/badge/?version=latest)](https://kyuubi.apache.org/docs/latest/)
- Test latest releases - [![Latest tag](https://img.shields.io/github/v/tag/apache/incubator-kyuubi?label=tag)](https://github.com/apache/incubator-kyuubi/tags)
- Improve test coverage - [![codecov](https://codecov.io/gh/apache/incubator-kyuubi/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/incubator-kyuubi)
- Test latest releases - [![Latest tag](https://img.shields.io/github/v/tag/apache/kyuubi?label=tag)](https://github.com/apache/kyuubi/tags)
- Improve test coverage - [![codecov](https://codecov.io/gh/apache/kyuubi/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/kyuubi)
- Report bugs and better help developers to reproduce
- Review changes
- [Make a pull request](https://kyuubi.apache.org/pull_request.html)
Expand Down
10 changes: 0 additions & 10 deletions DISCLAIMER

This file was deleted.

100 changes: 0 additions & 100 deletions MATURITY.md

This file was deleted.

2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Apache Kyuubi (Incubating)
Apache Kyuubi
Copyright 2021-2023 The Apache Software Foundation.

This product includes software developed at
Expand Down
2 changes: 1 addition & 1 deletion NOTICE-binary
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

Apache Kyuubi (Incubating)
Apache Kyuubi
Copyright 2021-2023 The Apache Software Foundation.

This product includes software developed at
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
- limitations under the License.
-->

# Apache Kyuubi (Incubating)
# Apache Kyuubi

<img src="https://svn.apache.org/repos/asf/comdev/project-logos/originals/kyuubi-1.svg" alt="Kyuubi logo" height="120px" align="right" />

[![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)
[![Release](https://img.shields.io/github/v/release/apache/incubator-kyuubi?label=release)](https://github.com/apache/incubator-kyuubi/releases)
[![](https://tokei.rs/b1/github.com/apache/incubator-kyuubi)](https://github.com/apache/incubator-kyuubi)
[![codecov](https://codecov.io/gh/apache/incubator-kyuubi/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/incubator-kyuubi)
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/apache/incubator-kyuubi/Kyuubi/master?style=plastic)
[![Travis](https://api.travis-ci.com/apache/incubator-kyuubi.svg?branch=master)](https://travis-ci.com/apache/incubator-kyuubi)
[![Release](https://img.shields.io/github/v/release/apache/kyuubi?label=release)](https://github.com/apache/kyuubi/releases)
[![](https://tokei.rs/b1/github.com/apache/kyuubi)](https://github.com/apache/kyuubi)
[![codecov](https://codecov.io/gh/apache/kyuubi/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/kyuubi)
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/apache/kyuubi/Kyuubi/master?style=plastic)
[![Travis](https://api.travis-ci.com/apache/kyuubi.svg?branch=master)](https://travis-ci.com/apache/kyuubi)
[![Documentation Status](https://readthedocs.org/projects/kyuubi/badge/?version=latest)](https://kyuubi.apache.org/docs/latest/)
![GitHub top language](https://img.shields.io/github/languages/top/apache/incubator-kyuubi)
[![Commit activity](https://img.shields.io/github/commit-activity/m/apache/incubator-kyuubi)](https://github.com/apache/incubator-kyuubi/graphs/commit-activity)
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/apache/incubator-kyuubi.svg)](http://isitmaintained.com/project/apache/incubator-kyuubi "Average time to resolve an issue")
[![Percentage of issues still open](http://isitmaintained.com/badge/open/apache/incubator-kyuubi.svg)](http://isitmaintained.com/project/apache/incubator-kyuubi "Percentage of issues still open")
![GitHub top language](https://img.shields.io/github/languages/top/apache/kyuubi)
[![Commit activity](https://img.shields.io/github/commit-activity/m/apache/kyuubi)](https://github.com/apache/kyuubi/graphs/commit-activity)
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/apache/kyuubi.svg)](http://isitmaintained.com/project/apache/kyuubi "Average time to resolve an issue")
[![Percentage of issues still open](http://isitmaintained.com/badge/open/apache/kyuubi.svg)](http://isitmaintained.com/project/apache/kyuubi "Percentage of issues still open")


## What is Kyuubi?
Expand Down Expand Up @@ -113,7 +113,7 @@ Ready? [Getting Started](https://kyuubi.apache.org/docs/latest/quick_start/quick

## Contributor over time

[![Contributor over time](https://contributor-graph-api.apiseven.com/contributors-svg?chart=contributorOverTime&repo=apache/incubator-kyuubi)](https://api7.ai/contributor-graph?chart=contributorOverTime&repo=apache/incubator-kyuubi)
[![Contributor over time](https://contributor-graph-api.apiseven.com/contributors-svg?chart=contributorOverTime&repo=apache/kyuubi)](https://api7.ai/contributor-graph?chart=contributorOverTime&repo=apache/kyuubi)

## Aside

Expand Down
2 changes: 1 addition & 1 deletion build/release/create-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Top level targets are:
All other inputs are environment variables:
RELEASE_VERSION - Release version, must match pom.xml (e.g. 1.3.0-incubating)
RELEASE_VERSION - Release version, must match pom.xml (e.g. 1.7.0)
SKIP_GPG - (optional) Default false
EOF
exit 1
Expand Down
6 changes: 3 additions & 3 deletions build/release/generate_changelog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ function usage {
echo "+--------------------------------------------------------------------+"
echo "| ./generate_changelog.sh <LAST_RELEASE_TAG> <CURRENT_RELEASE_TAG> |"
echo "+--------------------------------------------------------------------+"
echo "LAST_RELEASE_TAG: - last release tag of kyuubi e.g. v1.5.0-incubating"
echo "CURRENT_RELEASE_TAG: - current release tag of kyuubi e.g. v1.5.1-incubating-rc0"
echo "LAST_RELEASE_TAG: - last release tag of kyuubi e.g. v1.7.0"
echo "CURRENT_RELEASE_TAG: - current release tag of kyuubi e.g. v1.7.1-rc0"
echo ""
}

Expand All @@ -49,7 +49,7 @@ if [ "${LAST_RELEASE_TAG}" = "-h" ]; then
fi

## Add title for changelog doc.
echo "## Changelog for Apache Kyuubi(Incubating) $RELEASE_VERSION" > $CHANGELOG_PATH
echo "## Changelog for Apache Kyuubi $RELEASE_VERSION" > $CHANGELOG_PATH
echo "" >> $CHANGELOG_PATH
## Append well-formatted git log to changelog file.
git log --pretty="[%s]($KYUUBI_GITHUB_COMMIT_URL%h) " $LAST_RELEASE_TAG..$CURRENT_RELEASE_TAG | grep -v "\[RELEASE\]" >> $CHANGELOG_PATH
4 changes: 2 additions & 2 deletions build/release/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set -x

ASF_USERNAME=${ASF_USERNAME:?"ASF_USERNAME is required"}
ASF_PASSWORD=${ASF_PASSWORD:?"ASF_PASSWORD is required"}
RELEASE_VERSION=${RELEASE_VERSION:?"RELEASE_VERSION is required, e.g. 1.4.0-incubating"}
RELEASE_VERSION=${RELEASE_VERSION:?"RELEASE_VERSION is required, e.g. 1.7.0"}
RELEASE_RC_NO=${RELEASE_RC_NO:?"RELEASE_RC_NO is required, e.g. 0"}

exit_with_usage() {
Expand All @@ -37,7 +37,7 @@ Top level targets are:
All other inputs are environment variables
RELEASE_VERSION - Release version, must match pom.xml and not be SNAPSHOT (e.g. 1.3.0-incubating)
RELEASE_VERSION - Release version, must match pom.xml and not be SNAPSHOT (e.g. 1.7.0)
RELEASE_RC_NO - Release RC number, (e.g. 0)
ASF_USERNAME - Username of ASF committer account
Expand Down
20 changes: 10 additions & 10 deletions build/release/script/announce.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set -e
RELEASE_DIR="$(cd "$(dirname "$0")"/..; pwd)"

######### Please modify the variables ##########
# release version, e.g. 1.4.0-incubating
# release version, e.g. 1.7.0
release_version=${release_version:-""}
################################################

Expand All @@ -39,15 +39,15 @@ mkdir -p ${RELEASE_TEMP_DIR}
ANNOUNCE=${RELEASE_TEMP_DIR}/${release_version}_announce.temp

cat >$ANNOUNCE<<EOF
Title: [ANNOUNCE] Apache Kyuubi (Incubating) released ${release_version}
Title: [ANNOUNCE] Apache Kyuubi released ${release_version}
Content:
Hi all,
The Apache Kyuubi (Incubating) community is pleased to announce that
Apache Kyuubi (Incubating) ${release_version} has been released!
The Apache Kyuubi community is pleased to announce that
Apache Kyuubi ${release_version} has been released!
Apache Kyuubi (Incubating) is a distributed multi-tenant JDBC server for
Apache Kyuubi is a distributed multi-tenant JDBC server for
large-scale data processing and analytics, built on top of Apache Spark
and designed to support more engines (i.e. Apache Flink).
Expand All @@ -68,18 +68,18 @@ data security, high availability, high client concurrency, etc.
The full release notes and download links are available at:
Release Notes: https://kyuubi.apache.org/release/${release_version}.html
To learn more about Apache Kyuubi (Incubating), please see
To learn more about Apache Kyuubi, please see
https://kyuubi.apache.org/
Kyuubi Resources:
- Issue: https://github.com/apache/incubator-kyuubi/issues
- Issue: https://github.com/apache/kyuubi/issues
- Mailing list: [email protected]
We would like to thank all contributors of the Kyuubi community and Incubating
community who made this release possible!
We would like to thank all contributors of the Kyuubi community
who made this release possible!
Thanks,
On behalf of Apache Kyuubi (Incubating) community
On behalf of Apache Kyuubi community
EOF

echo "please Use [email protected], [email protected], [email protected], [email protected]
Expand Down
14 changes: 7 additions & 7 deletions build/release/script/dev_kyuubi_vote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ set -e
RELEASE_DIR="$(cd "$(dirname "$0")"/..; pwd)"

######### Please modify the variables ##########
# release version, e.g. v1.4.0-incubating
# release version, e.g. v1.7.0
release_version=${release_version:-""}
# release candidate number, e.g. rc2
release_rc_no=${release_rc_no:-""}
# previous release candidate number, e.g. rc1, could be empty if it is the first vote
prev_release_rc_no=${prev_release_rc_no:-""}
# previous release version, e.g. v1.3.0-incubating, this is used to generate change log
# previous release version, e.g. v1.7.0, this is used to generate change log
prev_release_version=${prev_release_version:-""}
# staging repository number, check it under https://repository.apache.org/content/repositories
repo_no=${repo_no:-""}
Expand Down Expand Up @@ -66,7 +66,7 @@ if [[ ! -z "$prev_release_rc_no" ]]; then
prev_release_rc_tag=${release_version}-${prev_release_rc_no}
change_from_pre_commit="
The commit list since the ${prev_release_rc_no}:
https://github.com/apache/incubator-kyuubi/compare/${prev_release_rc_tag}...${release_rc_tag}
https://github.com/apache/kyuubi/compare/${prev_release_rc_tag}...${release_rc_tag}
"
fi

Expand All @@ -81,15 +81,15 @@ Content:
Hello Apache Kyuubi PPMC and Community,
Please vote on releasing the following candidate as
Apache Kyuubi (Incubating) version ${release_version}.
Apache Kyuubi version ${release_version}.
The VOTE will remain open for at least 72 hours.
[ ] +1 Release this package as Apache Kyuubi ${release_version}
[ ] +0
[ ] -1 Do not release this package because ...
To learn more about Apache Kyuubi (Incubating), please see
To learn more about Apache Kyuubi, please see
https://kyuubi.apache.org/
The tag to be voted on is ${release_rc_tag} (commit ${git_commit_hash}):
Expand All @@ -105,10 +105,10 @@ The staging repository for this release can be found at:
https://repository.apache.org/content/repositories/orgapachekyuubi-${repo_no}/
${change_from_pre_commit}
The release note is available in:
https://github.com/apache/incubator-kyuubi/compare/${prev_release_version}...${release_rc_tag}
https://github.com/apache/kyuubi/compare/${prev_release_version}...${release_rc_tag}
Thanks,
On behalf of Apache Kyuubi(Incubating) community
On behalf of Apache Kyuubi community
EOF

echo "please use [email protected]
Expand Down
18 changes: 9 additions & 9 deletions build/release/script/general_incubator_vote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ set -e

RELEASE_DIR="$(cd "$(dirname "$0")"/..; pwd)"
######### Please modify the variables ##########
# release version, e.g. v1.4.0-incubating
# release version, e.g. v1.7.0
release_version=${release_version:-""}
# release candidate number, e.g. rc2
release_rc_no=${release_rc_no:-""}
# previous release candidate number, e.g. rc1, could be empty if it is the first vote
prev_release_rc_no=${prev_release_rc_no:-""}
# previous release version, e.g. v1.3.0-incubating, this is used to generate change log
# previous release version, e.g. v1.6.0, this is used to generate change log
prev_release_version=${prev_release_version:-""}
# staging repository number, check it under https://repository.apache.org/content/repositories
repo_no=${repo_no:-""}
Expand Down Expand Up @@ -88,13 +88,13 @@ mkdir -p ${RELEASE_TEMP_DIR}
GENERAL_VOTE=${RELEASE_TEMP_DIR}/${release_rc_tag}_general_vote.temp

cat >$GENERAL_VOTE<<EOF
Title: [VOTE] Release Apache Kyuubi(Incubating) ${release_version} ${release_rc_no}
Title: [VOTE] Release Apache Kyuubi ${release_version} ${release_rc_no}
Content:
Hello Incubator Community,
The Apache Kyuubi community has voted on and approved a proposal to release
Apache Kyuubi(Incubating) version ${release_version} ${release_rc_no}.
Apache Kyuubi version ${release_version} ${release_rc_no}.
We now kindly request the Incubator PMC members review and vote on this
incubator release.
Expand All @@ -109,14 +109,14 @@ ${dev_kyuubi_vote_result_mail_address}
[ ] +0
[ ] -1 Do not release this package because ...
To learn more about Apache Kyuubi (Incubating), please see
To learn more about Apache Kyuubi, please see
https://kyuubi.apache.org/
The tag to be voted on is ${release_rc_tag} (commit ${git_commit_hash}):
https://github.com/apache/incubator-kyuubi/tree/${release_rc_tag}
https://github.com/apache/kyuubi/tree/${release_rc_tag}
The release files, including signatures, digests, etc. can be found at:
https://dist.apache.org/repos/dist/dev/incubator/kyuubi/${release_rc_tag}/
https://dist.apache.org/repos/dist/dev/kyuubi/${release_rc_tag}/
Signatures used for Kyuubi RCs can be found in this file:
https://downloads.apache.org/incubator/kyuubi/KEYS
Expand All @@ -125,11 +125,11 @@ The staging repository for this release can be found at:
https://repository.apache.org/content/repositories/orgapachekyuubi-${repo_no}/
$change_from_pre_commit
The release note is available in:
https://github.com/apache/incubator-kyuubi/compare/${prev_release_version}...${release_rc_tag}
https://github.com/apache/kyuubi/compare/${prev_release_version}...${release_rc_tag}
Thanks,
On behalf of Apache Kyuubi(Incubating) community
On behalf of Apache Kyuubi community
EOF

echo "please use [email protected]
Expand Down
2 changes: 1 addition & 1 deletion build/release/tmpl/dev_kyuubi_cancel_vote.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Hello Apache Kyuubi PPMC and Community,
We need to cancel the {release_rc_no} due to {issue_description}[1],
and thank everyone who helped vote.

[1] https://github.com/apache/incubator-kyuubi/issues/{issue_number}
[1] https://github.com/apache/kyuubi/issues/{issue_number}

Thanks,
<Release Manager Name>
2 changes: 1 addition & 1 deletion build/release/tmpl/dev_kyuubi_vote_result.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ If this vote passes also, the release is accepted and will be published.
Thanks to all who helped with the release!

Thanks,
On behalf of Apache Kyuubi(Incubating) community
On behalf of Apache Kyuubi community
10 changes: 5 additions & 5 deletions dev/merge_kyuubi_pr.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
# Utility for creating well-formed pull request merges and pushing them to Kyuubi
# For committers:
# Please check your local git envs via `git remote -v` which should
# apache [email protected]:apache/incubator-kyuubi.git (fetch)
# apache [email protected]:apache/incubator-kyuubi.git (push)
# origin [email protected]:[ YOUR GITHUB USER NAME ]/incubator-kyuubi.git (fetch)
# origin [email protected]:[ YOUR GITHUB USER NAME ]/incubator-kyuubi.git (push)
# apache [email protected]:apache/kyuubi.git (fetch)
# apache [email protected]:apache/kyuubi.git (push)
# origin [email protected]:[ YOUR GITHUB USER NAME ]/kyuubi.git (fetch)
# origin [email protected]:[ YOUR GITHUB USER NAME ]/kyuubi.git (push)

import json
import os
Expand All @@ -38,7 +38,7 @@
PR_REMOTE_NAME = os.environ.get("PR_REMOTE_NAME", "apache")
PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache")
GITHUB_OAUTH_KEY = os.environ.get("GITHUB_OAUTH_KEY")
GITHUB_API_BASE = "https://api.github.com/repos/apache/incubator-kyuubi"
GITHUB_API_BASE = "https://api.github.com/repos/apache/kyuubi"
BRANCH_PREFIX = "PR_TOOL"


Expand Down
2 changes: 1 addition & 1 deletion docker/kyuubi-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

# Usage:
# DEMO:
# kubectl apply -f https://raw.githubusercontent.com/apache/incubator-kyuubi/master/docker/kyuubi-configmap.yaml
# kubectl apply -f https://raw.githubusercontent.com/apache/kyuubi/master/docker/kyuubi-configmap.yaml
# LOCAL:
# kubectl create cm kyuubi-defaults --from-file=${KYUUBI_HOME}/conf/kyuubi-defaults.conf

Expand Down
Loading

0 comments on commit 8e8d8be

Please sign in to comment.