summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-03-22 16:24:19 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-03-22 16:24:19 -0400
commit66f52b554aebe049270e9179a2ba25f838db15b9 (patch)
tree5e66dff8dd7c9cf06c455c161f76fc487987bb8e
parent9341f0842038d226d24ff51cf358770c35ea8f7c (diff)
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>
-rw-r--r--odlparent/binding-parent/pom.xml8
-rw-r--r--odlparent/bundle-parent/pom.xml8
-rw-r--r--odlparent/feature-repo-parent/pom.xml8
-rw-r--r--odlparent/mdsal-it-parent/pom.xml8
-rw-r--r--odlparent/odlparent-lite/pom.xml8
-rw-r--r--odlparent/odlparent/pom.xml8
-rwxr-xr-xodlparent/setup/src/main/resources/pom-template.xml8
-rw-r--r--odlparent/single-feature-parent/pom.xml8
8 files changed, 64 insertions, 0 deletions
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>