Bump to odlparent 3.1.4

Change-Id: I7a86cbb894d08c0f5af2df5a74a9ed6a61209359
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 63181b858f9300925c21f0673208d8cfba37c94d..8a44c9b9eb978b3120719db5762e3e3af99d3eeb 100644 (file)
--- 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 5c49c3bca3d42f200987c0bc08520aef3c4406cd..cb71c5649550ce67d332b68893b5025bf83525a5 100644 (file)
--- 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 4d1a0bc3d77dc567c857971b348699580873483a..13476b3a2b879ea4a4cfd6d9ce7b593dd198ccfa 100644 (file)
--- 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 683a5275866a5790759f2e72c9be247c0ddac874..c823b2ed22e495e8e182c2f3afc049bd8f77f9f0 100644 (file)
--- 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 f71acd497ae186ec84c3d4254cb0947a416dbb4f..f30d38c3fabcd91e2687dc594372670d50c5ebeb 100644 (file)
--- 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 73bd4fb8456bd20ea0997683e31e74a3539def0f..43a59488acd2cb112e1db93c1dedc2bf0ba43537 100644 (file)
--- 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 f5b8f177375aef5cd5680be563309c214872bb02..8629277978a3a6a8431e4c52f81049c9a78f53dd 100644 (file)
--- 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 c4db4fabe019dfc134c23a7ad50b008ad3d05da4..7e90599f1ee04e40737baadfeb81adcaced4dc75 100644 (file)
--- 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 c98269727bd69384dbcc8b87cfaf76df461ebe77..01ec9425aef54a09d5d8496f2313830b751250f1 100644 (file)
--- 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 1fe180b4ea6f618719e48001cb92eaa4d828fdb4..db40bfe4e989040019b5332d352b209658b45be4 100644 (file)
--- 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 22a6d71b7dbefa27fd30c29fa0d47434400ae9c9..b0df66a88b1d52a5bffb538ef5098f59ce0613b7 100644 (file)
--- 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 f83fa6844fba48b0872c720eec9956d46557a18a..7331f3b9f9a95f00f2d4440033af5bc302a8a550 100644 (file)
--- 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 5f292227bd778fb97dd2778194660df1ce7ddb4e..c7dc9cd13a9db7ca66ae2eea98792519aa794ca7 100644 (file)
--- 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 f1d219621f676aa0a9d86ae97f392b471e953d07..d416826c1699c1acb86bc907fbc0fcdf65b9f452 100644 (file)
--- 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 2783e7c637d3d9f8796a91a8ff1cb9c251dd802b..46f5bb8e45a162f46c6d5317bcea74bd41796cc4 100644 (file)
--- 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 dbc4778e1bb27b12540517328922d4473ea69f74..23dc7418ed0b815c0f0e817b73e5d8a48201c44d 100644 (file)
--- 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 83ca067ce608e4e62766d64d75d401ba428eea82..cffb7e0f719362bb4052832a496d0a68fc350a9d 100644 (file)
--- 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 57736e3400e077aee4a791ac536017e66d8e2773..57a6e4fe138ab3f92a2eda49bc103818e84fc8c4 100644 (file)
--- 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 a21705027fbe0942707e61f24fdffc91dde6f65e..77f9632af784d2cffd079adf96005bf26b50d1a2 100755 (executable)
--- 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 bb6fe4bff68023aa50ec3e1e33793518ade6ff14..61c924ba9e93f23f5eb5e1d27225af8251fe69f3 100755 (executable)
--- 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>