aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml34
1 files changed, 32 insertions, 2 deletions
diff --git a/pom.xml b/pom.xml
index 2cd38e0d22..16d3945307 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ Modifications copyright (c) 2018-2019 Nokia
<groupId>org.openecomp.sdc</groupId>
<artifactId>sdc-main</artifactId>
- <version>1.13.8-SNAPSHOT</version>
+ <version>1.14.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdc</name>
@@ -67,7 +67,7 @@ Modifications copyright (c) 2018-2019 Nokia
<onap.logging.version>1.6.1</onap.logging.version>
<apache-commons-text.version>1.10.0</apache-commons-text.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
- <io.vavr.version>0.10.3</io.vavr.version>
+ <io.vavr.version>0.9.0</io.vavr.version>
<groovy.version>4.0.13</groovy.version>
<swagger-core-mvn-plugin.version>2.1.7</swagger-core-mvn-plugin.version>
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
@@ -411,6 +411,36 @@ Modifications copyright (c) 2018-2019 Nokia
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>5.6.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-expression</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
</dependency>
</dependencies>