You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/04/30 04:34:35 UTC

[incubator-linkis] branch dev-1.1.1 updated: Remove DISCLAIMER-WIP (#2066)

This is an automated email from the ASF dual-hosted git repository.

peacewong pushed a commit to branch dev-1.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git


The following commit(s) were added to refs/heads/dev-1.1.1 by this push:
     new 43b548b53 Remove DISCLAIMER-WIP (#2066)
43b548b53 is described below

commit 43b548b5341961ebfd7e1a710ce5a918ef54ec01
Author: Casion <ca...@gmail.com>
AuthorDate: Sat Apr 30 12:34:29 2022 +0800

    Remove DISCLAIMER-WIP (#2066)
---
 DISCLAIMER        |  6 ++++++
 DISCLAIMER-WIP    | 17 -----------------
 LICENSE-binary-ui |  4 ++--
 pom.xml           |  2 +-
 web/vue.config.js |  2 +-
 5 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 000000000..578b810cd
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,6 @@
+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/DISCLAIMER-WIP b/DISCLAIMER-WIP
deleted file mode 100644
index 4d016bb28..000000000
--- a/DISCLAIMER-WIP
+++ /dev/null
@@ -1,17 +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.
-
-Some of the incubating project’s releases may not be fully compliant with ASF policy.
-For example, releases may have incomplete or un-reviewed licensing conditions.
-What follows is a list of issues the project is currently aware of (this list is likely to be incomplete):
-
-1. Releases may have incomplete licensing conditions
-
-If you are planning to incorporate this work into your product/project,please be aware that
-you will need to conduct a thorough licensing review to determine the overall implications of
-including this work.For the current status of this project through the Apache Incubator,
-visit: https://incubator.apache.org/projects/linkis.html
\ No newline at end of file
diff --git a/LICENSE-binary-ui b/LICENSE-binary-ui
index 4ce4e50db..b6a929bd2 100644
--- a/LICENSE-binary-ui
+++ b/LICENSE-binary-ui
@@ -230,7 +230,6 @@ See licenses-binary-ui/ for text of these licenses.
     (The MIT License) mitt@1.2.0 (https://github.com/developit/mitt)
     (The MIT License) moment@2.29.1 (https://github.com/moment/moment)
     (The MIT License) monaco-editor@0.19.3 (https://github.com/Microsoft/monaco-editor)
-    (The MIT License) pinyin@2.9.1 (https://github.com/hotoo/pinyin)
     (The MIT License) reconnecting-websocket@4.4.0 (https://github.com/pladaria/reconnecting-websocket)
     (The MIT License) sql-formatter@2.3.3 (https://github.com/zeroturnaround/sql-formatter)
     (The MIT License) svgo@1.3.0 (https://github.com/svg/svgo)
@@ -241,4 +240,5 @@ See licenses-binary-ui/ for text of these licenses.
     (The MIT License) vuescroll@4.16.1 (https://github.com/YvesCoding/vuescroll)
     (The MIT License) worker-loader@2.0.0 (https://github.com/webpack-contrib/worker-loader)
     (The MIT License) @form-create/iview@2.5.13 (https://github.com/xaboy/form-create)
-    (The MIT License) object-to-formdata@4.2.2 (https://github.com/therealparmesh/object-to-formdata)
\ No newline at end of file
+    (The MIT License) object-to-formdata@4.2.2 (https://github.com/therealparmesh/object-to-formdata)
+    (The Apache-2.0 License) material-design-icons@^3.0.1 (https://github.com/google/material-design-icons)
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e48bc56f1..530551676 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1054,7 +1054,7 @@
                             <exclude>**/*.log</exclude>
                             <exclude>CONTRIBUTING.md</exclude>
                             <exclude>CONTRIBUTING_CN.md</exclude>
-                            <exclude>DISCLAIMER-WIP</exclude>
+                            <exclude>DISCLAIMER</exclude>
                             <exclude>DISCLAIMER</exclude>
                             <exclude>README.md</exclude>
                             <exclude>**/META-INF/**</exclude>
diff --git a/web/vue.config.js b/web/vue.config.js
index b2ad8df74..0f763c125 100644
--- a/web/vue.config.js
+++ b/web/vue.config.js
@@ -159,7 +159,7 @@ module.exports = {
               { source: './install.sh', destination: `./dist/install.sh`,toType: 'file' },
               { source: '../NOTICE-binary-ui', destination: `./dist/NOTICE`,toType: 'file'},
               { source: '../LICENSE-binary-ui', destination: `./dist/LICENSE`,toType: 'file'},
-              { source: '../DISCLAIMER-WIP', destination: `./dist/DISCLAIMER-WIP`,toType: 'file'},
+              { source: '../DISCLAIMER', destination: `./dist/DISCLAIMER`,toType: 'file'},
               { source: '../licenses-binary-ui', destination: `./dist/licenses` }
             ],
             // 先删除根目录下的zip包


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org