Bump yangtools to 1.0.0-SNAPSHOT

[controller.git] / opendaylight / commons / opendaylight / pom.xml

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index f7ab2d978d4051d0bfb80d0ce32cb6a059f7e8d6..0dc9ba5f38032e9e19395691d1dc5c9b1ec62bde 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -119,8 +119,8 @@
     <samples.loadbalancer.northbound.version>0.7.0-SNAPSHOT</samples.loadbalancer.northbound.version>
     <samples.simpleforwarding.version>0.7.0-SNAPSHOT</samples.simpleforwarding.version>
     <sanitytest.version>0.7.0-SNAPSHOT</sanitytest.version>
-    <scala.version>2.10</scala.version>
-    <scala.micro.version>4</scala.micro.version>
+    <scala.version>2.11</scala.version>
+    <scala.micro.version>7</scala.micro.version>
     <security.version>0.7.0-SNAPSHOT</security.version>
     <karaf.security.version>0.7.0-SNAPSHOT</karaf.security.version>
     <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
@@ -153,7 +153,7 @@
     <web.version>0.7.0-SNAPSHOT</web.version>
     <yang-ext.version>2013.09.07.9-SNAPSHOT</yang-ext.version>
     <yang-jmx-generator.version>1.3.0-SNAPSHOT</yang-jmx-generator.version>
-    <yangtools.version>0.9.0-SNAPSHOT</yangtools.version>
+    <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
     <jmh.version>0.9.7</jmh.version>
   </properties>
 
@@ -784,12 +784,12 @@
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-library</artifactId>
-        <version>${scala.version}.1</version>
+        <version>${scala.version}.${scala.micro.version}</version>
       </dependency>
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-reflect</artifactId>
-        <version>${scala.version}.1</version>
+        <version>${scala.version}.${scala.micro.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
@@ -1119,7 +1119,7 @@
             <dependency>
               <groupId>org.opendaylight.mdsal</groupId>
               <artifactId>maven-sal-api-gen-plugin</artifactId>
-              <version>0.9.0-SNAPSHOT</version>
+              <version>${mdsal.model.version}</version>
               <type>jar</type>
             </dependency>
             <dependency>