diff options
| author |   Peyton Puckett <peyton.puckett@att.com> | 2020-02-21 10:25:28 -0600 |
|---|---|---|
| committer | Peyton Puckett <peyton.puckett@att.com> | 2020-02-21 13:36:58 -0600 |
| commit | a4eb86ee39e858d5f7c036cc70be8603d5f420bb (patch) | |
| tree | d2256c257ea184770379118a5c7716aca0b5c408 /ONAP-SDK-APP | |
| parent | 3710a41879717441884c75262015c536819a34c2 (diff) | |
Add pom.xml dependencies and exclusions needed for policy-engine gui
Update powermockignore annotation to fix junit failure
Issue-ID: POLICY-1590
Change-Id: Iadd0855565c05d02af034a5ad02ea7b8e386fadc
Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
Diffstat (limited to 'ONAP-SDK-APP')
| -rw-r--r-- | ONAP-SDK-APP/pom.xml | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/ONAP-SDK-APP/pom.xml b/ONAP-SDK-APP/pom.xml index c3c595c53..45d105a06 100644 --- a/ONAP-SDK-APP/pom.xml +++ b/ONAP-SDK-APP/pom.xml @@ -214,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> @@ -283,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> @@ -313,9 +327,25 @@ <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> @@ -369,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> @@ -383,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> |