简柏林 / thingskit · Commits

Commit 66db4c7fef6f54d8c11dfbb375b731a87f266a97

Authored by Igor Kulikov
2 parents b34122a3 b8de64f3

Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0

Inline Side-by-side
Showing 4 changed files with 30 additions and 19 deletions
... ... @@ -193,8 +193,8 @@
193 193 <artifactId>logback-classic</artifactId>
194 194 </dependency>
195 195 <dependency>
196   - <groupId>javax.mail</groupId>
197   - <artifactId>mail</artifactId>
  196 + <groupId>com.sun.mail</groupId>
  197 + <artifactId>javax.mail</artifactId>
198 198 </dependency>
199 199 <dependency>
200 200 <groupId>org.apache.curator</groupId>
... ...
... ... @@ -637,7 +637,7 @@ queue:
637 637 pack-processing-timeout: "${TB_QUEUE_CORE_PACK_PROCESSING_TIMEOUT_MS:60000}"
638 638 stats:
639 639 enabled: "${TB_QUEUE_CORE_STATS_ENABLED:true}"
640   - print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:10000}"
  640 + print-interval-ms: "${TB_QUEUE_CORE_STATS_PRINT_INTERVAL_MS:60000}"
641 641 js:
642 642 # JS Eval request topic
643 643 request_topic: "${REMOTE_JS_EVAL_REQUEST_TOPIC:js_eval.requests}"
... ... @@ -657,7 +657,7 @@ queue:
657 657 pack-processing-timeout: "${TB_QUEUE_RULE_ENGINE_PACK_PROCESSING_TIMEOUT_MS:60000}"
658 658 stats:
659 659 enabled: "${TB_QUEUE_RULE_ENGINE_STATS_ENABLED:true}"
660   - print-interval-ms: "${TB_QUEUE_RULE_ENGINE_STATS_PRINT_INTERVAL_MS:10000}"
  660 + print-interval-ms: "${TB_QUEUE_RULE_ENGINE_STATS_PRINT_INTERVAL_MS:60000}"
661 661 queues:
662 662 - name: "${TB_QUEUE_RE_MAIN_QUEUE_NAME:Main}"
663 663 topic: "${TB_QUEUE_RE_MAIN_TOPIC:tb_rule_engine.main}"
... ...
... ... @@ -30,10 +30,10 @@
30 30 <properties>
31 31 <main.dir>${basedir}</main.dir>
32 32 <pkg.user>thingsboard</pkg.user>
33   - <spring-boot.version>2.2.4.RELEASE</spring-boot.version>
  33 + <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
34 34 <spring-oauth2.version>2.1.2.RELEASE</spring-oauth2.version>
35   - <spring.version>5.2.2.RELEASE</spring.version>
36   - <spring-security.version>5.2.2.RELEASE</spring-security.version>
  35 + <spring.version>5.2.6.RELEASE</spring.version>
  36 + <spring-security.version>5.2.3.RELEASE</spring-security.version>
37 37 <spring-data-redis.version>2.2.4.RELEASE</spring-data-redis.version>
38 38 <jedis.version>3.1.0</jedis.version>
39 39 <jjwt.version>0.7.0</jjwt.version>
... ... @@ -62,14 +62,14 @@
62 62 <gson.version>2.6.2</gson.version>
63 63 <velocity.version>1.7</velocity.version>
64 64 <velocity-tools.version>2.0</velocity-tools.version>
65   - <mail.version>1.4.3</mail.version>
  65 + <mail.version>1.6.2</mail.version>
66 66 <curator.version>4.2.0</curator.version>
67 67 <zookeeper.version>3.5.5</zookeeper.version>
68 68 <protobuf.version>3.11.4</protobuf.version>
69 69 <grpc.version>1.22.1</grpc.version>
70 70 <lombok.version>1.16.18</lombok.version>
71 71 <paho.client.version>1.1.0</paho.client.version>
72   - <netty.version>4.1.45.Final</netty.version>
  72 + <netty.version>4.1.49.Final</netty.version>
73 73 <os-maven-plugin.version>1.5.0</os-maven-plugin.version>
74 74 <rabbitmq.version>4.8.0</rabbitmq.version>
75 75 <surfire.version>2.19.1</surfire.version>
... ... @@ -471,12 +471,12 @@
471 471 <dependency>
472 472 <groupId>org.springframework.security</groupId>
473 473 <artifactId>spring-security-oauth2-client</artifactId>
474   - <version>${spring.version}</version>
  474 + <version>${spring-security.version}</version>
475 475 </dependency>
476 476 <dependency>
477 477 <groupId>org.springframework.security</groupId>
478 478 <artifactId>spring-security-oauth2-jose</artifactId>
479   - <version>${spring.version}</version>
  479 + <version>${spring-security.version}</version>
480 480 </dependency>
481 481 <dependency>
482 482 <groupId>org.springframework.boot</groupId>
... ... @@ -591,8 +591,8 @@
591 591 <version>${rabbitmq.version}</version>
592 592 </dependency>
593 593 <dependency>
594   - <groupId>javax.mail</groupId>
595   - <artifactId>mail</artifactId>
  594 + <groupId>com.sun.mail</groupId>
  595 + <artifactId>javax.mail</artifactId>
596 596 <version>${mail.version}</version>
597 597 </dependency>
598 598 <dependency>
... ... @@ -610,6 +610,12 @@
610 610 <groupId>org.apache.zookeeper</groupId>
611 611 <artifactId>zookeeper</artifactId>
612 612 <version>${zookeeper.version}</version>
  613 + <exclusions>
  614 + <exclusion>
  615 + <groupId>log4j</groupId>
  616 + <artifactId>log4j</artifactId>
  617 + </exclusion>
  618 + </exclusions>
613 619 </dependency>
614 620 <dependency>
615 621 <groupId>com.jayway.jsonpath</groupId>
... ... @@ -692,6 +698,12 @@
692 698 <groupId>com.github.fge</groupId>
693 699 <artifactId>json-schema-validator</artifactId>
694 700 <version>${json-schema-validator.version}</version>
  701 + <exclusions>
  702 + <exclusion>
  703 + <groupId>javax.mail</groupId>
  704 + <artifactId>mailapi</artifactId>
  705 + </exclusion>
  706 + </exclusions>
695 707 </dependency>
696 708 <dependency>
697 709 <groupId>com.typesafe.akka</groupId>
... ... @@ -928,12 +940,6 @@
928 940 <groupId>com.microsoft.azure</groupId>
929 941 <artifactId>azure-servicebus</artifactId>
930 942 <version>${azure-servicebus.version}</version>
931   - <exclusions>
932   - <exclusion>
933   - <groupId>com.microsoft.azure</groupId>
934   - <artifactId>adal4j</artifactId>
935   - </exclusion>
936   - </exclusions>
937 943 </dependency>
938 944 <dependency>
939 945 <groupId>org.passay</groupId>
... ...
... ... @@ -93,5 +93,10 @@
93 93 <artifactId>spring-data-redis</artifactId>
94 94 <scope>provided</scope>
95 95 </dependency>
  96 + <dependency>
  97 + <groupId>com.sun.mail</groupId>
  98 + <artifactId>javax.mail</artifactId>
  99 + <scope>provided</scope>
  100 + </dependency>
96 101 </dependencies>
97 102 </project>
... ...