Code Review
/
sdc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update version to 1.13.5
[sdc.git]
/
openecomp-be
/
api
/
openecomp-sdc-rest-webapp
/
conflict-rest
/
conflict-rest-services
/
pom.xml
diff --git
a/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml
b/openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml
index
544655b
..
8329783
100644
(file)
--- a/
openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml
+++ b/
openecomp-be/api/openecomp-sdc-rest-webapp/conflict-rest/conflict-rest-services/pom.xml
@@
-7,7
+7,7
@@
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>conflict-rest</artifactId>
<parent>
<groupId>org.openecomp.sdc</groupId>
<artifactId>conflict-rest</artifactId>
- <version>1.
8.4
-SNAPSHOT</version>
+ <version>1.
13.5
-SNAPSHOT</version>
</parent>
<artifactId>conflict-rest-services</artifactId>
</parent>
<artifactId>conflict-rest-services</artifactId>
@@
-39,6
+39,16
@@
<groupId>org.openecomp.sdc.onboarding</groupId>
<artifactId>vendor-software-products-rest-services</artifactId>
<version>${project.version}</version>
<groupId>org.openecomp.sdc.onboarding</groupId>
<artifactId>vendor-software-products-rest-services</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.onboarding</groupId>
</dependency>
<dependency>
<groupId>org.openecomp.sdc.onboarding</groupId>