简柏林 / thingskit · Commits

Commit 637f816f7fcca457162a3e3bb06d72bb23bb62d2

Authored by Igor Kulikov
Committed by GitHub
2 parents 9f2bae98 0f662a67

Merge pull request #3718 from YevhenBondarenko/master 

Merge with develop/2.5.5
Inline Side-by-side
Showing 4 changed files with 21 additions and 21 deletions
@@ -146,10 +146,6 @@ @@ -146,10 +146,6 @@
146 <artifactId>spring-boot-starter-websocket</artifactId> 146 <artifactId>spring-boot-starter-websocket</artifactId>
147 </dependency> 147 </dependency>
148 <dependency> 148 <dependency>
149 - <groupId>org.springframework.cloud</groupId>  
150 - <artifactId>spring-cloud-starter-oauth2</artifactId>  
151 - </dependency>  
152 - <dependency>  
153 <groupId>org.springframework.security</groupId> 149 <groupId>org.springframework.security</groupId>
154 <artifactId>spring-security-oauth2-client</artifactId> 150 <artifactId>spring-security-oauth2-client</artifactId>
155 </dependency> 151 </dependency>
@@ -36,12 +36,11 @@ @@ -36,12 +36,11 @@
36 <pkg.implementationTitle>${project.name}</pkg.implementationTitle> 36 <pkg.implementationTitle>${project.name}</pkg.implementationTitle>
37 <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder> 37 <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
38 <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder> 38 <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
39 - <spring-boot.version>2.2.6.RELEASE</spring-boot.version>  
40 - <spring-oauth2.version>2.1.2.RELEASE</spring-oauth2.version>  
41 - <spring.version>5.2.6.RELEASE</spring.version>  
42 - <spring-security.version>5.2.3.RELEASE</spring-security.version>  
43 - <spring-data-redis.version>2.2.4.RELEASE</spring-data-redis.version>  
44 - <jedis.version>3.1.0</jedis.version> 39 + <spring-boot.version>2.3.5.RELEASE</spring-boot.version>
  40 + <spring.version>5.2.10.RELEASE</spring.version>
  41 + <spring-security.version>5.4.1</spring-security.version>
  42 + <spring-data-redis.version>2.4.1</spring-data-redis.version>
  43 + <jedis.version>3.3.0</jedis.version>
45 <jjwt.version>0.7.0</jjwt.version> 44 <jjwt.version>0.7.0</jjwt.version>
46 <json-path.version>2.2.0</json-path.version> 45 <json-path.version>2.2.0</json-path.version>
47 <junit.version>4.12</junit.version> 46 <junit.version>4.12</junit.version>
@@ -52,15 +51,16 @@ @@ -52,15 +51,16 @@
52 <cassandra.version>4.6.0</cassandra.version> 51 <cassandra.version>4.6.0</cassandra.version>
53 <metrics.version>4.0.5</metrics.version> 52 <metrics.version>4.0.5</metrics.version>
54 <cassandra-unit.version>4.3.1.0</cassandra-unit.version> 53 <cassandra-unit.version>4.3.1.0</cassandra-unit.version>
  54 + <cassandra-all.version>3.11.9</cassandra-all.version>
55 <takari-cpsuite.version>1.2.7</takari-cpsuite.version> 55 <takari-cpsuite.version>1.2.7</takari-cpsuite.version>
56 <guava.version>28.2-jre</guava.version> 56 <guava.version>28.2-jre</guava.version>
57 <caffeine.version>2.6.1</caffeine.version> 57 <caffeine.version>2.6.1</caffeine.version>
58 <commons-lang3.version>3.4</commons-lang3.version> 58 <commons-lang3.version>3.4</commons-lang3.version>
59 <commons-io.version>2.5</commons-io.version> 59 <commons-io.version>2.5</commons-io.version>
60 <commons-csv.version>1.4</commons-csv.version> 60 <commons-csv.version>1.4</commons-csv.version>
61 - <jackson.version>2.10.2</jackson.version>  
62 - <jackson-annotations.version>2.10.2</jackson-annotations.version>  
63 - <jackson-core.version>2.10.2</jackson-core.version> 61 + <jackson.version>2.11.3</jackson.version>
  62 + <jackson-annotations.version>2.11.3</jackson-annotations.version>
  63 + <jackson-core.version>2.11.3</jackson-core.version>
64 <json-schema-validator.version>2.2.6</json-schema-validator.version> 64 <json-schema-validator.version>2.2.6</json-schema-validator.version>
65 <californium.version>1.0.2</californium.version> 65 <californium.version>1.0.2</californium.version>
66 <gson.version>2.6.2</gson.version> 66 <gson.version>2.6.2</gson.version>
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 <grpc.version>1.22.1</grpc.version> 72 <grpc.version>1.22.1</grpc.version>
73 <lombok.version>1.16.18</lombok.version> 73 <lombok.version>1.16.18</lombok.version>
74 <paho.client.version>1.2.4</paho.client.version> 74 <paho.client.version>1.2.4</paho.client.version>
75 - <netty.version>4.1.49.Final</netty.version> 75 + <netty.version>4.1.53.Final</netty.version>
76 <os-maven-plugin.version>1.5.0</os-maven-plugin.version> 76 <os-maven-plugin.version>1.5.0</os-maven-plugin.version>
77 <rabbitmq.version>4.8.0</rabbitmq.version> 77 <rabbitmq.version>4.8.0</rabbitmq.version>
78 <surfire.version>2.19.1</surfire.version> 78 <surfire.version>2.19.1</surfire.version>
@@ -96,7 +96,7 @@ @@ -96,7 +96,7 @@
96 <bucket4j.version>4.1.1</bucket4j.version> 96 <bucket4j.version>4.1.1</bucket4j.version>
97 <fst.version>2.57</fst.version> 97 <fst.version>2.57</fst.version>
98 <antlr.version>2.7.7</antlr.version> 98 <antlr.version>2.7.7</antlr.version>
99 - <snakeyaml.version>1.25</snakeyaml.version> 99 + <snakeyaml.version>1.27</snakeyaml.version>
100 <amazonaws.sqs.version>1.11.747</amazonaws.sqs.version> 100 <amazonaws.sqs.version>1.11.747</amazonaws.sqs.version>
101 <pubsub.client.version>1.105.0</pubsub.client.version> 101 <pubsub.client.version>1.105.0</pubsub.client.version>
102 <azure-servicebus.version>3.2.0</azure-servicebus.version> 102 <azure-servicebus.version>3.2.0</azure-servicebus.version>
@@ -873,11 +873,6 @@ @@ -873,11 +873,6 @@
873 <version>${spring-boot.version}</version> 873 <version>${spring-boot.version}</version>
874 </dependency> 874 </dependency>
875 <dependency> 875 <dependency>
876 - <groupId>org.springframework.cloud</groupId>  
877 - <artifactId>spring-cloud-starter-oauth2</artifactId>  
878 - <version>${spring-oauth2.version}</version>  
879 - </dependency>  
880 - <dependency>  
881 <groupId>org.springframework.security</groupId> 876 <groupId>org.springframework.security</groupId>
882 <artifactId>spring-security-oauth2-client</artifactId> 877 <artifactId>spring-security-oauth2-client</artifactId>
883 <version>${spring-security.version}</version> 878 <version>${spring-security.version}</version>
@@ -1201,6 +1196,11 @@ @@ -1201,6 +1196,11 @@
1201 <scope>test</scope> 1196 <scope>test</scope>
1202 </dependency> 1197 </dependency>
1203 <dependency> 1198 <dependency>
  1199 + <groupId>org.apache.cassandra</groupId>
  1200 + <artifactId>cassandra-all</artifactId>
  1201 + <version>${cassandra-all.version}</version>
  1202 + </dependency>
  1203 + <dependency>
1204 <groupId>junit</groupId> 1204 <groupId>junit</groupId>
1205 <artifactId>junit</artifactId> 1205 <artifactId>junit</artifactId>
1206 <version>${junit.version}</version> 1206 <version>${junit.version}</version>
@@ -121,6 +121,11 @@ @@ -121,6 +121,11 @@
121 <artifactId>jts-core</artifactId> 121 <artifactId>jts-core</artifactId>
122 </dependency> 122 </dependency>
123 <dependency> 123 <dependency>
  124 + <groupId>com.sun.mail</groupId>
  125 + <artifactId>javax.mail</artifactId>
  126 + <scope>provided</scope>
  127 + </dependency>
  128 + <dependency>
124 <groupId>junit</groupId> 129 <groupId>junit</groupId>
125 <artifactId>junit</artifactId> 130 <artifactId>junit</artifactId>
126 <version>${junit.version}</version> 131 <version>${junit.version}</version>
@@ -54,7 +54,6 @@ @@ -54,7 +54,6 @@
54 <dependency> 54 <dependency>
55 <groupId>org.apache.cassandra</groupId> 55 <groupId>org.apache.cassandra</groupId>
56 <artifactId>cassandra-all</artifactId> 56 <artifactId>cassandra-all</artifactId>
57 - <version>3.11.6</version>  
58 </dependency> 57 </dependency>
59 <dependency> 58 <dependency>
60 <groupId>com.datastax.oss</groupId> 59 <groupId>com.datastax.oss</groupId>