Changes for 2.4.0-SNAPSHOT

Issue-ID: PORTAL-210

Included the pom changes for 2.4.0-SNAPSHOT, music and AAF changes.

Change-Id: Ib1e1c2679271aa40eb3b50397724e8cdc5ffe01c
Signed-off-by: sa282w <sa282w@att.com>

1 files changed, 143 insertions, 69 deletions

diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml
index 1bdb1490..d15b18ff 100644
--- a/ecomp-sdk/epsdk-core/pom.xml
+++ b/ecomp-sdk/epsdk-core/pom.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
-<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">
+<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.sdk</groupId>
 		<artifactId>epsdk-project</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<version>2.4.0-SNAPSHOT</version>
 	</parent>
 
 	<!-- GroupId is inherited from parent -->
@@ -20,7 +21,7 @@
 	<properties>
 		<drools.version>6.4.0.Final</drools.version>
 	</properties>
-	
+
 	<!-- repositories are inherited from parent -->
 
 	<build>
@@ -42,13 +43,13 @@
 					</systemPropertyVariables>
 				</configuration>
 			</plugin>
-			
+
 		</plugins>
 	</build>
 
 	<dependencies>
 
-		<!--  internal -->
+		<!-- internal -->
 		<dependency>
 			<groupId>org.onap.portal.sdk</groupId>
 			<artifactId>epsdk-fw</artifactId>
@@ -61,6 +62,18 @@
 			</exclusions>
 		</dependency>
 
+		<!-- internal -->
+		<dependency>
+			<groupId>org.onap.portal.sdk</groupId>
+			<artifactId>epsdk-domain</artifactId>
+			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<!-- Drools -->
 		<dependency>
 			<groupId>org.drools</groupId>
@@ -111,9 +124,9 @@
 			<version>${springframework.version}</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.springframework</groupId>
-   		    <artifactId>spring-aop</artifactId>
-    		<version>${springframework.version}</version>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-aop</artifactId>
+			<version>${springframework.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -126,19 +139,19 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+
 		<dependency>
-		    <groupId>org.aspectj</groupId>
-    		<artifactId>aspectjrt</artifactId>
-    		<version>1.8.9</version>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>1.8.9</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
 			<version>1.8.9</version>
 		</dependency>
-		
+
 
 		<!-- Hibernate -->
 		<dependency>
@@ -163,29 +176,29 @@
 			<version>2.3.1</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.apache.taglibs</groupId>
-    		<artifactId>taglibs-standard-spec</artifactId>
-    		<version>1.2.5</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>
+			<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-spec</artifactId>
-    		<version>1.2.5</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>
+			<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>
+			<groupId>org.apache.taglibs</groupId>
+			<artifactId>taglibs-standard-jstlel</artifactId>
+			<version>1.2.5</version>
 		</dependency>
 		<!-- bridge to implement commons-logging using slf4j -->
 		<dependency>
@@ -337,37 +350,38 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+
 		<dependency>
-			<groupId>com.att.eelf</groupId> 
-			<artifactId>eelf-core</artifactId> 
-			<version>1.0.0</version> 
+			<groupId>com.att.eelf</groupId>
+			<artifactId>eelf-core</artifactId>
+			<version>1.0.0</version>
 		</dependency>
 
 	<dependency>
 		<groupId>org.owasp.esapi</groupId>
 		<artifactId>esapi</artifactId>
 		<version>2.1.0.1</version>
-	    <exclusions>
-		<exclusion>
-        	<groupId>commons-beanutils</groupId>
-        	<artifactId>commons-beanutils-core</artifactId>
-		</exclusion>
-        <exclusion>
-        	<groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-		</exclusion>
-	    <exclusion>
-        	<groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
+		<exclusions>
+			<exclusion>
+				<groupId>commons-beanutils</groupId>
+				<artifactId>commons-beanutils-core</artifactId>
+			</exclusion>
+			<exclusion>
+				<groupId>commons-httpclient</groupId>
+				<artifactId>commons-httpclient</artifactId>
+			</exclusion>
+			<exclusion>
+				<groupId>xerces</groupId>
+				<artifactId>xercesImpl</artifactId>
 			</exclusion>
-	    <exclusion>
-        	<groupId>org.beanshell</groupId>
-            <artifactId>bsh-core</artifactId>
-		</exclusion>
-        </exclusions>
+			<exclusion>
+				<groupId>org.beanshell</groupId>
+				<artifactId>bsh-core</artifactId>
+			</exclusion>
+		</exclusions>
 	</dependency>
 
+
 		<!-- UEB was originally named Cambria -->
 		<dependency>
 			<groupId>com.att.nsa</groupId>
@@ -400,14 +414,19 @@
 			<classifier>runtime</classifier>
 		</dependency>
 		<dependency>
-    		<groupId>com.thoughtworks.xstream</groupId>
-    		<artifactId>xstream</artifactId>
-    		<version>1.4.10</version>
+			<groupId>org.apache.lucene</groupId>
+			<artifactId>lucene-queryparser</artifactId>
+			<version>7.2.1</version>
 		</dependency>
 		<dependency>
-    		<groupId>org.apache.wicket</groupId>
-    		<artifactId>wicket-core</artifactId>
-    		<version>1.5.16</version>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>xstream</artifactId>
+			<version>1.4.10</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-core</artifactId>
+			<version>1.5.16</version>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
@@ -425,9 +444,69 @@
 			<version>1.3.3</version>
 		</dependency>
 		<dependency>
-    		<groupId>commons-beanutils</groupId>
-    		<artifactId>commons-beanutils</artifactId>
-    		<version>1.9.3</version>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.9.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+			<version>3.17</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+			<version>3.17</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-scratchpad</artifactId>
+			<version>3.17</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-contrib</artifactId>
+			<version>3.5-FINAL</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>log4j</groupId>
+					<artifactId>log4j</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
@@ -435,15 +514,10 @@
 			<version>4.5.3</version>
 		</dependency>
 		<dependency>
-    		<groupId>xalan</groupId>
-    		<artifactId>xalan</artifactId>
-    		<version>2.7.2</version>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+			<version>2.7.2</version>
 		</dependency>
-		<dependency>
-    		<groupId>xerces</groupId>
-    		<artifactId>xercesImpl</artifactId>
-    		<version>2.11.0.SP5</version>
-		</dependency>			
 	</dependencies>
-	
+
 </project>