Commit a6648163bb64fe2aed85f20f3002857a0bfae9c5
1 parent
a167ee2e
Revert "updated spring and netty versions, excluded log4j from zookeeper dependency"
This reverts commit 73805759.
Showing
1 changed file
with
4 additions
and
10 deletions
| @@ -30,10 +30,10 @@ | @@ -30,10 +30,10 @@ | ||
| 30 | <properties> | 30 | <properties> |
| 31 | <main.dir>${basedir}</main.dir> | 31 | <main.dir>${basedir}</main.dir> |
| 32 | <pkg.user>thingsboard</pkg.user> | 32 | <pkg.user>thingsboard</pkg.user> |
| 33 | - <spring-boot.version>2.2.6.RELEASE</spring-boot.version> | 33 | + <spring-boot.version>2.2.4.RELEASE</spring-boot.version> |
| 34 | <spring-oauth2.version>2.1.2.RELEASE</spring-oauth2.version> | 34 | <spring-oauth2.version>2.1.2.RELEASE</spring-oauth2.version> |
| 35 | - <spring.version>5.2.6.RELEASE</spring.version> | ||
| 36 | - <spring-security.version>5.2.3.RELEASE</spring-security.version> | 35 | + <spring.version>5.2.2.RELEASE</spring.version> |
| 36 | + <spring-security.version>5.2.2.RELEASE</spring-security.version> | ||
| 37 | <spring-data-redis.version>2.2.4.RELEASE</spring-data-redis.version> | 37 | <spring-data-redis.version>2.2.4.RELEASE</spring-data-redis.version> |
| 38 | <jedis.version>3.1.0</jedis.version> | 38 | <jedis.version>3.1.0</jedis.version> |
| 39 | <jjwt.version>0.7.0</jjwt.version> | 39 | <jjwt.version>0.7.0</jjwt.version> |
| @@ -69,7 +69,7 @@ | @@ -69,7 +69,7 @@ | ||
| 69 | <grpc.version>1.22.1</grpc.version> | 69 | <grpc.version>1.22.1</grpc.version> |
| 70 | <lombok.version>1.16.18</lombok.version> | 70 | <lombok.version>1.16.18</lombok.version> |
| 71 | <paho.client.version>1.1.0</paho.client.version> | 71 | <paho.client.version>1.1.0</paho.client.version> |
| 72 | - <netty.version>4.1.49.Final</netty.version> | 72 | + <netty.version>4.1.45.Final</netty.version> |
| 73 | <os-maven-plugin.version>1.5.0</os-maven-plugin.version> | 73 | <os-maven-plugin.version>1.5.0</os-maven-plugin.version> |
| 74 | <rabbitmq.version>4.8.0</rabbitmq.version> | 74 | <rabbitmq.version>4.8.0</rabbitmq.version> |
| 75 | <surfire.version>2.19.1</surfire.version> | 75 | <surfire.version>2.19.1</surfire.version> |
| @@ -606,12 +606,6 @@ | @@ -606,12 +606,6 @@ | ||
| 606 | <groupId>org.apache.zookeeper</groupId> | 606 | <groupId>org.apache.zookeeper</groupId> |
| 607 | <artifactId>zookeeper</artifactId> | 607 | <artifactId>zookeeper</artifactId> |
| 608 | <version>${zookeeper.version}</version> | 608 | <version>${zookeeper.version}</version> |
| 609 | - <exclusions> | ||
| 610 | - <exclusion> | ||
| 611 | - <groupId>log4j</groupId> | ||
| 612 | - <artifactId>log4j</artifactId> | ||
| 613 | - </exclusion> | ||
| 614 | - </exclusions> | ||
| 615 | </dependency> | 609 | </dependency> |
| 616 | <dependency> | 610 | <dependency> |
| 617 | <groupId>com.jayway.jsonpath</groupId> | 611 | <groupId>com.jayway.jsonpath</groupId> |