Merge "bug 5096 Clean up transaction in case of failure"

[netconf.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index ff8a2b0872c12bad1e09451e5342d2e502eed0d1..7bea315dfd4d723f0f952df1c3a60391677709ef 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -43,10 +43,10 @@
         <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>
+        <scala.major.version>2.11</scala.major.version>
+        <scala.minor.version>7</scala.minor.version>
         <surefire.version>2.15</surefire.version>
-        <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
+        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
 
         <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
         <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
@@ -179,13 +179,13 @@
                         <dependency>
                             <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>
-                            <version>${yangtools.version}</version>
+                            <version>${mdsal.model.version}</version>
                             <type>jar</type>
                         </dependency>
                         <dependency>
                             <groupId>org.opendaylight.mdsal</groupId>
                             <artifactId>yang-binding</artifactId>
-                            <version>${yangtools.version}</version>
+                            <version>${mdsal.model.version}</version>
                             <type>jar</type>
                         </dependency>
                     </dependencies>