Skip to content

GitLab

S
schbrain-parent
Commit fcfe0d96 authored by liaozan's avatar liaozan 🏀
Browse files
Options

chore(deps): bump dubbo from 3.1.9 to 3.2.0

parent 674f60c8
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 110 deletions
pom.xml
View file @ fcfe0d96
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<commons-beanutils.version>1.9.4</commons-beanutils.version> <commons-beanutils.version>1.9.4</commons-beanutils.version>
<commons-collections4.version>4.4</commons-collections4.version> <commons-collections4.version>4.4</commons-collections4.version>
<commons-io.version>2.11.0</commons-io.version> <commons-io.version>2.11.0</commons-io.version>
<dubbo.version>3.1.9</dubbo.version> <dubbo.version>3.2.0</dubbo.version>
<druid.version>1.2.17</druid.version> <druid.version>1.2.17</druid.version>
<dynamic-datasource.version>3.5.0</dynamic-datasource.version> <dynamic-datasource.version>3.5.0</dynamic-datasource.version>
<easyexcel.version>3.2.1</easyexcel.version> <easyexcel.version>3.2.1</easyexcel.version>
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
<!-- alibabacloud new sdk --> <!-- alibabacloud new sdk -->
<aliyun-java-core.version>0.1.13-beta</aliyun-java-core.version> <aliyun-java-core.version>0.1.13-beta</aliyun-java-core.version>
<aliyun-gateway-pop.version>0.1.13-beta</aliyun-gateway-pop.version>
<alibabacloud-sts20150401.version>1.0.3</alibabacloud-sts20150401.version> <alibabacloud-sts20150401.version>1.0.3</alibabacloud-sts20150401.version>
<alibabacloud-oss20190517.version>1.0.2</alibabacloud-oss20190517.version> <alibabacloud-oss20190517.version>1.0.2</alibabacloud-oss20190517.version>
<alibabacloud-vod20170321.version>1.0.4</alibabacloud-vod20170321.version> <alibabacloud-vod20170321.version>1.0.4</alibabacloud-vod20170321.version>
...@@ -260,28 +261,6 @@ ...@@ -260,28 +261,6 @@
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-common</artifactId> <artifactId>dubbo-common</artifactId>
<version>${dubbo.version}</version> <version>${dubbo.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<exclusion>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</exclusion>
<exclusion>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
...@@ -292,12 +271,6 @@ ...@@ -292,12 +271,6 @@
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-config-spring</artifactId> <artifactId>dubbo-config-spring</artifactId>
<version>${dubbo.version}</version> <version>${dubbo.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
...@@ -323,16 +296,6 @@ ...@@ -323,16 +296,6 @@
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-registry-zookeeper</artifactId> <artifactId>dubbo-registry-zookeeper</artifactId>
<version>${dubbo.version}</version> <version>${dubbo.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-container-api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
...@@ -341,33 +304,18 @@ ...@@ -341,33 +304,18 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-metadata-report-zookeeper</artifactId> <artifactId>dubbo-serialization-fastjson2</artifactId>
<version>${dubbo.version}</version> <version>${dubbo.version}</version>
<exclusions> </dependency>
<exclusion> <dependency>
<groupId>org.apache.dubbo</groupId> <groupId>org.apache.dubbo</groupId>
<artifactId>dubbo-configcenter-zookeeper</artifactId> <artifactId>dubbo-metadata-report-zookeeper</artifactId>
</exclusion> <version>${dubbo.version}</version>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.zookeeper</groupId> <groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId> <artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version> <version>${zookeeper.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
...@@ -409,12 +357,6 @@ ...@@ -409,12 +357,6 @@
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid</artifactId> <artifactId>druid</artifactId>
<version>${druid.version}</version> <version>${druid.version}</version>
<exclusions>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
...@@ -472,12 +414,11 @@ ...@@ -472,12 +414,11 @@
<groupId>com.aliyun</groupId> <groupId>com.aliyun</groupId>
<artifactId>aliyun-java-core</artifactId> <artifactId>aliyun-java-core</artifactId>
<version>${aliyun-java-core.version}</version> <version>${aliyun-java-core.version}</version>
<exclusions> </dependency>
<exclusion> <dependency>
<groupId>com.github.tomakehurst</groupId> <groupId>com.aliyun</groupId>
<artifactId>wiremock-standalone</artifactId> <artifactId>aliyun-gateway-pop</artifactId>
</exclusion> <version>${aliyun-gateway-pop.version}</version>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.aliyun</groupId> <groupId>com.aliyun</groupId>
...@@ -509,12 +450,6 @@ ...@@ -509,12 +450,6 @@
<groupId>com.aliyun</groupId> <groupId>com.aliyun</groupId>
<artifactId>alibaba-dingtalk-service-sdk</artifactId> <artifactId>alibaba-dingtalk-service-sdk</artifactId>
<version>${alibaba-dingtalk-sdk.version}</version> <version>${alibaba-dingtalk-sdk.version}</version>
<exclusions>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.aliyun</groupId> <groupId>com.aliyun</groupId>
...@@ -556,16 +491,18 @@ ...@@ -556,16 +491,18 @@
<repositories> <repositories>
<repository> <repository>
<id>libs-releases</id>
<url>${maven.repository.url}/maven-releases</url>
<releases> <releases>
<enabled>true</enabled> <enabled>true</enabled>
</releases> </releases>
<snapshots> <snapshots>
<enabled>false</enabled> <enabled>false</enabled>
</snapshots> </snapshots>
<id>libs-releases</id>
<url>${maven.repository.url}/maven-releases</url>
</repository> </repository>
<repository> <repository>
<id>libs-snapshots</id>
<url>${maven.repository.url}/maven-snapshots</url>
<releases> <releases>
<enabled>false</enabled> <enabled>false</enabled>
</releases> </releases>
...@@ -573,26 +510,24 @@ ...@@ -573,26 +510,24 @@
<enabled>true</enabled> <enabled>true</enabled>
<updatePolicy>always</updatePolicy> <updatePolicy>always</updatePolicy>
</snapshots> </snapshots>
<id>libs-snapshots</id>
<url>${maven.repository.url}/maven-snapshots</url>
</repository> </repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>plugin-releases</id>
<url>${maven.repository.url}/maven-releases</url>
<snapshots> <snapshots>
<enabled>false</enabled> <enabled>false</enabled>
</snapshots> </snapshots>
<id>plugin-releases</id>
<url>${maven.repository.url}/maven-releases</url>
</pluginRepository> </pluginRepository>
<pluginRepository> <pluginRepository>
<id>plugin-snapshots</id>
<url>${maven.repository.url}/maven-snapshots</url>
<snapshots> <snapshots>
<enabled>true</enabled> <enabled>true</enabled>
<updatePolicy>always</updatePolicy> <updatePolicy>always</updatePolicy>
</snapshots> </snapshots>
<id>plugin-snapshots</id>
<url>${maven.repository.url}/maven-snapshots</url>
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
...@@ -711,31 +646,6 @@ ...@@ -711,31 +646,6 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-resources</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>compile</phase>
<configuration>
<resources>
<resource>
<directory>${project.build.outputDirectory}/META-INF</directory>
<filtering>true</filtering>
<includes>
<include>spring-configuration-metadata.json</include>
</includes>
</resource>
</resources>
<outputDirectory>${basedir}/src/main/resources/META-INF</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId> <artifactId>maven-enforcer-plugin</artifactId>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment