From: Siva.ye <yezhihua@huawei.com>
Date: Thu, 20 Sep 2018 03:28:20 +0000 (+0000)
Subject: Move h2 dependency configration to so top pom
X-Git-Tag: 1.3.1~71^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f46404ca84a4d46cb62f5e897923c60c930ae517;p=so.git

Move h2 dependency configration to so top pom

Change-Id: Idaa55084f5ecb0dd3536c232cebc14fb50000008
Issue-ID: SO-1075
Signed-off-by: Siva.ye <yezhihua@huawei.com>
---

diff --git a/bpmn/pom.xml b/bpmn/pom.xml
index ebf4481fdb..4e36b775f5 100644
--- a/bpmn/pom.xml
+++ b/bpmn/pom.xml
@@ -18,7 +18,6 @@
 		<camunda.version>7.8.0</camunda.version>
 		<camunda.bpm.assert.version>1.2</camunda.bpm.assert.version>
 		<camunda.bpm.webapp.artifact>camunda-webapp-jboss-standalone</camunda.bpm.webapp.artifact>
-		<h2.version>1.4.196</h2.version>
 		<groovy.version>2.4.8</groovy.version>
 		<saxon.version>9.5.1-8</saxon.version>
 		<xmlunit.version>2.4.0</xmlunit.version>
@@ -42,11 +41,6 @@
 	<!-- Define artifact versions for child modules -->
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>com.h2database</groupId>
-				<artifactId>h2</artifactId>
-				<version>${h2.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.codehaus.groovy</groupId>
 				<artifactId>groovy-all</artifactId>
diff --git a/pom.xml b/pom.xml
index 2af02bed2d..3d78f5220c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
 		<springboot.version>1.5.13.RELEASE</springboot.version>	
 		<springframework.version>5.0.8.RELEASE</springframework.version>
 		<tomcat.version>8.5.33</tomcat.version>
+                <h2.version>1.4.196</h2.version>
 		<originalClassifier>original</originalClassifier>
 		<docker.skip>true</docker.skip>
 		<docker.skip.build>true</docker.skip.build>
@@ -808,6 +809,11 @@
                             <artifactId>jetty-server</artifactId>
                             <version>9.4.12.v20180830</version>
                         </dependency>
+			<dependency>
+			    <groupId>com.h2database</groupId>
+			    <artifactId>h2</artifactId>
+			    <version>${h2.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<profiles>