Bump odlparent/yangtools/mdsal/controller

Adopt upstream versions:
- odlparent-7.0.5
- yangtools-5.0.5
- mdsal-6.0.4
- controller-2.0.3

Change-Id: I8c8be3249f6170b0c215f4fe06cd22fc327da2d8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index 4ac47192eb991f932ec4a7601d8de648406ce038..387156b39d8a49f2922d2d9f1a2a1cd742fb7167 100644 (file)
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>6.0.2</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 

diff --git a/commons/it/pom.xml b/commons/it/pom.xml
index 207662323eff5382a45791854efe86ebadc2e788..919cdebe97e614d3ae431d3108cbdc401807c80a 100644 (file)
--- a/commons/it/pom.xml
+++ b/commons/it/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-it-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.3</version>
     <relativePath/>
   </parent>
 
@@ -70,7 +70,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.2</version>
+        <version>6.0.4</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/commons/pom.xml b/commons/pom.xml
index d5414a98973aa8bd1838cd16bca4a7e1d225f80e..9d1bde749377e7642729800530ca6e82d125260c 100644 (file)
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml
index 20c1342c3aa3e5bff54b44020165deb28f5d048e..d77a2d2b3745b307dffa87dc45651067dec0131d 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml
index 73a4659dbb81893a062deb15c9d0f4bc5854e1b0..8a24486262e102fb28c5324c846df7646eeac2eb 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml
index 076f6eb53f94c4b5f5ec64ea8e1e98c135e6d15c..5696fdb01b098ff2f4f4885859da8fc29700171e 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 
@@ -22,7 +22,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.2</version>
+                <version>6.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml
index 67674b756c726c057014b9e8add23715a38a2ff3..b41509ebb0a913654236da3d5e2299f9cdf8cad8 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml
index b98436e93c7a43219af06831bfad39853ab3a686..7009a4f1ac0e5b008a54075d26a34d7627b33ae5 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml
index 1c5940dc47f9ccc321a36f6cd72887deda9b7efb..25cbcd549a5c3c9bbcb083bf2a0ece7bb5549b73 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
index cca5ad7fb8ec8d45eca8a95429e700a99cd6f2ec..466bf5bcc642d12379242836cc29e310e1cc6fac 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
index fe8c5b70a75fe6e7d3afd1b75f13ebe111bdc7dc..ef96142dcdc6e0bd9a1d2e8f1387f0ea378b321f 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.ovsdb</groupId>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml
index 632536db194aee4dda403b58de33904606fefa29..d9712e39ac9c1630cbf7563b0d184b51aceefbf0 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/hwvtepsouthbound/pom.xml b/hwvtepsouthbound/pom.xml
index f2aaa13f7ed12d550f4cd919e6ebf1a2143d72df..143ddcbe130a04920ffa8707537ba620061f434f 100644 (file)
--- a/hwvtepsouthbound/pom.xml
+++ b/hwvtepsouthbound/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/library/artifacts/pom.xml b/library/artifacts/pom.xml
index 0cad6dec2674665721b5e3f26efaa5fdab7cfc45..7a64ab17d31fa678ca7bdcbb33c89e4ee7181c0a 100644 (file)
--- a/library/artifacts/pom.xml
+++ b/library/artifacts/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/library/features/features/pom.xml b/library/features/features/pom.xml
index e0ce6ebe6ea804aa4eca011a7aa28213981d68ee..dcd6c6a86b2a4d9055cdf2a291222382965f29bf 100644 (file)
--- a/library/features/features/pom.xml
+++ b/library/features/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/library/features/odl-ovsdb-library/pom.xml b/library/features/odl-ovsdb-library/pom.xml
index 73fcf6266f20744bd65a1921822f00426a698d75..9b82ea4757ee4a090dd2a438bf7816d95e40cb72 100644 (file)
--- a/library/features/odl-ovsdb-library/pom.xml
+++ b/library/features/odl-ovsdb-library/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/library/features/pom.xml b/library/features/pom.xml
index 4b0cda7918cf292b9059e47ff60e90b6b6d6284a..e36dc46e11205c4a48d6e0634690602b4044c967 100644 (file)
--- a/library/features/pom.xml
+++ b/library/features/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.ovsdb</groupId>

diff --git a/library/karaf/pom.xml b/library/karaf/pom.xml
index 2822f5fa0ad5b8a6da0a6c499d841bb865b1f2c2..fbb6131da33497ffade2accb5bd272a52e1617b0 100644 (file)
--- a/library/karaf/pom.xml
+++ b/library/karaf/pom.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/library/pom.xml b/library/pom.xml
index da26e9d71fd98759cf31e2cb4c8ee0e9188559e4..d1dc3fd8fd6d35e4841c215c61a6bd3e6140835e 100644 (file)
--- a/library/pom.xml
+++ b/library/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 52529a76e40f09769cb956d52b0c4090832f1b54..cf27c3e78ebf2b6872d0612b3ef074503ab1752c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/schemas/pom.xml b/schemas/pom.xml
index 524c416fd8ce83c92f34433176a2b87feb02d2cb..e40c794204a9b9f524ff1069c405c107f4bc5fa1 100644 (file)
--- a/schemas/pom.xml
+++ b/schemas/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/southbound/pom.xml b/southbound/pom.xml
index 2fb75998582612850de206cf7b0fe84088b5924c..59d0379ad92ed5c85252167257f8104d8569118d 100644 (file)
--- a/southbound/pom.xml
+++ b/southbound/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/southbound/southbound-artifacts/pom.xml b/southbound/southbound-artifacts/pom.xml
index ae92f8d65bd9160c25e825bc72efca0469d3c480..2897addeac031e173347fbaacb7cc44205f37011 100644 (file)
--- a/southbound/southbound-artifacts/pom.xml
+++ b/southbound/southbound-artifacts/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 

diff --git a/southbound/southbound-features/features/pom.xml b/southbound/southbound-features/features/pom.xml
index 8c1e0fba355e4ed1e0752d5bf1ea7faecd1c0f42..8e46cce41dd80c3b995ac6cfbe4e9973974ed161 100644 (file)
--- a/southbound/southbound-features/features/pom.xml
+++ b/southbound/southbound-features/features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml
index ffffd4ecee38a1cf4dee24b0ffb49d942b7cd5a2..7bed5b1749ff3be523c2734eac9db4ec93bc7a8e 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.2</version>
+                <version>6.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml
index 08b7d5f49d4e9ef55f2909030e468936e934602d..d992031f063efe0cc9d34b09d167381b2818504d 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml
index 56ee786a2b4de7b86573c5f7f295dc571e806b26..a55fa10e4c65c362c22265d77b483b12f95ac781 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
index a0833b71c384990bc87133012e0133cd9de2b267..319d86065031a130cc8eae0536dd56f744b824fc 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml
index 61882aab7dba370773662f3fd36e7f708f3fa8cd..a0b019ede23cd3211cf626b151deff9257dceab0 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/pom.xml b/southbound/southbound-features/pom.xml
index 055cea3e16aa0a28ffc16c4f32ecc58508f373b7..2257106461333da02fba70673f168d0b0935deb2 100644 (file)
--- a/southbound/southbound-features/pom.xml
+++ b/southbound/southbound-features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
index 270ec495280f7498a13b8563ba8b4693761231d3..4a89b5dd07a8b146e3323da72cfc04bc0bc761e2 100644 (file)
--- a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
+++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
@@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableBiMap;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -35,7 +36,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import javax.inject.Inject;
-import jersey.repackaged.com.google.common.collect.Maps;
 import org.eclipse.jdt.annotation.Nullable;
 import org.junit.After;
 import org.junit.Assert;

diff --git a/southbound/southbound-karaf/pom.xml b/southbound/southbound-karaf/pom.xml
index a5df2380662038b344ba37a837d5f506d3de6c83..7999db222435d886a80ee27abfd5c00d02de87c3 100644 (file)
--- a/southbound/southbound-karaf/pom.xml
+++ b/southbound/southbound-karaf/pom.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/utils/odl-ovsdb-utils/pom.xml b/utils/odl-ovsdb-utils/pom.xml
index f66addf21dd8e299e005648ce92164456b8d186d..7dd5d88f8dd7655710161097fc68da58b6462b99 100644 (file)
--- a/utils/odl-ovsdb-utils/pom.xml
+++ b/utils/odl-ovsdb-utils/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.5</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>2.0.2</version>
+                <version>2.0.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/utils/pom.xml b/utils/pom.xml
index abd610c1852462273f752bc26293218e4eddc7c8..66b4f8055557d2cf9ab18b15a1315e1e3ba62250 100644 (file)
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.3</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>