From 8eed25b1f4f0ab8306b10c5b77e34143e75d07e8 Mon Sep 17 00:00:00 2001
From: da490c <dave.adams@amdocs.com>
Date: Wed, 20 Jun 2018 15:29:48 -0400
Subject: Add multi-oxm support to sparky-be

Issue-ID: AAI-1232
Change-Id: Ib26fe496f022baf680884ebcee6a02e8eb18c985
Signed-off-by: da490c <dave.adams@amdocs.com>
---
 sparkybe-onap-application/pom.xml | 41 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 deletions(-)

(limited to 'sparkybe-onap-application/pom.xml')

diff --git a/sparkybe-onap-application/pom.xml b/sparkybe-onap-application/pom.xml
index cc5e004..287debe 100644
--- a/sparkybe-onap-application/pom.xml
+++ b/sparkybe-onap-application/pom.xml
@@ -26,7 +26,8 @@
 		<config-home>${basedir}/</config-home>
 		<docker.location>${basedir}/target</docker.location>
 		<docker.image.name>sparky-be</docker.image.name>
-		<sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
+		<version.aai-schema>1.2.4</version.aai-schema>
+        <sitePath>/content/sites/site/org/onap/aai/sparky-be/${project.artifactId}/${project.version}</sitePath>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 	</properties>
 
@@ -42,12 +43,14 @@
 				<scope>import</scope>
 			</dependency>
 
-			<dependency>
+ 			<dependency>
 				<groupId>ch.qos.logback</groupId>
 				<artifactId>logback-classic</artifactId>
 				<version>1.2.1</version>
 			</dependency>
 
+ 
+ 
 		</dependencies>
 
 	</dependencyManagement>
@@ -84,6 +87,10 @@
 					<groupId>ch.qos.logback</groupId>
 					<artifactId>logback-classic</artifactId>
 				</exclusion>
+				<exclusion>
+   	 	 	        <groupId>org.slf4j</groupId>
+			        <artifactId>log4j-over-slf4j</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
@@ -552,7 +559,6 @@
 					<forceTags>true</forceTags>
 				</configuration>
 			</plugin>
-
 			<plugin>
 			  <groupId>org.apache.maven.plugins</groupId>
 			  <artifactId>maven-deploy-plugin</artifactId>
@@ -582,7 +588,33 @@
 				<include>src/main/java/**</include> </includes> </configuration> <executions>
 				<execution> <goals> <goal>format</goal> </goals> <phase>process-sources</phase>
 				</execution> </executions> </plugin> -->
-			
+				
+              <plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.onap.aai.aai-common</groupId>
+									<artifactId>aai-schema</artifactId>
+									<version>${version.aai-schema}</version>
+									<type>jar</type>
+									<includes>oxm/</includes>
+									<outputDirectory>${project.build.directory}/</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>				
+				
 		</plugins>
 	</build>
 
@@ -621,5 +653,4 @@
             <url>${nexusproxy}/content/repositories/snapshots/</url>
         </repository>
     </repositories>
-
 </project>
-- 
cgit 1.2.3-korg