Merge "Guard against multiple web registration attempts"

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 28738a0c9ed8430e9e9f4e3e9eed8d05b9528784..ba6f8390889a453b905c7957e1e8fb77798610be 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -53,7 +53,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.7</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml
index 1f985a5156c45167ecf0c45eeedb4a704369bb66..0e4bb4d931cb89a0a272b6b7e31a9303d36a247a 100644 (file)
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/netconf/odl-netconf-api/pom.xml
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.7</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/netconf/odl-netconf-api/src/main/feature/feature.xml b/features/netconf/odl-netconf-api/src/main/feature/feature.xml
index 4f0fa7b3cca306851557e40df96202041c0834be..3c32e1897b47f198735b201b24ed02364b1a3352 100644 (file)
--- a/features/netconf/odl-netconf-api/src/main/feature/feature.xml
+++ b/features/netconf/odl-netconf-api/src/main/feature/feature.xml
@@ -6,8 +6,8 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
   -->
-<features name="odl-netconf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-netconf-api" version="${project.version}">
-        <feature version="[2.0.5,3)">odl-yangtools-parser-api</feature>
+        <feature version="[2.0.7,3)">odl-yangtools-parser-api</feature>
     </feature>
 </features>

diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml
index 0c8c2d029762ed6a4123824afc48e23b73725170..914a4cdc385bd62c3fe394ee74a921b40f878c8b 100644 (file)
--- a/features/netconf/odl-netconf-util/pom.xml
+++ b/features/netconf/odl-netconf-util/pom.xml
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-codec</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.7</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/netconf/odl-netconf-util/src/main/feature/feature.xml b/features/netconf/odl-netconf-util/src/main/feature/feature.xml
index 73be18271cb9a6ac0b908d5d54494b816672fd26..e7d18d88f6104cc8a9e52c15dd706341c7a6c332 100644 (file)
--- a/features/netconf/odl-netconf-util/src/main/feature/feature.xml
+++ b/features/netconf/odl-netconf-util/src/main/feature/feature.xml
@@ -6,11 +6,11 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
  -->
-<features name="odl-netconf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-netconf-${project.version}">
     <feature name="odl-netconf-util" version="${project.version}">
         <configfile finalname="etc/netconf.cfg">
             mvn:org.opendaylight.netconf/netconf-util/${project.version}/cfg/config
         </configfile>
-        <feature version="[2.0.5,3)">odl-yangtools-codec</feature>
+        <feature version="[2.0.7,3)">odl-yangtools-codec</feature>
     </feature>
 </features>

diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml
index eee6e7745065f6aecbbb1cc2857439d689245ec2..3d79610b1bbc0532c3bec34af1b3276e38d03d0d 100644 (file)
--- a/features/restconf/odl-restconf-common/pom.xml
+++ b/features/restconf/odl-restconf-common/pom.xml
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.7</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/restconf/odl-restconf-common/src/main/feature/feature.xml b/features/restconf/odl-restconf-common/src/main/feature/feature.xml
index 738e15a99c713c1a71983b77ee214f047fd4c152..d64323230f6ed3a3db0499fe919fcc077c31c956 100644 (file)
--- a/features/restconf/odl-restconf-common/src/main/feature/feature.xml
+++ b/features/restconf/odl-restconf-common/src/main/feature/feature.xml
@@ -10,6 +10,6 @@
     <feature name="odl-restconf-common" version="${project.version}">
         <feature version="[3.1.0,4)">odl-karaf-feat-jetty</feature>
         <feature version="[3.1.0,4)">odl-jackson-2.8</feature>
-        <feature version="[2.0.5,3)">odl-yangtools-export</feature>
+        <feature version="[2.0.7,3)">odl-yangtools-export</feature>
     </feature>
 </features>

diff --git a/protocol-framework/pom.xml b/protocol-framework/pom.xml
index 558ddd41bcff7a58fcfd09feae5a8d787b13eea6..f3b131055cb5b7c1b248899bbfec7815825087b6 100644 (file)
--- a/protocol-framework/pom.xml
+++ b/protocol-framework/pom.xml
@@ -48,7 +48,7 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>mockito-configuration</artifactId>
-      <version>2.0.5</version>
+      <version>2.0.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>