Commit b8de64f3fb49238e721d84d8353d4b642ddb4191

Authored by YevhenBondarenko
Committed by Andrew Shvayka
1 parent 3e92a6a8

fix problem with duplication mail dependencies

... ... @@ -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>
... ...
... ... @@ -62,7 +62,7 @@
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>
... ... @@ -587,8 +587,8 @@
587 587 <version>${rabbitmq.version}</version>
588 588 </dependency>
589 589 <dependency>
590   - <groupId>javax.mail</groupId>
591   - <artifactId>mail</artifactId>
  590 + <groupId>com.sun.mail</groupId>
  591 + <artifactId>javax.mail</artifactId>
592 592 <version>${mail.version}</version>
593 593 </dependency>
594 594 <dependency>
... ... @@ -694,6 +694,12 @@
694 694 <groupId>com.github.fge</groupId>
695 695 <artifactId>json-schema-validator</artifactId>
696 696 <version>${json-schema-validator.version}</version>
  697 + <exclusions>
  698 + <exclusion>
  699 + <groupId>javax.mail</groupId>
  700 + <artifactId>mailapi</artifactId>
  701 + </exclusion>
  702 + </exclusions>
697 703 </dependency>
698 704 <dependency>
699 705 <groupId>com.typesafe.akka</groupId>
... ... @@ -930,12 +936,6 @@
930 936 <groupId>com.microsoft.azure</groupId>
931 937 <artifactId>azure-servicebus</artifactId>
932 938 <version>${azure-servicebus.version}</version>
933   - <exclusions>
934   - <exclusion>
935   - <groupId>com.microsoft.azure</groupId>
936   - <artifactId>adal4j</artifactId>
937   - </exclusion>
938   - </exclusions>
939 939 </dependency>
940 940 <dependency>
941 941 <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>
... ...