From: Jim Hahn <jrh3@att.com>
Date: Wed, 16 Jun 2021 19:49:40 +0000 (-0400)
Subject: Fix build of models
X-Git-Tag: 3.4.0~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=66b19bae2d3a06a373297ae8896fc31ecd9f2590;hp=cc22a32fb9e2e05f8399f66a4c649ec3ad31857f;p=policy%2Fparent.git

Fix build of models

A new dependency in policy-parent broke the build in policy-models.
Removed the problematic dependency.  Actually, removed both "bom"
dependencies since they would otherwise override policy's dependency
management.

Note: this may require adding them back into policy-gui and
policy-clamp.

Issue-ID: POLICY-3308
Change-Id: I898b1104081d6cf46a50d65e9f228c966d847559
Signed-off-by: Jim Hahn <jrh3@att.com>
---

diff --git a/integration/pom.xml b/integration/pom.xml
index dab14d4a..864dee26 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -68,23 +68,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- Spring BOM -->
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${version.springboot}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
-            <!-- Camel BOM -->
-            <dependency>
-                <groupId>org.apache.camel.springboot</groupId>
-                <artifactId>camel-spring-boot-bom</artifactId>
-                <version>${version.camel}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
 
             <!-- Jackson - needed by glassfish jersey -->
             <dependency>