Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Security/ Package Name changes
[portal.git]
/
ecomp-portal-BE-os
/
pom.xml
diff --git
a/ecomp-portal-BE-os/pom.xml
b/ecomp-portal-BE-os/pom.xml
index
473d0ee
..
f2855b7
100644
(file)
--- a/
ecomp-portal-BE-os/pom.xml
+++ b/
ecomp-portal-BE-os/pom.xml
@@
-1,13
+1,14
@@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.onap.portal</groupId>
<artifactId>onap-portal-parent</artifactId>
<parent>
<groupId>org.onap.portal</groupId>
<artifactId>onap-portal-parent</artifactId>
- <version>
1.3.0
</version>
+ <version>
2.2
</version>
</parent>
</parent>
- <artifactId>
ecomp
portal-be-os</artifactId>
+ <artifactId>portal-be-os</artifactId>
<packaging>war</packaging>
<properties>
<packaging>war</packaging>
<properties>
@@
-79,7
+80,7
@@
<!-- specify the order in which these should be applied -->
<overlay>
<groupId>org.onap.portal</groupId>
<!-- specify the order in which these should be applied -->
<overlay>
<groupId>org.onap.portal</groupId>
- <artifactId>
ecomp
portal-be-common</artifactId>
+ <artifactId>portal-be-common</artifactId>
</overlay>
<overlay>
<groupId>org.onap.portal.sdk</groupId>
</overlay>
<overlay>
<groupId>org.onap.portal.sdk</groupId>
@@
-483,17
+484,25
@@
<!-- EcompPortal common overlay -->
<dependency>
<groupId>org.onap.portal</groupId>
<!-- EcompPortal common overlay -->
<dependency>
<groupId>org.onap.portal</groupId>
- <artifactId>
ecomp
portal-be-common</artifactId>
+ <artifactId>portal-be-common</artifactId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.onap.portal</groupId>
<version>${project.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.onap.portal</groupId>
- <artifactId>
ecomp
portal-be-common</artifactId>
+ <artifactId>portal-be-common</artifactId>
<version>${project.version}</version>
<type>jar</type>
<classifier>classes</classifier>
</dependency>
<version>${project.version}</version>
<type>jar</type>
<classifier>classes</classifier>
</dependency>
+ <dependency>
+ <groupId>org.onap.portal</groupId>
+ <artifactId>portal-be-common</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-fw</artifactId>
<dependency>
<groupId>org.onap.portal.sdk</groupId>
<artifactId>epsdk-fw</artifactId>
@@
-534,6
+543,11
@@
<artifactId>epsdk-analytics</artifactId>
<version>${epsdk.version}</version>
</dependency>
<artifactId>epsdk-analytics</artifactId>
<version>${epsdk.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20171018</version>
+ </dependency>
<!-- Referenced by some poms and needed for testing; do NOT use "test"
scope here. -->
<dependency>
<!-- Referenced by some poms and needed for testing; do NOT use "test"
scope here. -->
<dependency>
@@
-578,7
+592,7
@@
<dependency>
<groupId>org.mitre</groupId>
<artifactId>openid-connect-client</artifactId>
<dependency>
<groupId>org.mitre</groupId>
<artifactId>openid-connect-client</artifactId>
- <version>1.
2.2
</version>
+ <version>1.
3.1
</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<exclusions>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
@@
-586,7
+600,7
@@
</exclusion>
</exclusions>
</dependency>
</exclusion>
</exclusions>
</dependency>
-
<dependency>
+
<!--
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>3.2.8.RELEASE</version>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>3.2.8.RELEASE</version>
@@
-596,7
+610,7
@@
<artifactId>*</artifactId>
</exclusion>
</exclusions>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
-->
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
@@
-637,5
+651,4
@@
</plugins>
</reporting>
</plugins>
</reporting>
-
</project>
</project>