Bump config and netconf versions to 0.2.5-SNAPSHOT, bump ietf-yang-types, opendayligh...

Change-Id: I9400f1e43d7e8b053c614d120bc4a764bdf1e726
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>

diff --git a/commons/distributions/bgpcep-controller/pom.xml b/commons/distributions/bgpcep-controller/pom.xml
index f17921d553fcceaef1a88ada2c51e0cdd41c1a53..167f6aa00726c2512a9153df50554679426454c3 100644 (file)
--- a/commons/distributions/bgpcep-controller/pom.xml
+++ b/commons/distributions/bgpcep-controller/pom.xml
@@ -51,8 +51,8 @@
         <checkstyle.version>2.10</checkstyle.version>
         <testvm.argLine>-Xmx1024m -XX:MaxPermSize=256m</testvm.argLine>
         <osgi.core.version>5.0.0</osgi.core.version>
-        <ietf-yang-types.version>2010.09.24.3</ietf-yang-types.version>
-        <opendaylight-l2-types.version>2013.08.27.3</opendaylight-l2-types.version>
+        <ietf-yang-types.version>2010.09.24.4-SNAPSHOT</ietf-yang-types.version>
+        <opendaylight-l2-types.version>2013.08.27.4-SNAPSHOT</opendaylight-l2-types.version>
         <javassist.version>3.17.1-GA</javassist.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
         <commons.lang.version>3.1</commons.lang.version>
@@ -67,7 +67,7 @@
         <arphandler.version>0.5.2-SNAPSHOT</arphandler.version>
         <forwarding.staticrouting>0.5.2-SNAPSHOT</forwarding.staticrouting>
         <samples.loadbalancer>0.5.2-SNAPSHOT</samples.loadbalancer>
-        <netconf.version>0.2.4-SNAPSHOT</netconf.version>
+        <netconf.version>${controller.config.version}</netconf.version>
         <containermanager.version>0.5.2-SNAPSHOT</containermanager.version>
         <containermanager.it.version>0.5.2-SNAPSHOT</containermanager.it.version>
         <switchmanager.api.version>0.7.1-SNAPSHOT</switchmanager.api.version>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 1988293ed5ab888d34ea38d7320e8aff0e5fe5f1..95a5aa420bd2a44105ff46803f8d83808b970d9d 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -66,7 +66,7 @@
         <yang-ext.version>2013.09.07.4-SNAPSHOT</yang-ext.version>
 
         <!-- Controller artifacts -->
-        <controller.config.version>0.2.4-SNAPSHOT</controller.config.version>
+        <controller.config.version>0.2.5-SNAPSHOT</controller.config.version>
         <controller.framework.version>0.5.0-SNAPSHOT</controller.framework.version>
         <controller.mdsal.version>1.1-SNAPSHOT</controller.mdsal.version>
     </properties>

diff --git a/pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleTest.java b/pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleTest.java
index 7d6ceca6e20bb6df3e39461a6ccf6f4bddf3a776..a37cfe0b4f09a780367b1b6327541baceef1d618 100644 (file)
--- a/pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleTest.java
+++ b/pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleTest.java
@@ -7,13 +7,6 @@
  */
 package org.opendaylight.controller.config.yang.pcep.impl;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.ObjectName;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.ConflictingVersionException;
@@ -23,6 +16,13 @@ import org.opendaylight.controller.config.manager.impl.AbstractConfigTest;
 import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver;
 import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
 
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.InstanceNotFoundException;
+import javax.management.ObjectName;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 public class PCEPSessionProposalFactoryImplModuleTest extends AbstractConfigTest {
 
        private final String instanceName = "pcep-proposal";
@@ -108,7 +108,7 @@ public class PCEPSessionProposalFactoryImplModuleTest extends AbstractConfigTest
        }
 
        @Test
-       public void testStatefulAfterCommitted() throws InstanceAlreadyExistsException, InstanceNotFoundException {
+       public void testStatefulAfterCommitted() throws InstanceAlreadyExistsException, InstanceNotFoundException, ValidationException, ConflictingVersionException {
                ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
                createInstance(transaction, this.factory.getImplementationName(), this.instanceName, 400, 100, false, true, true, true);
                transaction.validateConfig();