summaryrefslogtreecommitdiffstats
path: root/ONAP-SDK-APP
diff options
context:
space:
mode:
authorMichael Mokry <mm117s@att.com>2018-10-04 15:50:05 -0500
committerMichael Mokry <michael.mokry@att.com>2018-10-04 16:08:12 -0500
commit00bd1cd070e64e752bb1a0b61d2bf3b398dd2924 (patch)
treed396511596cafee1d92f07a59ccf84218b139f03 /ONAP-SDK-APP
parent3e8154370058fa38dec06b6d224fc8f3825dd5a4 (diff)
Fixed issue with springframework dependencies
Added exclusions to epsdk dependencies and added dependencies for springframework jars that were needed to the ONAP-SDK-APP Change-Id: I037ffa76d3d32b2db5ea2c439f40e8a86e1665f5 Issue-ID: POLICY-1154 Signed-off-by: Michael Mokry <michael.mokry@att.com>
Diffstat (limited to 'ONAP-SDK-APP')
-rw-r--r--ONAP-SDK-APP/pom.xml79
1 files changed, 79 insertions, 0 deletions
diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml
index d2281afd1..95ff284fe 100644
--- a/ONAP-SDK-APP/pom.xml
+++ b/ONAP-SDK-APP/pom.xml
@@ -236,6 +236,21 @@
<artifactId>epsdk-app-common</artifactId>
<version>${epsdk.version}</version>
<type>jar</type>
+ <exclusions>
+ <!-- Added exclusions to fix issue with duplicate jars of different versions -->
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- SDK components -->
<!--
@@ -265,6 +280,19 @@
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
</exclusion>
+ <!-- Added exclusions to fix issue with duplicate jars of different versions -->
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -276,12 +304,63 @@
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
</exclusion>
+ <!-- Added exclusions to fix issue with duplicate jars of different versions -->
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-workflow</artifactId>
<version>${epsdk.version}</version>
+ <exclusions>
+ <!-- Added exclusions to fix issue with duplicate jars of different versions -->
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- Spring -->
+ <!-- Added dependencies to fix issue with duplicate jars of different versions -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${springframework.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${springframework.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${springframework.version}</version>
</dependency>
<!-- bridge to implement commons-logging using slf4j -->
<dependency>