From ccd9b338bae187765a42cb16897f1d50724fd21c Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Fri, 19 Oct 2018 15:34:28 +0200
Subject: [PATCH] Bump to odlparent 3.1.4

Change-Id: I7a86cbb894d08c0f5af2df5a74a9ed6a61209359
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---
 artifacts/pom.xml                                |  2 +-
 distribution-karaf/pom.xml                       |  2 +-
 features/features-groupbasedpolicy/pom.xml       |  2 +-
 features/odl-groupbasedpolicy-base/pom.xml       |  2 +-
 features/odl-groupbasedpolicy-ios-xe/pom.xml     |  2 +-
 features/odl-groupbasedpolicy-iovisor/pom.xml    |  2 +-
 .../pom.xml                                      |  2 +-
 .../pom.xml                                      |  2 +-
 .../pom.xml                                      |  2 +-
 .../pom.xml                                      |  2 +-
 .../odl-groupbasedpolicy-neutronmapper/pom.xml   |  2 +-
 features/odl-groupbasedpolicy-ofoverlay/pom.xml  |  2 +-
 .../odl-groupbasedpolicy-sxp-ep-provider/pom.xml |  2 +-
 .../odl-groupbasedpolicy-sxp-ise-adapter/pom.xml |  2 +-
 features/odl-groupbasedpolicy-ui/pom.xml         |  2 +-
 features/odl-groupbasedpolicy-vpp/pom.xml        |  2 +-
 features/pom.xml                                 |  2 +-
 pom.xml                                          |  2 +-
 renderers/iovisor/pom.xml                        | 16 +++++++++++-----
 renderers/ofoverlay/pom.xml                      |  6 ++++++
 20 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 63181b858..8a44c9b9e 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.3</version>
+    <version>3.1.4</version>
     <relativePath/>
   </parent>
 
diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 5c49c3bca..cb71c5649 100644
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>3.1.3</version>
+    <version>3.1.4</version>
     <relativePath/>
   </parent>
 
diff --git a/features/features-groupbasedpolicy/pom.xml b/features/features-groupbasedpolicy/pom.xml
index 4d1a0bc3d..13476b3a2 100644
--- a/features/features-groupbasedpolicy/pom.xml
+++ b/features/features-groupbasedpolicy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-base/pom.xml b/features/odl-groupbasedpolicy-base/pom.xml
index 683a52758..c823b2ed2 100644
--- a/features/odl-groupbasedpolicy-base/pom.xml
+++ b/features/odl-groupbasedpolicy-base/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-ios-xe/pom.xml b/features/odl-groupbasedpolicy-ios-xe/pom.xml
index f71acd497..f30d38c3f 100644
--- a/features/odl-groupbasedpolicy-ios-xe/pom.xml
+++ b/features/odl-groupbasedpolicy-ios-xe/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-iovisor/pom.xml b/features/odl-groupbasedpolicy-iovisor/pom.xml
index 73bd4fb84..43a59488a 100644
--- a/features/odl-groupbasedpolicy-iovisor/pom.xml
+++ b/features/odl-groupbasedpolicy-iovisor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml b/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml
index f5b8f1773..862927797 100644
--- a/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml
+++ b/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-ne-location-provider/pom.xml b/features/odl-groupbasedpolicy-ne-location-provider/pom.xml
index c4db4fabe..7e90599f1 100644
--- a/features/odl-groupbasedpolicy-ne-location-provider/pom.xml
+++ b/features/odl-groupbasedpolicy-ne-location-provider/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml b/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml
index c98269727..01ec9425a 100644
--- a/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml
+++ b/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml b/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml
index 1fe180b4e..db40bfe4e 100644
--- a/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml
+++ b/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-neutronmapper/pom.xml b/features/odl-groupbasedpolicy-neutronmapper/pom.xml
index 22a6d71b7..b0df66a88 100644
--- a/features/odl-groupbasedpolicy-neutronmapper/pom.xml
+++ b/features/odl-groupbasedpolicy-neutronmapper/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-ofoverlay/pom.xml b/features/odl-groupbasedpolicy-ofoverlay/pom.xml
index f83fa6844..7331f3b9f 100644
--- a/features/odl-groupbasedpolicy-ofoverlay/pom.xml
+++ b/features/odl-groupbasedpolicy-ofoverlay/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml b/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml
index 5f292227b..c7dc9cd13 100644
--- a/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml
+++ b/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml b/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml
index f1d219621..d416826c1 100644
--- a/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml
+++ b/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-ui/pom.xml b/features/odl-groupbasedpolicy-ui/pom.xml
index 2783e7c63..46f5bb8e4 100644
--- a/features/odl-groupbasedpolicy-ui/pom.xml
+++ b/features/odl-groupbasedpolicy-ui/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-vpp/pom.xml b/features/odl-groupbasedpolicy-vpp/pom.xml
index dbc4778e1..23dc7418e 100644
--- a/features/odl-groupbasedpolicy-vpp/pom.xml
+++ b/features/odl-groupbasedpolicy-vpp/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index 83ca067ce..cffb7e0f7 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 57736e340..57a6e4fe1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.3</version>
+    <version>3.1.4</version>
     <relativePath/>
   </parent>
 
diff --git a/renderers/iovisor/pom.xml b/renderers/iovisor/pom.xml
index a21705027..77f9632af 100755
--- a/renderers/iovisor/pom.xml
+++ b/renderers/iovisor/pom.xml
@@ -90,11 +90,17 @@
       <artifactId>powermock-api-mockito</artifactId>
       <scope>test</scope>
     </dependency>
-      <dependency>
-          <groupId>com.sun.jersey.jersey-test-framework</groupId>
-          <artifactId>jersey-test-framework-grizzly2</artifactId>
-          <scope>test</scope>
-      </dependency>
+    <dependency>
+      <groupId>org.javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.21.0-GA</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.jersey.jersey-test-framework</groupId>
+      <artifactId>jersey-test-framework-grizzly2</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/renderers/ofoverlay/pom.xml b/renderers/ofoverlay/pom.xml
index bb6fe4bff..61c924ba9 100755
--- a/renderers/ofoverlay/pom.xml
+++ b/renderers/ofoverlay/pom.xml
@@ -101,6 +101,12 @@
       <artifactId>powermock-api-mockito</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.21.0-GA</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.sun.jersey.jersey-test-framework</groupId>
       <artifactId>jersey-test-framework-grizzly2</artifactId>
-- 
2.36.6