Fix for h2 missing from testing

First submit for re-organizing pom.xml dependencies. H2 is ONLY
used for testing and should be loaded otherwise. We removed it
from policy/common so that is affecting these test.

Issue-ID: POLICY-626
Change-Id: Iba86e89f2cb26581b2b465091e829d6bdd66a37b
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 4c88768..39e943b 100644 (file)
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -29,6 +29,11 @@
        <artifactId>BRMSGateway</artifactId>
        <description>This application will take in BRMS rules and acts as interface between PR and PDP XACML</description>
        <dependencies>
+               <dependency>
+                       <groupId>com.h2database</groupId>
+                       <artifactId>h2</artifactId>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>org.onap.policy.engine</groupId>
                        <artifactId>PolicyEngineAPI</artifactId>

diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index 34109c6..bd08a0e 100644 (file)
--- a/ONAP-PDP-REST/pom.xml
+++ b/ONAP-PDP-REST/pom.xml
@@ -48,6 +48,11 @@
                </plugins>
        </build>
        <dependencies>
+               <dependency>
+                       <groupId>com.h2database</groupId>
+                       <artifactId>h2</artifactId>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>org.onap.policy.engine</groupId>
                        <artifactId>ONAP-PDP</artifactId>

diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index ef8c76e..71bf6d8 100644 (file)
--- a/ONAP-REST/pom.xml
+++ b/ONAP-REST/pom.xml
@@ -38,6 +38,11 @@
        <packaging>jar</packaging>
 
        <dependencies>
+               <dependency>
+                       <groupId>com.h2database</groupId>
+                       <artifactId>h2</artifactId>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>org.onap.policy.engine</groupId>
                        <version>${project.version}</version>

diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml
index 1203797..55b78e5 100644 (file)
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -76,6 +76,11 @@
            <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**,src/main/webapp/app/policyApp/CSS/**/*,src/main/webapp/app/policyApp/libs/**/*</sonar.exclusions>               
        </properties>
        <dependencies>
+               <dependency>
+                       <groupId>com.h2database</groupId>
+                       <artifactId>h2</artifactId>
+                       <scope>test</scope>
+               </dependency>
                <dependency>
                        <groupId>org.onap.portal.sdk</groupId>
                        <artifactId>epsdk-core</artifactId>

diff --git a/pom.xml b/pom.xml
index 33f9c4c..eba1c04 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,15 @@
                <sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
                <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 
+               <!--
+               Shared between policy/* project repositories - same version 
+        -->
+               <h2.version>1.4.186</h2.version>
+
+               <!--
+               Shared between policy/* project repositories - different version 
+        -->
+
                <!-- Project common dependency versions -->
                <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>
                <dmaap.version>1.0.0</dmaap.version>
@@ -144,6 +153,17 @@
          </plugins>
        </reporting>
 
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>com.h2database</groupId>
+                               <artifactId>h2</artifactId>
+                               <version>${h2.version}</version>
+                               <scope>test</scope>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+       
        <dependencies>
 
                <dependency>