summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-02-20 13:36:48 -0500
committerPamela Dragosh <pdragosh@research.att.com>2018-02-20 14:07:10 -0500
commitb2c2186295866511b3c989279599388aaacd0ba2 (patch)
tree0a5e76109a0f001cf7f3fe689138cd386a758b9a
parent61e228f56bc39ce291ed8dc7a3401bee7a47e95d (diff)
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>
-rw-r--r--BRMSGateway/pom.xml5
-rw-r--r--ONAP-PDP-REST/pom.xml5
-rw-r--r--ONAP-REST/pom.xml5
-rw-r--r--POLICY-SDK-APP/pom.xml5
-rw-r--r--pom.xml20
5 files changed, 40 insertions, 0 deletions
diff --git a/BRMSGateway/pom.xml b/BRMSGateway/pom.xml
index 4c88768da..39e943be1 100644
--- a/BRMSGateway/pom.xml
+++ b/BRMSGateway/pom.xml
@@ -30,6 +30,11 @@
<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>
<version>${project.version}</version>
diff --git a/ONAP-PDP-REST/pom.xml b/ONAP-PDP-REST/pom.xml
index 34109c663..bd08a0e63 100644
--- a/ONAP-PDP-REST/pom.xml
+++ b/ONAP-PDP-REST/pom.xml
@@ -49,6 +49,11 @@
</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>
<version>${project.version}</version>
diff --git a/ONAP-REST/pom.xml b/ONAP-REST/pom.xml
index ef8c76eef..71bf6d843 100644
--- a/ONAP-REST/pom.xml
+++ b/ONAP-REST/pom.xml
@@ -39,6 +39,11 @@
<dependencies>
<dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.onap.policy.engine</groupId>
<version>${project.version}</version>
<artifactId>ONAP-XACML</artifactId>
diff --git a/POLICY-SDK-APP/pom.xml b/POLICY-SDK-APP/pom.xml
index 1203797f7..55b78e5a6 100644
--- a/POLICY-SDK-APP/pom.xml
+++ b/POLICY-SDK-APP/pom.xml
@@ -77,6 +77,11 @@
</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>
<version>${epsdk.version}</version>
diff --git a/pom.xml b/pom.xml
index 33f9c4cee..eba1c0471 100644
--- 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>