Merge "Bug 4114 - netconf connector replace causes transaction chain failure"

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 72b454a99548abe62d827a543a4201e030d4856c..02efc20c865268bdc31d537c9628ecd5e206aa55 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -12,25 +12,25 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>features-netconf-connector</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
-    <aaa.version>0.3.0-SNAPSHOT</aaa.version>
-    <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
-    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
-    <config.version>0.4.0-SNAPSHOT</config.version>
-    <features.test.version>1.6.0-SNAPSHOT</features.test.version>
-    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
-    <netconf.version>1.0.0-SNAPSHOT</netconf.version>
-    <netconf.connector.version>1.3.0-SNAPSHOT</netconf.connector.version>
-    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <aaa.version>0.4.0-SNAPSHOT</aaa.version>
+    <commons.opendaylight.version>1.7.0-SNAPSHOT</commons.opendaylight.version>
+    <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
+    <config.version>0.5.0-SNAPSHOT</config.version>
+    <features.test.version>1.7.0-SNAPSHOT</features.test.version>
+    <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.1.0-SNAPSHOT</netconf.version>
+    <netconf.connector.version>1.4.0-SNAPSHOT</netconf.connector.version>
+    <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
     <surefire.version>2.15</surefire.version>
 
     <features.file>features.xml</features.file>
@@ -45,7 +45,7 @@
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index ac9f87ce6706ac85c706a36e038a1aced97d6f59..12673d42ab75c0d37108f496953367e81c655893 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -4,26 +4,26 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <!-- FIXME: Convert to features-parent -->
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>features-netconf</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
-    <aaa.version>0.3.0-SNAPSHOT</aaa.version>
-    <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
-    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
-    <config.version>0.4.0-SNAPSHOT</config.version>
+    <aaa.version>0.4.0-SNAPSHOT</aaa.version>
+    <commons.opendaylight.version>1.7.0-SNAPSHOT</commons.opendaylight.version>
+    <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
+    <config.version>0.5.0-SNAPSHOT</config.version>
     <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
-    <features.test.version>1.6.0-SNAPSHOT</features.test.version>
-    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
-    <netconf.version>1.0.0-SNAPSHOT</netconf.version>
-    <protocol-framework.version>0.7.0-SNAPSHOT</protocol-framework.version>
-    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <features.test.version>1.7.0-SNAPSHOT</features.test.version>
+    <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.1.0-SNAPSHOT</netconf.version>
+    <protocol-framework.version>0.8.0-SNAPSHOT</protocol-framework.version>
+    <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
     <sshd-core.version>0.14.0</sshd-core.version>
 
     <features.file>features.xml</features.file>
@@ -44,7 +44,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/netconf/src/main/features/features.xml b/features/netconf/src/main/features/features.xml
index f9ef87e1cb1b925acdc37d937f7d493c307a4175..4d3113b15bd02e86d3103bb97174765225d0baa9 100644 (file)
--- a/features/netconf/src/main/features/features.xml
+++ b/features/netconf/src/main/features/features.xml
@@ -36,7 +36,7 @@
     <bundle>mvn:org.opendaylight.netconf/ietf-netconf-monitoring-extension/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.mdsal.model/ietf-inet-types/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.mdsal.model/ietf-yang-types/{{VERSION}}</bundle>
-    <bundle>mvn:org.opendaylight.mdsal.model/ietf-yang-types-20130715/2013.07.15.8-SNAPSHOT</bundle>
+    <bundle>mvn:org.opendaylight.mdsal.model/ietf-yang-types-20130715/2013.07.15.9-SNAPSHOT</bundle>
   </feature>
 
   <feature name='odl-netconf-mapping-api' version='${project.version}' description="OpenDaylight :: Netconf :: Mapping API">

diff --git a/features/pom.xml b/features/pom.xml
index cc3daeeec29668142c5c13f386227166964d9949..e63065ed5fb79ca6d05cc9036ec3cfbd4716ad8e 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>netconf-features-parent</artifactId>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index e241e6532e8e2f0c76c079ade78b47c5d09d761f..db5cb3c5fec32ff30a90f80fea140eda0ac43c14 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -12,23 +12,23 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <artifactId>features-restconf</artifactId>
   <groupId>org.opendaylight.netconf</groupId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <properties>
-    <aaa.version>0.3.0-SNAPSHOT</aaa.version>
-    <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
-    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
-    <features.test.version>1.6.0-SNAPSHOT</features.test.version>
-    <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
-    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
+    <aaa.version>0.4.0-SNAPSHOT</aaa.version>
+    <commons.opendaylight.version>1.7.0-SNAPSHOT</commons.opendaylight.version>
+    <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
+    <features.test.version>1.7.0-SNAPSHOT</features.test.version>
+    <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+    <restconf.version>1.4.0-SNAPSHOT</restconf.version>
     <surefire.version>2.15</surefire.version>
-    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+    <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
 
     <features.file>features.xml</features.file>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
@@ -41,7 +41,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 81b9bad6c20a775dbc0924a97b70cd7e828475a2..68c6e132a504990645d0d8a748b0a234631f72c5 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -10,19 +10,19 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>karaf-parent</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.7.0-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-karaf</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>
   <properties>
-    <netconf.version>1.0.0-SNAPSHOT</netconf.version>
-    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
+    <netconf.version>1.1.0-SNAPSHOT</netconf.version>
+    <restconf.version>1.4.0-SNAPSHOT</restconf.version>
   </properties>
 
   <dependencies>

diff --git a/opendaylight/netconf/aaa-authn-odl-plugin/pom.xml b/opendaylight/netconf/aaa-authn-odl-plugin/pom.xml
index b246556284407fb193b510aac92530a91c53d212..d0664190ec417a8c4bbd657502e5832c1b7f00e4 100644 (file)
--- a/opendaylight/netconf/aaa-authn-odl-plugin/pom.xml
+++ b/opendaylight/netconf/aaa-authn-odl-plugin/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-subsystem</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/opendaylight/netconf/abstract-topology/pom.xml b/opendaylight/netconf/abstract-topology/pom.xml
index b600b6a98aab7e2af52ccc05c46db9330e42872f..4f8f1e06a5d3f04369b6af6316dd33c0b7f3a933 100644 (file)
--- a/opendaylight/netconf/abstract-topology/pom.xml
+++ b/opendaylight/netconf/abstract-topology/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.netconf</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/netconf/config-netconf-connector/pom.xml b/opendaylight/netconf/config-netconf-connector/pom.xml
index 019202242a9aa46c9f65f100ecd0a6ffc525b37e..10c8fe5ac4a5b9e9d3242a855a5005024cabe582 100644 (file)
--- a/opendaylight/netconf/config-netconf-connector/pom.xml
+++ b/opendaylight/netconf/config-netconf-connector/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>config-netconf-connector</artifactId>

diff --git a/opendaylight/netconf/mdsal-netconf-connector/pom.xml b/opendaylight/netconf/mdsal-netconf-connector/pom.xml
index 7548d830e8357b2c2a9d90ef5d335e615ab0cc80..8cb96b12a2141e412fa41312cba0b05668b15680 100644 (file)
--- a/opendaylight/netconf/mdsal-netconf-connector/pom.xml
+++ b/opendaylight/netconf/mdsal-netconf-connector/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>mdsal-netconf-connector</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java b/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java
index 23da0f5617fc2822184190fd4adfd7c52a09c565..1eacbf364b739a7796a31204baa8ab1fd059f3ac 100644 (file)
--- a/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java
+++ b/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/TransactionProvider.java
@@ -73,8 +73,9 @@ public class TransactionProvider implements AutoCloseable{
 
     public synchronized boolean commitTransaction() throws DocumentedException {
         if (!getCandidateTransaction().isPresent()) {
-            throw new DocumentedException(NO_TRANSACTION_FOUND_FOR_SESSION + netconfSessionIdForReporting,
-                    ErrorType.application, ErrorTag.operation_failed, ErrorSeverity.error);
+            //making empty commit without prior opened transaction, just return true
+            LOG.debug("Making commit without open candidate transaction for session {}", netconfSessionIdForReporting);
+            return true;
         }
 
         CheckedFuture<Void, TransactionCommitFailedException> future = candidateTransaction.submit();

diff --git a/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java b/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java
index 6f1037a4d5abe0ff461a442401d83b36101b88d5..43e12a34945df1feb2b93fd0fe73f180ff538ca2 100644 (file)
--- a/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java
+++ b/opendaylight/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java
@@ -37,7 +37,7 @@ public class Commit extends AbstractSingletonNetconfOperation {
     protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) throws DocumentedException {
 
         boolean commitStatus = transactionProvider.commitTransaction();
-        LOG.trace("Transaction commited succesfuly {}", commitStatus);
+        LOG.trace("Commit completed successfully {}", commitStatus);
 
         return XmlUtil.createElement(document, XmlNetconfConstants.OK, Optional.<String>absent());
     }

diff --git a/opendaylight/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java b/opendaylight/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java
index 3a0f3572831b590b3f36967477cc7511d9861caf..4bf2a2b2738decd223b18b53e43c5b043b0d6132 100644 (file)
--- a/opendaylight/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java
+++ b/opendaylight/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/NetconfMDSalMappingTest.java
@@ -213,6 +213,12 @@ public class NetconfMDSalMappingTest {
 
     }
 
+    @Test
+    public void testCommitWithoutOpenTransaction() throws Exception {
+        verifyResponse(commit(), RPC_REPLY_OK);
+        assertEmptyDatastore(getConfigCandidate());
+    }
+
     @Test
     public void testCandidateTransaction() throws Exception {
 

diff --git a/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml b/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml
index fb1cf5a0e6f55b2c7623335ac485b693295671b9..54326f64f840797c215c4bbf2f6baebec31aabdb 100644 (file)
--- a/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/mdsal-netconf-monitoring/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>mdsal-netconf-monitoring</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/mdsal-netconf-notification/pom.xml b/opendaylight/netconf/mdsal-netconf-notification/pom.xml
index 542ab35066a481fda821241dc0dc98c4bf4a7b65..bfaecb7abd28fa1313eeb829551559aef63da56a 100644 (file)
--- a/opendaylight/netconf/mdsal-netconf-notification/pom.xml
+++ b/opendaylight/netconf/mdsal-netconf-notification/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-subsystem</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>mdsal-netconf-notification</artifactId>
     <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/messagebus-netconf/pom.xml b/opendaylight/netconf/messagebus-netconf/pom.xml
index abb592bcd6de1759a0ff1e655c2a99976f276f62..ea175cfa434709885d49e890a02a9104849fc6c7 100644 (file)
--- a/opendaylight/netconf/messagebus-netconf/pom.xml
+++ b/opendaylight/netconf/messagebus-netconf/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-subsystem</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>messagebus-netconf</artifactId>

diff --git a/opendaylight/netconf/models/ietf-netconf-monitoring-extension/pom.xml b/opendaylight/netconf/models/ietf-netconf-monitoring-extension/pom.xml
index cbe032ad27e6332cd73347206a335dbcfc8ddbef..6e5c3c4402c185325f5fdc7db32b172c29cc2628 100644 (file)
--- a/opendaylight/netconf/models/ietf-netconf-monitoring-extension/pom.xml
+++ b/opendaylight/netconf/models/ietf-netconf-monitoring-extension/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-models</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>ietf-netconf-monitoring-extension</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/models/ietf-netconf-monitoring/pom.xml b/opendaylight/netconf/models/ietf-netconf-monitoring/pom.xml
index 0d889ac85d7fa71142f35a9c66e79d6edf5afaa6..f5417c9690788082491a84ac05a83451373eb89e 100644 (file)
--- a/opendaylight/netconf/models/ietf-netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/models/ietf-netconf-monitoring/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-models</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>ietf-netconf-monitoring</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/models/ietf-netconf-notifications/pom.xml b/opendaylight/netconf/models/ietf-netconf-notifications/pom.xml
index aa4ee271d6b5e4193da63fd621ca89520ead7f35..b5a9ffb47c3dc8c693be66cf394c9ebd81d14088 100644 (file)
--- a/opendaylight/netconf/models/ietf-netconf-notifications/pom.xml
+++ b/opendaylight/netconf/models/ietf-netconf-notifications/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-models</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>ietf-netconf-notifications</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/models/ietf-netconf/pom.xml b/opendaylight/netconf/models/ietf-netconf/pom.xml
index cdf9efc7e73c0b43d452e17f694090fa9e6d4384..fc6d3475da8e8f571449fa65c5774f0f2bff9f18 100644 (file)
--- a/opendaylight/netconf/models/ietf-netconf/pom.xml
+++ b/opendaylight/netconf/models/ietf-netconf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-models</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>ietf-netconf</artifactId>
     <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/models/pom.xml b/opendaylight/netconf/models/pom.xml
index 630dda534dee7289e9d10a98c3b2279af76879d9..c8bdb777b4d2cfb8c8d7ac68c3f09bc41d5c8e80 100644 (file)
--- a/opendaylight/netconf/models/pom.xml
+++ b/opendaylight/netconf/models/pom.xml
@@ -5,11 +5,11 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-models</artifactId>
 
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 

diff --git a/opendaylight/netconf/netconf-api/pom.xml b/opendaylight/netconf/netconf-api/pom.xml
index ebc626c10440a624404eb8b4398f2f02793856ab..f74343296ac062d121c44cdf1640b837309986dd 100644 (file)
--- a/opendaylight/netconf/netconf-api/pom.xml
+++ b/opendaylight/netconf/netconf-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-api</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-artifacts/pom.xml b/opendaylight/netconf/netconf-artifacts/pom.xml
index cd4a0b7a26fec576d756150b1c02b0ac5beebf9d..c5839172ad4cfd669844cf298f215d131ab1dcfe 100644 (file)
--- a/opendaylight/netconf/netconf-artifacts/pom.xml
+++ b/opendaylight/netconf/netconf-artifacts/pom.xml
@@ -14,17 +14,17 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
+      <version>1.7.0-SNAPSHOT</version>
       <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-artifacts</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+        <mdsal.version>1.4.0-SNAPSHOT</mdsal.version>
     </properties>
 
     <dependencyManagement>

diff --git a/opendaylight/netconf/netconf-auth/pom.xml b/opendaylight/netconf/netconf-auth/pom.xml
index 3f0a0e548c19621764b10d87ae2b1e44745f37f4..76f50bd63c15a4b5845e0e659a97779b0bb7a52a 100644 (file)
--- a/opendaylight/netconf/netconf-auth/pom.xml
+++ b/opendaylight/netconf/netconf-auth/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-subsystem</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <artifactId>netconf-auth</artifactId>

diff --git a/opendaylight/netconf/netconf-client/pom.xml b/opendaylight/netconf/netconf-client/pom.xml
index 07465e1a4410ddb0e73f935bc94274e0e015177e..dbc0797e8b4092b36579669f9747c02966cdcf4c 100644 (file)
--- a/opendaylight/netconf/netconf-client/pom.xml
+++ b/opendaylight/netconf/netconf-client/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-client</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-config-dispatcher/pom.xml b/opendaylight/netconf/netconf-config-dispatcher/pom.xml
index cf978d940f2786d1a6363d0713ee0ec6adfc9ef2..d5e54838130feb3699797bc5dcd0ee3dc292d329 100644 (file)
--- a/opendaylight/netconf/netconf-config-dispatcher/pom.xml
+++ b/opendaylight/netconf/netconf-config-dispatcher/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-subsystem</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
   <artifactId>netconf-config-dispatcher</artifactId>

diff --git a/opendaylight/netconf/netconf-config/pom.xml b/opendaylight/netconf/netconf-config/pom.xml
index 9636602399872331d248780d0427784f7878f1fd..51e0ab63bd25bc3f1e048bb8605859576d84ce6b 100644 (file)
--- a/opendaylight/netconf/netconf-config/pom.xml
+++ b/opendaylight/netconf/netconf-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-config</artifactId>
   <description>Configuration files for netconf</description>

diff --git a/opendaylight/netconf/netconf-connector-config/pom.xml b/opendaylight/netconf/netconf-connector-config/pom.xml
index f3d52910381764022fa6b2894599a3db5b35c964..6b3877c23ea28ea2da7e7707ebc57e8655f4763c 100644 (file)
--- a/opendaylight/netconf/netconf-connector-config/pom.xml
+++ b/opendaylight/netconf/netconf-connector-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-connector-config</artifactId>
   <description>Configuration files for netconf-connector</description>

diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml
index 0c462173153b5376ecf65ffe510f40245755fea6..6eb0dfba662c8b74333a01036ca52adad7b35c6a 100644 (file)
--- a/opendaylight/netconf/netconf-impl/pom.xml
+++ b/opendaylight/netconf/netconf-impl/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-impl</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-it/pom.xml b/opendaylight/netconf/netconf-it/pom.xml
index f26e91d57191608473bfcf89a37d6bea3c32bf9d..af67990b984fd13bc8428798966d35a29c41134a 100644 (file)
--- a/opendaylight/netconf/netconf-it/pom.xml
+++ b/opendaylight/netconf/netconf-it/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>netconf-it</artifactId>

diff --git a/opendaylight/netconf/netconf-mapping-api/pom.xml b/opendaylight/netconf/netconf-mapping-api/pom.xml
index f96c2b03f894e91096557e5bbd9de61aa5a94446..a64d7a6aff164896d33df6fbda1f64c5d2c9bba0 100644 (file)
--- a/opendaylight/netconf/netconf-mapping-api/pom.xml
+++ b/opendaylight/netconf/netconf-mapping-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-mapping-api</artifactId>
 

diff --git a/opendaylight/netconf/netconf-mdsal-config/pom.xml b/opendaylight/netconf/netconf-mdsal-config/pom.xml
index d5db6bc3bcd2fb565854e31dbafd3a6f55bcb3b5..12ec4db740eb7b4247c088dd92f3a6fa33a68356 100644 (file)
--- a/opendaylight/netconf/netconf-mdsal-config/pom.xml
+++ b/opendaylight/netconf/netconf-mdsal-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-mdsal-config</artifactId>
   <description>Configuration files for netconf for mdsal</description>

diff --git a/opendaylight/netconf/netconf-monitoring/pom.xml b/opendaylight/netconf/netconf-monitoring/pom.xml
index cb22568a2c2e657f820d4b9068366002b554d53a..e9926481b8c4284b84726e16182d9be5ab2dcfba 100644 (file)
--- a/opendaylight/netconf/netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/netconf-monitoring/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-monitoring</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-netty-util/pom.xml b/opendaylight/netconf/netconf-netty-util/pom.xml
index 8b01d4ff36356c713c6728771e13af13d6832d1b..8aaab0a840f6f6d6750715d3ca3878f5f63eac93 100644 (file)
--- a/opendaylight/netconf/netconf-netty-util/pom.xml
+++ b/opendaylight/netconf/netconf-netty-util/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-netty-util</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java
index 6fcea5130a7e18b42fc3d069f0c0d179386e229f..35451ca04c91e60beb66d450d71b091ec235c5d9 100644 (file)
--- a/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java
+++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/EXIParameters.java
@@ -86,7 +86,7 @@ public final class EXIParameters {
         return new EXIParameters(options);
     }
 
-    public final EXIOptions getOptions() {
+    public EXIOptions getOptions() {
         return options;
     }
 }

diff --git a/opendaylight/netconf/netconf-notifications-api/pom.xml b/opendaylight/netconf/netconf-notifications-api/pom.xml
index 3bbd4df8386e9ffea2f8ed6f2b1f3c7a7a53ec44..6240f4d6c93f1115221ac3275f74f73230ad1045 100644 (file)
--- a/opendaylight/netconf/netconf-notifications-api/pom.xml
+++ b/opendaylight/netconf/netconf-notifications-api/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.netconf</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-notifications-impl/pom.xml b/opendaylight/netconf/netconf-notifications-impl/pom.xml
index 59658a6dcf4ab904946e4eac3b469728c9d22bb6..136525959d441c5d2e3c5f618c13a0789c242bb4 100644 (file)
--- a/opendaylight/netconf/netconf-notifications-impl/pom.xml
+++ b/opendaylight/netconf/netconf-notifications-impl/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.netconf</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <packaging>bundle</packaging>
     <artifactId>netconf-notifications-impl</artifactId>

diff --git a/opendaylight/netconf/netconf-ssh/pom.xml b/opendaylight/netconf/netconf-ssh/pom.xml
index 265c3d6959925189393021d8ee091e25ee296aac..4ec1a1f0be267f10a9cb5726eda4d63722fcb672 100644 (file)
--- a/opendaylight/netconf/netconf-ssh/pom.xml
+++ b/opendaylight/netconf/netconf-ssh/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-ssh</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-tcp/pom.xml b/opendaylight/netconf/netconf-tcp/pom.xml
index d95a26b979eaff3f5ea0baa0ac1749bb6c011f9d..2c9fcfa9cddf32b24696af349598ddca651757e5 100644 (file)
--- a/opendaylight/netconf/netconf-tcp/pom.xml
+++ b/opendaylight/netconf/netconf-tcp/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>netconf-tcp</artifactId>

diff --git a/opendaylight/netconf/netconf-topology-config/pom.xml b/opendaylight/netconf/netconf-topology-config/pom.xml
index f0667f67a6e49a4136449b08e42035e1349b3477..8155b66da91e4d65e704990d22b8de26b337eafc 100644 (file)
--- a/opendaylight/netconf/netconf-topology-config/pom.xml
+++ b/opendaylight/netconf/netconf-topology-config/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.netconf</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/netconf/netconf-topology/pom.xml b/opendaylight/netconf/netconf-topology/pom.xml
index 4944abfa417f62120677a5680115cb346b1d0331..7bf1a5729597f13b25fb9f7d4573605582592efd 100644 (file)
--- a/opendaylight/netconf/netconf-topology/pom.xml
+++ b/opendaylight/netconf/netconf-topology/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>netconf-subsystem</artifactId>
         <groupId>org.opendaylight.netconf</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/opendaylight/netconf/netconf-util/pom.xml b/opendaylight/netconf/netconf-util/pom.xml
index adecf4feb93cb96dd525257be3cae69cb38ba16d..4a991c7c35294c0dbfba17ab4796c80cc0de04e4 100644 (file)
--- a/opendaylight/netconf/netconf-util/pom.xml
+++ b/opendaylight/netconf/netconf-util/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-util</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/osgi/NetconfConfigUtil.java b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/osgi/NetconfConfigUtil.java
index 7287bb688496ba2e7bbbc889c1a48e8439c53d2b..12ce7e22a8059be3c46eb645cc0dfaa3270b5b20 100644 (file)
--- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/osgi/NetconfConfigUtil.java
+++ b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/osgi/NetconfConfigUtil.java
@@ -89,7 +89,7 @@ public final class NetconfConfigUtil {
         if (address.isPresent() && port.isPresent()) {
             try {
                 return Optional.of(parseAddress(address, port));
-            } catch (final RuntimeException e) {
+            } catch (final IllegalArgumentException | SecurityException e) {
                 LOG.warn("Unable to parse {} netconf address from {}:{}, fallback to default",
                         infixProp, address, port, e);
             }

diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml
index 657819072e44aaedc1bb33f69ad6236f67b82ebc..db7b96a11d16f1048646a2cc6c7c1853fc3908b0 100644 (file)
--- a/opendaylight/netconf/pom.xml
+++ b/opendaylight/netconf/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 

diff --git a/opendaylight/netconf/sal-netconf-connector/pom.xml b/opendaylight/netconf/sal-netconf-connector/pom.xml
index d53eee48b8c683860a6ca96f82e7053e1511e13b..bb43eafaf91faacbf49acb01e6d9cfa9e7670867 100644 (file)
--- a/opendaylight/netconf/sal-netconf-connector/pom.xml
+++ b/opendaylight/netconf/sal-netconf-connector/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>sal-netconf-connector</artifactId>

diff --git a/opendaylight/netconf/tools/netconf-cli/pom.xml b/opendaylight/netconf/tools/netconf-cli/pom.xml
index cfe1f994d4da707a60f91a075fb7fb16d534ea0c..912a6d6c97faf899a55c85ffc52807fb11780ba3 100644 (file)
--- a/opendaylight/netconf/tools/netconf-cli/pom.xml
+++ b/opendaylight/netconf/tools/netconf-cli/pom.xml
@@ -10,7 +10,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-tools</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>netconf-cli</artifactId>
   <packaging>jar</packaging>

diff --git a/opendaylight/netconf/tools/netconf-testtool/pom.xml b/opendaylight/netconf/tools/netconf-testtool/pom.xml
index 06a1ea3b49588152aff358af2622313799a0159b..9b1b17f8dccc3eb789e4a986d449b62e0694e50e 100644 (file)
--- a/opendaylight/netconf/tools/netconf-testtool/pom.xml
+++ b/opendaylight/netconf/tools/netconf-testtool/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-tools</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>netconf-testtool</artifactId>

diff --git a/opendaylight/netconf/tools/pom.xml b/opendaylight/netconf/tools/pom.xml
index aa346861bc04de63f9ea3d68a7f015b494576f96..5dfb770b35b5ae64c48098d1c420915ff2e71d2a 100644 (file)
--- a/opendaylight/netconf/tools/pom.xml
+++ b/opendaylight/netconf/tools/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
   <artifactId>netconf-tools</artifactId>

diff --git a/opendaylight/restconf/pom.xml b/opendaylight/restconf/pom.xml
index 6c4cbc47de68e3ac1d7b75d025bd3ecae1216665..1e9c805b826a5e286a91c64cdf2968f8c2ba418d 100644 (file)
--- a/opendaylight/restconf/pom.xml
+++ b/opendaylight/restconf/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>restconf-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 

diff --git a/opendaylight/restconf/restconf-artifacts/pom.xml b/opendaylight/restconf/restconf-artifacts/pom.xml
index d8e8edee1a3c673692b410bd03fad3abde9c48bd..cb715b930dd4105919cd2d59b6618160288dd7d8 100644 (file)
--- a/opendaylight/restconf/restconf-artifacts/pom.xml
+++ b/opendaylight/restconf/restconf-artifacts/pom.xml
@@ -8,13 +8,13 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>1.6.0-SNAPSHOT</version>
+      <version>1.7.0-SNAPSHOT</version>
       <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>restconf-artifacts</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>

diff --git a/opendaylight/restconf/sal-rest-connector-config/pom.xml b/opendaylight/restconf/sal-rest-connector-config/pom.xml
index dea6ea1363f1957c7c38a27d3f36d48193063616..88ac9d8017509247d163435c0ab8a49163d67f5e 100644 (file)
--- a/opendaylight/restconf/sal-rest-connector-config/pom.xml
+++ b/opendaylight/restconf/sal-rest-connector-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>restconf-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-rest-connector-config</artifactId>
   <description>Configuration files for sal-rest-connector</description>

diff --git a/opendaylight/restconf/sal-rest-connector/pom.xml b/opendaylight/restconf/sal-rest-connector/pom.xml
index d826a2573570fc594235c9e10d190057f8cf15c4..b6436d6b7853b4d676cfdc30d64fedd5b38306c9 100644 (file)
--- a/opendaylight/restconf/sal-rest-connector/pom.xml
+++ b/opendaylight/restconf/sal-rest-connector/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>restconf-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-rest-connector</artifactId>
   <packaging>bundle</packaging>

diff --git a/opendaylight/restconf/sal-rest-docgen-maven/pom.xml b/opendaylight/restconf/sal-rest-docgen-maven/pom.xml
index e3cf496e124073d6694181111922a0b6a7713928..490022bba3db2b596cd2bd27d24182d9b75ab28b 100644 (file)
--- a/opendaylight/restconf/sal-rest-docgen-maven/pom.xml
+++ b/opendaylight/restconf/sal-rest-docgen-maven/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>restconf-parent</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sal-rest-docgen-maven</artifactId>

diff --git a/opendaylight/restconf/sal-rest-docgen/pom.xml b/opendaylight/restconf/sal-rest-docgen/pom.xml
index 30f78ea494ace7f4cfec7cd23583606c8558eb78..6457dd28ffdda350c4849825cdaf304146a6a2eb 100644 (file)
--- a/opendaylight/restconf/sal-rest-docgen/pom.xml
+++ b/opendaylight/restconf/sal-rest-docgen/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>restconf-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>sal-rest-docgen</artifactId>

diff --git a/opendaylight/restconf/sal-restconf-broker/pom.xml b/opendaylight/restconf/sal-restconf-broker/pom.xml
index f3566725f1a88bbab17fdc130c4a9588b52db172..3e3a0c4bafb84ee4c908a564ddbb585863298115 100644 (file)
--- a/opendaylight/restconf/sal-restconf-broker/pom.xml
+++ b/opendaylight/restconf/sal-restconf-broker/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>restconf-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
   <artifactId>sal-restconf-broker</artifactId>
   <packaging>bundle</packaging>

diff --git a/pom.xml b/pom.xml
index 51077a81914b108f74b4b3958912907da00b3d18..ff8a2b0872c12bad1e09451e5342d2e502eed0d1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.7.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 
@@ -23,30 +23,30 @@
     </modules>
 
     <properties>
-        <aaa.version>0.3.0-SNAPSHOT</aaa.version>
+        <aaa.version>0.4.0-SNAPSHOT</aaa.version>
         <akka.version>2.3.14</akka.version>
-        <commons.logback_settings.version>0.2.0-SNAPSHOT</commons.logback_settings.version>
-        <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
-        <config.version>0.4.0-SNAPSHOT</config.version>
+        <commons.logback_settings.version>0.3.0-SNAPSHOT</commons.logback_settings.version>
+        <commons.opendaylight.version>1.7.0-SNAPSHOT</commons.opendaylight.version>
+        <config.version>0.5.0-SNAPSHOT</config.version>
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
         <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
-        <features.test.version>1.6.0-SNAPSHOT</features.test.version>
-        <ietf-inet-types.version>2010.09.24.8-SNAPSHOT</ietf-inet-types.version>
-        <ietf-restconf.version>2013.10.19.8-SNAPSHOT</ietf-restconf.version>
-        <ietf-topology.version>2013.10.21.8-SNAPSHOT</ietf-topology.version>
-        <ietf-yang-types.version>2010.09.24.8-SNAPSHOT</ietf-yang-types.version>
+        <features.test.version>1.7.0-SNAPSHOT</features.test.version>
+        <ietf-inet-types.version>2010.09.24.9-SNAPSHOT</ietf-inet-types.version>
+        <ietf-restconf.version>2013.10.19.9-SNAPSHOT</ietf-restconf.version>
+        <ietf-topology.version>2013.10.21.9-SNAPSHOT</ietf-topology.version>
+        <ietf-yang-types.version>2010.09.24.9-SNAPSHOT</ietf-yang-types.version>
 
-        <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
-        <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
-        <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
-        <netconf.version>1.0.0-SNAPSHOT</netconf.version>
-        <restconf.version>1.3.0-SNAPSHOT</restconf.version>
-        <protocol-framework.version>0.7.0-SNAPSHOT</protocol-framework.version>
+        <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
+        <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+        <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
+        <netconf.version>1.1.0-SNAPSHOT</netconf.version>
+        <restconf.version>1.4.0-SNAPSHOT</restconf.version>
+        <protocol-framework.version>0.8.0-SNAPSHOT</protocol-framework.version>
         <sshd-core.version>0.14.0</sshd-core.version>
         <scala.major.version>2.10</scala.major.version>
         <scala.minor.version>4</scala.minor.version>
         <surefire.version>2.15</surefire.version>
-        <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
+        <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
 
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
@@ -120,7 +120,7 @@
                         <dependency>
                             <groupId>org.opendaylight.controller</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>0.2.0-SNAPSHOT</version>
+                            <version>0.3.0-SNAPSHOT</version>
                         </dependency>
                     </dependencies>
                     <executions>