X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=0798d5c53c4d6b06c5a0ef3575d2fe31ecbb6ddf;hb=f03e49cdf5c8d54733416ab244826b9429c9c86c;hp=df0676143ea9317b36ecafde65a92139a2eea9fd;hpb=4c5a94e163eec4617c8907871a5ed5b81f6ca94b;p=aai%2Fbabel.git

diff --git a/pom.xml b/pom.xml
index df06761..0798d5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,13 +28,13 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.1</version>
 		<relativePath />
 	</parent>
 
 	<groupId>org.onap.aai</groupId>
 	<artifactId>babel</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>aai-babel</name>
@@ -42,27 +42,29 @@
 
 	<properties>
 		<!-- Spring boot version -->
-		<spring.boot.version>1.5.14.RELEASE</spring.boot.version>
+		<spring.boot.version>1.5.18.RELEASE</spring.boot.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<docker.location>${basedir}/target</docker.location>
+		<aai.schema.source.folder>onap/aai_schema</aai.schema.source.folder>
+		<aai.schema.target.folder>${project.build.directory}/aai-schema</aai.schema.target.folder>
 
 		<!-- Dependency Versions -->
 		<common.logging.version>1.2.2</common.logging.version>
-		<sdc.tosca.version>1.4.1</sdc.tosca.version>
-		<commons.compress.version>1.16.1</commons.compress.version>
+		<sdc.tosca.version>1.4.7</sdc.tosca.version>
+		<commons.compress.version>1.18</commons.compress.version>
 		<javax.ws.rs.version>2.1</javax.ws.rs.version>
 		<mvn.jaxb2.version>0.13.2</mvn.jaxb2.version>
 		<aai-schema.group.id>org.onap.aai.aai-common</aai-schema.group.id>
-		<aai-schema.version>1.3.0-SNAPSHOT</aai-schema.version>
+		<aai-schema.version>1.3.0</aai-schema.version>
 		<apache.lang3.version>3.7</apache.lang3.version>
 		<aai.rest.client.version>1.2.1</aai.rest.client.version>
 		<sdc.distribution.client.version>1.3.0</sdc.distribution.client.version>
 		<xmlunit.version>1.6</xmlunit.version>
 		<logback.version>1.2.3</logback.version>
-		<guava.version>25.1-jre</guava.version>
+		<antrun.version>1.8</antrun.version>
 	</properties>
 
 	<dependencyManagement>
@@ -86,6 +88,12 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-jersey</artifactId>
+		        <exclusions>
+			  <exclusion>
+			    <groupId>org.springframework.boot</groupId>
+			    <artifactId>spring-boot-starter-tomcat</artifactId>
+			  </exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.aai.logging-service</groupId>
@@ -102,7 +110,6 @@
 			<artifactId>logback-core</artifactId>
 			<version>${logback.version}</version><!--$NO-MVN-MAN-VER$-->
 		</dependency>
-
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
@@ -126,24 +133,17 @@
 			<groupId>org.codehaus.groovy</groupId>
 			<artifactId>groovy-all</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.onap.sdc.sdc-tosca</groupId>
 			<artifactId>sdc-tosca</artifactId>
 			<version>${sdc.tosca.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>${guava.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.onap.aai</groupId>
 			<artifactId>rest-client</artifactId>
 			<version>${aai.rest.client.version}</version>
 		</dependency>
-
+		
 		<!-- Testing -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -204,14 +204,37 @@
 									<artifactId>aai-schema</artifactId>
 									<version>${aai-schema.version}</version>
 									<type>jar</type>
-									<includes>aai_schema/aai_schema_v**.xsd</includes>
-									<outputDirectory>target/tmp</outputDirectory>
+									<includes>${aai.schema.source.folder}/aai_schema_v**.xsd</includes>
+									<outputDirectory>${project.build.directory}/tmp</outputDirectory>
 								</artifactItem>
 							</artifactItems>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<version>${antrun.version}</version>
+				<executions>
+					<execution>
+						<id>Flatten XSDs</id>
+						<phase>initialize</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<target>
+								<copy todir="${aai.schema.target.folder}" flatten="true">
+									<fileset dir="${project.build.directory}/tmp">
+										<include name="**/*.xsd" />
+									</fileset>
+								</copy>
+							</target>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.jvnet.jaxb2.maven2</groupId>
 				<artifactId>maven-jaxb2-plugin</artifactId>
@@ -225,9 +248,9 @@
 					</execution>
 				</executions>
 				<configuration>
-					<schemaDirectory>target/tmp/aai_schema</schemaDirectory>
+					<schemaDirectory>${aai.schema.target.folder}</schemaDirectory>
 					<generatePackage>org.onap.aai.babel.xml.generator.xsd</generatePackage>
-					<generateDirectory>target/generated-sources</generateDirectory>
+					<generateDirectory>${project.build.directory}/generated-sources</generateDirectory>
 					<schemaIncludes>
 						<include>aai_schema_latest.xsd</include>
 					</schemaIncludes>
@@ -362,13 +385,6 @@
 				<groupId>com.spotify</groupId>
 				<artifactId>docker-maven-plugin</artifactId>
 				<version>0.4.11</version>
-				<dependencies>
-					<dependency>
-						<groupId>com.github.jnr</groupId>
-						<artifactId>jnr-unixsocket</artifactId>
-						<version>0.13</version>
-					</dependency>
-				</dependencies>
 				<configuration>
 					<verbose>true</verbose>
 					<serverId>docker-hub</serverId>