From 66f52b554aebe049270e9179a2ba25f838db15b9 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Fri, 22 Mar 2019 16:24:19 -0400
Subject: Add jackson-bom import

Add jackson-bom import to parent poms. This is missing, which causes
feature.xml generation to use incorrect version of jackson-databind
which in turn prevents container from starting up.

Change-Id: Ide693c9a46bc2204fc7bd55f403c20cf7930b12d
Issue-ID: CCSDK-1156
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 odlparent/binding-parent/pom.xml                    | 8 ++++++++
 odlparent/bundle-parent/pom.xml                     | 8 ++++++++
 odlparent/feature-repo-parent/pom.xml               | 8 ++++++++
 odlparent/mdsal-it-parent/pom.xml                   | 8 ++++++++
 odlparent/odlparent-lite/pom.xml                    | 8 ++++++++
 odlparent/odlparent/pom.xml                         | 8 ++++++++
 odlparent/setup/src/main/resources/pom-template.xml | 8 ++++++++
 odlparent/single-feature-parent/pom.xml             | 8 ++++++++
 8 files changed, 64 insertions(+)

(limited to 'odlparent')

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 5c730dd9..80fad55e 100644
--- a/odlparent/binding-parent/pom.xml
+++ b/odlparent/binding-parent/pom.xml
@@ -133,6 +133,7 @@
 		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
 			integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.8.11</jackson.version>
+		<jackson.bom.version>2.8.11.20181123</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.0-GA</javassist.version>
 
@@ -554,6 +555,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+			    <groupId>com.fasterxml.jackson</groupId>
+			    <artifactId>jackson-bom</artifactId>
+			    <version>${jackson.bom.version}</version>
+			    <type>pom</type>
+			    <scope>import</scope>
+			</dependency>
 
 			<dependency>
 				<groupId>org.opendaylight.controller</groupId>
diff --git a/odlparent/bundle-parent/pom.xml b/odlparent/bundle-parent/pom.xml
index a93fbe2f..909a0341 100644
--- a/odlparent/bundle-parent/pom.xml
+++ b/odlparent/bundle-parent/pom.xml
@@ -133,6 +133,7 @@
 		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
 			integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.8.11</jackson.version>
+		<jackson.bom.version>2.8.11.20181123</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.0-GA</javassist.version>
 
@@ -554,6 +555,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+			    <groupId>com.fasterxml.jackson</groupId>
+			    <artifactId>jackson-bom</artifactId>
+			    <version>${jackson.bom.version}</version>
+			    <type>pom</type>
+			    <scope>import</scope>
+			</dependency>
 
 			<dependency>
 				<groupId>org.opendaylight.controller</groupId>
diff --git a/odlparent/feature-repo-parent/pom.xml b/odlparent/feature-repo-parent/pom.xml
index 5d73108d..cd00bd29 100644
--- a/odlparent/feature-repo-parent/pom.xml
+++ b/odlparent/feature-repo-parent/pom.xml
@@ -133,6 +133,7 @@
 		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
 			integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.8.11</jackson.version>
+		<jackson.bom.version>2.8.11.20181123</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.0-GA</javassist.version>
 
@@ -554,6 +555,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+			    <groupId>com.fasterxml.jackson</groupId>
+			    <artifactId>jackson-bom</artifactId>
+			    <version>${jackson.bom.version}</version>
+			    <type>pom</type>
+			    <scope>import</scope>
+			</dependency>
 
 			<dependency>
 				<groupId>org.opendaylight.controller</groupId>
diff --git a/odlparent/mdsal-it-parent/pom.xml b/odlparent/mdsal-it-parent/pom.xml
index b2a76739..1c1914d0 100644
--- a/odlparent/mdsal-it-parent/pom.xml
+++ b/odlparent/mdsal-it-parent/pom.xml
@@ -133,6 +133,7 @@
 		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
 			integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.8.11</jackson.version>
+		<jackson.bom.version>2.8.11.20181123</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.0-GA</javassist.version>
 
@@ -554,6 +555,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+			    <groupId>com.fasterxml.jackson</groupId>
+			    <artifactId>jackson-bom</artifactId>
+			    <version>${jackson.bom.version}</version>
+			    <type>pom</type>
+			    <scope>import</scope>
+			</dependency>
 
 			<dependency>
 				<groupId>org.opendaylight.controller</groupId>
diff --git a/odlparent/odlparent-lite/pom.xml b/odlparent/odlparent-lite/pom.xml
index e1847597..a65a7aee 100644
--- a/odlparent/odlparent-lite/pom.xml
+++ b/odlparent/odlparent-lite/pom.xml
@@ -133,6 +133,7 @@
 		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
 			integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.8.11</jackson.version>
+		<jackson.bom.version>2.8.11.20181123</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.0-GA</javassist.version>
 
@@ -554,6 +555,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+			    <groupId>com.fasterxml.jackson</groupId>
+			    <artifactId>jackson-bom</artifactId>
+			    <version>${jackson.bom.version}</version>
+			    <type>pom</type>
+			    <scope>import</scope>
+			</dependency>
 
 			<dependency>
 				<groupId>org.opendaylight.controller</groupId>
diff --git a/odlparent/odlparent/pom.xml b/odlparent/odlparent/pom.xml
index a0852f9e..25fde22d 100644
--- a/odlparent/odlparent/pom.xml
+++ b/odlparent/odlparent/pom.xml
@@ -133,6 +133,7 @@
 		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
 			integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.8.11</jackson.version>
+		<jackson.bom.version>2.8.11.20181123</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.0-GA</javassist.version>
 
@@ -554,6 +555,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+			    <groupId>com.fasterxml.jackson</groupId>
+			    <artifactId>jackson-bom</artifactId>
+			    <version>${jackson.bom.version}</version>
+			    <type>pom</type>
+			    <scope>import</scope>
+			</dependency>
 
 			<dependency>
 				<groupId>org.opendaylight.controller</groupId>
diff --git a/odlparent/setup/src/main/resources/pom-template.xml b/odlparent/setup/src/main/resources/pom-template.xml
index 7e8f7b09..a9eae9a8 100755
--- a/odlparent/setup/src/main/resources/pom-template.xml
+++ b/odlparent/setup/src/main/resources/pom-template.xml
@@ -133,6 +133,7 @@
 		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
 			integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.8.11</jackson.version>
+		<jackson.bom.version>2.8.11.20181123</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.0-GA</javassist.version>
 
@@ -554,6 +555,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+			    <groupId>com.fasterxml.jackson</groupId>
+			    <artifactId>jackson-bom</artifactId>
+			    <version>\${jackson.bom.version}</version>
+			    <type>pom</type>
+			    <scope>import</scope>
+			</dependency>
 
 			<dependency>
 				<groupId>org.opendaylight.controller</groupId>
diff --git a/odlparent/single-feature-parent/pom.xml b/odlparent/single-feature-parent/pom.xml
index 43f829b4..9fd78b53 100644
--- a/odlparent/single-feature-parent/pom.xml
+++ b/odlparent/single-feature-parent/pom.xml
@@ -133,6 +133,7 @@
 		<!-- Used by aaa, alto, netconf, ovsdb, sfc; see also affinity, defense4all, 
 			integration/distribution, snmp4sdn, toolkit, ttp -->
 		<jackson.version>2.8.11</jackson.version>
+		<jackson.bom.version>2.8.11.20181123</jackson.bom.version>
 		<!-- Used by snmp4sdn, yangtools -->
 		<javassist.version>3.24.0-GA</javassist.version>
 
@@ -554,6 +555,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+			    <groupId>com.fasterxml.jackson</groupId>
+			    <artifactId>jackson-bom</artifactId>
+			    <version>${jackson.bom.version}</version>
+			    <type>pom</type>
+			    <scope>import</scope>
+			</dependency>
 
 			<dependency>
 				<groupId>org.opendaylight.controller</groupId>
-- 
cgit 1.2.3-korg