X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fbabel.git;a=blobdiff_plain;f=pom.xml;h=4ef4a71671bcd72c863c19f730b6621daaa3096f;hp=b8839106f8133b8fb92e6dda3e131a2cab6d981f;hb=6600175eb4b9fed25b08e0d6a868d78439f7c4b4;hpb=b133a6cf27fc00ff2b8d29401c8cb08c4259db88

diff --git a/pom.xml b/pom.xml
index b883910..4ef4a71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    ============LICENSE_START=======================================================
+    ============LICENSE_START=======================================================
     org.onap.aai
     ================================================================================
-    Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
-    Copyright © 2017-2018 European Software Marketing Ltd.
+    Copyright (c) 2017-2019 AT&T Intellectual Property. All rights reserved.
+    Copyright (c) 2017-2019 European Software Marketing Ltd.
     ================================================================================
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -28,13 +28,13 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
+		<version>2.1.0</version>
 		<relativePath />
 	</parent>
 
 	<groupId>org.onap.aai</groupId>
 	<artifactId>babel</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.7.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>aai-babel</name>
@@ -42,26 +42,53 @@
 
 	<properties>
 		<!-- Spring boot version -->
-		<spring.boot.version>1.5.12.RELEASE</spring.boot.version>
+		<spring.boot.version>2.1.12.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>
+
+		<sonar.jacoco.reportPath />
+		<sonar.jacoco.itReportPath />
+		<sonar.jacoco.reportMissing.force.zero />
+		
+		<jacoco.line.coverage.limit>0.90</jacoco.line.coverage.limit>
+		<jacoco.version>0.8.5</jacoco.version>
+		<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+		<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+		<sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+
+		<sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
+
+        <!-- docker related properties -->
+		<docker.fabric.version>0.28.0</docker.fabric.version>
+		<aai.docker.version>1.0.0</aai.docker.version>
+		<aai.build.directory>${project.build.directory}/${project.artifactId}-${project.version}-build/
+		</aai.build.directory>
+		<aai.docker.namespace>onap</aai.docker.namespace>
+		<aai.base.image>alpine</aai.base.image>
+		<aai.base.image.version>1.6.0</aai.base.image.version>
 
 		<!-- Dependency Versions -->
 		<common.logging.version>1.2.2</common.logging.version>
-		<sdc.tosca.version>1.3.0</sdc.tosca.version>
-		<commons.compress.version>1.16.1</commons.compress.version>
+		<sdc.tosca.version>1.5.1</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.2.3</aai-schema.version>
-		<apache.lang3.version>3.7</apache.lang3.version>
+		<aai-schema.group.id>org.onap.aai.schema-service</aai-schema.group.id>
+		<aai-schema.version>1.6.6</aai-schema.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>
+		<antrun.version>1.8</antrun.version>
+		<jaxb.version>2.2.11</jaxb.version>
+		<javax.activation.version>1.1.1</javax.activation.version>
+        <!-- This will be used for the docker images as the default format of maven build has issues -->
+		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 	</properties>
 
 	<dependencyManagement>
@@ -77,6 +104,118 @@
 		</dependencies>
 	</dependencyManagement>
 
+	<profiles>
+        <!-- Docker profile to be used for building docker image and pushing to nexus -->
+		<profile>
+			<id>docker</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>build-helper-maven-plugin</artifactId>
+						<version>3.0.0</version>
+						<executions>
+							<execution>
+								<phase>pre-clean</phase>
+								<id>parse-version</id>
+								<goals>
+									<goal>parse-version</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.codehaus.groovy.maven</groupId>
+						<artifactId>gmaven-plugin</artifactId>
+						<version>1.0</version>
+						<executions>
+							<execution>
+								<phase>pre-clean</phase>
+								<goals>
+									<goal>execute</goal>
+								</goals>
+								<configuration>
+									<source>
+										def userAaiBaseImage = session.userProperties['aai.base.image'];
+										def userAaiCommonVersion = session.userProperties['aai.base.image.version'];
+										if (userAaiCommonVersion != null) {
+										project.properties['aai.base.image.version'] = userAaiCommonVersion;
+										}
+										if (userAaiBaseImage != null) {
+										project.properties['aai.base.image'] = userAaiBaseImage;
+										}
+										log.info 'Base image flavour: ' + project.properties['aai.base.image'];
+										log.info 'Base image version: ' + project.properties['aai.base.image.version'];
+									</source>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>io.fabric8</groupId>
+						<artifactId>docker-maven-plugin</artifactId>
+						<version>${docker.fabric.version}</version>
+						<configuration>
+							<verbose>true</verbose>
+							<apiVersion>1.23</apiVersion>
+							<images>
+								<image>
+									<name>${docker.push.registry}/${aai.docker.namespace}/${project.artifactId}:%l
+									</name>
+									<build>
+										<filter>@</filter>
+										<tags>
+											<tag>latest</tag>
+											<tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
+											<tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-${maven.build.timestamp}</tag>
+										</tags>
+										<cleanup>try</cleanup>
+										<dockerFileDir>${project.basedir}/src/main/docker</dockerFileDir>
+										<assembly>
+											<inline>
+												<fileSets>
+													<fileSet>
+														<directory>${aai.build.directory}</directory>
+														<outputDirectory>/${project.artifactId}</outputDirectory>
+													</fileSet>
+												</fileSets>
+											</inline>
+										</assembly>
+									</build>
+								</image>
+							</images>
+						</configuration>
+						<executions>
+							<execution>
+								<id>clean-images</id>
+								<phase>pre-clean</phase>
+								<goals>
+									<goal>remove</goal>
+								</goals>
+								<configuration>
+									<removeAll>true</removeAll>
+								</configuration>
+							</execution>
+							<execution>
+								<id>generate-images</id>
+								<phase>package</phase>
+								<goals>
+									<goal>build</goal>
+								</goals>
+							</execution>
+							<execution>
+								<id>push-images</id>
+								<phase>deploy</phase>
+								<goals>
+									<goal>push</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -85,6 +224,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>
@@ -101,7 +246,6 @@
 			<artifactId>logback-core</artifactId>
 			<version>${logback.version}</version><!--$NO-MVN-MAN-VER$-->
 		</dependency>
-
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
@@ -114,7 +258,6 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>${apache.lang3.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
@@ -123,15 +266,8 @@
 		</dependency>
 		<dependency>
 			<groupId>org.codehaus.groovy</groupId>
-			<artifactId>groovy-all</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
-			<version>8.0</version>
-			<scope>provided</scope>
+			<artifactId>groovy</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.onap.sdc.sdc-tosca</groupId>
 			<artifactId>sdc-tosca</artifactId>
@@ -142,7 +278,7 @@
 			<artifactId>rest-client</artifactId>
 			<version>${aai.rest.client.version}</version>
 		</dependency>
-
+		
 		<!-- Testing -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -161,10 +297,29 @@
 			<version>${xmlunit.version}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>${jaxb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-core</artifactId>
+			<version>${jaxb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>${jaxb.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>${javax.activation.version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>
-		<finalName>babel</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
@@ -174,7 +329,7 @@
 					<jvmArguments>
 						-DCONFIG_HOME=./appconfig-local
 						-DAPP_HOME=.
-						-Dartifactgenerator.config=./appconfig-local/artifact-generator.properties
+						-Dtosca.mappings.config=./appconfig-local/tosca-mappings.json
 						-DKEY_STORE_PASSWORD=${KEY_STORE_PASSWORD}
 					</jvmArguments>
 				</configuration>
@@ -203,14 +358,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>
@@ -224,9 +402,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>
@@ -268,6 +446,23 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptors>
+						<descriptor>src/main/assembly/descriptor.xml</descriptor>
+					</descriptors>
+				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
@@ -303,34 +498,6 @@
 					</environmentVariables>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.2</version>
-				<executions>
-					<execution>
-						<id>copy-docker-file</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>target</outputDirectory>
-							<overwrite>true</overwrite>
-							<resources>
-								<resource>
-									<directory>${basedir}/src/main/docker</directory>
-									<filtering>true</filtering>
-								</resource>
-								<resource>
-									<directory>${basedir}/src/main/bin/</directory>
-									<filtering>true</filtering>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
@@ -357,21 +524,153 @@
 					<classifier>client</classifier>
 				</configuration>
 			</plugin>
+
+
+			<!-- once we connect aai-parent or oparent 3.0+ we can take out this 
+			     whole section -->
+
+			<plugin>
+			  <groupId>org.jacoco</groupId>
+			  <artifactId>jacoco-maven-plugin</artifactId>
+			  <version>${jacoco.version}</version>
+			  <configuration>
+			    <!-- Note: This exclusion list should match <sonar.exclusions> property 
+				 above -->
+			    <excludes>
+			      <exclude>**/gen/**</exclude>
+			      <exclude>**/generated-sources/**</exclude>
+			      <exclude>**/yang-gen/**</exclude>
+			      <exclude>**/pax/**</exclude>
+			      <exclude>org/onap/aai/babel/xml/generator/xsd/*</exclude>
+			    </excludes>
+			  </configuration>
+			  <executions>
+			    <!-- Prepares the property pointing to the JaCoCo runtime agent which 
+				 is passed as VM argument when Maven the Surefire plugin is executed. -->
+			    <execution>
+			      <id>pre-unit-test</id>
+			      <goals>
+				<goal>prepare-agent</goal>
+			      </goals>
+			      <configuration>
+				<!-- Sets the path to the file which contains the execution data 
+				     . -->
+				<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+				<!-- Sets the name of the property containing the settings for JaCoCo 
+				     runtime agent. -->
+				<propertyName>surefireArgLine</propertyName>
+			      </configuration>
+			    </execution>
+			    <!-- Ensures that the code coverage report for unit tests is created 
+				 after unit tests have been run. -->
+			    <execution>
+			      <id>post-unit-test</id>
+			      <phase>test</phase>
+			      <goals>
+				<goal>report</goal>
+			      </goals>
+			      <configuration>
+				<!-- Sets the path to the file which contains the execution data 
+				     . -->
+				<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+				<!-- Sets the output directory for the code coverage report. -->
+				<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+			      </configuration>
+			    </execution>
+			    <execution>
+			      <id>pre-integration-test</id>
+			      <phase>pre-integration-test</phase>
+			      <goals>
+				<goal>prepare-agent</goal>
+			      </goals>
+			      <configuration>
+				<!-- Sets the path to the file which contains the execution data 
+				     . -->
+				<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+				<!-- Sets the name of the property containing the settings for JaCoCo 
+				     runtime agent. -->
+				<propertyName>failsafeArgLine</propertyName>
+			      </configuration>
+			    </execution>
+			    <!-- Ensures that the code coverage report for integration tests after 
+				 integration tests have been run. -->
+			    <execution>
+			      <id>post-integration-test</id>
+			      <phase>post-integration-test</phase>
+			      <goals>
+				<goal>report</goal>
+			      </goals>
+			      <configuration>
+				<!-- Sets the path to the file which contains the execution data 
+				     . -->
+				<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+				<!-- Sets the output directory for the code coverage report. -->
+				<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+			      </configuration>
+			    </execution>
+			    <execution>
+			      <id>default-check</id>
+			      <goals>
+				<goal>check</goal>
+			      </goals>
+			      <configuration>
+				<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+				<rules>
+				  <rule implementation="org.jacoco.maven.RuleConfiguration">
+				    <element>BUNDLE</element>
+				    <limits>
+				      <limit implementation="org.jacoco.report.check.Limit">
+					<counter>LINE</counter>
+					<value>COVEREDRATIO</value>
+					<minimum>${jacoco.line.coverage.limit}</minimum>
+				      </limit>
+				    </limits>
+				  </rule>
+				</rules>
+			      </configuration>
+			    </execution>
+			  </executions>
+			</plugin>
 			<plugin>
-				<groupId>com.spotify</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.4.11</version>
-				<configuration>
-					<verbose>true</verbose>
-					<serverId>docker-hub</serverId>
-					<imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
-					<dockerDirectory>${docker.location}</dockerDirectory>
-					<imageTags>
-						<imageTag>latest</imageTag>
-					</imageTags>
-					<forceTags>true</forceTags>
-				</configuration>
+			  <groupId>org.apache.maven.plugins</groupId>
+			  <artifactId>maven-surefire-plugin</artifactId>
+			  <version>3.0.0-M4</version>
+			  <configuration>
+			    <!-- Sets the VM argument line used when unit tests are run. -->
+			    <argLine>${surefireArgLine}</argLine>
+			    <!-- Excludes integration tests when unit tests are run. -->
+			    <excludes>
+			      <exclude>**/IT*.java</exclude>
+			    </excludes>
+			  </configuration>
+			</plugin>
+			<plugin>
+			  <groupId>org.apache.maven.plugins</groupId>
+			  <artifactId>maven-failsafe-plugin</artifactId>
+			  <version>3.0.0-M4</version>
+			  <executions>
+			    <!-- Ensures that both integration-test and verify goals of the Failsafe 
+				 Maven plugin are executed. -->
+			    <execution>
+			      <id>integration-tests</id>
+			      <goals>
+				<goal>integration-test</goal>
+				<goal>verify</goal>
+			      </goals>
+			      <configuration>
+				<!-- Sets the VM argument line used when integration tests are run. -->
+				<argLine>${failsafeArgLine}</argLine>
+			      </configuration>
+			    </execution>
+			  </executions>
+			</plugin>
+			<plugin>
+			  <groupId>org.sonarsource.scanner.maven</groupId>
+			  <artifactId>sonar-maven-plugin</artifactId>
+			  <version>${sonar.scanner.version}</version>
 			</plugin>
+			<!-- end removable sonar config, note the additional exclusion for babel above
+			     -->
 		</plugins>
 	</build>