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>

diff --git a/odlparent/binding-parent/pom.xml b/odlparent/binding-parent/pom.xml
index 5c730dd..80fad55 100644 (file)
--- 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 a93fbe2..909a034 100644 (file)
--- 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 5d73108..cd00bd2 100644 (file)
--- 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 b2a7673..1c1914d 100644 (file)
--- 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 e184759..a65a7ae 100644 (file)
--- 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 a0852f9..25fde22 100644 (file)
--- 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 7e8f7b0..a9eae9a 100755 (executable)
--- 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 43f829b..9fd78b5 100644 (file)
--- 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>