Browse Source

fixed vulnerabilities

pull/4953/head
YevhenBondarenko 5 years ago
committed by Andrew Shvayka
parent
commit
57632a1e25
  1. 19
      pom.xml
  2. 2
      tools/src/main/java/org/thingsboard/client/tools/migrator/DictionaryParser.java
  3. 2
      tools/src/main/java/org/thingsboard/client/tools/migrator/RelatedEntitiesParser.java

19
pom.xml

@ -39,10 +39,11 @@
<javax-annotation.version>1.3.2</javax-annotation.version> <javax-annotation.version>1.3.2</javax-annotation.version>
<jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version> <jakarta.xml.bind-api.version>2.3.2</jakarta.xml.bind-api.version>
<jaxb-runtime.version>2.3.2</jaxb-runtime.version> <jaxb-runtime.version>2.3.2</jaxb-runtime.version>
<spring-boot.version>2.3.9.RELEASE</spring-boot.version> <spring-boot.version>2.3.12.RELEASE</spring-boot.version>
<spring.version>5.2.10.RELEASE</spring.version> <spring.version>5.2.16.RELEASE</spring.version>
<spring-redis.version>5.2.11.RELEASE</spring-redis.version>
<spring-security.version>5.4.1</spring-security.version> <spring-security.version>5.4.1</spring-security.version>
<spring-data-redis.version>2.4.1</spring-data-redis.version> <spring-data-redis.version>2.4.11</spring-data-redis.version>
<jedis.version>3.3.0</jedis.version> <jedis.version>3.3.0</jedis.version>
<jjwt.version>0.7.0</jjwt.version> <jjwt.version>0.7.0</jjwt.version>
<json-path.version>2.2.0</json-path.version> <json-path.version>2.2.0</json-path.version>
@ -62,7 +63,7 @@
<guava.version>28.2-jre</guava.version> <guava.version>28.2-jre</guava.version>
<caffeine.version>2.6.1</caffeine.version> <caffeine.version>2.6.1</caffeine.version>
<commons-lang3.version>3.4</commons-lang3.version> <commons-lang3.version>3.4</commons-lang3.version>
<commons-io.version>2.5</commons-io.version> <commons-io.version>2.11.0</commons-io.version>
<commons-csv.version>1.4</commons-csv.version> <commons-csv.version>1.4</commons-csv.version>
<jackson.version>2.12.1</jackson.version> <jackson.version>2.12.1</jackson.version>
<jackson-annotations.version>2.12.1</jackson-annotations.version> <jackson-annotations.version>2.12.1</jackson-annotations.version>
@ -79,7 +80,7 @@
<grpc.version>1.38.0</grpc.version> <grpc.version>1.38.0</grpc.version>
<lombok.version>1.18.18</lombok.version> <lombok.version>1.18.18</lombok.version>
<paho.client.version>1.2.4</paho.client.version> <paho.client.version>1.2.4</paho.client.version>
<netty.version>4.1.60.Final</netty.version> <netty.version>4.1.66.Final</netty.version>
<os-maven-plugin.version>1.7.0</os-maven-plugin.version> <os-maven-plugin.version>1.7.0</os-maven-plugin.version>
<rabbitmq.version>4.8.0</rabbitmq.version> <rabbitmq.version>4.8.0</rabbitmq.version>
<surfire.version>2.19.1</surfire.version> <surfire.version>2.19.1</surfire.version>
@ -115,7 +116,7 @@
<micrometer.version>1.5.2</micrometer.version> <micrometer.version>1.5.2</micrometer.version>
<protobuf-dynamic.version>1.0.3TB</protobuf-dynamic.version> <protobuf-dynamic.version>1.0.3TB</protobuf-dynamic.version>
<wire-schema.version>3.4.0</wire-schema.version> <wire-schema.version>3.4.0</wire-schema.version>
<twilio.version>7.54.2</twilio.version> <twilio.version>8.17.0</twilio.version>
<hibernate-validator.version>6.0.13.Final</hibernate-validator.version> <hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
<javax.el.version>3.0.0</javax.el.version> <javax.el.version>3.0.0</javax.el.version>
<javax.validation-api.version>2.0.1.Final</javax.validation-api.version> <javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
@ -1504,7 +1505,7 @@
<dependency> <dependency>
<groupId>org.springframework.integration</groupId> <groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-redis</artifactId> <artifactId>spring-integration-redis</artifactId>
<version>${spring.version}</version> <version>${spring-redis.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>redis.clients</groupId> <groupId>redis.clients</groupId>
@ -1678,6 +1679,10 @@
<groupId>com.github.spotbugs</groupId> <groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-annotations</artifactId> <artifactId>spotbugs-annotations</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>

2
tools/src/main/java/org/thingsboard/client/tools/migrator/DictionaryParser.java

@ -43,7 +43,7 @@ public class DictionaryParser {
return line.startsWith("COPY public.ts_kv_dictionary ("); return line.startsWith("COPY public.ts_kv_dictionary (");
} }
private void parseDictionaryDump(LineIterator iterator) { private void parseDictionaryDump(LineIterator iterator) throws IOException {
try { try {
String tempLine; String tempLine;
while (iterator.hasNext()) { while (iterator.hasNext()) {

2
tools/src/main/java/org/thingsboard/client/tools/migrator/RelatedEntitiesParser.java

@ -58,7 +58,7 @@ public class RelatedEntitiesParser {
return StringUtils.isBlank(line) || line.equals("\\."); return StringUtils.isBlank(line) || line.equals("\\.");
} }
private void processAllTables(LineIterator lineIterator) { private void processAllTables(LineIterator lineIterator) throws IOException {
String currentLine; String currentLine;
try { try {
while (lineIterator.hasNext()) { while (lineIterator.hasNext()) {

Loading…
Cancel
Save