Migrated to odlparent 4.0.2 and mdsal 3.0.2

    Required some fixes to unit tests for disappearing parents on delete
    and stricter constraint checking of parent-node-edge-point

Change-Id: I668519860728a749479cedc983d8cc8e3d1d8e8b
Signed-off-by: Donald Hunter <donaldh@cisco.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 490a75f5a90564d56530461e6045db0ad10c3906..abc3c3e05bdc66ef46b731399c0027e9763e1d53 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -6,14 +6,14 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/cisco-xr-driver/pom.xml b/cisco-xr-driver/pom.xml
index 47a96f310e32eaae3af29edb0948f0ef97f1ae32..9e4bf451b6360e9fb9231669fdd06e03f4e04cda 100644 (file)
--- a/cisco-xr-driver/pom.xml
+++ b/cisco-xr-driver/pom.xml
@@ -6,19 +6,20 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.2 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>0.14.0-SNAPSHOT</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 
     <properties>
         <powermock.version>2.0.0-beta.5</powermock.version>
-        <mdsal.version>2.6.0-SNAPSHOT</mdsal.version>
+        <mdsal.version>3.0.2</mdsal.version>
+        <netconf.version>1.6.0-SNAPSHOT</netconf.version>
     </properties>
 
     <modelVersion>4.0.0</modelVersion>
@@ -78,6 +79,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
             <artifactId>mdsal-binding-dom-adapter</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-topology</artifactId>
+            <version>${netconf.version}</version>
+        </dependency>
 
         <!-- Testing Dependencies -->
         <dependency>
@@ -123,10 +129,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
             <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
-            <version>2013.07.15.14.0-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+        <artifactId>rfc6991</artifactId>
+    </dependency>
     </dependencies>
 </project>

diff --git a/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/TopologyDataHandler.java b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/TopologyDataHandler.java
index a27ab8f6a5a96f66e5a44cd3a3e69e36655ec95a..f60c4915b9ecdcd6631af441a514a357bc9b7790 100644 (file)
--- a/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/TopologyDataHandler.java
+++ b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/TopologyDataHandler.java
@@ -246,7 +246,7 @@ public class TopologyDataHandler implements DataTreeChangeListener<Node> {
             final NodeKey key = cn.key();
             try {
                 KeyedInstanceIdentifier<Node, NodeKey> id = mountIds.get(key);
-                Optional<MountPoint> mountPoint = mountService.getMountPoint(id).toJavaUtil();
+                Optional<MountPoint> mountPoint = mountService.getMountPoint(id);
                 if (mountPoint.isPresent()) {
                     DataBroker deviceBroker = mountPoint.get().getService(DataBroker.class).get();
                     LOG.debug(deviceBroker.toString());

diff --git a/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/AbstractL2vpnActivator.java b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/AbstractL2vpnActivator.java
index bab741a949ab8699574fd1947137a80dd57d438e..4d87b62d7dd6342e664328b6c99a3d947246169a 100644 (file)
--- a/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/AbstractL2vpnActivator.java
+++ b/cisco-xr-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/AbstractL2vpnActivator.java
@@ -192,7 +192,7 @@ public abstract class AbstractL2vpnActivator implements ResourceActivator {
                 .child(Node.class, new NodeKey(nodeId))
                 .build();
 
-        final Optional<MountPoint> nodeOptional = mountService.getMountPoint(nodeInstanceId).toJavaUtil();
+        final Optional<MountPoint> nodeOptional = mountService.getMountPoint(nodeInstanceId);
 
         if (!nodeOptional.isPresent()) {
             return Optional.empty();

diff --git a/cisco-xr-driver/src/main/resources/org/opendaylight/blueprint/cisco-xr-driver.xml b/cisco-xr-driver/src/main/resources/OSGI-INF/blueprint/cisco-xr-driver.xml
similarity index 100%
rename from cisco-xr-driver/src/main/resources/org/opendaylight/blueprint/cisco-xr-driver.xml
rename to cisco-xr-driver/src/main/resources/OSGI-INF/blueprint/cisco-xr-driver.xml

diff --git a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java
index ddd68c144578461695db97d84cadffe1dc7b5d6a..265a4724b7274dfba1a0ad6ddcb86a1b670a1d93 100644 (file)
--- a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java
+++ b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnLocalConnectionActivatorTest.java
@@ -57,9 +57,9 @@ public class L2vpnLocalConnectionActivatorTest extends AbstractConcurrentDataBro
     public void setUp() {
         //given
         MountPoint mp = Mockito.mock(MountPoint.class);
-        Mockito.when(mp.getService(DataBroker.class)).thenReturn(com.google.common.base.Optional.of(getDataBroker()));
+        Mockito.when(mp.getService(DataBroker.class)).thenReturn(Optional.of(getDataBroker()));
         mountService = Mockito.mock(MountPointService.class);
-        Mockito.when(mountService.getMountPoint(Mockito.any())).thenReturn(com.google.common.base.Optional.of(mp));
+        Mockito.when(mountService.getMountPoint(Mockito.any())).thenReturn(Optional.of(mp));
 
         l2VpnLocalConnectActivator = new L2vpnLocalConnectActivator(getDataBroker(),mountService);
 

diff --git a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java
index 9c311a365811e1fe2c35229d3af5149c06c6c1c1..353c403ace9a20b4c88ac0be0eea4bfeb53df39d 100644 (file)
--- a/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java
+++ b/cisco-xr-driver/src/test/java/org/opendaylight/unimgr/mef/nrp/cisco/xr/l2vpn/activator/L2vpnP2pConnectionActivatorTest.java
@@ -57,9 +57,9 @@ public class L2vpnP2pConnectionActivatorTest extends AbstractConcurrentDataBroke
         //given
         //given
         MountPoint mp = Mockito.mock(MountPoint.class);
-        Mockito.when(mp.getService(DataBroker.class)).thenReturn(com.google.common.base.Optional.of(getDataBroker()));
+        Mockito.when(mp.getService(DataBroker.class)).thenReturn(Optional.of(getDataBroker()));
         mountService = Mockito.mock(MountPointService.class);
-        Mockito.when(mountService.getMountPoint(Mockito.any())).thenReturn(com.google.common.base.Optional.of(mp));
+        Mockito.when(mountService.getMountPoint(Mockito.any())).thenReturn(Optional.of(mp));
         l2VpnP2PConnectActivator = new L2vpnP2pConnectActivator(getDataBroker(), mountService);
 
         mtu = Long.valueOf(1500);

diff --git a/cisco-xrmodels/pom.xml b/cisco-xrmodels/pom.xml
index 405dad1ee1d048b2277be7c1e30a06b860ba28fe..c1dbd57c9c3a5a358c798485bb90d5c47f5d12df 100644 (file)
--- a/cisco-xrmodels/pom.xml
+++ b/cisco-xrmodels/pom.xml
@@ -6,12 +6,12 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.2 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
+    <version>3.0.2</version>
     <relativePath />
   </parent>
 
@@ -26,12 +26,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-inet-types-2013-07-15</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>ietf-yang-types-20130715</artifactId>
+        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+        <artifactId>rfc6991</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/features/features4-unimgr/pom.xml b/features/features4-unimgr/pom.xml
index f95c62318353558d9721c7efcc1047e83d75c0c5..bba5ce1d697eb416d04fe64594cf5e13c47cbefc 100644 (file)
--- a/features/features4-unimgr/pom.xml
+++ b/features/features4-unimgr/pom.xml
@@ -6,13 +6,13 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-unimgr-cisco-xr-driver/pom.xml b/features/odl-unimgr-cisco-xr-driver/pom.xml
index f80f92caabcbd0c798178b0ac4a47ecaccea916b..a5aa1e4bfd26df3dfa1315ecfd11f0758026c951 100644 (file)
--- a/features/odl-unimgr-cisco-xr-driver/pom.xml
+++ b/features/odl-unimgr-cisco-xr-driver/pom.xml
@@ -3,11 +3,11 @@
   This program and the accompanying materials are made available under the 
   terms of the Eclipse Public License v1.0 which accompanies this distribution, 
   and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.unimgr</groupId>
@@ -44,11 +44,12 @@
     <!-- netconf dependencies -->
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>odl-netconf-connector</artifactId>
+      <artifactId>odl-netconf-topology</artifactId>
       <version>${netconf.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
+    <!-- 
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>odl-netconf-connector-ssh</artifactId>
@@ -63,7 +64,7 @@
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-
+ -->
   </dependencies>
   <build>
     <plugins>

diff --git a/features/odl-unimgr-legato-api/pom.xml b/features/odl-unimgr-legato-api/pom.xml
index 770c392eb9902569ef5a06e22694a88bf6042372..abe8cb6eca512a75e935e5b31d7e26724f22ad3a 100755 (executable)
--- a/features/odl-unimgr-legato-api/pom.xml
+++ b/features/odl-unimgr-legato-api/pom.xml
@@ -7,12 +7,12 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
   
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.2 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath />
     </parent>
     <groupId>org.opendaylight.unimgr</groupId>
@@ -22,7 +22,7 @@
     <name>ODL :: unimgr :: ${project.artifactId}</name>
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <mdsal.model.version>0.14.0-SNAPSHOT</mdsal.model.version>
+        <mdsal.model.version>3.0.2</mdsal.model.version>
     </properties>
 
     <dependencies>

diff --git a/features/odl-unimgr-ovs-driver/pom.xml b/features/odl-unimgr-ovs-driver/pom.xml
index 420f5972f1c1848c8f0732e7a78aa7429db51f3b..07ef54ce0e158775b54298d3d363a2ffb1e35e22 100644 (file)
--- a/features/odl-unimgr-ovs-driver/pom.xml
+++ b/features/odl-unimgr-ovs-driver/pom.xml
@@ -3,11 +3,11 @@
   This program and the accompanying materials are made available under the 
   terms of the Eclipse Public License v1.0 which accompanies this distribution, 
   and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.unimgr</groupId>
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <properties>
-    <mdsal.version>2.6.0-SNAPSHOT</mdsal.version>
+    <mdsal.version>3.0.2</mdsal.version>
     <restconf.version>1.9.0-SNAPSHOT</restconf.version>
     <ovsdb.version>1.8.0-SNAPSHOT</ovsdb.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>

diff --git a/features/odl-unimgr-rest/pom.xml b/features/odl-unimgr-rest/pom.xml
index a768e4789fe17f870e4f1fdb0297f94d639ab3e6..859521488e0166b16c767882331d8cfd76da3739 100644 (file)
--- a/features/odl-unimgr-rest/pom.xml
+++ b/features/odl-unimgr-rest/pom.xml
@@ -3,11 +3,11 @@
   This program and the accompanying materials are made available under the 
   terms of the Eclipse Public License v1.0 which accompanies this distribution, 
   and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.unimgr</groupId>

diff --git a/features/odl-unimgr-template-driver/pom.xml b/features/odl-unimgr-template-driver/pom.xml
index 2c419bd3870fa078f7785debb167ffb62e1cf7d2..6ab600662d76ec609bff30bbf405e4818eab1926 100644 (file)
--- a/features/odl-unimgr-template-driver/pom.xml
+++ b/features/odl-unimgr-template-driver/pom.xml
@@ -3,11 +3,11 @@
   This program and the accompanying materials are made available under the 
   terms of the Eclipse Public License v1.0 which accompanies this distribution, 
   and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.unimgr</groupId>

diff --git a/features/odl-unimgr/pom.xml b/features/odl-unimgr/pom.xml
index 9345f5c1cb1a8efec774be717071fdb1f7f3ddaf..c70170bb56d872c17c262740e6bd5476a70df0b6 100644 (file)
--- a/features/odl-unimgr/pom.xml
+++ b/features/odl-unimgr/pom.xml
@@ -3,11 +3,11 @@
   This program and the accompanying materials are made available under the 
   terms of the Eclipse Public License v1.0 which accompanies this distribution, 
   and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.unimgr</groupId>
@@ -36,16 +36,25 @@
     </plugins>
   </build>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${controller.mdsal.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
   <dependencies>
-  <!-- 
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>odl-mdsal-broker</artifactId>
-      <version>${controller.mdsal.version}</version>
       <type>xml</type>
       <classifier>features</classifier>
     </dependency>
-     -->
     <dependency>
       <groupId>org.opendaylight.unimgr</groupId>
       <artifactId>unimgr-impl</artifactId>

diff --git a/features/pom.xml b/features/pom.xml
index ef8fcae91907d639237180e379fcc14f26922407..34c08dec570b1ee1d8d0ae756eacf93bbcce478e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -3,11 +3,11 @@
   This program and the accompanying materials are made available under the
   terms of the Eclipse Public License v1.0 which accompanies this distribution,
   and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.unimgr</groupId>

diff --git a/impl/pom.xml b/impl/pom.xml
index 575d4456181c728ec635f3d250aade830751c62e..059ad75aeeb8dc313096c3b4a87e8365930853b4 100644 (file)
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -6,19 +6,19 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.2 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>0.14.0-SNAPSHOT</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 
     <properties>
         <ovsdb.version>1.8.0-SNAPSHOT</ovsdb.version>
-        <mdsal.version>2.6.0-SNAPSHOT</mdsal.version>
+        <mdsal.version>3.0.2</mdsal.version>
         <netconf.version>1.6.0-SNAPSHOT</netconf.version>
         <powermock.version>2.0.0-beta.5</powermock.version>
     </properties>
@@ -31,6 +31,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <!-- <name> formatting is used by autorelse to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: unimgr :: ${project.artifactId}</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.9.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.powermock</groupId>
+                <artifactId>powermock-api-mockito2</artifactId>
+                <version>${powermock.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>2.10.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>
@@ -78,9 +101,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>netconf-topology</artifactId>
-            <version>${netconf.version}</version>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>ietf-topology</artifactId>
         </dependency>
 
         <!-- dependencies to use AbstractConcurrentDataBrokerTest -->
@@ -94,7 +116,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-adapter</artifactId>
-            <scope>test</scope>
         </dependency>
 
         <!-- dependecies of decomposer -->
@@ -140,11 +161,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
             <version>${powermock.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
-            <version>2013.07.15.14.0-SNAPSHOT</version>
-        </dependency>
+    <dependency>
+        <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+        <artifactId>rfc6991</artifactId>
+    </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
@@ -154,18 +174,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
             <artifactId>logback-classic</artifactId>
         </dependency>
     </dependencies>
-    <dependencyManagement>
-       <dependencies>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-api-mockito2</artifactId>
-                       <version>${powermock.version}</version>
-               </dependency>
-            <dependency>
-                <groupId>org.mockito</groupId>
-                <artifactId>mockito-core</artifactId>
-                <version>2.10.0</version>
-            </dependency>
-       </dependencies>
-    </dependencyManagement>
 </project>

diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/NrpDao.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/NrpDao.java
index 66775f0d2a9fa3591104976ca4f2b282908a8c8c..bea12af6309d5584dbad20c0ac16e259162aa716 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/NrpDao.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/common/NrpDao.java
@@ -16,6 +16,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
+import org.opendaylight.mdsal.binding.api.ReadOperations;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
@@ -76,7 +77,7 @@ public class NrpDao  {
             .tapi.connectivity.rev180307.Context1.class);
 
     private final ReadWriteTransaction tx;
-    private final ReadTransaction rtx;
+    private final ReadOperations rtx;
 
     public NrpDao(ReadWriteTransaction tx) {
         if (tx == null) {

diff --git a/impl/src/main/resources/org/opendaylight/blueprint/unimgr.xml b/impl/src/main/resources/OSGI-INF/blueprint/unimgr.xml
similarity index 100%
rename from impl/src/main/resources/org/opendaylight/blueprint/unimgr.xml
rename to impl/src/main/resources/OSGI-INF/blueprint/unimgr.xml

diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/NrpDaoIntTest.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/NrpDaoIntTest.java
index 477689b0cdb20dee8cbcf32e34207ad1647889ed..a5b8daad73d7646f0ebecf88734c90a4de219151 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/NrpDaoIntTest.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/NrpDaoIntTest.java
@@ -28,6 +28,8 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev180307.Uuid
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev180307.OwnedNodeEdgePoint1;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev180307.cep.list.ConnectionEndPoint;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev180307.cep.list.ConnectionEndPointBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev180307.connection.end.point.ParentNodeEdgePoint;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev180307.connection.end.point.ParentNodeEdgePointBuilder;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.connectivity.rev180307.connectivity.context.Connection;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.OwnedNodeEdgePointRef;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.link.NodeEdgePointBuilder;
@@ -38,15 +40,25 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev180307.to
 public class NrpDaoIntTest extends AbstractTestWithTopo {
 
     private String uuid1 = "uuid1";
+    private Uuid topologyId = new Uuid(TapiConstants.PRESTO_SYSTEM_TOPO);
 
     private OwnedNodeEdgePointRef toRef(String nodeId, String nepId) {
         return new NodeEdgePointBuilder()
-                .setTopologyId(new Uuid(TapiConstants.PRESTO_SYSTEM_TOPO))
+                .setTopologyId(topologyId)
                 .setNodeId(new Uuid(nodeId))
                 .setOwnedNodeEdgePointId(new Uuid(nepId))
                 .build();
     }
 
+    private ParentNodeEdgePoint parentNep(String nodeId, String nepId) {
+        ParentNodeEdgePoint parentNep = new ParentNodeEdgePointBuilder()
+                       .setTopologyId(topologyId)
+                       .setNodeId(new Uuid(nodeId))
+                       .setOwnedNodeEdgePointId(new Uuid(nepId))
+                       .build();
+        return parentNep;
+    }
+    
     @Test
     public void testAddCeps()
             throws ReadFailedException, InterruptedException, ExecutionException {
@@ -57,12 +69,12 @@ public class NrpDaoIntTest extends AbstractTestWithTopo {
         NrpDao nrpDao = new NrpDao(tx);
         OwnedNodeEdgePointRef nepRef = toRef(uuid1, uuid1 + ":1");
 
-
         ConnectionEndPointBuilder builder = new ConnectionEndPointBuilder()
                 .setConnectionPortDirection(PortDirection.BIDIRECTIONAL)
                 .setLayerProtocolName(LayerProtocolName.ETH)
                 .setClientNodeEdgePoint(Collections.emptyList())
-                .setParentNodeEdgePoint(Collections.emptyList());
+                .setParentNodeEdgePoint(Collections.singletonList(
+                               parentNep(uuid1, uuid1 + ":1")));
 
         ConnectionEndPoint cep1 = builder
                 .setUuid(new Uuid("c001:" + uuid1 + ":1"))
@@ -87,7 +99,7 @@ public class NrpDaoIntTest extends AbstractTestWithTopo {
 
         ConnectionEndPointBuilder builder = new ConnectionEndPointBuilder()
                 .setClientNodeEdgePoint(Collections.emptyList())
-                .setParentNodeEdgePoint(Collections.emptyList());
+                .setParentNodeEdgePoint(Collections.singletonList(parentNep(uuid1, uuid1 + ":1")));
 
         OwnedNodeEdgePointRef nepRef = toRef(uuid1, uuid1 + ":1");
 

diff --git a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceInplIntTest.java b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceInplIntTest.java
index 34462f82ea7be4c6634e30a5200ee9eda2865c59..5adb0bc15a24821b652f50ca957226748d1bc553 100644 (file)
--- a/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceInplIntTest.java
+++ b/impl/src/test/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/TapiConnectivityServiceInplIntTest.java
@@ -314,9 +314,9 @@ public class TapiConnectivityServiceInplIntTest extends AbstractTestWithTopo {
         Context1 connCtx = c.augmentation(Context1.class);
 
         // Semantics changed to augmentation being removed along with last child?
-//        assertNull(connCtx);
-      assertEquals(0, connCtx.getConnection().size());
-      assertEquals(0, connCtx.getConnectivityService().size());
+        assertNull(connCtx);
+//      assertEquals(0, connCtx.getConnection().size());
+//      assertEquals(0, connCtx.getConnectivityService().size());
 
         verify(ad1).deactivate();
         verify(ad1).commit();

diff --git a/it/pom.xml b/it/pom.xml
index 4be0a63e2e3fbaa119ffe1d278bbe6a806848c09..f85647a7e63a3aadc4735492301aaa974de619f7 100644 (file)
--- a/it/pom.xml
+++ b/it/pom.xml
@@ -6,7 +6,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
     <groupId>org.opendaylight.controller</groupId>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index a054d7f5dcca535e5d35b0ca88e110bc19090841..fecf01ce70a73d8974db8a494c729e4bc146343b 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -6,11 +6,11 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/legato-api/pom.xml b/legato-api/pom.xml
index 9f3d90245428daba3ff593f2e520ae66ed475b55..7c936cb2b824c066ecfd9f63325b87dcf7d3fc3c 100644 (file)
--- a/legato-api/pom.xml
+++ b/legato-api/pom.xml
@@ -7,11 +7,11 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>0.14.0-SNAPSHOT</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 
@@ -32,9 +32,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
-            <version>2013.07.15.14.0-SNAPSHOT</version>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/legato-api/src/main/resources/org/opendaylight/blueprint/legato-api-blueprint.xml b/legato-api/src/main/resources/OSGI-INF/blueprint/legato-api-blueprint.xml
similarity index 100%
rename from legato-api/src/main/resources/org/opendaylight/blueprint/legato-api-blueprint.xml
rename to legato-api/src/main/resources/OSGI-INF/blueprint/legato-api-blueprint.xml

diff --git a/nrp-api/pom.xml b/nrp-api/pom.xml
index 40c9dd945ae8d418cede3fdf2de23e6a163963b5..350e2632f43f2500fa55045d626ef362f19002b8 100644 (file)
--- a/nrp-api/pom.xml
+++ b/nrp-api/pom.xml
@@ -6,11 +6,11 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.14.0-SNAPSHOT</version>
+    <version>3.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/ovs-driver/pom.xml b/ovs-driver/pom.xml
index 74a14758a1fb0ecc51753c30e3457f512d58cc04..d4ccd71e80099d3a9f2df8473f27f6514da6c664 100644 (file)
--- a/ovs-driver/pom.xml
+++ b/ovs-driver/pom.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.2"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.2 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>0.14.0-SNAPSHOT</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 
@@ -14,7 +14,7 @@
         <powermock.version>2.0.0-beta.5</powermock.version>
         <openflow.version>0.8.0-SNAPSHOT</openflow.version>
         <ovsdb.version>1.8.0-SNAPSHOT</ovsdb.version>
-        <mdsal.version>2.6.0-SNAPSHOT</mdsal.version>
+        <mdsal.version>3.0.2</mdsal.version>
     </properties>
 
     <modelVersion>4.0.0</modelVersion>
@@ -118,9 +118,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>ietf-yang-types-20130715</artifactId>
-            <version>2013.07.15.14.0-SNAPSHOT</version>
+            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <artifactId>rfc6991</artifactId>
         </dependency>
 
         <dependency>

diff --git a/ovs-driver/src/main/resources/org/opendaylight/blueprint/ovs-driver.xml b/ovs-driver/src/main/resources/OSGI-INF/blueprint/ovs-driver.xml
similarity index 100%
rename from ovs-driver/src/main/resources/org/opendaylight/blueprint/ovs-driver.xml
rename to ovs-driver/src/main/resources/OSGI-INF/blueprint/ovs-driver.xml

diff --git a/pom.xml b/pom.xml
index a31c64b6b06cd07baab8751044a052209310ba05..a2d329746d5c786ecb20368ab1515130ae0e59b7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,12 +6,12 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.1.3</version>
+    <version>4.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/template-driver/pom.xml b/template-driver/pom.xml
index acc134d846c111f341e5f1edf61eb5722042e1d9..9d67aa5af818ef1a3260f3cdcd38e6b4afab9ca3 100644 (file)
--- a/template-driver/pom.xml
+++ b/template-driver/pom.xml
@@ -7,19 +7,19 @@
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.2"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.2 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>0.14.0-SNAPSHOT</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
 
     <properties>
-        <mdsal.version>2.6.0-SNAPSHOT</mdsal.version>
+        <mdsal.version>3.0.2</mdsal.version>
     </properties>
 
     <modelVersion>4.0.0</modelVersion>
@@ -73,7 +73,6 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-dom-adapter</artifactId>
-            <scope>test</scope>
         </dependency>
 
         <dependency>

diff --git a/template-driver/src/main/resources/org/opendaylight/blueprint/template-driver.xml b/template-driver/src/main/resources/OSGI-INF/blueprint/template-driver.xml
similarity index 100%
rename from template-driver/src/main/resources/org/opendaylight/blueprint/template-driver.xml
rename to template-driver/src/main/resources/OSGI-INF/blueprint/template-driver.xml