Browse Source

Align new JavaMail dependencies with Spring IO Platform

Spring IO Platform already provides dependency management for JavaMail.
This commit updates Boot’s new JavaMail dependency management to align
with the Platform, thereby allowing the Platform to inherit Boot’s
dependency management instead of defining its own.
pull/1578/merge
Andy Wilkinson 11 years ago
parent
commit
ef2455938e
  1. 2
      spring-boot-autoconfigure/pom.xml
  2. 11
      spring-boot-dependencies/pom.xml
  3. 4
      spring-boot-starters/spring-boot-starter-mail/pom.xml

2
spring-boot-autoconfigure/pom.xml

@ -382,7 +382,7 @@ @@ -382,7 +382,7 @@
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<artifactId>javax.mail-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>

11
spring-boot-dependencies/pom.xml

@ -82,6 +82,7 @@ @@ -82,6 +82,7 @@
<janino.version>2.6.1</janino.version>
<javassist.version>3.18.1-GA</javassist.version> <!-- Same as Hibernate -->
<javax-cache.version>1.0.0</javax-cache.version>
<javax-mail.version>1.5.2</javax-mail.version>
<jedis.version>2.4.2</jedis.version>
<jetty.version>8.1.15.v20140411</jetty.version>
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
@ -123,6 +124,7 @@ @@ -123,6 +124,7 @@
<spring-security.version>3.2.5.RELEASE</spring-security.version>
<spring-security-jwt.version>1.0.2.RELEASE</spring-security-jwt.version>
<spring-ws.version>2.2.0.RELEASE</spring-ws.version>
<sun-mail.version>${javax-mail.version}</sun-mail.version>
<thymeleaf.version>2.1.3.RELEASE</thymeleaf.version>
<thymeleaf-extras-springsecurity3.version>2.1.1.RELEASE</thymeleaf-extras-springsecurity3.version>
<thymeleaf-layout-dialect.version>1.2.5</thymeleaf-layout-dialect.version>
@ -488,6 +490,11 @@ @@ -488,6 +490,11 @@
<artifactId>json-path</artifactId>
<version>${json-path.version}</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>${sun-mail.version}</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
@ -552,8 +559,8 @@ @@ -552,8 +559,8 @@
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.5.0-b01</version>
<artifactId>javax.mail-api</artifactId>
<version>${javax-mail.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>

4
spring-boot-starters/spring-boot-starter-mail/pom.xml

@ -42,8 +42,8 @@ @@ -42,8 +42,8 @@
<artifactId>spring-context-support</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
</dependency>
</dependencies>
</project>

Loading…
Cancel
Save