X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=e88d67f16afc545ee13d89ea2408839277bb76cd;hb=eec3403e1439f536a2aaf89474a6d4b1ca08df29;hp=beb42242b0cb419aab7c357308b9fc636b356a03;hpb=de0812a382df2347f4b2b420df97a67560c213ac;p=so.git

diff --git a/pom.xml b/pom.xml
index beb42242b0..e88d67f16a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,16 +1,16 @@
-<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">
+<?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">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
-		<relativePath />
+		<version>1.2.1</version>
+		<relativePath/>
 	</parent>
 	<groupId>org.onap.so</groupId>
 	<artifactId>so</artifactId>
 	<packaging>pom</packaging>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<name>so</name>
 	<description>This Maven project is responsible to build and package all child projects - contributions in the MSO project.
 	This build can be configured to run Functional tests and to start/stop a jboss server + Mysql DB.
@@ -29,6 +29,8 @@
 		<module>asdc-controller</module>
 		<module>bpmn</module>
 		<module>cloudify-client</module>
+		<module>cxf-logging</module>
+                <module>so-monitoring</module>
 		<module>packages</module>
 	</modules>
 	<properties>
@@ -44,10 +46,10 @@
 		<sonar.projectVersion>${project.version}</sonar.projectVersion>
 		<sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
 		<jacoco.version>0.7.5.201505241946</jacoco.version>
-		<org.apache.maven.user-settings></org.apache.maven.user-settings>
-		<openstack.version>1.2.2</openstack.version>
-		<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
-		<springboot.version>1.5.13.RELEASE</springboot.version>	
+		<org.apache.maven.user-settings/>
+		<!-- TODO: update to version 1.4.0 for Dublin -->
+		<openstack.version>1.3.0</openstack.version>
+		<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>		
 		<originalClassifier>original</originalClassifier>
 		<docker.skip>true</docker.skip>
 		<docker.skip.build>true</docker.skip.build>
@@ -57,13 +59,14 @@
 		<docker.buildArg.docker_repository>${dockerPullRepo}</docker.buildArg.docker_repository>
 		<enforcer.skip>true</enforcer.skip>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
-		<stagingNexusPath>content/repositories/staging/</stagingNexusPath>
 		<releaseNexusPath>content/repositories/releases/</releaseNexusPath>
 		<snapshotNexusPath>content/repositories/snapshots/</snapshotNexusPath>
 		<publicNexusPath>content/repositories/public/</publicNexusPath>
 		<siteNexusPath>content/sites/site/org/onap/so/${project.version}/</siteNexusPath>
-		<cxf.version>3.2.5</cxf.version>
+		<cxf.version>3.2.6</cxf.version>
 		<jax.ws.rs>2.1</jax.ws.rs>
+		<springboot.version>2.0.5.RELEASE</springboot.version>	
+		<camunda.springboot.version>3.0.0</camunda.springboot.version>
 	</properties>
 	<distributionManagement>
 		<repository>
@@ -111,13 +114,6 @@
 			<id>restlet</id>
 			<url>http://maven.restlet.com</url>
 		</pluginRepository>
-		<pluginRepository>
-			<id>ecomp-staging</id>
-			<url>${nexusproxy}/${stagingNexusPath}</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
 		<pluginRepository>
 			<id>ecomp-public</id>
 			<url>${nexusproxy}/${publicNexusPath}</url>
@@ -141,13 +137,6 @@
 		</pluginRepository>
 	</pluginRepositories>
 	<repositories>
-		<repository>
-			<id>ecomp-staging</id>
-			<url>https://nexus.onap.org/content/repositories/staging/</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
 		<repository>
 			<id>ecomp-public</id>
 			<url>https://nexus.onap.org/content/repositories/public/</url>
@@ -233,7 +222,7 @@
 				<artifactId>maven-deploy-plugin</artifactId>
 				<version>2.8</version> <!-- This version supports the "deployAtEnd" parameter -->
 				<configuration>
-					<skip />
+					<skip/>
 				</configuration>
 			</plugin>
 
@@ -249,6 +238,9 @@
 					<showWarnings>true</showWarnings>
 					<source>1.8</source>
 					<target>1.8</target>
+					<compilerArgs>
+						<arg>-parameters</arg>
+					</compilerArgs>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -439,7 +431,7 @@
 					<version>2.20</version>
 					<configuration>
 						<systemPropertyVariables>
-							<so.log.level>${so.log.level}</so.log.level>
+							<so.log.level>DEBUG</so.log.level>
 						</systemPropertyVariables>
 						<rerunFailingTestsCount>2</rerunFailingTestsCount>
 					</configuration>
@@ -451,7 +443,7 @@
 					<configuration>
 						<skip>true</skip>
 						<systemPropertyVariables>
-							<so.log.level>${so.log.level}</so.log.level>
+							<so.log.level>DEBUG</so.log.level>
 						</systemPropertyVariables>
 						<rerunFailingTestsCount>2</rerunFailingTestsCount>
 					</configuration>
@@ -517,33 +509,27 @@
 	<dependencies>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-core</artifactId>
-			<version>2.8.7</version>
+			<artifactId>jackson-core</artifactId>			
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.module</groupId>
-			<artifactId>jackson-module-jaxb-annotations</artifactId>
-			<version>2.4.0</version>
+			<artifactId>jackson-module-jaxb-annotations</artifactId>			
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-			<version>2.8.7</version>
+			<artifactId>jackson-databind</artifactId>			
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-			<version>2.8.7</version>
+			<artifactId>jackson-annotations</artifactId>			
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-base</artifactId>
-			<version>2.9.2</version>
+			<artifactId>jackson-jaxrs-base</artifactId>			
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jaxrs-json-provider</artifactId>
-			<version>2.9.2</version>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>			
 		</dependency>
 		<dependency>
 			<groupId>javax.ws.rs</groupId>
@@ -560,38 +546,21 @@
 			<artifactId>javax.inject</artifactId>
 			<version>1</version>
 		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-core</artifactId>
-			<version>1.3</version>
-		</dependency>
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
-			<version>1.3</version>
-		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
-			<artifactId>mockito-all</artifactId>
-			<version>1.10.19</version>
-			<scope>test</scope>
+			<artifactId>mockito-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito</artifactId>
-			<version>1.6.2</version>
-			<scope>test</scope>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-core</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-module-junit4</artifactId>
-			<version>1.6.2</version>
-			<scope>test</scope>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-library</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<artifactId>junit</artifactId>		
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -672,7 +641,6 @@
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.9.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -686,12 +654,6 @@
 			<!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
 			<!-- force use of version 4.5 everywhere in transient deps, aligned on 
 				WildFly 10 version -->
-			<dependency>
-				<groupId>org.apache.httpcomponents</groupId>
-				<artifactId>httpclient</artifactId>
-				<version>4.5.5</version>
-				<scope>compile</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.apache.httpcomponents</groupId>
 				<artifactId>httpcore</artifactId>
@@ -709,19 +671,7 @@
 				<artifactId>commons-io</artifactId>
 				<version>2.5</version>
 				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>log4j</groupId>
-				<artifactId>log4j</artifactId>
-				<version>1.2.17</version>
-				<scope>compile</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>1.7.15</version>
-				<scope>compile</scope>
-			</dependency>
+			</dependency>		
 			<dependency>
 				<groupId>com.sun.xml.fastinfoset</groupId>
 				<artifactId>FastInfoset</artifactId>
@@ -738,7 +688,12 @@
 			<dependency>
 				<groupId>org.yaml</groupId>
 				<artifactId>snakeyaml</artifactId>
-				<version>1.15</version>
+				<version>1.23</version>
+			</dependency>
+			<dependency>
+				<groupId>javax.interceptor</groupId>
+				<artifactId>javax.interceptor-api</artifactId>
+				<version>1.2.2</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
@@ -752,24 +707,29 @@
 				</exclusions>
 			</dependency>
 			<dependency>
-			    <groupId>net.javacrumbs.shedlock</groupId>
-			    <artifactId>shedlock-spring</artifactId>
-			    <version>0.18.2</version>
+				<groupId>net.javacrumbs.shedlock</groupId>
+				<artifactId>shedlock-spring</artifactId>
+				<version>0.18.2</version>
+			</dependency>
+			<dependency>
+				<groupId>net.javacrumbs.shedlock</groupId>
+				<artifactId>shedlock-provider-jdbc-template</artifactId>
+				<version>0.18.2</version>
 			</dependency>
 			<dependency>
-			    <groupId>net.javacrumbs.shedlock</groupId>
-			    <artifactId>shedlock-provider-jdbc-template</artifactId>
-			    <version>0.18.2</version>
+				<groupId>org.flywaydb</groupId>
+				<artifactId>flyway-core</artifactId>
+				<version>5.1.4</version>
 			</dependency>
 			<dependency>
-			    <groupId>net.javacrumbs.shedlock</groupId>
-			    <artifactId>shedlock-provider-jdbc-template</artifactId>
-			    <version>0.18.2</version>
+				<groupId>org.json</groupId>
+				<artifactId>json</artifactId>
+				<version>20140107</version>
 			</dependency>
 			<dependency>
-    			<groupId>org.flywaydb</groupId>
-    			<artifactId>flyway-core</artifactId>
-    			<version>4.2.0</version>
+				<groupId>org.yaml</groupId>
+				<artifactId>snakeyaml</artifactId>
+				<version>1.19</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
@@ -799,7 +759,7 @@
 				</property>
 			</activation>
 			<properties>
-				<originalClassifier></originalClassifier>
+				<originalClassifier/>
 			</properties>
 		</profile>
 	</profiles>