Integrate controller-2.0.1

This bumps versions to the following:
- odlparent-7.0.2
- yangtools-5.0.2
- mdsal-6.0.1
- controller-2.0.1

Also fix up MD-SAL API migration.

JIRA: NETVIRT-1630
Change-Id: I46f20bbb6e46ee3e1dd18f9abcc5a279d8ccd917
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aclservice/api/pom.xml b/aclservice/api/pom.xml
index 6a7b3e9de957d87f29fd92d364a70279cc0abc06..304dbc21f0453520664371f871f5c3969482df81 100644 (file)
--- a/aclservice/api/pom.xml
+++ b/aclservice/api/pom.xml
@@ -22,10 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <modelVersion>4.0.0</modelVersion>
 
     <dependencies>
-        <!--dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-access-control-list</artifactId>
-        </dependency-->
         <dependency>
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc7223</artifactId>
@@ -34,10 +30,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991</artifactId>
         </dependency>
-        <!--dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>yang-ext</artifactId>
-        </dependency-->
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>mdsalutil-api</artifactId>

diff --git a/aclservice/impl/pom.xml b/aclservice/impl/pom.xml
index 0e9fe27f0ca7db9ea00fede48e3b2bd6d9432a4d..7ef96ee6eef12d58d0d3161ddeb564cd4d04181c 100644 (file)
--- a/aclservice/impl/pom.xml
+++ b/aclservice/impl/pom.xml
@@ -31,10 +31,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>aclservice-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>mdsalutil-api</artifactId>
@@ -124,16 +120,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>testutils</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-test-utils</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.immutables</groupId>

diff --git a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestModule.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestModule.java
index 4a2ad11c6fa05bda92623462e38e49d7b2dbb90c..f4a3c96abe290a155802a7f179dabd28f2f44bdd 100644 (file)
--- a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestModule.java
+++ b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestModule.java
@@ -12,18 +12,14 @@ import static org.opendaylight.yangtools.testutils.mockito.MoreAnswers.realOrExc
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
 import com.google.inject.AbstractModule;
-import java.util.concurrent.Executors;
 import org.mockito.Mockito;
 import org.opendaylight.genius.datastoreutils.testutils.JobCoordinatorEventsWaiter;
 import org.opendaylight.genius.datastoreutils.testutils.TestableJobCoordinatorEventsWaiter;
 import org.opendaylight.genius.mdsalutil.interfaces.IMdsalApiManager;
 import org.opendaylight.genius.mdsalutil.interfaces.testutils.TestIMdsalApiManager;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractBaseDataBrokerTest;
-import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer;
+import org.opendaylight.mdsal.binding.testutils.DataBrokerTestModule;
 import org.opendaylight.netvirt.aclservice.AclInterfaceCacheImpl;
 import org.opendaylight.netvirt.aclservice.api.AclInterfaceCache;
 import org.opendaylight.netvirt.aclservice.stats.TestOdlDirectStatisticsService;
@@ -66,26 +62,9 @@ public class AclServiceTestModule extends AbstractModule {
         this.securityGroupMode = securityGroupMode;
     }
 
-    @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     protected void configure() {
-        AbstractBaseDataBrokerTest test = new AbstractBaseDataBrokerTest() {
-            @Override
-            protected AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() {
-                return new AbstractDataBrokerTestCustomizer() {
-                    @Override
-                    public ListeningExecutorService getCommitCoordinatorExecutor() {
-                        return MoreExecutors.listeningDecorator(Executors.newCachedThreadPool());
-                    }
-                };
-            }
-        };
-        try {
-            test.setup();
-        } catch (Exception e) {
-            LOG.trace("Exception", e.getMessage());
-        }
-        bind(DataBroker.class).toInstance(test.getDataBroker());
+        bind(DataBroker.class).toInstance(DataBrokerTestModule.dataBroker());
         bind(AclserviceConfig.class).toInstance(aclServiceConfig());
         bind(AclDataUtil.class).toInstance(aclDataUtil());
         bind(AclClusterUtil.class).toInstance(() -> true);
@@ -110,7 +89,7 @@ public class AclServiceTestModule extends AbstractModule {
         return aclServiceConfig;
     }
 
-    private AclDataUtil aclDataUtil() {
+    private static AclDataUtil aclDataUtil() {
         AclDataUtil aclDataUtil = new AclDataUtil();
         aclDataUtil.addAclTag("85cc3048-abc3-43cc-89b3-377341426ac5", 2);
         aclDataUtil.addAclTag("85cc3048-abc3-43cc-89b3-377341426ac8", 4);

diff --git a/aclservice/pom.xml b/aclservice/pom.xml
index 196be938299d37d53c6d7b96d7757b05c9d5a56d..c3e270ae9f9ec0673941223034f6f7b091304c18 100644 (file)
--- a/aclservice/pom.xml
+++ b/aclservice/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/alarm/pom.xml b/alarm/pom.xml
index a0266f4265a9df71da36ea74d45e691eceb92acf..ed7d4953f20367482d7424c6ca5cfd25fbe56bda 100644 (file)
--- a/alarm/pom.xml
+++ b/alarm/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index cd65671ea2612120388fa34e9fec9cae76cdcab6..9b2f8dc5cc0e8183f6661b7a95be0fe46195b82a 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/bgpmanager/impl/pom.xml b/bgpmanager/impl/pom.xml
index 3860347a61a94092e2a4dbc0c202b895e1be615d..5e5bc23eedcb58828bd95c0c2b5bb06b9667c9df 100644 (file)
--- a/bgpmanager/impl/pom.xml
+++ b/bgpmanager/impl/pom.xml
@@ -69,13 +69,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-test-utils</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>

diff --git a/bgpmanager/pom.xml b/bgpmanager/pom.xml
index b11709b7dd4026bc50ec9c32401dce05729f9b32..c91b6a34a971346980ab00160369b636dff498d5 100644 (file)
--- a/bgpmanager/pom.xml
+++ b/bgpmanager/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/cache/pom.xml b/cache/pom.xml
index feba8fbc4eb729880a06ac59a8e6aa393846c688..c1526929b66caccf0762b550340172c7f503b1b4 100644 (file)
--- a/cache/pom.xml
+++ b/cache/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/cloud-servicechain/impl/pom.xml b/cloud-servicechain/impl/pom.xml
index a7e3c4b1518574bcb94502a51d9c4815166ae7a0..911e8b2afce70c0c5ddf76cba63afeedff60f67e 100644 (file)
--- a/cloud-servicechain/impl/pom.xml
+++ b/cloud-servicechain/impl/pom.xml
@@ -30,10 +30,6 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>interfacemanager-api</artifactId>

diff --git a/cloud-servicechain/pom.xml b/cloud-servicechain/pom.xml
index 3268a07ce46bea1a5aa1ab4e1dcb739545e0adcc..7ed4f14ef753aca9d4ee125547190113fac85d36 100644 (file)
--- a/cloud-servicechain/pom.xml
+++ b/cloud-servicechain/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index 508f2af7635d456ab5185d7a4efcf42355406c6b..61054ff3c60f61b4a85f176cde14f64d424e2904 100644 (file)
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <relativePath/>
   </parent>
 
@@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <packaging>pom</packaging>
 
   <properties>
-    <controller.mdsal.version>2.0.0</controller.mdsal.version>
+    <controller.mdsal.version>2.0.1</controller.mdsal.version>
     <genius.version>0.9.0-SNAPSHOT</genius.version>
     <infrautils.version>1.8.0-SNAPSHOT</infrautils.version>
     <model.bgp.version>2013.07.15.17.0-SNAPSHOT</model.bgp.version>

diff --git a/commons/checkstyle/pom.xml b/commons/checkstyle/pom.xml
index 2d3862d1d6b768b4126886417f43e0b3662ae7f8..4c8f41fda6450fa2d734d765be8a9ed90641aa9b 100644 (file)
--- a/commons/checkstyle/pom.xml
+++ b/commons/checkstyle/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/commons/pom.xml b/commons/pom.xml
index e10e5bb633ad64f260a5cf176490f55e53435df4..5946192268a289935fa32915022b8c4a27977f5e 100644 (file)
--- a/commons/pom.xml
+++ b/commons/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/dhcpservice/pom.xml b/dhcpservice/pom.xml
index 1d531d202b94d0eea958e34ced3436f32f66a454..37ad541f12238fae84341a61bac2e778cf5f15d5 100644 (file)
--- a/dhcpservice/pom.xml
+++ b/dhcpservice/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/elanmanager/impl/pom.xml b/elanmanager/impl/pom.xml
index eb5a6161703f340b717b6e0ab17977399f18f9a5..c4da9ad290005a62a90d9032bbba0fa55dc8c815 100644 (file)
--- a/elanmanager/impl/pom.xml
+++ b/elanmanager/impl/pom.xml
@@ -36,6 +36,10 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>elanmanager-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>interfacemanager-api</artifactId>
@@ -75,10 +79,6 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>neutronvpn-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-       <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
-       </dependency>
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
             <artifactId>hwvtepsouthbound-api</artifactId>
@@ -156,16 +156,9 @@ this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
             <version>${genius.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-test-utils</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>

diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java
index 9ce65d924ebc4536842fda6efe1f4a5c687f3e7c..6c2554f68550e885d46ad7553b21920d54cc1148 100644 (file)
--- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java
+++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java
@@ -10,10 +10,7 @@ package org.opendaylight.netvirt.elanmanager.tests;
 import static org.mockito.Mockito.CALLS_REAL_METHODS;
 import static org.mockito.Mockito.mock;
 
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
 import java.util.Optional;
-import java.util.concurrent.Executors;
 import org.mockito.Mockito;
 import org.opendaylight.daexim.DataImportBootReady;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
@@ -35,8 +32,7 @@ import org.opendaylight.infrautils.inject.guice.testutils.AbstractGuiceJsr250Mod
 import org.opendaylight.infrautils.metrics.MetricProvider;
 import org.opendaylight.infrautils.metrics.testimpl.TestMetricProviderImpl;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractBaseDataBrokerTest;
-import org.opendaylight.mdsal.binding.dom.adapter.test.AbstractDataBrokerTestCustomizer;
+import org.opendaylight.mdsal.binding.testutils.DataBrokerTestModule;
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState;
 import org.opendaylight.netvirt.bgpmanager.api.IBgpManager;
@@ -61,6 +57,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.lockmanager.rev16041
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.config.rev150710.ElanConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.config.rev150710.ElanConfigBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 
 /**
@@ -72,20 +69,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.Pa
 public class ElanServiceTestModule extends AbstractGuiceJsr250Module {
 
     @Override
-    protected void configureBindings() throws Exception {
-        AbstractBaseDataBrokerTest test = new AbstractBaseDataBrokerTest() {
-            @Override
-            protected AbstractDataBrokerTestCustomizer createDataBrokerTestCustomizer() {
-                return new AbstractDataBrokerTestCustomizer() {
-                    @Override
-                    public ListeningExecutorService getCommitCoordinatorExecutor() {
-                        return MoreExecutors.listeningDecorator(Executors.newCachedThreadPool());
-                    }
-                };
-            }
-        };
-        test.setup();
-        DataBroker dataBroker = test.getDataBroker();
+    protected void configureBindings() {
+        DataBroker dataBroker = DataBrokerTestModule.dataBroker();
         EntityOwnershipService mockedEntityOwnershipService = mock(EntityOwnershipService.class);
         EntityOwnershipState mockedEntityOwnershipState = EntityOwnershipState.IS_OWNER;
         Mockito.when(mockedEntityOwnershipService.getOwnershipState(Mockito.any()))
@@ -102,7 +87,7 @@ public class ElanServiceTestModule extends AbstractGuiceJsr250Module {
         // Bindings for external services to "real" implementations
         bind(LockManagerService.class).to(LockManagerServiceImpl.class);
         bind(ElanConfig.class).toInstance(new ElanConfigBuilder().setIntBridgeGenMac(true)
-                        .setTempSmacLearnTimeout(10).build());
+                        .setTempSmacLearnTimeout(Uint16.TEN).build());
         bind(MetricProvider.class).toInstance(new TestMetricProviderImpl());
 
         // Bindings of all listeners (which are not directly referenced in the code)

diff --git a/elanmanager/pom.xml b/elanmanager/pom.xml
index 09a1cf266422a505aef2fe436799c1c2d8aa94ac..2a0e45a7072b55578905708f6bbebc311eb39fb0 100644 (file)
--- a/elanmanager/pom.xml
+++ b/elanmanager/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/netvirt-features/pom.xml b/features/netvirt-features/pom.xml
index dbc98800f0c164f6098df9f606a3d647e8c180a7..4fb1470dbbdc3365106c67c39f94d5ffb759595c 100644 (file)
--- a/features/netvirt-features/pom.xml
+++ b/features/netvirt-features/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-netvirt-api/pom.xml b/features/odl-netvirt-api/pom.xml
index 2e781b4585d413185eb9595df8ec9b46a6593373..f3cf1458026685ba35979aec609385280a6f9e1e 100644 (file)
--- a/features/odl-netvirt-api/pom.xml
+++ b/features/odl-netvirt-api/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
@@ -27,14 +27,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.0</version>
+                <version>6.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features/odl-netvirt-impl/pom.xml b/features/odl-netvirt-impl/pom.xml
index 2eadadc0d045166b6ace60a4eb69baf4fbc0f006..ba4ecb254a040bf9888cc0795abfd359ca9c77ca 100644 (file)
--- a/features/odl-netvirt-impl/pom.xml
+++ b/features/odl-netvirt-impl/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-netvirt-openstack/pom.xml b/features/odl-netvirt-openstack/pom.xml
index f1d36ad042a8580d34709d97d7310af9889a82b5..9ef25ae6e6cc29b71e3a7d4a45cb182055add608 100644 (file)
--- a/features/odl-netvirt-openstack/pom.xml
+++ b/features/odl-netvirt-openstack/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index 02f2f3113acccca3cd49d4437bc04cb7c22dd6ec..f291826958e58c189becdb335363d4444781b72c 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/fibmanager/pom.xml b/fibmanager/pom.xml
index ee25634420188656087ece7c4c6cf7558999de4d..d7c90f9f67de71c3f394b83ef278eb4b5390b5bf 100644 (file)
--- a/fibmanager/pom.xml
+++ b/fibmanager/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/ipv6service/pom.xml b/ipv6service/pom.xml
index 37bad2794028bf4f452de6190efeafeedb66cb71..5d28d5a3d4ab8077035913c5c778d3c79435dea8 100644 (file)
--- a/ipv6service/pom.xml
+++ b/ipv6service/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index b6e338f8225e3a70e4cb2f504f808a0577d50b00..adaba1236e2819218573bb64b9aad97c66239c1f 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/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>karaf4-parent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/natservice/impl/pom.xml b/natservice/impl/pom.xml
index eed942335e40a3559d6308fc44141eb36aa06731..b27b4090b777773dcc8d937eddaa318149d618f8 100644 (file)
--- a/natservice/impl/pom.xml
+++ b/natservice/impl/pom.xml
@@ -40,10 +40,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.karaf.shell</groupId>
             <artifactId>org.apache.karaf.shell.commands</artifactId>

diff --git a/natservice/pom.xml b/natservice/pom.xml
index ce593c7249e1064860aaf9151b1d90e32a700c61..c370596a867cc59475dab01f6565d4dc30785c83 100644 (file)
--- a/natservice/pom.xml
+++ b/natservice/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/neutronvpn/api/pom.xml b/neutronvpn/api/pom.xml
index ae98ea33c2c3577e4581b2123da4094915120bb7..59a26b7aaf0f22a0fb2aa313165daeed4c23c74a 100644 (file)
--- a/neutronvpn/api/pom.xml
+++ b/neutronvpn/api/pom.xml
@@ -44,10 +44,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.genius</groupId>
-            <artifactId>mdsalutil-api</artifactId>
-            <version>0.9.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 </project>

diff --git a/neutronvpn/pom.xml b/neutronvpn/pom.xml
index acc89c5c980e0159e25560338238c54b9c96a15f..805bb988cc410f5b1a55d411abe93d7979d74d7f 100644 (file)
--- a/neutronvpn/pom.xml
+++ b/neutronvpn/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/policyservice/pom.xml b/policyservice/pom.xml
index 45f03e9db45112b67964f67da9f9346b12ab54a0..d34ff08a205ce1535c7fa915bb1af54fd671df32 100644 (file)
--- a/policyservice/pom.xml
+++ b/policyservice/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 9cb765b319c3ec800aac879ea89e1f6475a26ba1..3046c4534d940a20759b2bb172044b440138fa28 100644 (file)
--- a/pom.xml
+++ b/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/qosservice/pom.xml b/qosservice/pom.xml
index 5911ca37d3afc6022b4a7ff675cb1a2cc72f3c69..0cb1d31afac8263fede2625bdbc7add81744c68d 100644 (file)
--- a/qosservice/pom.xml
+++ b/qosservice/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/statemanager/pom.xml b/statemanager/pom.xml
index 0fcc8c3c3b1c740c00664b60cf9a5d480393d79d..509ca05d0ef9ed3ebe3840d8f673033235d0806b 100644 (file)
--- a/statemanager/pom.xml
+++ b/statemanager/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/statistics/pom.xml b/statistics/pom.xml
index 70b1e8179cd8f09bc4f7bbe7c0370978e8b710e1..c66610f109ccd37741446b91ded7fb7e8e584c30 100644 (file)
--- a/statistics/pom.xml
+++ b/statistics/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/vpnmanager/impl/pom.xml b/vpnmanager/impl/pom.xml
index 69b158a580a59ef6472302333247e6284fa26173..84983942ba69d06375f8e96ab01042d7f3680e33 100644 (file)
--- a/vpnmanager/impl/pom.xml
+++ b/vpnmanager/impl/pom.xml
@@ -103,16 +103,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </dependency>
 
         <!-- Testing dependencies -->
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-binding-dom-adapter</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-test-utils</artifactId>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 

diff --git a/vpnmanager/pom.xml b/vpnmanager/pom.xml
index ee7502295c1617eed2061cdb4cc2e82a312a7f3d..1e4d5a1e628e3b0e6f873e15b34994da6b5af81e 100644 (file)
--- a/vpnmanager/pom.xml
+++ b/vpnmanager/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.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>