You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2019/04/25 04:34:43 UTC
[skywalking] branch master updated: Merge RocketBot UI as primary
UI (#2515)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 5321a85 Merge RocketBot UI as primary UI (#2515)
5321a85 is described below
commit 5321a8538d0d631e9bd237a8d97d912c7f4d1b83
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Apr 25 12:34:36 2019 +0800
Merge RocketBot UI as primary UI (#2515)
* Remove old UI submodule.
* Add rocketbot UI as submodule.
* update skywalking-rocketbot-ui commitId.
* Update ignore.
---
.gitmodules | 6 +++---
pom.xml | 14 ++------------
skywalking-ui | 2 +-
3 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index ed908a8..2d6acd7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "skywalking-ui"]
- path = skywalking-ui
- url = https://github.com/apache/incubator-skywalking-ui
[submodule "apm-protocol/apm-network/src/main/proto"]
path = apm-protocol/apm-network/src/main/proto
url = https://github.com/apache/incubator-skywalking-data-collect-protocol.git
[submodule "oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol"]
path = oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol
url = https://github.com/apache/incubator-skywalking-query-protocol.git
+[submodule "skywalking-ui"]
+ path = skywalking-ui
+ url = https://github.com/apache/skywalking-rocketbot-ui.git
diff --git a/pom.xml b/pom.xml
index 27a978c..d8bc1b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -318,18 +318,8 @@
<!-- UI IDE configs -->
<exclude>**/skywalking-ui/.editorconfig</exclude>
- <!-- UI Compiler configs -->
- <exclude>**/skywalking-ui/.webpackrc.js</exclude>
- <exclude>**/skywalking-ui/.roadhogrc.mock.js</exclude>
- <!-- UI Test configs -->
- <exclude>**/skywalking-ui/jest.config.js</exclude>
- <!-- UI style check files -->
- <exclude>**/skywalking-ui/.eslintrc.js</exclude>
- <exclude>**/skywalking-ui/.stylelintrc</exclude>
- <exclude>**/skywalking-ui/.prettierignore</exclude>
- <exclude>**/skywalking-ui/.prettierrc</exclude>
- <!-- UI icon files -->
- <exclude>**/skywalking-ui/public/font/iconfont/**</exclude>
+ <!-- UI ignore -->
+ <exclude>**/skywalking-ui/.browserslistrc</exclude>
<!-- git files -->
<exclude>**/.gitignore</exclude>
diff --git a/skywalking-ui b/skywalking-ui
index 949e434..4959569 160000
--- a/skywalking-ui
+++ b/skywalking-ui
@@ -1 +1 @@
-Subproject commit 949e43436a652acb213a18feda73125ae8a7c0df
+Subproject commit 49595692ed8fae2e3d9e931cc34f4c350f6973e2