diff options
Diffstat (limited to 'ONAP-SDK-APP/pom.xml')
| -rw-r--r-- | ONAP-SDK-APP/pom.xml | 106 |
1 files changed, 94 insertions, 12 deletions
diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index 340ca4f98..0d753fb13 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018, 2020 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -22,14 +22,14 @@ <parent> <groupId>org.onap.policy.engine</groupId> <artifactId>PolicyEngineSuite</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.6.4-SNAPSHOT</version> </parent> <artifactId>ONAP-SDK-APP</artifactId> <packaging>war</packaging> <properties> <encoding>UTF-8</encoding> - <epsdk.version>2.4.0</epsdk.version> - <springframework.version>4.2.0.RELEASE</springframework.version> + <epsdk.version>2.6.0</epsdk.version> + <springframework.version>4.3.24.RELEASE</springframework.version> <hibernate.version>4.3.11.Final</hibernate.version> <!-- Skip assembling the zip; assemble via mvn -Dskipassembly=false .. --> <skipassembly>true</skipassembly> @@ -63,14 +63,6 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <skipTests>${skiptests}</skipTests> @@ -185,6 +177,11 @@ </plugins> </build> <dependencies> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito2</artifactId> + <scope>test</scope> + </dependency> <!-- Policy overlay war --> <dependency> <groupId>org.onap.policy.engine</groupId> @@ -196,6 +193,14 @@ <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-core</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -209,6 +214,10 @@ <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-core</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -248,6 +257,22 @@ <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis-ext</artifactId> + </exclusion> + <exclusion> + <groupId>xom</groupId> + <artifactId>xom</artifactId> + </exclusion> </exclusions> </dependency> <!-- SDK components --> @@ -262,6 +287,16 @@ <version>3.2.2</version> </dependency> <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${springframework.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>${springframework.version}</version> + </dependency> + <dependency> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-core</artifactId> <version>${epsdk.version}</version> @@ -291,6 +326,26 @@ <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + </exclusion> + <exclusion> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </exclusion> + <exclusion> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + </exclusion> + <exclusion> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -344,6 +399,21 @@ <!-- Spring --> <!-- Added dependencies to fix issue with duplicate jars of different versions --> <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjrt</artifactId> + <version>1.8.14</version> + </dependency> + <dependency> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> + <version>1.8.14</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + <version>${springframework.version}</version> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${springframework.version}</version> @@ -358,11 +428,23 @@ <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> <version>${springframework.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> <version>${springframework.version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-expression</artifactId> + </exclusion> + </exclusions> </dependency> <!-- bridge to implement commons-logging using slf4j --> <dependency> |