diff options
| -rw-r--r-- | ONAP-SDK-APP/pom.xml | 79 | ||||
| -rw-r--r-- | POLICY-SDK-APP/pom.xml | 13 |
2 files changed, 92 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> diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml index d255c7c21..eed94341c 100644 --- a/POLICY-SDK-APP/pom.xml +++ b/POLICY-SDK-APP/pom.xml @@ -98,6 +98,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> <!-- Spring --> |