forgetest5
/
ifffff
mirror of https://gitee.com/maxjhandsome/pig
1
0
Fork 0
Code Issues Releases Wiki Activity

⬆️ Upgrading dependencies. spring cloud 2020

This commit is contained in:
lengleng 2020-12-23 10:34:55 +08:00
parent 1634cca54e
commit 57860066b2
22 changed files with 36 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pig-auth/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-auth</artifactId> <artifactId>pig-auth</artifactId>
@ -44,19 +44,19 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-sentinel</artifactId> <artifactId>pig-common-sentinel</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</dependency> </dependency>
<!--upms api、model 模块--> <!--upms api、model 模块-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId> <artifactId>pig-upms-api</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</dependency> </dependency>
<!--security--> <!--security-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId> <artifactId>pig-common-security</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</dependency> </dependency>
<!--JDBC相关--> <!--JDBC相关-->
<dependency> <dependency>

2
pig-common/pig-common-core/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-common-core</artifactId> <artifactId>pig-common-core</artifactId>

2
pig-common/pig-common-datasource/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
pig-common/pig-common-job/pom.xml
View File

@ -23,7 +23,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-common-job</artifactId> <artifactId>pig-common-job</artifactId>

6
pig-common/pig-common-log/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-common-log</artifactId> <artifactId>pig-common-log</artifactId>
@ -35,13 +35,13 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId> <artifactId>pig-common-core</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</dependency> </dependency>
<!--UPMS接口模块--> <!--UPMS接口模块-->
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId> <artifactId>pig-upms-api</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</dependency> </dependency>
<!--安全依赖获取上下文信息--> <!--安全依赖获取上下文信息-->
<dependency> <dependency>

2
pig-common/pig-common-mybatis/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-common-mybatis</artifactId> <artifactId>pig-common-mybatis</artifactId>

6
pig-common/pig-common-security/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-common-security</artifactId> <artifactId>pig-common-security</artifactId>
@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId> <artifactId>pig-common-core</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</dependency> </dependency>
<!--安全模块--> <!--安全模块-->
<dependency> <dependency>
@ -50,7 +50,7 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-upms-api</artifactId> <artifactId>pig-upms-api</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

6
pig-common/pig-common-sentinel/pom.xml
View File

@ -21,18 +21,19 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
<artifactId>pig-common-sentinel</artifactId> <artifactId>pig-common-sentinel</artifactId>
<description>sentinel服务降级熔断、限流组件</description> <description>sentinel服务降级熔断、限流组件</description>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-core</artifactId> <artifactId>pig-common-core</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba.cloud</groupId> <groupId>com.alibaba.cloud</groupId>
@ -47,6 +48,7 @@
<dependency> <dependency>
<groupId>io.github.openfeign</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>feign-hystrix</artifactId> <artifactId>feign-hystrix</artifactId>
<version>10.10.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>

2
pig-common/pig-common-swagger/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-common-swagger</artifactId> <artifactId>pig-common-swagger</artifactId>

4
pig-common/pig-common-test/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-common-test</artifactId> <artifactId>pig-common-test</artifactId>
@ -18,7 +18,7 @@
<dependency> <dependency>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-common-security</artifactId> <artifactId>pig-common-security</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>

2
pig-common/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-common</artifactId> <artifactId>pig-common</artifactId>

2
pig-gateway/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-gateway</artifactId> <artifactId>pig-gateway</artifactId>

2
pig-register/pom.xml
View File

@ -18,7 +18,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-register</artifactId> <artifactId>pig-register</artifactId>

2
pig-upms/pig-upms-api/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-upms</artifactId> <artifactId>pig-upms</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-upms-api</artifactId> <artifactId>pig-upms-api</artifactId>

2
pig-upms/pig-upms-biz/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-upms</artifactId> <artifactId>pig-upms</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-upms-biz</artifactId> <artifactId>pig-upms-biz</artifactId>

2
pig-upms/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-upms</artifactId> <artifactId>pig-upms</artifactId>

2
pig-visual/pig-codegen/pom.xml
View File

@ -22,7 +22,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId> <artifactId>pig-visual</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-codegen</artifactId> <artifactId>pig-codegen</artifactId>

2
pig-visual/pig-monitor/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId> <artifactId>pig-visual</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-monitor</artifactId> <artifactId>pig-monitor</artifactId>

2
pig-visual/pig-sentinel-dashboard/pom.xml
View File

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId> <artifactId>pig-visual</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-sentinel-dashboard</artifactId> <artifactId>pig-sentinel-dashboard</artifactId>

2
pig-visual/pig-xxl-job-admin/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-visual</artifactId> <artifactId>pig-visual</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-xxl-job-admin</artifactId> <artifactId>pig-xxl-job-admin</artifactId>

2
pig-visual/pom.xml
View File

@ -21,7 +21,7 @@
<parent> <parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.10.4-SNAPSHOT</version> <version>2.11.0</version>
</parent> </parent>
<artifactId>pig-visual</artifactId> <artifactId>pig-visual</artifactId>

38
pom.xml
View File

@ -23,25 +23,25 @@
<!-- 源码: https://gitee.com/log4j/pig-cloud-dependencies-parent --> <!-- 源码: https://gitee.com/log4j/pig-cloud-dependencies-parent -->
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig-cloud-dependencies-parent</artifactId> <artifactId>pig-cloud-dependencies-parent</artifactId>
<version>2.10.3</version> <version>2.11.0</version>
</parent> </parent>
<groupId>com.pig4cloud</groupId> <groupId>com.pig4cloud</groupId>
<artifactId>pig</artifactId> <artifactId>pig</artifactId>
<version>2.10.3</version> <version>2.11.0</version>
<name>${project.artifactId}</name> <name>${project.artifactId}</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<url>https://www.pig4cloud.com</url> <url>https://www.pig4cloud.com</url>
<properties> <properties>
<spring-boot.version>2.4.1</spring-boot.version> <spring-boot.version>2.4.1</spring-boot.version>
<spring-cloud.version>2020.0.0-RC1</spring-cloud.version> <spring-cloud.version>2020.0.0</spring-cloud.version>
<spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version> <spring-cloud-alibaba.version>2.2.3.RELEASE</spring-cloud-alibaba.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<spring-boot-admin.version>2.3.1</spring-boot-admin.version> <spring-boot-admin.version>2.3.1</spring-boot-admin.version>
<hutool.version>5.5.1</hutool.version> <hutool.version>5.5.3</hutool.version>
<mybatis-plus.version>3.4.1</mybatis-plus.version> <mybatis-plus.version>3.4.1</mybatis-plus.version>
<dynamic-ds.version>3.2.0</dynamic-ds.version> <dynamic-ds.version>3.2.0</dynamic-ds.version>
<captcha.version>2.2.0</captcha.version> <captcha.version>2.2.0</captcha.version>
@ -211,34 +211,4 @@
</profile> </profile>
</profiles> </profiles>
<repositories>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
</repository>
<repository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
</pluginRepository>
<pluginRepository>
<id>spring-snapshots</id>
<name>Spring Snapshots</name>
<url>https://repo.spring.io/snapshot</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project> </project>