diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index ebabca719..6e37b26c4 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -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 ...'. --> diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 7f4300253..43c7a5585 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -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). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 76f4a7fa4..7150edb0c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 @@ -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) diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index dd0d1cd3d..000000000 --- a/DISCLAIMER +++ /dev/null @@ -1,10 +0,0 @@ -Apache Kyuubi (Incubating) is an effort undergoing incubation at the Apache -Software Foundation (ASF), sponsored by the Apache Incubator PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness -or stability of the code, it does indicate that the project has yet to be -fully endorsed by the ASF. diff --git a/MATURITY.md b/MATURITY.md deleted file mode 100644 index 3ad4918bd..000000000 --- a/MATURITY.md +++ /dev/null @@ -1,100 +0,0 @@ - - -# Apache Kyuubi(Incubating) Maturity Self Assessment - -## Overview - -This is an assessment of the overall maturity of Apache Kyuubi(Incubating) as an Apache project, meant to inform the decision (of mentors, community, incubator PMCs, and ASF Board of Directors) to graduate Kyuubi as a top-level Apache project. It is based on the [Apache Project Maturity Model](https://community.apache.org/apache-way/apache-project-maturity-model.html). - -Mentors and community members are encouraged to contribute to this page and comment on it, the following tables summarize our self-assessment against the **Apache Project Maturity Model**. - -:white_check_mark: means that the related item is in good status. -:white_large_square: means that the related item need long-term attention. -:x: means that the related item need to be fixed ASAP. - - -## Code - -| ID | Description | Status | -|-----|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| C10 | The project produces Open Source software for distribution to the public, at no charge. | :white_check_mark: The project source code is licensed under the [Apache License, v2.0](https://github.com/apache/incubator-kyuubi/blob/master/LICENSE) | -| C20 | Anyone can easily discover and access the project's code. | :white_check_mark: The source code is available on GitHub directly, linked on website | -| C30 | Anyone using standard, widely-available tools, can build the code in a reproducible way. | :white_check_mark: The source code is automatically built for each Pull Request commit, with license checks, style checks, doc builds, unit and end to end tests, via GitHub actions and Travis. Development environment setup and build instructions to do the same locally are documented on the [website](https://kyuubi.apache.org/developer-tools.html). | -| C40 | The full history of the project's code is available via a source code control system, in a way that allows anyone to recreate any released version. | :white_check_mark: The project uses git to manage source code, documentation and website, all releases are tagged. The commit history is available from the beginning of the project. | -| C50 | The source code control system establishes the provenance of each line of code in a reliable way, based on strong authentication of the committer. When third parties contribute code, commit messages provide reliable information about the code provenance. | :white_check_mark: The project uses GitHub repository managed by Apache Infra, it ensuring the provenance of each line of code to a committer. All code is checked in after review and approval via GitHub pull requests. | - -## Licenses and Copyright - -| ID | Description | Status | -|------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| LC10 | The Apache License, version 2.0, covers the released code. | :white_check_mark: The [LICENSE file](https://github.com/apache/incubator-kyuubi/blob/master/LICENSE) is in GitHub repository. [All releases](https://kyuubi.apache.org/releases.html) are verified by IPMC to contain the copy. | -| LC20 | Libraries that are mandatory dependencies of the project's code do not create more restrictions than the Apache License does. | :white_check_mark: [The list of mandatory dependencies](https://github.com/apache/incubator-kyuubi/tree/master/licenses-binary) have been reviewed to contain approved and compatible licenses only. | -| LC30 | The libraries mentioned in LC20 are available as Open Source software. | :white_check_mark: All mandatory dependencies listed in L20 are available as open source software. | -| LC40 | Committers are bound by an Individual Contributor Agreement (the "Apache iCLA") that defines which code they may commit and how they need to identify code that is not their own. | :white_check_mark: All committers have iCLAs on file before they have an apache account. | -| LC50 | The project clearly defines and documents the copyright ownership of everything that the project produces. | :white_check_mark: All files in the source repository have appropriate headers. [The Github workflow](https://github.com/apache/incubator-kyuubi/actions/workflows/license.yml) is in place to ensure every file has the expected license header. | - -## Releases - -| ID | Description | Status | -|------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| RE10 | Releases consist of source code, distributed using standard and open archive formats that are expected to stay readable in the long term. | :white_check_mark: Recent releases are available via the [download page](https://kyuubi.apache.org/releases.html) on the website. All releases are available via the [apache archive](https://archive.apache.org/dist/incubator/kyuubi/). | -| RE20 | The project's PMC (Project Management Committee, see CS10) approves each software release in order to make the release an act of the Foundation. | :white_check_mark: All incubating releases have been approved by the Kyuubi community and the Incubator, all with at least 3 PPMC/IPMC votes and more +1 than -1. | -| RE30 | Releases are signed and/or distributed along with digests that anyone can reliably use to validate the downloaded archives. | :white_check_mark: [Releases](https://kyuubi.apache.org/releases.html) are signed, the [keys](https://downloads.apache.org/incubator/kyuubi/KEYS) are available from the download page. Every release has a corresponding hash(sha512) to prevent content tampering. | -| RE40 | The project can distribute convenience binaries alongside source code, but they are not Apache Releases, they are provided with no guarantee. | :white_check_mark: Convenience binaries are distributed alongside source code at the same time via | -| RE50 | The project documents a repeatable release process so that someone new to the project can independently generate the complete set of artifacts required for a release. | :white_check_mark: [Release guide](https://github.com/apache/incubator-kyuubi/blob/master/docs/community/release.md) is available. The releases of the project have been performed by 6 different release managers. | - -## Quality - -| ID | Description | Status | -|------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| QU10 | The project is open and honest about the quality of its code. Various levels of quality and maturity for various modules are natural and acceptable as long as they are clearly communicated. | :white_check_mark: All issues are tracked on Kyuubi's GitHub [Issues](https://github.com/apache/incubator-kyuubi/issues). | -| QU20 | The project puts a very high priority on producing secure software. | :white_check_mark: Security issues are treated with the highest priority. We use Apache's default way to submit security related information. | -| QU30 | The project provides a well-documented, secure and private channel to report security issues, along with a documented way of responding to them. | :white_check_mark: Website provides a link to https://www.apache.org/security/ | -| QU40 | The project puts a high priority on backwards compatibility and aims to document any incompatible changes and provide tools and documentation to help users transition to new features. | :white_check_mark: Each release note contains all related issues and pull requests in the milestone, and extract mainly updates and API changes from milestones. | -| QU50 | The project strives to respond to documented bug reports in a timely manner. | :white_check_mark: The community is very active in responding to bug reports and usually fixes them within a short time period. | - - -## Community - -| ID | Description | Status | -|------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| CO10 | The project has a well-known homepage that points to all the information required to operate according to this maturity model. | :white_check_mark: The website describes of the project with download, user manual, technical details, how to contribute and team introduce. | -| CO20 | The community welcomes contributions from anyone who acts in good faith and in a respectful manner, and who adds value to the project. | :white_check_mark: Committers are really welcome contributions and the community is actively seeking for new committers. The community has elected 3 new PPMC members and 8 new committers during incubation, based on meritocracy. | -| CO30 | Contributions include source code, documentation, constructive bug reports, constructive discussions, marketing and generally anything that adds value to the project. | :white_check_mark: The community welcomes all contributions. The contribution guide refers to non source code contribution. The community is very clear about contributions being more than code. | -| CO40 | The community strives to be meritocratic and gives more rights and responsibilities to contributors who, over time, add value to the project. | :white_check_mark:. The community has elected 3 new PPMC members and 8 new committers during incubation, based on meritocracy. | -| CO50 | The project documents how contributors can earn more rights such as commit access or decision power, and applies these principles consistently. | :white_check_mark: The process to become a committer or PPMC member is documented on the website, see [newcommitter](https://kyuubi.apache.org/become_committer.html), [newppmc](https://kyuubi.apache.org/become_pmc_member.html) | -| CO60 | The community operates based on consensus of its members (see CS10) who have decision power. Dictators, benevolent or not, are not welcome in Apache projects. | :white_check_mark: The project works to build consensus. All PPMC votes have been unanimous so far. | -| CO70 | The project strives to answer user questions in a timely manner. | :white_check_mark: The project typically provides detailed answers to user questions within a few days via dev mailing list, GitHub issues and Github Discussions. | - -## Consensus Building - -| ID | Description | Status | -|------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| CS10 | The project maintains a public list of its contributors who have decision power. The project's PMC (Project Management Committee) consists of those contributors. | :white_check_mark: Committers and PPMC members are listed on the website’s community page, see [newcommitter](https://kyuubi.apache.org/become_committer.html), [newppmc](https://kyuubi.apache.org/become_pmc_member.html) | -| CS20 | Decisions require a consensus among PMC members and are documented on the project's main communications channel. The PMC takes community opinions into account, but the PMC has the final word. | :white_check_mark: The project has been making important decisions on the mailing lists. | -| CS30 | The project uses documented voting rules to build consensus when discussion is not sufficient. | :white_check_mark: The project uses the standard ASF voting rules. | -| CS40 | In Apache projects, vetoes are only valid for code commits. The person exercising the veto must justify it with a technical explanation, as per the Apache voting rules defined in CS30. | :white_check_mark: We've used vetoes with clear technical explanations for code commits only. | -| CS50 | All "important" discussions happen asynchronously in written form on the project's main communications channel. Offline, face-to-face or private discussions that affect the project are also documented on that channel. | :white_check_mark: The project has been making important decisions on the project mailing lists. Minor decisions may occasionally happen during code reviews, which are also asynchronous and in written form. | - -## Independence - -| ID | Description | Status | -|------|------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| IN10 | The project is independent from any corporate or organizational influence. | :white_check_mark: The project team gathers people from different companies (AsiaInfo, bilibili, China Mobile, eBay, iQIYI, NetEase, T3, Zhihu ...). No company or organization has significantly more influence than any other. We can note a growth of the contributions coming from different contributors. | -| IN20 | Contributors act as themselves, not as representatives of a corporation or organization. | :white_check_mark: The contributors act on their own initiative without representing a corporation or organization. | - diff --git a/NOTICE b/NOTICE index 01663c01f..8370cdd7e 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ -Apache Kyuubi (Incubating) +Apache Kyuubi Copyright 2021-2023 The Apache Software Foundation. This product includes software developed at diff --git a/NOTICE-binary b/NOTICE-binary index 9d80a1a78..ef58e21f6 100644 --- a/NOTICE-binary +++ b/NOTICE-binary @@ -1,5 +1,5 @@ -Apache Kyuubi (Incubating) +Apache Kyuubi Copyright 2021-2023 The Apache Software Foundation. This product includes software developed at diff --git a/README.md b/README.md index df15fa8e7..f4b720989 100644 --- a/README.md +++ b/README.md @@ -15,21 +15,21 @@ - limitations under the License. --> -# Apache Kyuubi (Incubating) +# Apache Kyuubi Kyuubi logo [![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? @@ -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 diff --git a/build/release/create-package.sh b/build/release/create-package.sh index 98f328ca2..c98e7c0f8 100755 --- a/build/release/create-package.sh +++ b/build/release/create-package.sh @@ -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 diff --git a/build/release/generate_changelog.sh b/build/release/generate_changelog.sh index a3a773418..edb9eb245 100755 --- a/build/release/generate_changelog.sh +++ b/build/release/generate_changelog.sh @@ -36,8 +36,8 @@ function usage { echo "+--------------------------------------------------------------------+" echo "| ./generate_changelog.sh |" 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 "" } @@ -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 diff --git a/build/release/release.sh b/build/release/release.sh index 35e174cbd..ea5234d43 100755 --- a/build/release/release.sh +++ b/build/release/release.sh @@ -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() { @@ -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 diff --git a/build/release/script/announce.sh b/build/release/script/announce.sh index 221cd61b5..a5acb9345 100644 --- a/build/release/script/announce.sh +++ b/build/release/script/announce.sh @@ -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:-""} ################################################ @@ -39,15 +39,15 @@ mkdir -p ${RELEASE_TEMP_DIR} ANNOUNCE=${RELEASE_TEMP_DIR}/${release_version}_announce.temp cat >$ANNOUNCE<$GENERAL_VOTE< diff --git a/build/release/tmpl/dev_kyuubi_vote_result.tmpl b/build/release/tmpl/dev_kyuubi_vote_result.tmpl index 179319abf..c0723d223 100644 --- a/build/release/tmpl/dev_kyuubi_vote_result.tmpl +++ b/build/release/tmpl/dev_kyuubi_vote_result.tmpl @@ -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 diff --git a/dev/merge_kyuubi_pr.py b/dev/merge_kyuubi_pr.py index fc2e6dfb4..cb3696d1f 100755 --- a/dev/merge_kyuubi_pr.py +++ b/dev/merge_kyuubi_pr.py @@ -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 git@github.com:apache/incubator-kyuubi.git (fetch) -# apache git@github.com:apache/incubator-kyuubi.git (push) -# origin git@github.com:[ YOUR GITHUB USER NAME ]/incubator-kyuubi.git (fetch) -# origin git@github.com:[ YOUR GITHUB USER NAME ]/incubator-kyuubi.git (push) +# apache git@github.com:apache/kyuubi.git (fetch) +# apache git@github.com:apache/kyuubi.git (push) +# origin git@github.com:[ YOUR GITHUB USER NAME ]/kyuubi.git (fetch) +# origin git@github.com:[ YOUR GITHUB USER NAME ]/kyuubi.git (push) import json import os @@ -38,7 +38,7 @@ KYUUBI_HOME = os.environ.get("KYUUBI_HOME", os.getcwd()) 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" diff --git a/docker/kyuubi-configmap.yaml b/docker/kyuubi-configmap.yaml index c08ea9925..13835493b 100644 --- a/docker/kyuubi-configmap.yaml +++ b/docker/kyuubi-configmap.yaml @@ -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 diff --git a/docker/kyuubi-deployment.yaml b/docker/kyuubi-deployment.yaml index 808e2d6d7..12f52b576 100644 --- a/docker/kyuubi-deployment.yaml +++ b/docker/kyuubi-deployment.yaml @@ -18,19 +18,19 @@ # Usage: # ConfigMap: # 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 # Start: -# kubectl apply -f https://raw.githubusercontent.com/apache/incubator-kyuubi/master/docker/kyuubi-deployment.yaml +# kubectl apply -f https://raw.githubusercontent.com/apache/kyuubi/master/docker/kyuubi-deployment.yaml # Expose port with NodePort: # see usage of kyuubi-service.yaml # Config change: # 1. edit ConfigMap # kubectl edit cm kyuubi-defaults # 2. restart deployment -# kubectl delete -f https://raw.githubusercontent.com/apache/incubator-kyuubi/master/docker/kyuubi-deployment.yaml -# kubectl apply -f https://raw.githubusercontent.com/apache/incubator-kyuubi/master/docker/kyuubi-deployment.yaml +# kubectl delete -f https://raw.githubusercontent.com/apache/kyuubi/master/docker/kyuubi-deployment.yaml +# kubectl apply -f https://raw.githubusercontent.com/apache/kyuubi/master/docker/kyuubi-deployment.yaml apiVersion: apps/v1 kind: Deployment diff --git a/docker/kyuubi-pod.yaml b/docker/kyuubi-pod.yaml index bbc327262..8eacd8a6b 100644 --- a/docker/kyuubi-pod.yaml +++ b/docker/kyuubi-pod.yaml @@ -18,11 +18,11 @@ # Usage: # ConfigMap: # 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 # Start: -# kubectl apply -f https://raw.githubusercontent.com/apache/incubator-kyuubi/master/docker/kyuubi-pod.yaml +# kubectl apply -f https://raw.githubusercontent.com/apache/kyuubi/master/docker/kyuubi-pod.yaml # Expose port: # 1. Expose the Pod by port-forward, for temporary test # kubectl port-forward kyuubi-example --address localhost 10009:10009 @@ -38,8 +38,8 @@ # 1. edit ConfigMap # kubectl edit cm kyuubi-defaults # 2. restart pod -# kubectl delete -f https://raw.githubusercontent.com/apache/incubator-kyuubi/master/docker/kyuubi-pod.yaml -# kubectl apply -f https://raw.githubusercontent.com/apache/incubator-kyuubi/master/docker/kyuubi-pod.yaml +# kubectl delete -f https://raw.githubusercontent.com/apache/kyuubi/master/docker/kyuubi-pod.yaml +# kubectl apply -f https://raw.githubusercontent.com/apache/kyuubi/master/docker/kyuubi-pod.yaml apiVersion: v1 kind: Pod diff --git a/docker/kyuubi-service.yaml b/docker/kyuubi-service.yaml index f71623896..396d49017 100644 --- a/docker/kyuubi-service.yaml +++ b/docker/kyuubi-service.yaml @@ -17,7 +17,7 @@ # Usage: # Start: -# kubectl apply -f https://raw.githubusercontent.com/apache/incubator-kyuubi/master/docker/kyuubi-service.yaml +# kubectl apply -f https://raw.githubusercontent.com/apache/kyuubi/master/docker/kyuubi-service.yaml # Connect: # ${SPARK_HOME}/bin/beeline -u 'jdbc:hive2://${any_hostname_of_k8s_nodes}:30009' diff --git a/docs/community/release.md b/docs/community/release.md index d24530715..edd65943b 100644 --- a/docs/community/release.md +++ b/docs/community/release.md @@ -19,7 +19,7 @@ Kyuubi Release Guide === ## Introduction -The Apache Kyuubi (Incubating) project periodically declares and publishes releases. A release is one or more packages +The Apache Kyuubi project periodically declares and publishes releases. A release is one or more packages of the project artifact(s) that are approved for general public distribution and use. They may come with various degrees of caveat regarding their perceived quality and potential for change, such as "alpha", "beta", "incubating", "stable", etc. @@ -166,7 +166,7 @@ After cutting release branch, don't forget bump version in `master` branch. 1. Set environment variables. ```shell -export RELEASE_VERSION= +export RELEASE_VERSION= export RELEASE_RC_NO= ``` @@ -182,7 +182,7 @@ git commit -am "[RELEASE] Bump ${RELEASE_VERSION}" 3. Create a git tag for the release candidate. -The tag pattern is `v${RELEASE_VERSION}-rc${RELEASE_RC_NO}`, e.g. `v1.3.0-incubating-rc0` +The tag pattern is `v${RELEASE_VERSION}-rc${RELEASE_RC_NO}`, e.g. `v1.7.0-rc0` > NOTE: After all the voting passed, be sure to create a final tag with the pattern: `v${RELEASE_VERSION}` @@ -197,15 +197,15 @@ To make your release available in the staging repository, you must close the sta 5. Generate a pre-release note from GitHub for the subsequent voting. -Goto the [release page](https://github.com/apache/incubator-kyuubi/releases) and click the "Draft a new release" button, then it would jump to a new page to prepare the release. +Goto the [release page](https://github.com/apache/kyuubi/releases) and click the "Draft a new release" button, then it would jump to a new page to prepare the release. Filling in all the necessary information required by the form. And in the bottom of the form, choose the "This is a pre-release" checkbox. Finally, click the "Publish release" button to finish the step. -> Note: the pre-release note is used for voting purposes. It would be marked with a **Pre-release** tag. After all the voting works(dev and general) are finished, do not forget to inverse the "This is a pre-release" checkbox. The pre-release version comes from vx.y.z-incubating-rcN tags, and the final version should come from vx.y.z-incubating tags. +> Note: the pre-release note is used for voting purposes. It would be marked with a **Pre-release** tag. After all the voting works(dev and general) are finished, do not forget to inverse the "This is a pre-release" checkbox. The pre-release version comes from vx.y.z-rcN tags, and the final version should come from vx.y.z tags. ## Vote on the release candidate -The release voting takes place on the Apache Kyuubi (Incubating) developers list (the (P)PMC is voting). +The release voting takes place on the Apache Kyuubi developers list (the (P)PMC is voting). - If possible, attach a draft of the release notes with the email. - Recommend represent voting closing time in UTC format. diff --git a/docs/conf.py b/docs/conf.py index 97ad4a0f7..3df98c6e3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -99,7 +99,7 @@ exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store'] # html_theme = 'sphinx_book_theme' html_theme_options = { - "repository_url": "https://github.com/apache/incubator-kyuubi", + "repository_url": "https://github.com/apache/kyuubi", "use_repository_button": True, "use_edit_page_button": True, "use_download_button": True, @@ -128,7 +128,7 @@ html_static_path = ['_static'] html_css_files = ["css/custom.css"] htmlhelp_basename = 'Recommonmarkdoc' -github_doc_root = 'https://github.com/apache/incubator-kyuubi/tree/master/docs/' +github_doc_root = 'https://github.com/apache/kyuubi/tree/master/docs/' def setup(app): app.add_config_value('recommonmark_config', { 'url_resolver': lambda url: github_doc_root + url, diff --git a/docs/connector/spark/delta_lake_with_azure_blob.rst b/docs/connector/spark/delta_lake_with_azure_blob.rst index dd302c5fd..1d7cab048 100644 --- a/docs/connector/spark/delta_lake_with_azure_blob.rst +++ b/docs/connector/spark/delta_lake_with_azure_blob.rst @@ -156,7 +156,7 @@ Install Kyuubi 2.Unpackage - tar -xzvf apache-kyuubi-|release|-incubating-bin.tgz + tar -xzvf apache-kyuubi-|release|-bin.tgz Config Kyuubi ************* diff --git a/docs/deployment/kyuubi_on_kubernetes.md b/docs/deployment/kyuubi_on_kubernetes.md index 42c2ab3c8..03836629e 100644 --- a/docs/deployment/kyuubi_on_kubernetes.md +++ b/docs/deployment/kyuubi_on_kubernetes.md @@ -30,7 +30,7 @@ If you want to deploy Kyuubi on Kubernetes, you'd better get a sense of the foll ## Kyuubi Official Docker Image -You can find the official docker image at [Apache Kyuubi (Incubating) Docker Hub](https://registry.hub.docker.com/r/apache/kyuubi). +You can find the official docker image at [Apache Kyuubi Docker Hub](https://registry.hub.docker.com/r/apache/kyuubi). ## Build Kyuubi Docker Image diff --git a/externals/kyuubi-flink-sql-engine/src/main/resources/META-INF/NOTICE b/externals/kyuubi-flink-sql-engine/src/main/resources/META-INF/NOTICE index 41c6f741c..74a23577f 100644 --- a/externals/kyuubi-flink-sql-engine/src/main/resources/META-INF/NOTICE +++ b/externals/kyuubi-flink-sql-engine/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ -Apache Kyuubi (Incubating) -Copyright 2021-2022 The Apache Software Foundation. +Apache Kyuubi +Copyright 2021-2023 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (https://www.apache.org/). diff --git a/externals/kyuubi-hive-sql-engine/src/main/resources/META-INF/NOTICE b/externals/kyuubi-hive-sql-engine/src/main/resources/META-INF/NOTICE index 3578d760b..c9ffbb70a 100644 --- a/externals/kyuubi-hive-sql-engine/src/main/resources/META-INF/NOTICE +++ b/externals/kyuubi-hive-sql-engine/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ -Apache Kyuubi (Incubating) -Copyright 2021-2022 The Apache Software Foundation. +Apache Kyuubi +Copyright 2021-2023 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (https://www.apache.org/). diff --git a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/NOTICE b/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/NOTICE index da91fb4fb..bfb7e9834 100644 --- a/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/NOTICE +++ b/externals/kyuubi-spark-sql-engine/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ -Apache Kyuubi (Incubating) -Copyright 2021-2022 The Apache Software Foundation. +Apache Kyuubi +Copyright 2021-2023 The Apache Software Foundation. This product includes software developed at The Apache Software Foundation (https://www.apache.org/). diff --git a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala index a5fc5cfac..42e7c44a1 100644 --- a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala +++ b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/SparkSQLEngine.scala @@ -214,7 +214,7 @@ object SparkSQLEngine extends Logging { if (Utils.isOnK8s) { kyuubiConf.setIfMissing(FRONTEND_CONNECTION_URL_USE_HOSTNAME, false) - // https://github.com/apache/incubator-kyuubi/issues/3385 + // https://github.com/apache/kyuubi/issues/3385 // Set unset executor pod prefix to prevent kubernetes pod length limit error // due to the long app name _sparkConf.setIfMissing( diff --git a/integration-tests/kyuubi-flink-it/src/test/scala/org/apache/kyuubi/it/flink/operation/FlinkOperationSuite.scala b/integration-tests/kyuubi-flink-it/src/test/scala/org/apache/kyuubi/it/flink/operation/FlinkOperationSuite.scala index d4902d461..893e0020a 100644 --- a/integration-tests/kyuubi-flink-it/src/test/scala/org/apache/kyuubi/it/flink/operation/FlinkOperationSuite.scala +++ b/integration-tests/kyuubi-flink-it/src/test/scala/org/apache/kyuubi/it/flink/operation/FlinkOperationSuite.scala @@ -86,7 +86,7 @@ class FlinkOperationSuite extends WithKyuubiServerAndFlinkMiniCluster val req = new TGetInfoReq() req.setSessionHandle(handle) req.setInfoType(TGetInfoType.CLI_DBMS_NAME) - assert(client.GetInfo(req).getInfoValue.getStringValue === "Apache Kyuubi (Incubating)") + assert(client.GetInfo(req).getInfoValue.getStringValue === "Apache Kyuubi") } } } diff --git a/integration-tests/kyuubi-hive-it/src/test/scala/org/apache/kyuubi/it/hive/operation/KyuubiOperationHiveEnginePerUserSuite.scala b/integration-tests/kyuubi-hive-it/src/test/scala/org/apache/kyuubi/it/hive/operation/KyuubiOperationHiveEnginePerUserSuite.scala index 556dbea01..a4e6bb150 100644 --- a/integration-tests/kyuubi-hive-it/src/test/scala/org/apache/kyuubi/it/hive/operation/KyuubiOperationHiveEnginePerUserSuite.scala +++ b/integration-tests/kyuubi-hive-it/src/test/scala/org/apache/kyuubi/it/hive/operation/KyuubiOperationHiveEnginePerUserSuite.scala @@ -46,7 +46,7 @@ class KyuubiOperationHiveEnginePerUserSuite extends WithKyuubiServer with HiveEn val req = new TGetInfoReq() req.setSessionHandle(handle) req.setInfoType(TGetInfoType.CLI_DBMS_NAME) - assert(client.GetInfo(req).getInfoValue.getStringValue === "Apache Kyuubi (Incubating)") + assert(client.GetInfo(req).getInfoValue.getStringValue === "Apache Kyuubi") } } } diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala index dcf0b7df0..1a8c51ccd 100644 --- a/kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/session/AbstractSession.scala @@ -111,7 +111,7 @@ abstract class AbstractSession( override def getInfo(infoType: TGetInfoType): TGetInfoValue = withAcquireRelease() { infoType match { case TGetInfoType.CLI_SERVER_NAME | TGetInfoType.CLI_DBMS_NAME => - TGetInfoValue.stringValue("Apache Kyuubi (Incubating)") + TGetInfoValue.stringValue("Apache Kyuubi") case TGetInfoType.CLI_DBMS_VER => TGetInfoValue.stringValue(org.apache.kyuubi.KYUUBI_VERSION) case TGetInfoType.CLI_ODBC_KEYWORDS => TGetInfoValue.stringValue("Unimplemented") case TGetInfoType.CLI_MAX_COLUMN_NAME_LEN | diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/service/TFrontendServiceSuite.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/service/TFrontendServiceSuite.scala index 9972c4f60..28442fe62 100644 --- a/kyuubi-common/src/test/scala/org/apache/kyuubi/service/TFrontendServiceSuite.scala +++ b/kyuubi-common/src/test/scala/org/apache/kyuubi/service/TFrontendServiceSuite.scala @@ -168,9 +168,9 @@ class TFrontendServiceSuite extends KyuubiFunSuite { req.setInfoType(TGetInfoType.CLI_DBMS_VER) assert(client.GetInfo(req).getInfoValue.getStringValue === org.apache.kyuubi.KYUUBI_VERSION) req.setInfoType(TGetInfoType.CLI_SERVER_NAME) - assert(client.GetInfo(req).getInfoValue.getStringValue === "Apache Kyuubi (Incubating)") + assert(client.GetInfo(req).getInfoValue.getStringValue === "Apache Kyuubi") req.setInfoType(TGetInfoType.CLI_DBMS_NAME) - assert(client.GetInfo(req).getInfoValue.getStringValue === "Apache Kyuubi (Incubating)") + assert(client.GetInfo(req).getInfoValue.getStringValue === "Apache Kyuubi") req.setInfoType(TGetInfoType.CLI_ODBC_KEYWORDS) assert(client.GetInfo(req).getInfoValue.getStringValue === "Unimplemented") req.setInfoType(TGetInfoType.CLI_MAX_COLUMN_NAME_LEN) diff --git a/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java b/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java index 7711e21b6..c88ceb5a8 100644 --- a/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java +++ b/kyuubi-hive-beeline/src/main/java/org/apache/hive/beeline/KyuubiBeeLine.java @@ -102,7 +102,7 @@ public class KyuubiBeeLine extends BeeLine { new Object[] { "Beeline", pack.getImplementationVersion() == null ? "???" : pack.getImplementationVersion(), - "Apache Kyuubi (Incubating)", + "Apache Kyuubi", }); } diff --git a/kyuubi-hive-jdbc-shaded/src/main/resources/META-INF/NOTICE b/kyuubi-hive-jdbc-shaded/src/main/resources/META-INF/NOTICE index dd90d9c6f..01ce2db0d 100644 --- a/kyuubi-hive-jdbc-shaded/src/main/resources/META-INF/NOTICE +++ b/kyuubi-hive-jdbc-shaded/src/main/resources/META-INF/NOTICE @@ -1,4 +1,4 @@ -Apache Kyuubi (Incubating) +Apache Kyuubi Copyright 2021-2022 The Apache Software Foundation. This product includes software developed at diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/KyuubiOpenApiResource.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/KyuubiOpenApiResource.scala index d5702e88e..a8d350114 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/KyuubiOpenApiResource.scala +++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/KyuubiOpenApiResource.scala @@ -87,9 +87,9 @@ class KyuubiOpenApiResource extends BaseOpenApiResource with ApiRequestContext { // TODO: to improve when https is enabled. val apiUrl = s"http://${fe.connectionUrl}/api" openApi.info( - new Info().title("Apache Kyuubi (Incubating) REST API Documentation") + new Info().title("Apache Kyuubi REST API Documentation") .version(org.apache.kyuubi.KYUUBI_VERSION) - .description("Apache Kyuubi (Incubating) REST API Documentation") + .description("Apache Kyuubi REST API Documentation") .contact( new Contact().name("Apache Kyuubi Community") .url("https://kyuubi.apache.org/issue_tracking.html") diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/mysql/constant/MySQLServerDefines.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/mysql/constant/MySQLServerDefines.scala index 067a23c18..79937120f 100644 --- a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/mysql/constant/MySQLServerDefines.scala +++ b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/mysql/constant/MySQLServerDefines.scala @@ -24,5 +24,5 @@ object MySQLServerDefines { val CHARSET = 0x2D // utf8mb4_general_ci val MYSQL_VERSION = "5.7.22" val MYSQL_KYUUBI_SERVER_VERSION = s"$MYSQL_VERSION-Kyuubi-Server $KYUUBI_VERSION" - val KYUUBI_SERVER_DESCRIPTION = s"Apache Kyuubi (Incubating) v$KYUUBI_VERSION revision $REVISION" + val KYUUBI_SERVER_DESCRIPTION = s"Apache Kyuubi v$KYUUBI_VERSION revision $REVISION" } diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerUserSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerUserSuite.scala index 8db286809..9ed723079 100644 --- a/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerUserSuite.scala +++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/operation/KyuubiOperationPerUserSuite.scala @@ -49,7 +49,7 @@ class KyuubiOperationPerUserSuite withSessionConf()(Map(KyuubiConf.SERVER_INFO_PROVIDER.key -> "SERVER"))(Map.empty) { withJdbcStatement() { statement => val metaData = statement.getConnection.getMetaData - assert(metaData.getDatabaseProductName === "Apache Kyuubi (Incubating)") + assert(metaData.getDatabaseProductName === "Apache Kyuubi") assert(metaData.getDatabaseProductVersion === KYUUBI_VERSION) val ver = SemanticVersion(KYUUBI_VERSION) assert(metaData.getDatabaseMajorVersion === ver.majorVersion) @@ -265,7 +265,7 @@ class KyuubiOperationPerUserSuite val req = new TGetInfoReq() req.setSessionHandle(handle) req.setInfoType(TGetInfoType.CLI_DBMS_NAME) - assert(client.GetInfo(req).getInfoValue.getStringValue === "Apache Kyuubi (Incubating)") + assert(client.GetInfo(req).getInfoValue.getStringValue === "Apache Kyuubi") } } } diff --git a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/SessionsResourceSuite.scala b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/SessionsResourceSuite.scala index e9c5a266b..7f3f52104 100644 --- a/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/SessionsResourceSuite.scala +++ b/kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/SessionsResourceSuite.scala @@ -164,7 +164,7 @@ class SessionsResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper { assert(200 == response.getStatus) val sessions = response.readEntity(classOf[InfoDetail]) assert(sessions.getInfoType.equals("CLI_SERVER_NAME") && - sessions.getInfoValue.equals("Apache Kyuubi (Incubating)")) + sessions.getInfoValue.equals("Apache Kyuubi")) // Invalid sessionHandleStr val handle = "b88d6b56-d200-4bb6-bf0a-5da0ea572e11|0c4aad4e-ccf7-4abd-9305-943d4bfd2d9a|0" response = webTarget.path(s"api/v1/sessions/$handle/info/13").request().get() diff --git a/pom.xml b/pom.xml index 546854410..6f9a7b28d 100644 --- a/pom.xml +++ b/pom.xml @@ -82,15 +82,15 @@ - scm:git:git@github.com:apache/incubator-kyuubi.git - scm:git:https://gitbox.apache.org/repos/asf/incubator-kyuubi.git + scm:git:git@github.com:apache/kyuubi.git + scm:git:https://gitbox.apache.org/repos/asf/kyuubi.git HEAD - scm:git:git@github.com:apache/incubator-kyuubi.git + scm:git:git@github.com:apache/kyuubi.git GitHub Issues - https://github.com/apache/incubator-kyuubi/issues + https://github.com/apache/kyuubi/issues