Merge "Bump odlparent 2.0.2 to 2.0.4"

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 542aa877b88c24f4e648febf5c8541e7f2d7bc89..4146e7391e1f5e3103cfe8bc96d1f74545eee95d 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index 6cf1c49f67c7054a60799b9775b7e2cf9928723c..6200edebcae9ae190e702adc084ce5791c31ed8d 100644 (file)
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
   </parent>
   <groupId>org.opendaylight.openflowplugin</groupId>
   <artifactId>openflowplugin-karaf</artifactId>

diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
index 8569236218ad952d59c74ab81f15ef8b1acbe10e..b989acb371b963d39dd7ec235e3759f659881d7d 100644 (file)
--- a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
+++ b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
index 454915ff6cdb26261418acde999e2cc0d1c668cf..52b94841056effbdbae257d8bf1da20a896c5b56 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
index cf6aa5969b0f7c14c370b52dda7be259c687e23d..0e6962752772aa7a3208883d36f9b13171f51058 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml
index 623f04a2073f00a9cc06cd4ff32793fff3d9c184..44639be9f72a6dabd622235ed7f48483cc1eb097 100644 (file)
--- a/extension/features-extension-aggregator/pom.xml
+++ b/extension/features-extension-aggregator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features-aggregator/features-openflowplugin/pom.xml
index d17776dccb3b9a2cf9faf9d8e2aec24c0db2d247..00aca9e9b12ad0b00da569958963643c63eb471e 100644 (file)
--- a/features-aggregator/features-openflowplugin/pom.xml
+++ b/features-aggregator/features-openflowplugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
index 21437726e5d5bc735a13577b417b622a268cbefb..cb981b8d5e5994704667fb34b14852c06289b101 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
index a5a1e5ea9a62c3c28b694a4eab3aebc35f9126b3..a2cea457b4f40c8417a1901fa654d4b80b217f82 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
index 743f74c53ef421355fe0ae9c7ef0b86c6259242a..359f6b01476c62db93819f9aef9dba8cabcbf6d2 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
index d0b61f5fc6221fce2435855672affbbde8fb3375..a6b96e0681a50d29c830fccfd612d6dd47966122 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
index 9d42f6234ed60a81434cd2fc4e29b3622366a4dd..d1e7d7d0f3b7d18db65e2189854c71d1cf622cfc 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
index 6faf91983e9f20855f03262de3318dcb1379d0c0..1de66eee4deab869ef08d5e17c9aa93b2f9abe90 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
index 0149c3386489dfea295d788591f1ecaf81b7b247..160ac847d9b340ed06f4bccff0b3661c0bcf03b9 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
index 208cf2ef35dcc318774e3f58e2620d3d7f831458..d4ef2b638796b90414fc6d86306330b56804ebb8 100644 (file)
--- a/features-aggregator/odl-openflowplugin-drop-test/pom.xml
+++ b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
index f5dc81545285173c48b008947ca2c137436278d8..3732921f81b7bc28bf2db77dfb5dfc53abfc3184 100644 (file)
--- a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
+++ b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-flow-services/pom.xml b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
index d858f9b579ad577e247e665c2a5ba76931180400..ba04c6878f4453c0d1ae0861fda3d1437338a952 100644 (file)
--- a/features-aggregator/odl-openflowplugin-flow-services/pom.xml
+++ b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
index fa1d798c7957d120d3f37e52ae42720298f31947..b34a00c21adcbbe676163eb313f44f2275bc9db0 100644 (file)
--- a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
+++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml
index 3921291e14f2e60136b3051e1effd577c3d5f128..186c1287c144ada557bf036ec0d5ca82fad09d9a 100644 (file)
--- a/features-aggregator/odl-openflowplugin-southbound/pom.xml
+++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/pom.xml b/features-aggregator/pom.xml
index 0d1a59b8a66c0a6959e373e20165c83c013caa3c..26094bf8bdb74ad714832c8ac67c3a3375561ca7 100644 (file)
--- a/features-aggregator/pom.xml
+++ b/features-aggregator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 

diff --git a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
index f100880f5c727022119c5389c9f277bc4cd6881b..187b4153ee923a07753900a3398bb995abd5366c 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
index dd8ae7268041c96891ad9bf326e6d8266253fa21..de73c831d1f6a644c1b7ddbe8670d2d10210c58d 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
@@ -25,7 +25,7 @@
         <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
         <mdsal.version>2.3.0-SNAPSHOT</mdsal.version>
         <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-        <odlparent.netty>2.0.2</odlparent.netty>
+        <odlparent.netty>2.0.4</odlparent.netty>
     </properties>
 
 

diff --git a/openflowjava/features-openflowjava-aggregator/pom.xml b/openflowjava/features-openflowjava-aggregator/pom.xml
index ad40a13089b3c8a797650a448a56ed7f6efc1246..424e9584082cf55f126ac79e148d93b77cb31da4 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index 7c8153e19d5302245440578e429ce2d1d74c9d4c..a8ca5e2a7d8feba2bc116affd6f14f75edeaf5ab 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>