X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-os%2Fpom.xml;h=ad9a992728a5cb916bde6452cdf3d98d555c3ef7;hb=880ba87b59dba2375b42095a85eb781bc8b4b867;hp=837e6dff5a97e9657280ab7fd0743725762895d1;hpb=959830943c96734b46de8f0b8477394c83054aeb;p=portal.git

diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index 837e6dff..ad9a9927 100644
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -1,84 +1,28 @@
 <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>
-	<groupId>org.openecomp.portal</groupId>
-	<artifactId>ecompportal-be-os</artifactId>
+
+	<parent>
+		<groupId>org.onap.portal</groupId>
+		<artifactId>onap-portal-parent</artifactId>
+		<version>2.6.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>portal-be-os</artifactId>
 	<packaging>war</packaging>
-	<!-- Jenkins is not used to build the o/s version -->
-	<version>1.1</version>
 
 	<properties>
-		<springframework.version>4.2.0.RELEASE</springframework.version>
-		<hibernate.version>4.3.11.Final</hibernate.version>
-		<eelf.version>1.0.0</eelf.version>
-		<epsdk.version>1.1.0</epsdk.version>
-		<portal.version>1.1.0</portal.version>
-		<encoding>UTF-8</encoding>
-		<!-- Tests usually require some setup that maven cannot do, so skip. -->
-		<skiptests>false</skiptests>
-		<!-- Jenkins invokes mvn with argument -Dbuild.number=${BUILD_NUMBER} -->
-		<build.number>0</build.number>
-		<sonar.exclusions>**.js</sonar.exclusions>
-		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
-		<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
+		<!-- If skipTests is false use this command to generate the report: mvn 
+			clean jacoco:prepare-agent install jacoco:report -->
+		<skipTests>false</skipTests>
 	</properties>
 
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
-				<configuration>
-					<failOnError>false</failOnError>
-					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
-					<docletArtifact>
-						<groupId>org.umlgraph</groupId>
-						<artifactId>umlgraph</artifactId>
-						<version>5.6</version>
-					</docletArtifact>
-					<additionalparam>-views</additionalparam>
-					<useStandardDocletOptions>true</useStandardDocletOptions>
-				</configuration>
-			</plugin>
-		</plugins>
-	</reporting>
-	<distributionManagement>
-		<site>
-			<id>ecomp-site</id>
-			<url>dav:${nexusproxy}/content/sites/site/org/onap/portal/${project.version}</url>
-		</site>
-	</distributionManagement>
-	<repositories>
-		<repository>
-			<id>ecomp-releases</id>
-			<name>OpenECOMP - Release Repository</name>
-			<url>${nexusproxy}/${releaseNexusPath}</url>
-		</repository>
-		<repository>
-			<id>ecomp-snapshots</id>
-			<name>OpenECOMP - Snapshot Repository</name>
-			<url>${nexusproxy}/${snapshotNexusPath}</url>
-		</repository>
-		<repository>
-			<id>ecomp-public</id>
-			<name>ecomp onap public Repository</name>
-			<url>https://nexus.onap.org/content/groups/public</url>
-		</repository>
-	</repositories>
-
 	<build>
 		<sourceDirectory>src/main/java</sourceDirectory>
 		<!-- The war file name carries no version number -->
 		<finalName>${project.artifactId}</finalName>
 
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>sonar-maven-plugin</artifactId>
-				<version>3.2</version>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
@@ -92,11 +36,28 @@
 				</dependencies>
 			</plugin>
 			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.19.1</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<skipTests>${skipTests}</skipTests>
+					<includes>
+						<include>**/*Test.java</include>
+						<include>**/*TestCase.java</include>
+						<inlcude>**/*TestSuite.java</inlcude>
+					</includes>
+					<!-- Intentionally Excluding TestFromSuite -->
+					<excludes>
+						<exclude>**/*TestFromSuite.java</exclude>
+					</excludes>
+					<additionalClasspathElements>
+						<additionalClasspathElement>${basedir}/src/main/webapp</additionalClasspathElement>
+						<additionalClasspathElement>../ecomp-portal-BE-common/src/main/webapp</additionalClasspathElement>
+						<additionalClasspathElement>../ecomp-portal-BE-common</additionalClasspathElement>
+					</additionalClasspathElements>
+					<systemPropertyVariables>
+						<container.classpath>classpath:</container.classpath>
+					</systemPropertyVariables>
 				</configuration>
 			</plugin>
 
@@ -116,13 +77,13 @@
 						</manifestEntries>
 					</archive>
 					<overlays>
-						<!-- specify the order in which these should be applied -->						
+						<!-- specify the order in which these should be applied -->
 						<overlay>
-							<groupId>org.openecomp.portal</groupId>
-							<artifactId>ecompportal-be-common</artifactId>
+							<groupId>org.onap.portal</groupId>
+							<artifactId>portal-be-common</artifactId>
 						</overlay>
 						<overlay>
-							<groupId>org.openecomp.ecompsdkos</groupId>
+							<groupId>org.onap.portal.sdk</groupId>
 							<artifactId>epsdk-app-overlay</artifactId>
 						</overlay>
 					</overlays>
@@ -141,7 +102,7 @@
 
 			<plugin>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.1</version>
+				<version>3.0.2</version>
 				<!-- Your own property files can be placed in ecomp-portal-be/../../overrides 
 					directory and they will override the generic source controlled versions at 
 					build time allowing you to test locally with your own settings. -->
@@ -249,17 +210,6 @@
 	</build>
 
 	<dependencies>
-		<dependency>
-			<groupId>com.att.eelf</groupId>
-			<artifactId>eelf-core</artifactId>
-			<version>${eelf.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>2.5</version>
-		</dependency>
-
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -311,18 +261,12 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
 		<!-- Hibernate -->
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
 			<version>${hibernate.version}</version>
 		</dependency>
-
-		<!-- jsr303 validation -->
-		<!-- <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> 
-			<version>1.1.0.Final</version> </dependency> -->
-
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
@@ -340,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>
@@ -361,47 +314,50 @@
 			<artifactId>cxf-rt-rs-client</artifactId>
 			<version>3.0.0-milestone1</version>
 		</dependency>
-
 		<!-- Mapper -->
 		<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>
 			<artifactId>classmate</artifactId>
 			<version>1.3.1</version>
 		</dependency>
-
+		<!-- Use Mariadb connector/j for failover -->
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.22</version>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+			<version>1.5.8</version>
 		</dependency>
-
 		<!-- Elastic Search -->
 		<dependency>
 			<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>
 			<artifactId>jest</artifactId>
 			<version>2.0.0</version>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.jcs</groupId>
 			<artifactId>jcs</artifactId>
@@ -412,16 +368,13 @@
 					<artifactId>*</artifactId>
 				</exclusion>
 			</exclusions>
-			<!-- -->
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-websocket</artifactId>
 			<version>8.0.28</version>
 			<scope>provided</scope>
 		</dependency>
-
 		<!-- Raptor required Libraries -->
 		<!-- for static charts -->
 		<dependency>
@@ -433,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>
@@ -448,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>
@@ -490,10 +443,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
-		<!-- <dependency> <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> 
-			<version>2.0.8</version> <exclusions> <exclusion> <groupId>org.bouncycastle</groupId> 
-			<artifactId>bcprov-jdk14</artifactId> </exclusion> </exclusions> </dependency> -->
 		<!-- Quartz -->
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
@@ -507,13 +456,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
 			<version>1.9</version>
 		</dependency>
-
 		<dependency>
 			<groupId>com.att.nsa</groupId>
 			<artifactId>cambriaClient</artifactId>
@@ -537,40 +484,50 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
 		<!-- SDK overlay war -->
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-app-overlay</artifactId>
 			<version>${epsdk.version}</version>
 			<type>war</type>
 		</dependency>
-
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<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.openecomp.portal</groupId>
-			<artifactId>ecompportal-be-common</artifactId>
-			<version>${portal.version}</version>
+			<groupId>org.onap.portal</groupId>
+			<artifactId>portal-be-common</artifactId>
+			<version>${project.version}</version>
 			<type>war</type>
 		</dependency>
-
 		<dependency>
-			<groupId>org.openecomp.portal</groupId>
-			<artifactId>ecompportal-be-common</artifactId>
-			<version>${portal.version}</version>
+			<groupId>org.onap.portal</groupId>
+			<artifactId>portal-be-common</artifactId>
+			<version>${project.version}</version>
 			<type>jar</type>
 			<classifier>classes</classifier>
 		</dependency>
-
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<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>
 			<version>${epsdk.version}</version>
 			<exclusions>
@@ -592,35 +549,35 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-core</artifactId>
 			<version>${epsdk.version}</version>
 		</dependency>
-
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-workflow</artifactId>
 			<version>${epsdk.version}</version>
 		</dependency>
-
 		<!-- Raptor required Libraries -->
 		<!-- for static charts -->
 		<dependency>
-			<groupId>org.openecomp.ecompsdkos</groupId>
+			<groupId>org.onap.portal.sdk</groupId>
 			<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>
 			<groupId>junit</groupId>
@@ -628,27 +585,49 @@
 			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
-
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-core</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>1.6.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.8.5</version>
+			<scope>test</scope>
+		</dependency>
 		<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>
@@ -658,8 +637,7 @@
 					<artifactId>*</artifactId>
 				</exclusion>
 			</exclusions>
-		</dependency>
-
+		</dependency> -->
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
@@ -670,6 +648,58 @@
 			<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>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.0.0-M1</version>
+				<configuration>
+					<failOnError>false</failOnError>
+					<doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
+					<docletArtifact>
+						<groupId>org.umlgraph</groupId>
+						<artifactId>umlgraph</artifactId>
+						<version>5.6</version>
+					</docletArtifact>
+					<additionalparam>-views</additionalparam>
+					<useStandardDocletOptions>true</useStandardDocletOptions>
+				</configuration>
+			</plugin>
+
+		</plugins>
+	</reporting>
 </project>