Merge pull request #1339 from tdonohue/DS-2898-dependency-issues

Resolve dependency conflict complaints from maven-enforcer-plugin
This commit is contained in:
Tim Donohue
2016-03-23 13:38:08 -05:00

View File

@@ -129,11 +129,25 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>${spring-security.version}</version>
<exclusions>
<!-- Latest version will be provided by spring-context-->
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>${spring-security.version}</version>
<exclusions>
<!-- Latest version will be provided by spring-context-->
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>