Adjust for odlparent 3 / yangtools 2

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

diff --git a/commons/it/pom.xml b/commons/it/pom.xml
index 110f9c5fb35273cf4acae5e86cda2804d816991f..e4975f27d5905f0e4bf902db5a0dab15e4c090f2 100644 (file)
--- a/commons/it/pom.xml
+++ b/commons/it/pom.xml
@@ -64,7 +64,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.codehaus.sonar-plugins.java</groupId>
+        <groupId>org.sonarsource.java</groupId>
         <artifactId>sonar-jacoco-listeners</artifactId>
         <version>${sonar-jacoco-listeners.version}</version>
         <scope>test</scope>

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

diff --git a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml
index a5f594ec2ddca1c8b4cd25f57e1a3fb8635b1111..e774d92ed514dce72b9ebbd2a9be5c773a392ad8 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-artifacts/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml
index 3c432ffbe7014f5d4a72d6445ff68f0c59b0fa99..2e73c1846a5401a928bb6ca1b5198009b1243edf 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/features/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</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 c6f6cfee8f5d5fd7a7c7178f71f7a24e032d6a0e..3ef4deff01f335108beb71cd8216c50383efa798 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml
index 14ebc0e8774b6734a629f017a6675b139ffdfabd..6b122fdc5aa86b90c3b9989f6eff58656db3d8ef 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-rest/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</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 dc1c379780bf7956acd7f62326d60ebc2da89cf6..84401c25dc151bba97723a7621e2fdf9e3b4da5f 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-test/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</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 d3900d19099575ee2dbb0f955df7f1e535c51e2c..ee6558ab7a58fbd5e290d9e786161304b28a5cb1 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound-ui/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
index d61296734a0028cbe85fda14de03042562613724..238991c21fd28225e98e1c6f088276c69e3244c4 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
index ae7a9f7d645fa27a75ec64551889d5a264124f0c..6b7386c4cba0a7ad02ed2eea1d5c3785d758c6cf 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>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.ovsdb</groupId>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/InstanceIdentifierCodec.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/InstanceIdentifierCodec.java
index 7cab110a2132b463d1d20ddaf8f49cca3bd1e03e..c5a267f276a700712cc83beeda559b816ed62b66 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/InstanceIdentifierCodec.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/InstanceIdentifierCodec.java
@@ -10,6 +10,7 @@ package org.opendaylight.ovsdb.hwvtepsouthbound;
 
 import java.net.URI;
 
+import java.util.Optional;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -41,13 +42,12 @@ public class InstanceIdentifierCodec extends AbstractModuleStringInstanceIdentif
 
     @Override
     protected Module moduleForPrefix(final String prefix) {
-        return context.findModuleByName(prefix, null);
+        return context.findModule(prefix, Optional.empty()).orElse(null);
     }
 
     @Override
     protected String prefixForNamespace(final URI namespace) {
-        final Module module = context.findModuleByNamespaceAndRevision(namespace, null);
-        return module == null ? null : module.getName();
+        return context.findModule(namespace, Optional.empty()).map(Module::getName).orElse(null);
     }
 
     @Override

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/ReconciliationManager.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/ReconciliationManager.java
index a3a4bd5a4e1d4f642b69927ca358c8f169e15deb..2b9ec5c5dbf11b49e10711efa5717817e98331dd 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/ReconciliationManager.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/ReconciliationManager.java
@@ -56,7 +56,9 @@ public class ReconciliationManager implements AutoCloseable {
 
     public ReconciliationManager(final DataBroker db) {
         this.db = db;
-        reconcilers = SpecialExecutors.newBoundedCachedThreadPool(NO_OF_RECONCILER, RECON_TASK_QUEUE_SIZE, "ovsdb-reconciler");
+        reconcilers =
+                SpecialExecutors.newBoundedCachedThreadPool(NO_OF_RECONCILER, RECON_TASK_QUEUE_SIZE, "ovsdb-reconciler",
+                        getClass());
 
         ThreadFactory threadFact = new ThreadFactoryBuilder()
                 .setNameFormat("ovsdb-recon-task-triager-%d").build();

diff --git a/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml
index 359451ccb25c6bf264510408627377e692676acc..31a38549b85b412e8a12dad317f02eb3bc1dae87 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-it/pom.xml
@@ -116,7 +116,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar-plugins.java</groupId>
+      <groupId>org.sonarsource.java</groupId>
       <artifactId>sonar-jacoco-listeners</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml
index 4440f6e7e513d098d540009087f1d084ca9ab214..882b453956a094bff733fd84fe7f237f1aca1dc4 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>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/hwvtepsouthbound/pom.xml b/hwvtepsouthbound/pom.xml
index dbc80c25802cbb98a7ee9e01e96d385ebb03db6b..c80e7972faf3b1fa354bc384541e106929531278 100644 (file)
--- a/hwvtepsouthbound/pom.xml
+++ b/hwvtepsouthbound/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>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/library/artifacts/pom.xml b/library/artifacts/pom.xml
index abfc01be601f604ebae3a1004131ac238fa7888b..b298eb23c82dd3b077f077e70d29ab0ab6013046 100644 (file)
--- a/library/artifacts/pom.xml
+++ b/library/artifacts/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/library/features/features/pom.xml b/library/features/features/pom.xml
index b91a712e58babdd915324a8f1870420fb6fd88a0..3887750cc0a03c6aa43ed8233d169af3c24983d1 100644 (file)
--- a/library/features/features/pom.xml
+++ b/library/features/features/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/library/features/odl-ovsdb-library/pom.xml b/library/features/odl-ovsdb-library/pom.xml
index af738ff1de248665294073cfb40b4e0ccd84ff2b..c7f205dbfad166a14ff05f1c17e8fe6fee3d12a5 100644 (file)
--- a/library/features/odl-ovsdb-library/pom.xml
+++ b/library/features/odl-ovsdb-library/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/library/features/pom.xml b/library/features/pom.xml
index 4a5d94b2a2be7c6c2f470298554cfe95b7c0cbdd..b0f3e5167b77a0446e5caec1f235164d842948dc 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>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.ovsdb</groupId>

diff --git a/library/impl/pom.xml b/library/impl/pom.xml
index 876ae3e6094e4f9c451d2f2cf4adbeb22c9f9d68..6798ee1d19731ac7f45f4bbe5f988863bfe9b979 100644 (file)
--- a/library/impl/pom.xml
+++ b/library/impl/pom.xml
@@ -84,7 +84,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar-plugins.java</groupId>
+      <groupId>org.sonarsource.java</groupId>
       <artifactId>sonar-jacoco-listeners</artifactId>
       <version>${sonar-jacoco-listeners.version}</version>
       <scope>test</scope>

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java
index 9946340c4f1c26aa79e66f886c5f2e32009e094b..3e82761821c7dab92c839fadd1492003a760560c 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java
@@ -21,6 +21,7 @@ import io.netty.buffer.ByteBufInputStream;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.ByteToMessageDecoder;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.List;
 import org.opendaylight.ovsdb.lib.error.InvalidEncodingException;
 import org.slf4j.Logger;
@@ -105,7 +106,7 @@ public class JsonRpcDecoder extends ByteToMessageDecoder {
 
             if (leftCurlies != 0 && leftCurlies == rightCurlies && !inS) {
                 ByteBuf slice = buf.readSlice(1 + index - buf.readerIndex());
-                JsonParser jp = jacksonJsonFactory.createParser(new ByteBufInputStream(slice));
+                JsonParser jp = jacksonJsonFactory.createParser((InputStream) new ByteBufInputStream(slice));
                 JsonNode root = jp.readValueAsTree();
                 out.add(root);
                 leftCurlies = 0;

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbTypesIdResolver.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbTypesIdResolver.java
index 0e8819968bb5ce09a048381f7421cc68351069cc..76bd04196c69f4f4e8c19c71f0c6424673abed81 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbTypesIdResolver.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbTypesIdResolver.java
@@ -9,9 +9,9 @@
 package org.opendaylight.ovsdb.lib.notation.json;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.DatabindContext;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase;
-import com.fasterxml.jackson.databind.type.TypeFactory;
 import org.opendaylight.ovsdb.lib.notation.OvsdbSet;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 
@@ -40,11 +40,11 @@ public  class OvsdbTypesIdResolver extends TypeIdResolverBase {
     }
 
     @Override
-    public JavaType typeFromId(String id) {
+    public JavaType typeFromId(DatabindContext context, String id) {
         if ("set".equals(id)) {
-            return TypeFactory.defaultInstance().constructCollectionType(OvsdbSet.class, Object.class);
+            return context.getTypeFactory().constructCollectionType(OvsdbSet.class, Object.class);
         } else if ("uuid".equals(id) || "named-uuid".equals(id)) {
-            return TypeFactory.defaultInstance().constructType(UUID.class);
+            return context.constructType(UUID.class);
         }
         return null;
     }

diff --git a/library/it/pom.xml b/library/it/pom.xml
index 7cad54f7f5732e6e74d44e82c0cd84e16dd5191f..e1e87dc952e27d018316adcedb6450bb4dcac703 100644 (file)
--- a/library/it/pom.xml
+++ b/library/it/pom.xml
@@ -65,7 +65,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar-plugins.java</groupId>
+      <groupId>org.sonarsource.java</groupId>
       <artifactId>sonar-jacoco-listeners</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/library/karaf/pom.xml b/library/karaf/pom.xml
index 8522a2c4f7d38c22b0ecb5a45f189c1aed0bfd57..67a88ad207a2e5fde1b98c95c0f4accd5ca933a7 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>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/library/pom.xml b/library/pom.xml
index a6951515363979d49cec228a4612ef29af1b6eaf..10a55b34c346ff82137ac7a3ccd40305accdb698 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>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index bafec35772e90b96151c4ef1e7b838639bb573b6..b2e7271d002a192d719c33fff67480212c1e0094 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/schemas/hardwarevtep/pom.xml b/schemas/hardwarevtep/pom.xml
index 791cf653b87818def6e0df1fd2411d6a42f3df3f..b68c59cffe69d5cf8a39780fb3fffdc40ea09575 100755 (executable)
--- a/schemas/hardwarevtep/pom.xml
+++ b/schemas/hardwarevtep/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/schemas/openvswitch/pom.xml b/schemas/openvswitch/pom.xml
index d8c91604abc6d08bd63f48f7c8c8616ef7d1f872..8736b6b095ccee18b2942cf1fa5972cee17d08d2 100755 (executable)
--- a/schemas/openvswitch/pom.xml
+++ b/schemas/openvswitch/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/schemas/pom.xml b/schemas/pom.xml
index aaac69ca3517c0300a7d7805bc5c90b208ecb280..91b086acf677d2bf45dc666f47612b03de58fec6 100644 (file)
--- a/schemas/pom.xml
+++ b/schemas/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/southbound/pom.xml b/southbound/pom.xml
index 6bed93cb98d9eb8fdea594942fc80b5cfce04cf7..5414db1b57735692ac0cfa089bbcb973f199b127 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>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/southbound/southbound-artifacts/pom.xml b/southbound/southbound-artifacts/pom.xml
index 34ef56e084bccc06ca5ee0c197888321c27c58e7..4d1ca8af394754c6d5cf36de43a9f32a38c13f5f 100644 (file)
--- a/southbound/southbound-artifacts/pom.xml
+++ b/southbound/southbound-artifacts/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/southbound/southbound-features/features/pom.xml b/southbound/southbound-features/features/pom.xml
index f0f57b7afccef4f90afce3b82f8380b4b8a15076..f560fcec4261b8872f5588fcd02478d9dbc7715b 100644 (file)
--- a/southbound/southbound-features/features/pom.xml
+++ b/southbound/southbound-features/features/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</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 c15126d86232b6d987bf60efe4c57cb98eb6deae..4f3da9aa78413cb2b35e2742b29ea8a995f502e8 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-api/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

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 cc1f41468e4255b1b1c6bef96489168d19cba0e5..a50f31d1319dfa8d55ace9db369755aec0bafcd1 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-impl-rest/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</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 b33ef76f66264f75af88420fedf38e02b548c78b..aa5c00df5c8fe90eabf2cf14d7b63676fe31aa7a 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-impl-ui/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</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 bebb166775d659fed84e50ff9dc428ea0f4bf7c0..b1460957d8a69eafdaadf556d299aa7059f8a39c 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</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 71e669323fa00c33f0cefe56b8914869b15df9d2..08e8a99372345eb13cdf31905e5239c9dcb90dba 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-test/pom.xml
@@ -14,7 +14,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>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-features/pom.xml b/southbound/southbound-features/pom.xml
index 46e964209e29ba525d36c7b5a92a90526ebd6082..2f8fb6e07535f4efbc5f8e0db91195d57b0b2cb0 100644 (file)
--- a/southbound/southbound-features/pom.xml
+++ b/southbound/southbound-features/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>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml
index 3f4665fa61d87e44d4b1a639ce398d22930c31df..32d53ce02f3466eb0ed85c7132c331133cf185ef 100644 (file)
--- a/southbound/southbound-impl/pom.xml
+++ b/southbound/southbound-impl/pom.xml
@@ -75,7 +75,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
     <!-- external dependencies -->
     <dependency>
-      <groupId>org.codehaus.sonar-plugins.java</groupId>
+      <groupId>org.sonarsource.java</groupId>
       <artifactId>sonar-jacoco-listeners</artifactId>
       <version>${sonar-jacoco-listeners.version}</version>
       <scope>test</scope>

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java
index 8186b46ce9d9aae11bad72930b99e709a1e27ca8..6e4d456dbf7250b0e2044b9eed0eec88558840cc 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodec.java
@@ -10,6 +10,7 @@ package org.opendaylight.ovsdb.southbound;
 
 import java.net.URI;
 
+import java.util.Optional;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
@@ -45,13 +46,12 @@ public class InstanceIdentifierCodec extends AbstractModuleStringInstanceIdentif
 
     @Override
     protected Module moduleForPrefix(final String prefix) {
-        return context.findModuleByName(prefix, null);
+        return context.findModule(prefix, Optional.empty()).orElse(null);
     }
 
     @Override
     protected String prefixForNamespace(final URI namespace) {
-        final Module module = context.findModuleByNamespaceAndRevision(namespace, null);
-        return module == null ? null : module.getName();
+        return context.findModule(namespace, Optional.empty()).map(Module::getName).orElse(null);
     }
 
     @Override

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationManager.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationManager.java
index 4b99c549169d1eb6d449d63640a893111236b95b..7b42925555770afeaf1617e1fa18b0f269b038ce 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationManager.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationManager.java
@@ -95,7 +95,7 @@ public class ReconciliationManager implements AutoCloseable {
         this.db = db;
         this.instanceIdentifierCodec = instanceIdentifierCodec;
         reconcilers = SpecialExecutors.newBoundedCachedThreadPool(NO_OF_RECONCILER, RECON_TASK_QUEUE_SIZE,
-                "ovsdb-reconciler");
+                "ovsdb-reconciler", getClass());
 
         ThreadFactory threadFact = new ThreadFactoryBuilder()
                 .setNameFormat("ovsdb-recon-task-triager-%d").build();

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodecTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodecTest.java
index 3539daed1650e5c50156cc39f8ffd474f1c8631e..f24946e3ecddc304e8dc41f30224910ad9d2e3ae 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodecTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/InstanceIdentifierCodecTest.java
@@ -18,7 +18,7 @@ import static org.powermock.api.support.membermodification.MemberMatcher.field;
 
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.util.Date;
+import java.util.Optional;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -75,7 +75,7 @@ public class InstanceIdentifierCodecTest {
     @Test
     public void testModuleForPrefix() {
         Module module = mock(Module.class);
-        when(context.findModuleByName(anyString(), any(Date.class))).thenReturn(module);
+        when(context.findModule(anyString(), any(Optional.class))).thenReturn(Optional.of(module));
         assertEquals("Error, did not return correct Module object", module, instanceIdCodec.moduleForPrefix(""));
     }
 
@@ -83,8 +83,8 @@ public class InstanceIdentifierCodecTest {
     public void testPrefixForNamespace() throws URISyntaxException {
         Module module = mock(Module.class);
         URI namespace = new URI("");
-        when(context.findModuleByNamespaceAndRevision(any(URI.class), any(Date.class))).thenReturn(null)
-                .thenReturn(module);
+        when(context.findModule(any(URI.class), any(Optional.class))).thenReturn(Optional.empty()).thenReturn(
+                Optional.of(module));
         when(module.getName()).thenReturn("");
         assertEquals("Error, null should have been returned", null, instanceIdCodec.prefixForNamespace(namespace));
         assertEquals("Error, did not return the correct module name", anyString(),

diff --git a/southbound/southbound-it/pom.xml b/southbound/southbound-it/pom.xml
index ab01b6325b5605a01c8fa1f8b63346b891a66515..4c1c56e1a9140fea0e6bd6aaf6da4d75379187cf 100644 (file)
--- a/southbound/southbound-it/pom.xml
+++ b/southbound/southbound-it/pom.xml
@@ -114,7 +114,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.sonar-plugins.java</groupId>
+      <groupId>org.sonarsource.java</groupId>
       <artifactId>sonar-jacoco-listeners</artifactId>
       <scope>test</scope>
     </dependency>

diff --git a/southbound/southbound-karaf/pom.xml b/southbound/southbound-karaf/pom.xml
index 2bf7b3fffd71404064b0829565a041a54c6f58e7..630a501daf5d079f4da6365a24e29c33e978067e 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>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/utils/pom.xml b/utils/pom.xml
index 1a21e915ac2ade5f189ee68d8d60a54927afff27..bcadcf8a91c8b9cffeb142eab9136a2d28eed53a 100644 (file)
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/utils/yang-utils/pom.xml b/utils/yang-utils/pom.xml
index 482d65b447771a935d22f58f15e8cc511fc6d033..0cfd879ce01b729b661c6b98f3e004ca95214fb1 100644 (file)
--- a/utils/yang-utils/pom.xml
+++ b/utils/yang-utils/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>bundle-parent</artifactId>
-    <version>2.0.5</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>