Postman tests up

[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 901f684..ad9a992 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>
+
        <parent>
                <groupId>org.onap.portal</groupId>
                <artifactId>onap-portal-parent</artifactId>
-               <version>1.3.0</version>
+               <version>2.6.0-SNAPSHOT</version>
        </parent>
 
-       <artifactId>ecompportal-be-os</artifactId>
+       <artifactId>portal-be-os</artifactId>
        <packaging>war</packaging>
 
        <properties>
@@ -79,7 +80,7 @@
                                                <!-- specify the order in which these should be applied -->
                                                <overlay>
                                                        <groupId>org.onap.portal</groupId>
-                                                       <artifactId>ecompportal-be-common</artifactId>
+                                                       <artifactId>portal-be-common</artifactId>
                                                </overlay>
                                                <overlay>
                                                        <groupId>org.onap.portal.sdk</groupId>
@@ -283,11 +284,20 @@
                        <version>2.3.1</version>
                </dependency>
                <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>jstl</artifactId>
-                       <version>1.2</version>
+               <groupId>org.apache.taglibs</groupId>
+               <artifactId>taglibs-standard-spec</artifactId>
+               <version>1.2.5</version>
+               </dependency>
+               <dependency>
+               <groupId>org.apache.taglibs</groupId>
+               <artifactId>taglibs-standard-impl</artifactId>
+               <version>1.2.5</version>
+               </dependency>
+               <dependency>
+               <groupId>org.apache.taglibs</groupId>
+                       <artifactId>taglibs-standard-jstlel</artifactId>
+               <version>1.2.5</version>
                </dependency>
-
                <!-- Apache Tiles -->
                <dependency>
                        <groupId>org.apache.tiles</groupId>
@@ -308,17 +318,17 @@
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-annotations</artifactId>
-                       <version>2.6.3</version>
+                       <version>2.8.10</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-core</artifactId>
-                       <version>2.6.3</version>
+                       <version>2.8.10</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml.jackson.core</groupId>
                        <artifactId>jackson-databind</artifactId>
-                       <version>2.6.3</version>
+                       <version>2.8.10</version>
                </dependency>
                <dependency>
                        <groupId>com.fasterxml</groupId>
@@ -336,6 +346,12 @@
                        <groupId>org.elasticsearch</groupId>
                        <artifactId>elasticsearch</artifactId>
                        <version>2.2.0</version>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.apache.lucene</groupId>
+                                       <artifactId>lucene-queryparser</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>io.searchbox</groupId>
@@ -370,7 +386,7 @@
                <dependency>
                        <groupId>org.apache.poi</groupId>
                        <artifactId>poi</artifactId>
-                       <version>3.5-FINAL</version>
+                       <version>3.15</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>commons-logging</groupId>
@@ -385,7 +401,7 @@
                <dependency>
                        <groupId>org.apache.poi</groupId>
                        <artifactId>poi-ooxml</artifactId>
-                       <version>3.5-FINAL</version>
+                       <version>3.15</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>commons-logging</groupId>
@@ -480,21 +496,36 @@
                        <artifactId>epsdk-app-common</artifactId>
                        <version>${epsdk.version}</version>
                        <type>jar</type>
+                                <exclusions>
+                               <exclusion>
+                       <groupId>commons-beanutils</groupId>
+                       <artifactId>commons-beanutils-core</artifactId>
+                </exclusion>
+              </exclusions>
+                       
                </dependency>
                <!-- EcompPortal common overlay -->
                <dependency>
                        <groupId>org.onap.portal</groupId>
-                       <artifactId>ecompportal-be-common</artifactId>
+                       <artifactId>portal-be-common</artifactId>
                        <version>${project.version}</version>
                        <type>war</type>
                </dependency>
                <dependency>
                        <groupId>org.onap.portal</groupId>
-                       <artifactId>ecompportal-be-common</artifactId>
+                       <artifactId>portal-be-common</artifactId>
                        <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>
@@ -535,12 +566,17 @@
                        <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>
                        <groupId>org.apache.httpcomponents</groupId>
                        <artifactId>httpclient</artifactId>
-                       <version>4.5.2</version>
+                       <version>4.5.3</version>
                </dependency>
                <!-- for testing -->
                <dependency>
@@ -573,21 +609,25 @@
                <dependency>
                        <groupId>commons-beanutils</groupId>
                        <artifactId>commons-beanutils</artifactId>
-                       <version>1.9.2</version>
+                       <version>1.9.3</version>
                </dependency>
                <!-- OpenID Connect Dependencies -->
                <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>
                                        <artifactId>jackson-mapper-asl</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>com.nimbusds</groupId>
+                                       <artifactId>nimbus-jose-jwt</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
-               <dependency>
+<!--           <dependency>
                        <groupId>org.springframework.security</groupId>
                        <artifactId>spring-security-taglibs</artifactId>
                        <version>3.2.8.RELEASE</version>
@@ -597,7 +637,7 @@
                                        <artifactId>*</artifactId>
                                </exclusion>
                        </exclusions>
-               </dependency>
+               </dependency> -->
                <dependency>
                        <groupId>org.aspectj</groupId>
                        <artifactId>aspectjrt</artifactId>
@@ -608,6 +648,37 @@
                        <artifactId>aspectjweaver</artifactId>
                        <version>1.8.9</version>
                </dependency>
+               <!-- Jacoco for offline instrumentation -->
+               <dependency>
+                       <groupId>org.jacoco</groupId>
+                       <artifactId>org.jacoco.agent</artifactId>
+                       <version>${jacocoVersion}</version>
+                       <classifier>runtime</classifier>
+               </dependency>
+               <!-- Music -->
+               <dependency>
+                       <groupId>org.onap.portal.sdk</groupId>
+                       <artifactId>epsdk-music</artifactId>
+                       <version>${epsdk.version}</version>
+                       
+                       <exclusions> 
+                               <exclusion> 
+                                         <groupId>com.sun.jersey</groupId> 
+                                 <artifactId>jersey-client</artifactId> 
+                               </exclusion> 
+                               <exclusion> 
+                                        <groupId>com.sun.jersey</groupId> 
+                                <artifactId>jersey-server</artifactId> 
+                               </exclusion> 
+                               <exclusion> 
+                                        <groupId>com.sun.jersey</groupId> 
+                                <artifactId>jersey-json</artifactId> 
+                               </exclusion><exclusion> 
+                                       <groupId>com.sun.jersey</groupId> 
+                               <artifactId>jersey-servlet</artifactId> 
+                               </exclusion> 
+                       </exclusions> 
+               </dependency> 
        </dependencies>
 
        <reporting>
@@ -631,5 +702,4 @@
 
                </plugins>
        </reporting>
-
 </project>