zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into leng_dev

Browse Source 
# Conflicts:
#	pigx-auth/pom.xml
#	pigx-common/pigx-common-bom/pom.xml
#	pigx-common/pigx-common-core/pom.xml
#	pigx-common/pigx-common-data/pom.xml
#	pigx-common/pigx-common-datasource/pom.xml
#	pigx-common/pigx-common-gateway/pom.xml
#	pigx-common/pigx-common-job/pom.xml
#	pigx-common/pigx-common-log/pom.xml
#	pigx-common/pigx-common-minio/pom.xml
#	pigx-common/pigx-common-security/pom.xml
#	pigx-common/pigx-common-sequence/pom.xml
#	pigx-common/pigx-common-swagger/pom.xml
#	pigx-common/pigx-common-transaction/pom.xml
#	pigx-common/pom.xml
#	pigx-gateway/pom.xml
#	pigx-register/pom.xml
#	pigx-upms/pigx-upms-api/pom.xml
#	pigx-upms/pigx-upms-biz/pom.xml
#	pigx-upms/pom.xml
#	pigx-visual/pigx-activiti/pom.xml
#	pigx-visual/pigx-codegen/pom.xml
#	pigx-visual/pigx-daemon-elastic-job/pom.xml
#	pigx-visual/pigx-daemon-quartz/pom.xml
#	pigx-visual/pigx-monitor/pom.xml
#	pigx-visual/pigx-mp-manager/pom.xml
#	pigx-visual/pigx-pay/pom.xml
#	pigx-visual/pigx-sso-client-demo/pom.xml
#	pigx-visual/pigx-tx-manager/pom.xml
#	pigx-visual/pom.xml
#	pom.xml
This commit is contained in:
冷冷 committed 2019-08-28 12:00:03 +08:00
2 parents e2a7b58926 de5e8f638d
commit fc0919e4aa
30 files changed
+31 -36
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-auth/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-auth</artifactId>
pigx-common/pigx-common-bom/pom.xml
+1 -6
View File
@@ -16,7 +16,7 @@
<description>pigx 公共版本控制</description>
<properties>
<pigx.version>3.3.0</pigx.version>
<pigx.version>3.3.SNAPSHOT</pigx.version>
<mybatis-plus.version>3.1.0</mybatis-plus.version>
<druid.version>1.1.18</druid.version>
<mysql.connector.version>8.0.16</mysql.connector.version>
@@ -26,11 +26,6 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>pigx-common-bom</artifactId>
<version>3.2</version>
</dependency>
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-core</artifactId>
pigx-common/pigx-common-core/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-common-core</artifactId>
pigx-common/pigx-common-data/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-common-data</artifactId>
pigx-common/pigx-common-datasource/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>pigx-common</artifactId>
<groupId>com.pig4cloud</groupId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pigx-common/pigx-common-gateway/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-common-gateway</artifactId>
pigx-common/pigx-common-job/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-common-job</artifactId>
pigx-common/pigx-common-log/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-common-log</artifactId>
pigx-common/pigx-common-minio/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-common-minio</artifactId>
pigx-common/pigx-common-security/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-common-security</artifactId>
pigx-common/pigx-common-sequence/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-common-sequence</artifactId>
pigx-common/pigx-common-swagger/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-common-swagger</artifactId>
pigx-common/pigx-common-transaction/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-common-transaction</artifactId>
pigx-common/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-common</artifactId>
pigx-gateway/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-gateway</artifactId>
pigx-register/pom.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-register</artifactId>
pigx-upms/pigx-upms-api/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-upms-api</artifactId>
pigx-upms/pigx-upms-biz/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-upms-biz</artifactId>
pigx-upms/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-upms</artifactId>
pigx-visual/pigx-activiti/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-activiti</artifactId>
pigx-visual/pigx-codegen/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-codegen</artifactId>
pigx-visual/pigx-daemon-elastic-job/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-daemon-elastic-job</artifactId>
pigx-visual/pigx-daemon-quartz/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pigx-visual/pigx-monitor/pom.xml
+2 -2
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-monitor</artifactId>
@@ -36,7 +36,7 @@
<dependency>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common-core</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
pigx-visual/pigx-mp-manager/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-mp-manager</artifactId>
pigx-visual/pigx-pay/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-pay</artifactId>
pigx-visual/pigx-sso-client-demo/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<dependencies>
pigx-visual/pigx-tx-manager/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-tx-manager</artifactId>
pigx-visual/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
</parent>
<artifactId>pigx-visual</artifactId>
pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.3.0</version>
<version>3.3.SNAPSHOT</version>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<organization>