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

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index ba2474550ac256fe91ad307cb00bbdd9e7c48f86..e27f8bd5813812f286c4d1fc6e7e8d931f87d294 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,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/features/parent/pom.xml b/features/parent/pom.xml
index d396aad6f616bde5cabb6178d54dc8bfb994a443..1aa45dc83f5bf8fd0a89b714399fbefae0452540 100644 (file)
--- a/features/parent/pom.xml
+++ b/features/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
@@ -30,14 +30,14 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.0</version>
+                <version>6.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/production/pom.xml b/features/production/pom.xml
index 79a6b8c3fbe0dc4e6cef9da1480ada77fb692de0..c3e88715e8f9d1f866956d0695e873e80772f075 100644 (file)
--- a/features/production/pom.xml
+++ b/features/production/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/features/test/features-neutron-test/pom.xml b/features/test/features-neutron-test/pom.xml
index 34d09d9f3b0a47eb65b4f435317d25c4224c7b46..8a9cdab8940f3f650a859e9fc6333d83a5b61e49 100644 (file)
--- a/features/test/features-neutron-test/pom.xml
+++ b/features/test/features-neutron-test/pom.xml
@@ -12,7 +12,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/test/pom.xml b/features/test/pom.xml
index 4689987efe943cf896853e6138dd51f21b65ceec..54d83ea1d5bf5734b03cc463e19047e60ac4ebf5 100644 (file)
--- a/features/test/pom.xml
+++ b/features/test/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/integration/test-standalone/pom.xml b/integration/test-standalone/pom.xml
index aac6039f9cb0f85bbbdb20a1a4be723c53dab409..ca9714756d5b79f98e26734ab40858e39226747b 100644 (file)
--- a/integration/test-standalone/pom.xml
+++ b/integration/test-standalone/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -82,13 +82,6 @@
     <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>
-      <type>test-jar</type>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>

diff --git a/integration/test/pom.xml b/integration/test/pom.xml
index 0ef85d25f4ac8a22cbad8d933e16cd68dff4d326..7a09f8f0b2ec14cf82f0662747e5b74efd9cc365 100644 (file)
--- a/integration/test/pom.xml
+++ b/integration/test/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-it-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 38ba7cd4467c7a1600595720c1a62c248fc7750a..966e424f648bd476b1808c4201f0c2d276eb9bd3 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/neutron-hostconfig/pom.xml b/neutron-hostconfig/pom.xml
index 15a395cd9e9d22763dc9fd0a118985fd1db4a22c..1090fcebac35dd3feb89085f333cabe409efb24a 100644 (file)
--- a/neutron-hostconfig/pom.xml
+++ b/neutron-hostconfig/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/neutron-hostconfig/vpp/pom.xml b/neutron-hostconfig/vpp/pom.xml
index 5e6a3148523baf61862de96612f22041f9adfd52..189426d3e1df9df34dc6626b015ec1dbdbb3f293 100644 (file)
--- a/neutron-hostconfig/vpp/pom.xml
+++ b/neutron-hostconfig/vpp/pom.xml
@@ -67,14 +67,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-dom-adapter</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>mdsal-binding-dom-adapter</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
+      <artifactId>mdsal-binding-test-utils</artifactId>
     </dependency>
   </dependencies>
   <build>

diff --git a/parent/pom.xml b/parent/pom.xml
index f4c65d853b7b553a25bf2bbb61be541293d460b2..68645256da87d6e03be719c8ec4d32ad0dc9860f 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>6.0.0</version>
+    <version>6.0.1</version>
     <relativePath/>
   </parent>
 
@@ -46,7 +46,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>