You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ki...@apache.org on 2020/07/23 14:42:13 UTC
[shardingsphere-elasticjob-ui] branch master updated: polish
This is an automated email from the ASF dual-hosted git repository.
kimmking pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 1adb3cd polish
1adb3cd is described below
commit 1adb3cd1496448c0d25ce56672464040f65e3a9e
Author: kimmking <ki...@apache.org>
AuthorDate: Thu Jul 23 22:41:19 2020 +0800
polish
---
README.md | 8 ++++----
README_ZH.md | 8 ++++----
pom.xml | 2 --
shardingsphere-elasticjob-cloud-ui/pom.xml | 4 +---
.../shardingsphere-elasticjob-cloud-ui-backend/pom.xml | 5 ++---
shardingsphere-elasticjob-lite-ui/pom.xml | 2 --
.../shardingsphere-elasticjob-lite-ui-backend/pom.xml | 5 ++---
shardingsphere-elasticjob-ui-distribution/pom.xml | 2 +-
.../shardingsphere-elasticjob-cloud-ui-bin-distribution/pom.xml | 1 -
.../shardingsphere-elasticjob-lite-ui-bin-distribution/pom.xml | 5 ++---
.../shardingsphere-elasticjob-ui-src-distribution/pom.xml | 2 +-
.../assembly/shardingsphere-elasticjob-ui-src-distribution.xml | 2 +-
12 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/README.md b/README.md
index 6f101f9..f5c74f5 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@ There are two parts in this project:
shardingsphere-elasticjob-lite-ui-frontend/shardingsphere-elasticjob-cloud-ui-frontend based on [vue](https://github.com/vuejs/vue) and use the UI Toolkit [element](https://github.com/ElemeFE/element).
-* [shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/README.md](shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/README.md)
-* [shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/README.md](shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/README.md)
+- [shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/README.md](shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/README.md)
+- [shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/README.md](shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/README.md)
### ShardingSphere ElasticJob UI Backend
@@ -28,5 +28,5 @@ cd shardingsphere-elasticjob-ui/
mvn clean package -Prelease
```
-- Get the lite package in `shardingsphere-elasticjob-ui/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-lite-ui-bin.tar.gz`
-- Get the cloud package in `shardingsphere-elasticjob-ui/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-cloud-ui-bin.tar.gz`
+- Get the lite package in `shardingsphere-elasticjob-ui/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-lite-ui-bin.tar.gz`
+- Get the cloud package in `shardingsphere-elasticjob-ui/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-cloud-ui-bin.tar.gz`
diff --git a/README_ZH.md b/README_ZH.md
index 2871388..0e98a60 100644
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -13,8 +13,8 @@ ShardingSphere ElasticJob UI是 [ShardingSphere ElasticJob](https://shardingsphe
shardingsphere-elasticjob-lite-ui-frontend/shardingsphere-elasticjob-cloud-ui-frontend 模块基于 [vue](https://github.com/vuejs/vue) ，并使用了UI工具包 [element](https://github.com/ElemeFE/element) 。
-* [shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/README.md](shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/README.md)
-* [shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/README.md](shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/README.md)
+- [shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/README.md](shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/README.md)
+- [shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/README.md](shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-frontend/README.md)
### ShardingSphere ElasticJob UI 后端
@@ -28,5 +28,5 @@ cd shardingsphere-elasticjob-ui/
mvn clean package -Prelease
```
-- 从 `shardingsphere-elasticjob-ui/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-lite-ui-bin.tar.gz` 中获取 lite 软件包。
-- 从 `shardingsphere-elasticjob-ui/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-cloud-ui-bin.tar.gz` 中获取 cloud 软件包。
+- 从 `shardingsphere-elasticjob-ui/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-lite-ui-bin.tar.gz` 中获取 lite 软件包。
+- 从 `shardingsphere-elasticjob-ui/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/target/apache-shardingsphere-${latest.release.version}-shardingsphere-elasticjob-cloud-ui-bin.tar.gz` 中获取 cloud 软件包。
diff --git a/pom.xml b/pom.xml
index 1cdb0d4..4d1b905 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,13 +38,11 @@
<properties>
<java.version>1.8</java.version>
<spring-boot.version>1.5.21.RELEASE</spring-boot.version>
-
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
<takari-maven-plugin.version>0.6.1</takari-maven-plugin.version>
-
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
diff --git a/shardingsphere-elasticjob-cloud-ui/pom.xml b/shardingsphere-elasticjob-cloud-ui/pom.xml
index ad17649..ce13a81 100644
--- a/shardingsphere-elasticjob-cloud-ui/pom.xml
+++ b/shardingsphere-elasticjob-cloud-ui/pom.xml
@@ -37,13 +37,11 @@
<properties>
<java.version>1.8</java.version>
<spring-boot.version>1.5.21.RELEASE</spring-boot.version>
-
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
<takari-maven-plugin.version>0.6.1</takari-maven-plugin.version>
-
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
@@ -68,7 +66,7 @@
<version>${os-maven-plugin.version}</version>
</extension>
</extensions>
-
+
<pluginManagement>
<plugins>
<plugin>
diff --git a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/pom.xml b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/pom.xml
index 1ba4eb9..0a2fa34 100644
--- a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/pom.xml
+++ b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/pom.xml
@@ -29,6 +29,7 @@
<properties>
<spring-boot.version>2.3.1.RELEASE</spring-boot.version>
<springframework.version>5.2.7.RELEASE</springframework.version>
+ <commons-dbcp.version>1.4</commons-dbcp.version>
</properties>
<dependencies>
@@ -115,9 +116,8 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <version>${commons-dbcp.version}</version>
</dependency>
-
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -146,7 +146,6 @@
</resources>
</configuration>
</plugin>
-
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/shardingsphere-elasticjob-lite-ui/pom.xml b/shardingsphere-elasticjob-lite-ui/pom.xml
index c62abbf..50bdb91 100644
--- a/shardingsphere-elasticjob-lite-ui/pom.xml
+++ b/shardingsphere-elasticjob-lite-ui/pom.xml
@@ -37,13 +37,11 @@
<properties>
<java.version>1.8</java.version>
<spring-boot.version>1.5.21.RELEASE</spring-boot.version>
-
<apache-rat-plugin.version>0.12</apache-rat-plugin.version>
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
<takari-maven-plugin.version>0.6.1</takari-maven-plugin.version>
-
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/pom.xml b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/pom.xml
index f0c2838..e837fec 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/pom.xml
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/pom.xml
@@ -29,6 +29,7 @@
<properties>
<spring-boot.version>2.3.1.RELEASE</spring-boot.version>
<springframework.version>5.2.7.RELEASE</springframework.version>
+ <commons-dbcp.version>1.4</commons-dbcp.version>
</properties>
<dependencies>
@@ -115,9 +116,8 @@
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
- <version>1.4</version>
+ <version>${commons-dbcp.version}</version>
</dependency>
-
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -146,7 +146,6 @@
</resources>
</configuration>
</plugin>
-
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
diff --git a/shardingsphere-elasticjob-ui-distribution/pom.xml b/shardingsphere-elasticjob-ui-distribution/pom.xml
index a3a3bd8..41785b1 100644
--- a/shardingsphere-elasticjob-ui-distribution/pom.xml
+++ b/shardingsphere-elasticjob-ui-distribution/pom.xml
@@ -36,7 +36,7 @@
<module>shardingsphere-elasticjob-lite-ui-bin-distribution</module>
<module>shardingsphere-elasticjob-cloud-ui-bin-distribution</module>
</modules>
-
+
<build>
<finalName>apache-shardingsphere-elasticjob-${project.version}</finalName>
</build>
diff --git a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/pom.xml b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/pom.xml
index e1aadfc..65c013c 100644
--- a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/pom.xml
+++ b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-cloud-ui-bin-distribution/pom.xml
@@ -45,7 +45,6 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
diff --git a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/pom.xml b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/pom.xml
index 1dacd11..4759b29 100644
--- a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/pom.xml
+++ b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-lite-ui-bin-distribution/pom.xml
@@ -34,7 +34,7 @@
<artifactId>shardingsphere-elasticjob-lite-ui-backend</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
@@ -45,7 +45,6 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
@@ -58,7 +57,7 @@
</exclusions>
</dependency>
</dependencies>
-
+
<profiles>
<profile>
<id>release</id>
diff --git a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-ui-src-distribution/pom.xml b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-ui-src-distribution/pom.xml
index dd25551..572b343 100644
--- a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-ui-src-distribution/pom.xml
+++ b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-ui-src-distribution/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>shardingsphere-elasticjob-ui-src-distribution</artifactId>
<name>${project.artifactId}</name>
-
+
<profiles>
<profile>
<id>release</id>
diff --git a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-ui-src-distribution/src/main/assembly/shardingsphere-elasticjob-ui-src-distribution.xml b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-ui-src-distribution/src/main/assembly/shardingsphere-elasticjob-ui-src-distribution.xml
index eea0ed5..2bcebd6 100644
--- a/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-ui-src-distribution/src/main/assembly/shardingsphere-elasticjob-ui-src-distribution.xml
+++ b/shardingsphere-elasticjob-ui-distribution/shardingsphere-elasticjob-ui-src-distribution/src/main/assembly/shardingsphere-elasticjob-ui-src-distribution.xml
@@ -57,12 +57,12 @@
<exclude>**/shardingsphere-elasticjob-lite-ui-frontend/node/**</exclude>
<exclude>**/shardingsphere-elasticjob-lite-ui-frontend/node_modules/**</exclude>
<exclude>**/shardingsphere-elasticjob-lite-ui-frontend/etc/**</exclude>
-
<exclude>**/shardingsphere-elasticjob-cloud-ui-frontend/test/coverage/**</exclude>
<exclude>**/shardingsphere-elasticjob-cloud-ui-frontend/dist/**</exclude>
<exclude>**/shardingsphere-elasticjob-cloud-ui-frontend/node/**</exclude>
<exclude>**/shardingsphere-elasticjob-cloud-ui-frontend/node_modules/**</exclude>
<exclude>**/shardingsphere-elasticjob-cloud-ui-frontend/etc/**</exclude>
+
<!-- eclipse ignore -->
<exclude>**/.settings/**</exclude>
<exclude>**/.project</exclude>