diff options
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 44 |
1 files changed, 37 insertions, 7 deletions
@@ -26,7 +26,7 @@ Modifications copyright (c) 2018-2019 Nokia <groupId>org.openecomp.sdc</groupId> <artifactId>sdc-main</artifactId> - <version>1.13.9-SNAPSHOT</version> + <version>1.14.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdc</name> @@ -45,7 +45,7 @@ Modifications copyright (c) 2018-2019 Nokia <!-- 3rd parties versions --> <lang3.version>3.12.0</lang3.version> <guava.version>32.1.1-jre</guava.version> - <janusgraph.version>0.3.3</janusgraph.version> + <janusgraph.version>0.5.0</janusgraph.version> <spring.version>5.3.27</spring.version> <mvn.assembly.version>3.6.0</mvn.assembly.version> @@ -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> @@ -818,12 +848,12 @@ Modifications copyright (c) 2018-2019 Nokia <profile> <id>fast-build-no-ui</id> <properties> - <maven.test.skip>true</maven.test.skip> - <skipYamlJsonValidator>true</skipYamlJsonValidator> + <!-- <maven.test.skip>true</maven.test.skip> + <skipYamlJsonValidator>true</skipYamlJsonValidator> --> <checkstyle.skip>true</checkstyle.skip> - <jacoco.skip>true</jacoco.skip> + <!-- <jacoco.skip>true</jacoco.skip> <maven.antrun.skip>true</maven.antrun.skip> - <swagger.skip>true</swagger.skip> + <swagger.skip>true</swagger.skip> --> </properties> <modules> <module>openecomp-be</module> |