This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/linkis.git
The following commit(s) were added to refs/heads/master by this push:
new 1bd458afc [feat-4051] remove incubator in path (#4058)
1bd458afc is described below
commit 1bd458afcea047321c42b9070c85507acb28c1b7
Author: aiceflower <[email protected]>
AuthorDate: Thu Dec 29 14:15:14 2022 +0800
[feat-4051] remove incubator in path (#4058)
* remove incubator in path
---
.github/ISSUE_TEMPLATE/ask_for_help .yml | 2 +-
.github/ISSUE_TEMPLATE/bug_report.yml | 6 ++--
.github/ISSUE_TEMPLATE/config.yml | 2 +-
.github/ISSUE_TEMPLATE/feature_request.yml | 4 +--
.github/workflows/auto-comment.yml | 2 +-
.github/workflows/dead-link-checker.yaml | 2 +-
.github/workflows/publish-docker.yaml | 2 +-
CONTRIBUTING.md | 10 +++----
CONTRIBUTING_CN.md | 10 +++----
DISCLAIMER | 6 ----
README.md | 28 +++++++++---------
README_CN.md | 26 ++++++++---------
linkis-dist/bin/install-linkis-to-kubernetes.sh | 18 ++++++------
linkis-dist/docker/ldh.Dockerfile | 2 +-
linkis-dist/docker/linkis.Dockerfile | 4 +--
.../db/upgrade/1.1.1_schema/mysql/linkis_dml.sql | 2 +-
linkis-dist/pom.xml | 2 +-
linkis-dist/src/main/assembly/distribution.xml | 1 -
linkis-web/vue.config.js | 4 +--
pom.xml | 34 +++++++++-------------
20 files changed, 76 insertions(+), 91 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/ask_for_help .yml
b/.github/ISSUE_TEMPLATE/ask_for_help .yml
index 01ea75f6d..220f6c5b6 100644
--- a/.github/ISSUE_TEMPLATE/ask_for_help .yml
+++ b/.github/ISSUE_TEMPLATE/ask_for_help .yml
@@ -86,7 +86,7 @@ body:
````
log file:
<!-- 拖拽上传后,会自动生成如下示例格式的附件url -->
-
[linkis-xxx.log](https://github.com/apache/incubator-linkis/files/9219529/yarn-error.log)
+
[linkis-xxx.log](https://github.com/apache/linkis/files/9219529/yarn-error.log)
validations:
required: true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml
b/.github/ISSUE_TEMPLATE/bug_report.yml
index 49bb80b46..16b361e2e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -24,17 +24,17 @@ body:
value: |
Thank you for reporting the problem!
Please make sure what you are reporting is a bug with reproducible
steps.
- To ask questions or share ideas, pleae post on our [Discussion
page](https://github.com/apache/incubator-linkis/discussions) instead.
+ To ask questions or share ideas, pleae post on our [Discussion
page](https://github.com/apache/linkis/discussions) instead.
- type: checkboxes
attributes:
label: Search before asking
description: >
- Please make sure to search in the
[issues](https://github.com/apache/incubator-linkis/issues) first to see
+ Please make sure to search in the
[issues](https://github.com/apache/linkis/issues) first to see
whether the same issue was reported already.
options:
- label: >
- I searched the
[issues](https://github.com/apache/incubator-linkis/issues) and found no
similar issues.
+ I searched the [issues](https://github.com/apache/linkis/issues)
and found no similar issues.
required: true
- type: dropdown
diff --git a/.github/ISSUE_TEMPLATE/config.yml
b/.github/ISSUE_TEMPLATE/config.yml
index 89bf2bb8c..8882e21de 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -18,6 +18,6 @@
blank_issues_enabled: fasle
contact_links:
- name: Get Support
- url: https://github.com/apache/incubator-linkis/discussions
+ url: https://github.com/apache/linkis/discussions
about: Ask a question or request support for using Linkis
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml
b/.github/ISSUE_TEMPLATE/feature_request.yml
index 34b3c0d39..a0e1dbda0 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -30,11 +30,11 @@ body:
attributes:
label: Search before asking
description: >
- Please make sure to search in the
[issues](https://github.com/apache/incubator-linkis/issues) first to see
+ Please make sure to search in the
[issues](https://github.com/apache/linkis/issues) first to see
whether the same feature was requested already.
options:
- label: >
- I had searched in the
[issues](https://github.com/apache/incubator-linkis/issues) and found no similar
+ I had searched in the
[issues](https://github.com/apache/linkis/issues) and found no similar
feature requirement.
required: true
- type: textarea
diff --git a/.github/workflows/auto-comment.yml
b/.github/workflows/auto-comment.yml
index 0c96029b4..242b71bfb 100644
--- a/.github/workflows/auto-comment.yml
+++ b/.github/workflows/auto-comment.yml
@@ -31,7 +31,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.issue.number }}
body: |
- ## :blush: Welcome to the Apache Linkis (incubating) community!!
+ ## :blush: Welcome to the Apache Linkis community!!
We are glad that you are contributing by opening this issue.
Please make sure to include all the relevant context.
diff --git a/.github/workflows/dead-link-checker.yaml
b/.github/workflows/dead-link-checker.yaml
index 68fc1258c..98aa19ab5 100644
--- a/.github/workflows/dead-link-checker.yaml
+++ b/.github/workflows/dead-link-checker.yaml
@@ -24,7 +24,7 @@ jobs:
dead-links-check:
runs-on: ubuntu-latest
timeout-minutes: 30
- if: (github.repository == 'apache/incubator-linkis')
+ if: (github.repository == 'apache/linkis')
steps:
- uses: actions/checkout@v3
- uses: gaurav-nelson/github-action-markdown-link-check@v1
diff --git a/.github/workflows/publish-docker.yaml
b/.github/workflows/publish-docker.yaml
index c15cff59a..2bcbef378 100644
--- a/.github/workflows/publish-docker.yaml
+++ b/.github/workflows/publish-docker.yaml
@@ -30,7 +30,7 @@ jobs:
env:
TAG: ${{ github.sha }}
SKIP_TEST: true
- HUB: ghcr.io/apache/incubator-linkis
+ HUB: ghcr.io/apache/linkis
LINKIS_VERSION: 1.3.1
steps:
- name: Checkout
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f5ed5970d..4514f4b45 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -38,8 +38,8 @@ The Linkis source code may have some temporary branches, but
only the following
#### 2.1.1 Concept
-- Upstream repository: <https://github.com/apache/incubator-linkis> The apache
repository of linkis is called Upstream repository in the text
-- Fork repository: From <https://github.com/apache/incubator-linkis> fork to
your own personal repository called Fork repository
+- Upstream repository: <https://github.com/apache/linkis> The apache
repository of linkis is called Upstream repository in the text
+- Fork repository: From <https://github.com/apache/linkis> fork to your own
personal repository called Fork repository
#### 2.1.2 Synchronize Upstream Repository
@@ -60,7 +60,7 @@ Operate in your own clone's local project
- Step1 Add the apacheUpstream repository image to the local
```shell script
-git remote add apache [email protected]:apache/incubator-linkis.git
+git remote add apache [email protected]:apache/linkis.git
```
- Step2 Pull the apache image information to the local
@@ -126,7 +126,7 @@ We recommend to clone the dev branch and name it dev-fix
for development. At the
```shell script
#pull the branch
-git clone https://github.com/{githubid}/incubator-linkis.git --branch dev
+git clone https://github.com/{githubid}/linkis.git --branch dev
#Generate local dev-fix branch according to dev
git checkout -b dev-fix dev
@@ -139,7 +139,7 @@ git push origin dev-fix dev-fix
- If you still don’t know how to initiate a PR to an open source project,
please refer to [About
issues](https://docs.github.com/en/github/managing-your-work-on-github/about-issues)
- Issue name, which should briefly describe your problem or suggestion in one
sentence; for the international promotion of the project, please write the
issue in English or both Chinese and English
-- For each Issue, please bring at least two labels, component and type, such
as component=Computation Governance/EngineConn, type=Improvement. Reference:
[issue #590](https://github.com/apache/incubator-linkis/issues/590)
+- For each Issue, please bring at least two labels, component and type, such
as component=Computation Governance/EngineConn, type=Improvement. Reference:
[issue #590](https://github.com/apache/linkis/issues/590)
### 2.4 Pull Request(PR) Submission Guidelines
diff --git a/CONTRIBUTING_CN.md b/CONTRIBUTING_CN.md
index a728e4ccc..a16ebf102 100644
--- a/CONTRIBUTING_CN.md
+++ b/CONTRIBUTING_CN.md
@@ -38,8 +38,8 @@ Linkis 源码可能会产生一些临时分支,但真正有明确意义的只
#### 2.1.1 概念
-- Upstream 仓库:<https://github.com/apache/incubator-linkis> linkis 的 apache
仓库文中称为 Upstream 仓库
-- Fork 仓库: 从 <https://github.com/apache/incubator-linkis> fork 到自己个人仓库 称为 Fork
仓库
+- Upstream 仓库:<https://github.com/apache/linkis> linkis 的 apache 仓库文中称为
Upstream 仓库
+- Fork 仓库: 从 <https://github.com/apache/linkis> fork 到自己个人仓库 称为 Fork 仓库
#### 2.1.2 同步 Upstream 仓库分支最新代码到自己的 Fork 仓库
@@ -56,7 +56,7 @@ Linkis 源码可能会产生一些临时分支,但真正有明确意义的只
- step1 添加 apacheUpstream 仓库镜像到本地
```shell script
-git remote add apache [email protected]:apache/incubator-linkis.git
+git remote add apache [email protected]:apache/linkis.git
```
- step2 拉去 apache 镜像信息到本地
@@ -122,7 +122,7 @@ Linkis 前后端代码共用同一个代码库,但在开发上是分离的。
```shell script
#拉取分支
-git clone https://github.com/{githubid}/incubator-linkis.git --branch dev
+git clone https://github.com/{githubid}/linkis.git --branch dev
#根据 dev 生成本地 dev-fix 分支
git checkout -b dev-fix dev
#把本地 dev-fix 分支推到自己的仓库
@@ -133,7 +133,7 @@ git push origin dev-fix dev-fix
- 如果您还不知道怎样向开源项目发起 PR,请参考[About
issues](https://docs.github.com/en/github/managing-your-work-on-github/about-issues)
- Issue 名称,应一句话简单描述您的问题或建议;为了项目的国际化推广,请用英文,或中英文双语书写 issue
-- 每个 Issue,请至少带上 component 和 type 两个 label,如 component=Computation
Governance/EngineConn,type=Improvement.参考:[issue
#590](https://github.com/apache/incubator-linkis/issues/590)
+- 每个 Issue,请至少带上 component 和 type 两个 label,如 component=Computation
Governance/EngineConn,type=Improvement.参考:[issue
#590](https://github.com/apache/linkis/issues/590)
### 2.4 Pull Request(PR) 提交指引
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 578b810cd..000000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,6 +0,0 @@
-Apache Linkis 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.
\ No newline at end of file
diff --git a/README.md b/README.md
index 26fe9b6da..d0c0fa1f2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
<h2 align="center">
- Apache Linkis(Incubating)
+ Apache Linkis
</h2>
<p align="center">
@@ -23,24 +23,24 @@
<a target="_blank"
href="https://search.maven.org/search?q=g:org.apache.linkis%20AND%20a:linkis">
<img
src="https://img.shields.io/maven-central/v/org.apache.linkis/linkis.svg?label=maven%20central"
/>
</a>
- <a target="_blank"
href="https://github.com/apache/incubator-linkis/blob/master/LICENSE">
+ <a target="_blank"
href="https://github.com/apache/linkis/blob/master/LICENSE">
<img
src="https://img.shields.io/badge/License-Apache%202.0-blue.svg?label=license"
/>
</a>
<a target="_blank"
href="https://www.oracle.com/technetwork/java/javase/downloads/index.html">
<img src="https://img.shields.io/badge/JDK-8-green.svg" />
</a>
- <a target="_blank"
href="https://github.com/apache/incubator-linkis/actions">
- <img
src="https://github.com/apache/incubator-linkis/actions/workflows//build-backend.yml/badge.svg"
/>
+ <a target="_blank" href="https://github.com/apache/linkis/actions">
+ <img
src="https://github.com/apache/linkis/actions/workflows//build-backend.yml/badge.svg"
/>
</a>
- <a target="_blank" href='https://github.com/apache/incubator-linkis'>
- <img
src="https://img.shields.io/github/forks/apache/incubator-linkis.svg"
alt="github forks"/>
+ <a target="_blank" href='https://github.com/apache/linkis'>
+ <img src="https://img.shields.io/github/forks/apache/linkis.svg"
alt="github forks"/>
</a>
- <a target="_blank" href='https://github.com/apache/incubator-linkis'>
- <img
src="https://img.shields.io/github/stars/apache/incubator-linkis.svg"
alt="github stars"/>
+ <a target="_blank" href='https://github.com/apache/linkis'>
+ <img src="https://img.shields.io/github/stars/apache/linkis.svg"
alt="github stars"/>
</a>
- <a target="_blank" href='https://github.com/apache/incubator-linkis'>
- <img
src="https://img.shields.io/github/contributors/apache/incubator-linkis.svg"
alt="github contributors"/>
+ <a target="_blank" href='https://github.com/apache/linkis'>
+ <img
src="https://img.shields.io/github/contributors/apache/linkis.svg" alt="github
contributors"/>
</a>
<a target="_blank"
href="https://badges.toozhao.com/stats/01G7TRNN1PH9PMSCYWDF3EK4QT">
<img
src="https://badges.toozhao.com/badges/01G7TRNN1PH9PMSCYWDF3EK4QT/green.svg" />
@@ -143,7 +143,7 @@ mvnw.cmd -N install
mvnw.cmd clean install -Dmaven.javadoc.skip=true -Dmaven.test.skip=true
## compile web
-cd incubator-linkis/linkis-web
+cd linkis/linkis-web
npm install
npm run build
```
@@ -169,7 +169,7 @@ Please refer to [Quick
Deployment](https://linkis.apache.org/docs/latest/deploym
# Documentation & Vedio
-- The documentation of linkis is in [Linkis-Website Git
Repository](https://github.com/apache/incubator-linkis-website)
+- The documentation of linkis is in [Linkis-Website Git
Repository](https://github.com/apache/linkis-website)
- Meetup videos on
[Bilibili](https://space.bilibili.com/598542776?from=search&seid=14344213924133040656)
# Architecture
@@ -189,7 +189,7 @@ For code and documentation contributions, please follow the
[contribution guide]
# Contact Us
-- Any questions or suggestions please kindly submit an
[issue](https://github.com/apache/incubator-linkis/issues).
+- Any questions or suggestions please kindly submit an
[issue](https://github.com/apache/linkis/issues).
- By mail [[email protected]](mailto:[email protected])
- You can scan the QR code below to join our WeChat group to get more
immediate response
@@ -198,5 +198,5 @@ For code and documentation contributions, please follow the
[contribution guide]
# Who is Using Linkis
-We opened an issue [[Who is Using
Linkis]](https://github.com/apache/incubator-linkis/issues/23) for users to
feedback and record who is using Linkis.
+We opened an issue [[Who is Using
Linkis]](https://github.com/apache/linkis/issues/23) for users to feedback and
record who is using Linkis.
Since the first release of Linkis in 2019, it has accumulated more than
**700** trial companies and **1000+** sandbox trial users, which involving
diverse industries, from finance, banking, tele-communication, to manufactory,
internet companies and so on.
diff --git a/README_CN.md b/README_CN.md
index 10ad45f66..b7ceb6cde 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -1,5 +1,5 @@
<h2 align="center">
- Apache Linkis(Incubating)
+ Apache Linkis
</h2>
<p align="center">
@@ -22,24 +22,24 @@
<a target="_blank"
href="https://search.maven.org/search?q=g:org.apache.linkis%20AND%20a:linkis">
<img
src="https://img.shields.io/maven-central/v/org.apache.linkis/linkis.svg?label=maven%20central"
/>
</a>
- <a target="_blank"
href="https://github.com/apache/incubator-linkis/blob/master/LICENSE">
+ <a target="_blank"
href="https://github.com/apache/linkis/blob/master/LICENSE">
<img
src="https://img.shields.io/badge/License-Apache%202.0-blue.svg?label=license"
/>
</a>
<a target="_blank"
href="https://www.oracle.com/technetwork/java/javase/downloads/index.html">
<img src="https://img.shields.io/badge/JDK-8-green.svg" />
</a>
- <a target="_blank"
href="https://github.com/apache/incubator-linkis/actions">
- <img
src="https://github.com/apache/incubator-linkis/actions/workflows//build-backend.yml/badge.svg"
/>
+ <a target="_blank" href="https://github.com/apache/linkis/actions">
+ <img
src="https://github.com/apache/linkis/actions/workflows//build-backend.yml/badge.svg"
/>
</a>
- <a target="_blank" href='https://github.com/apache/incubator-linkis'>
- <img
src="https://img.shields.io/github/forks/apache/incubator-linkis.svg"
alt="github forks"/>
+ <a target="_blank" href='https://github.com/apache/linkis'>
+ <img src="https://img.shields.io/github/forks/apache/linkis.svg"
alt="github forks"/>
</a>
- <a target="_blank" href='https://github.com/apache/incubator-linkis'>
- <img
src="https://img.shields.io/github/stars/apache/incubator-linkis.svg"
alt="github stars"/>
+ <a target="_blank" href='https://github.com/apache/linkis'>
+ <img src="https://img.shields.io/github/stars/apache/linkis.svg"
alt="github stars"/>
</a>
- <a target="_blank" href='https://github.com/apache/incubator-linkis'>
- <img
src="https://img.shields.io/github/contributors/apache/incubator-linkis.svg"
alt="github contributors"/>
+ <a target="_blank" href='https://github.com/apache/linkis'>
+ <img
src="https://img.shields.io/github/contributors/apache/linkis.svg" alt="github
contributors"/>
</a>
<a target="_blank"
href="https://badges.toozhao.com/stats/01G7TRNN1PH9PMSCYWDF3EK4QT">
<img
src="https://badges.toozhao.com/badges/01G7TRNN1PH9PMSCYWDF3EK4QT/green.svg" />
@@ -136,7 +136,7 @@ mvnw.cmd clean install -Dmaven.javadoc.skip=true
-Dmaven.test.skip=true
## 管理台编译
-cd incubator-linkis/linkis-web
+cd linkis/linkis-web
npm install
npm run build
```
@@ -161,7 +161,7 @@ $>
./linkis-dist/docker/scripts/make-linikis-image-with-mysql-jdbc.sh
# 文档&视频
-- 完整的 Linkis 文档代码存放在[linkis-website 仓库中
](https://github.com/apache/incubator-linkis-website)
+- 完整的 Linkis 文档代码存放在[linkis-website 仓库中
](https://github.com/apache/linkis-website)
- Meetup 视频
[Bilibili](https://space.bilibili.com/598542776?from=search&seid=14344213924133040656)
@@ -191,5 +191,5 @@ Linkis 基于微服务架构开发,其服务可以分为 3 类:计算治理服
# 谁在使用 Linkis
-我们创建了一个 issue [[Who is Using
Linkis]](https://github.com/apache/incubator-linkis/issues/23) 以便用户反馈和记录谁在使用
Linkis.
+我们创建了一个 issue [[Who is Using
Linkis]](https://github.com/apache/linkis/issues/23) 以便用户反馈和记录谁在使用 Linkis.
Linkis 自 2019 年开源发布以来,累计已有 700 多家试验企业和 1000+沙盒试验用户,涉及金融、电信、制造、互联网等多个行业。
diff --git a/linkis-dist/bin/install-linkis-to-kubernetes.sh
b/linkis-dist/bin/install-linkis-to-kubernetes.sh
index dbc54de70..c1007d3a9 100644
--- a/linkis-dist/bin/install-linkis-to-kubernetes.sh
+++ b/linkis-dist/bin/install-linkis-to-kubernetes.sh
@@ -60,18 +60,18 @@ help() {
#pull the container image of the linkis
pull(){
- debug ${MIRRORS}/apache/incubator-linkis/linkis-ldh:${TAG}
- docker pull ${MIRRORS}/apache/incubator-linkis/linkis-ldh:${TAG}
- debug ${MIRRORS}/apache/incubator-linkis/linkis:${TAG}
- docker pull ${MIRRORS}/apache/incubator-linkis/linkis:${TAG}
- debug ${MIRRORS}/apache/incubator-linkis/linkis-web:${TAG}
- docker pull ${MIRRORS}/apache/incubator-linkis/linkis-web:${TAG}
+ debug ${MIRRORS}/apache/linkis/linkis-ldh:${TAG}
+ docker pull ${MIRRORS}/apache/linkis/linkis-ldh:${TAG}
+ debug ${MIRRORS}/apache/linkis/linkis:${TAG}
+ docker pull ${MIRRORS}/apache/linkis/linkis:${TAG}
+ debug ${MIRRORS}/apache/linkis/linkis-web:${TAG}
+ docker pull ${MIRRORS}/apache/linkis/linkis-web:${TAG}
}
#change the label
tag(){
- docker tag ${MIRRORS}/apache/incubator-linkis/linkis:${TAG} linkis:dev
- docker tag ${MIRRORS}/apache/incubator-linkis/linkis-web:${TAG}
linkis-web:dev
- docker tag ${MIRRORS}/apache/incubator-linkis/linkis-ldh:${TAG}
linkis-ldh:dev
+ docker tag ${MIRRORS}/apache/linkis/linkis:${TAG} linkis:dev
+ docker tag ${MIRRORS}/apache/linkis/linkis-web:${TAG} linkis-web:dev
+ docker tag ${MIRRORS}/apache/linkis/linkis-ldh:${TAG} linkis-ldh:dev
}
#create an image to carry mysql
make_linikis_image_with_mysql_jdbc(){
diff --git a/linkis-dist/docker/ldh.Dockerfile
b/linkis-dist/docker/ldh.Dockerfile
index 3b2073f29..dcd01bdf9 100644
--- a/linkis-dist/docker/ldh.Dockerfile
+++ b/linkis-dist/docker/ldh.Dockerfile
@@ -39,7 +39,7 @@ ARG LINKIS_VERSION=0.0.0
RUN useradd -r -s /bin/bash -u 100001 -g root -G wheel hadoop
# if you want to set specific yum repos conf file, you can put its at
linkis-dist/docker/CentOS-Base.repo
-# and exec [COPY apache-linkis-*-incubating-bin/docker/CentOS-Epel.repo
/etc/yum.repos.d/CentOS-Epel.repo]
+# and exec [COPY apache-linkis-*-bin/docker/CentOS-Epel.repo
/etc/yum.repos.d/CentOS-Epel.repo]
# TODO: remove install mysql client when schema-init-tools is ready
RUN yum install -y \
diff --git a/linkis-dist/docker/linkis.Dockerfile
b/linkis-dist/docker/linkis.Dockerfile
index 4a9fa9886..8390ba6b2 100644
--- a/linkis-dist/docker/linkis.Dockerfile
+++ b/linkis-dist/docker/linkis.Dockerfile
@@ -27,7 +27,7 @@ ARG JDK_VERSION=1.8.0-openjdk
ARG JDK_BUILD_REVISION=1.8.0.332.b09-1.el7_9
# if you want to set specific yum repos conf file, you can put its at
linkis-dist/docker/CentOS-Base.repo
-# and exec [COPY apache-linkis-*-incubating-bin/docker/CentOS-Epel.repo
/etc/yum.repos.d/CentOS-Epel.repo]
+# and exec [COPY apache-linkis-*-bin/docker/CentOS-Epel.repo
/etc/yum.repos.d/CentOS-Epel.repo]
# TODO: remove install mysql client when schema-init-tools is ready
RUN yum install -y \
@@ -74,7 +74,7 @@ ENV LINKIS_CLIENT_CONF_DIR ${LINKIS_CONF_DIR}
ENV LINKIS_HOME ${LINKIS_HOME}
# can do some pre-operations
-ADD apache-linkis-${LINKIS_VERSION}-incubating-bin /opt/tmp/
+ADD apache-linkis-${LINKIS_VERSION}-bin /opt/tmp/
RUN mv /opt/tmp/linkis-package/* ${LINKIS_HOME}/ \
&& mv /opt/tmp/LICENSE ${LINKIS_HOME}/ \
diff --git a/linkis-dist/package/db/upgrade/1.1.1_schema/mysql/linkis_dml.sql
b/linkis-dist/package/db/upgrade/1.1.1_schema/mysql/linkis_dml.sql
index fe43670f0..23f621336 100644
--- a/linkis-dist/package/db/upgrade/1.1.1_schema/mysql/linkis_dml.sql
+++ b/linkis-dist/package/db/upgrade/1.1.1_schema/mysql/linkis_dml.sql
@@ -211,6 +211,6 @@ INSERT INTO
`linkis_mg_gateway_auth_token`(`token_name`,`legal_users`,`legal_hos
--- https://github.com/apache/incubator-linkis/issues/1899
+-- https://github.com/apache/linkis/issues/1899
update `linkis_cg_rm_external_resource_provider` set `name` = 'default' where
name = 'sit' and `resource_type` = 'Yarn';
diff --git a/linkis-dist/pom.xml b/linkis-dist/pom.xml
index a9d628d80..10781ab28 100644
--- a/linkis-dist/pom.xml
+++ b/linkis-dist/pom.xml
@@ -185,7 +185,7 @@
<phase>package</phase>
<configuration>
<skipAssembly>false</skipAssembly>
-
<finalName>apache-linkis-${project.version}-incubating-bin</finalName>
+ <finalName>apache-linkis-${project.version}-bin</finalName>
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
<descriptors>
diff --git a/linkis-dist/src/main/assembly/distribution.xml
b/linkis-dist/src/main/assembly/distribution.xml
index b45e14b46..15eee3d20 100644
--- a/linkis-dist/src/main/assembly/distribution.xml
+++ b/linkis-dist/src/main/assembly/distribution.xml
@@ -102,7 +102,6 @@
<outputDirectory></outputDirectory>
<includes>
<include>README*</include>
- <include>DISCLAIMER*</include>
</includes>
</fileSet>
diff --git a/linkis-web/vue.config.js b/linkis-web/vue.config.js
index 8cdf3e417..757664b4c 100644
--- a/linkis-web/vue.config.js
+++ b/linkis-web/vue.config.js
@@ -163,10 +163,10 @@ module.exports = {
{ source: '../DISCLAIMER', destination:
`./dist/DISCLAIMER`,toType: 'file'}
],
// 先删除根目录下的zip包
- delete:
[`./apache-linkis-${getVersion()}-incubating-web-bin.tar.gz`],
+ delete: [`./apache-linkis-${getVersion()}-web-bin.tar.gz`],
// 将dist文件夹下的文件进行打包
archive: [
- { source: './dist', destination:
`./apache-linkis-${getVersion()}-incubating-web-bin.tar.gz`,format: 'tar' ,
+ { source: './dist', destination:
`./apache-linkis-${getVersion()}-web-bin.tar.gz`,format: 'tar' ,
options: {
gzip: true,
gzipOptions: {
diff --git a/pom.xml b/pom.xml
index 5b385407a..50e262a09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<packaging>pom</packaging>
<name>Linkis Project Parent POM</name>
<description>Linkis helps easily connect to various back-end
computation/storage engines</description>
- <url>https://github.com/apache/incubator-linkis</url>
+ <url>https://github.com/apache/linkis</url>
<organization>
<name>The Apache Software Foundation</name>
@@ -46,9 +46,9 @@
</licenses>
<developers>
<developer>
- <id>Apache Linkis(incubating)</id>
+ <id>Apache Linkis</id>
<name>The Linkis Project Contributors</name>
- <email>[email protected]</email>
+ <email>[email protected]</email>
<url>http://linkis.apache.org/</url>
</developer>
</developers>
@@ -56,21 +56,15 @@
<mailingLists>
<mailingList>
<name>Development List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
</mailingList>
<mailingList>
<name>Commits List</name>
- <subscribe>[email protected]</subscribe>
-
<unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
- </mailingList>
- <mailingList>
- <name>Issues List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
+ <subscribe>[email protected]</subscribe>
+ <unsubscribe>[email protected]</unsubscribe>
+ <post>[email protected]</post>
</mailingList>
</mailingLists>
<modules>
@@ -84,15 +78,15 @@
<module>linkis-dist</module>
</modules>
<scm>
-
<connection>scm:git:https://github.com/apache/incubator-linkis.git</connection>
-
<developerConnection>scm:git:https://github.com/apache/incubator-linkis.git</developerConnection>
+ <connection>scm:git:https://github.com/apache/linkis.git</connection>
+
<developerConnection>scm:git:https://github.com/apache/linkis.git</developerConnection>
<tag>HEAD</tag>
- <url>https://github.com/apache/incubator-linkis</url>
+ <url>https://github.com/apache/linkis</url>
</scm>
<issueManagement>
<system>Github Issues</system>
- <url>https://github.com/apache/linkis-incubator/issues</url>
+ <url>https://github.com/apache/linkis/issues</url>
</issueManagement>
<distributionManagement>
@@ -1133,8 +1127,6 @@
<exclude>**/*.log</exclude>
<exclude>CONTRIBUTING.md</exclude>
<exclude>CONTRIBUTING_CN.md</exclude>
- <exclude>DISCLAIMER</exclude>
- <exclude>DISCLAIMER</exclude>
<exclude>README.md</exclude>
<exclude>**/META-INF/**</exclude>
<exclude>.github/**</exclude>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]