Use version 0.6.0-SNAPSHOT of yangtools everywhere in controller.

As of yangtools commit f5e9689b95d945c22c7a38870681cab899326de9, all projects
in yangtools repo have version 0.6.0-SNAPSHOT. This commit bumps all
yangtools dependencies to this version.

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

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 06c1d8d..98a0bd1 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -73,8 +73,7 @@
     <bundle.plugin.version>2.3.7</bundle.plugin.version>
     <junit.version>4.8.1</junit.version>
     <bgpcep.version>0.3.0-SNAPSHOT</bgpcep.version>
     <bundle.plugin.version>2.3.7</bundle.plugin.version>
     <junit.version>4.8.1</junit.version>
     <bgpcep.version>0.3.0-SNAPSHOT</bgpcep.version>

-    <yangtools.version>0.5.9-SNAPSHOT</yangtools.version>
-    <yangtools.binding.version>0.6.0-SNAPSHOT</yangtools.binding.version>
+    <yangtools.version>0.6.0-SNAPSHOT</yangtools.version>

     <!--versions for bits of the controller -->
     <controller.version>0.4.1-SNAPSHOT</controller.version>
     <hosttracker.version>0.5.1-SNAPSHOT</hosttracker.version>
     <!--versions for bits of the controller -->
     <controller.version>0.4.1-SNAPSHOT</controller.version>
     <hosttracker.version>0.5.1-SNAPSHOT</hosttracker.version>


@@ -732,7 +731,7 @@
       <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>yang-binding</artifactId>
       <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>yang-binding</artifactId>

-       <version>${yangtools.binding.version}</version>
+       <version>${yangtools.version}</version>

       </dependency>
       <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
       </dependency>
       <dependency>
        <groupId>org.opendaylight.yangtools</groupId>


@@ -744,6 +743,11 @@
        <artifactId>yang-data-api</artifactId>
        <version>${yangtools.version}</version>
       </dependency>
        <artifactId>yang-data-api</artifactId>
        <version>${yangtools.version}</version>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yang-data-impl</artifactId>
+        <version>${yangtools.version}</version>
+      </dependency>

       <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>yang-data-util</artifactId>
       <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>yang-data-util</artifactId>


@@ -759,6 +763,11 @@
         <artifactId>switchmanager</artifactId>
         <version>${switchmanager.api.version}</version>
       </dependency>
         <artifactId>switchmanager</artifactId>
         <version>${switchmanager.api.version}</version>
       </dependency>

+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>concepts</artifactId>
+        <version>${yangtools.version}</version>
+      </dependency>

 
       <!-- equinox http service bridge -->
       <dependency>
 
       <!-- equinox http service bridge -->
       <dependency>

diff --git a/opendaylight/config/config-manager/pom.xml b/opendaylight/config/config-manager/pom.xml
index 7f3b88c..b5e73dd 100644 (file)
--- a/opendaylight/config/config-manager/pom.xml
+++ b/opendaylight/config/config-manager/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

-            <version>${opendaylight.yangtools.version}</version>
+            <version>${yangtools.version}</version>

         </dependency>
     </dependencies>
 
         </dependency>
     </dependencies>
 

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 2ee7926..ad89a32 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -68,9 +68,6 @@
         <osgi.version>5.0.0</osgi.version>
         <jacoco.version>0.6.2.201302030002</jacoco.version>
         <slf4j.version>1.7.2</slf4j.version>
         <osgi.version>5.0.0</osgi.version>
         <jacoco.version>0.6.2.201302030002</jacoco.version>
         <slf4j.version>1.7.2</slf4j.version>

-        <opendaylight.yang.version>0.5.9-SNAPSHOT</opendaylight.yang.version>
-        <opendaylight.binding.version>0.6.0-SNAPSHOT</opendaylight.binding.version>
-        <opendaylight.yangtools.version>0.1.1-SNAPSHOT</opendaylight.yangtools.version>

         <salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
     </properties>
 
         <salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
     </properties>
 


@@ -163,22 +160,22 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-spi</artifactId>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-spi</artifactId>

-                <version>${opendaylight.binding.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-util</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-util</artifactId>

-                <version>${opendaylight.binding.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-parser-impl</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-parser-impl</artifactId>

-                <version>${opendaylight.yang.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-impl</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-impl</artifactId>

-                <version>${opendaylight.binding.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>


@@ -199,12 +196,12 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-type-provider</artifactId>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-type-provider</artifactId>

-                <version>${opendaylight.binding.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin-spi</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin-spi</artifactId>

-                <version>${opendaylight.yang.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>


@@ -222,17 +219,17 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-binding</artifactId>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-binding</artifactId>

-                <version>${opendaylight.binding.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-common</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-common</artifactId>

-                <version>${opendaylight.yang.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>concepts</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>concepts</artifactId>

-                <version>${opendaylight.yangtools.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
         </dependencies>
     </dependencyManagement>
             </dependency>
         </dependencies>
     </dependencyManagement>


@@ -284,7 +281,7 @@
                 <plugin>
                     <groupId>org.opendaylight.yangtools</groupId>
                     <artifactId>yang-maven-plugin</artifactId>
                 <plugin>
                     <groupId>org.opendaylight.yangtools</groupId>
                     <artifactId>yang-maven-plugin</artifactId>

-                    <version>${opendaylight.yang.version}</version>
+                    <version>${yangtools.version}</version>

                     <executions>
                         <execution>
                             <id>sal</id>
                     <executions>
                         <execution>
                             <id>sal</id>


@@ -315,7 +312,7 @@
                         <dependency>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>
                         <dependency>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>

-                            <version>${opendaylight.binding.version}</version>
+                            <version>${yangtools.version}</version>

                             <type>jar</type>
                         </dependency>
                     </dependencies>
                             <type>jar</type>
                         </dependency>
                     </dependencies>

diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml
index 235e466..19e2273 100644 (file)
--- a/opendaylight/config/yang-test/pom.xml
+++ b/opendaylight/config/yang-test/pom.xml
@@ -65,7 +65,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>${opendaylight.yang.version}</version>
+                <version>${yangtools.version}</version>

                 <executions>
                     <execution>
                         <id>config</id>
                 <executions>
                     <execution>
                         <id>config</id>


@@ -122,7 +122,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yangtools.binding.version}</version>
+                        <version>${yangtools.version}</version>

                     </dependency>
                 </dependencies>
             </plugin>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 7aa2532..17d484a 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -175,7 +175,7 @@
         <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>concepts</artifactId>
         <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>concepts</artifactId>

-          <version>0.1.1-SNAPSHOT</version>
+          <version>${yangtools.version}</version>

         </dependency>
 
         <dependency>
         </dependency>
 
         <dependency>


@@ -418,27 +418,27 @@
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-spi</artifactId>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-spi</artifactId>

-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>

          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-api</artifactId>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-api</artifactId>

-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>

          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-impl</artifactId>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-impl</artifactId>

-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>

          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-util</artifactId>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-util</artifactId>

-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>

          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-model-api</artifactId>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-model-api</artifactId>

-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>

          </dependency>
          <dependency>
            <groupId>commons-lang</groupId>
          </dependency>
          <dependency>
            <groupId>commons-lang</groupId>


@@ -482,7 +482,6 @@
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>yang-data-impl</artifactId>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>yang-data-impl</artifactId>

-          <version>0.5.9-SNAPSHOT</version>

          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>

diff --git a/opendaylight/md-sal/clustered-data-store/implementation/pom.xml b/opendaylight/md-sal/clustered-data-store/implementation/pom.xml
index 62775c1..869a298 100644 (file)
--- a/opendaylight/md-sal/clustered-data-store/implementation/pom.xml
+++ b/opendaylight/md-sal/clustered-data-store/implementation/pom.xml
@@ -35,7 +35,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>

                 <executions>
                     <execution>
                         <goals>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/clustered-data-store/integrationtest/pom.xml b/opendaylight/md-sal/clustered-data-store/integrationtest/pom.xml
index 129e6ff..b4f7176 100644 (file)
--- a/opendaylight/md-sal/clustered-data-store/integrationtest/pom.xml
+++ b/opendaylight/md-sal/clustered-data-store/integrationtest/pom.xml
@@ -195,7 +195,6 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>

-            <version>0.1.1-SNAPSHOT</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>


@@ -258,6 +257,18 @@
             <artifactId>yang-store-impl</artifactId>
             <version>${config.version}</version>
         </dependency>
             <artifactId>yang-store-impl</artifactId>
             <version>${config.version}</version>
         </dependency>

+
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-parser-impl</artifactId>
+            <version>${yangtools.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-util</artifactId>
+            <version>${yangtools.version}</version>
+        </dependency>
+

         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>logback-config</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>logback-config</artifactId>

diff --git a/opendaylight/md-sal/model/pom.xml b/opendaylight/md-sal/model/pom.xml
index 571e9d8..f7c137f 100644 (file)
--- a/opendaylight/md-sal/model/pom.xml
+++ b/opendaylight/md-sal/model/pom.xml
@@ -47,7 +47,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>

                 <executions>
                     <execution>
                         <goals>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index efc8423..3c4c8e3 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -89,6 +89,7 @@
     </profiles>
 
     <properties>
     </profiles>
 
     <properties>

+        <yangtools.version>0.6.0-SNAPSHOT</yangtools.version>

         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
         <!-- Java Versions -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
         <!-- Java Versions -->


@@ -101,8 +102,6 @@
 
         <!-- Dependency Versions -->
         <slf4j.version>1.7.2</slf4j.version>
 
         <!-- Dependency Versions -->
         <slf4j.version>1.7.2</slf4j.version>

-        <yang.version>0.5.9-SNAPSHOT</yang.version>
-        <yang.binding.version>0.6.0-SNAPSHOT</yang.binding.version>

         <yang.codegen.version>0.6.0-SNAPSHOT</yang.codegen.version>
         <guava.version>14.0.1</guava.version>
         <osgi.core.version>5.0.0</osgi.core.version>
         <yang.codegen.version>0.6.0-SNAPSHOT</yang.codegen.version>
         <guava.version>14.0.1</guava.version>
         <osgi.core.version>5.0.0</osgi.core.version>


@@ -213,32 +212,37 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-binding</artifactId>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-binding</artifactId>

-                <version>${yang.binding.version}</version>
+                <version>${yangtools.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-model-util</artifactId>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-common</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-common</artifactId>

-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-api</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-api</artifactId>

-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-impl</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-impl</artifactId>

-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-model-api</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-model-api</artifactId>

-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-util</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-util</artifactId>

-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>

             </dependency>
             <!-- SAL Dependencies -->
             <dependency>
             </dependency>
             <!-- SAL Dependencies -->
             <dependency>


@@ -310,6 +314,16 @@
                 <version>${powermock.version}</version>
                 <scope>test</scope>
             </dependency>
                 <version>${powermock.version}</version>
                 <scope>test</scope>
             </dependency>

+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>binding-generator-impl</artifactId>
+                <version>0.6.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-parser-impl</artifactId>
+                <version>0.6.0-SNAPSHOT</version>
+            </dependency>

         </dependencies>
     </dependencyManagement>
     <build>
         </dependencies>
     </dependencyManagement>
     <build>

diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index 29357c0..87a0736 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -19,7 +19,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>

                 <executions>
                     <execution>
                         <goals>
                 <executions>
                     <execution>
                         <goals>


@@ -196,12 +196,10 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>binding-generator-impl</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>binding-generator-impl</artifactId>

-            <version>0.6.0-SNAPSHOT</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>

-            <version>0.5.9-SNAPSHOT</version>

             <scope>test</scope>
         </dependency>
         <dependency>
             <scope>test</scope>
         </dependency>
         <dependency>


@@ -237,12 +235,10 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>

-            <version>0.5.9-SNAPSHOT</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-util</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-util</artifactId>

-            <version>0.5.9-SNAPSHOT</version>

         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml
index a913faa..be031a7 100644 (file)
--- a/opendaylight/md-sal/sal-binding-config/pom.xml
+++ b/opendaylight/md-sal/sal-binding-config/pom.xml
@@ -24,7 +24,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>

                 <executions>
                     <execution>
                         <goals>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml
index 4ed629b..ac273cd 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/pom.xml
+++ b/opendaylight/md-sal/sal-dom-api/pom.xml
@@ -22,7 +22,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>

                 <executions>
                     <execution>
                         <goals>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
index 10e7946..949d59c 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -55,12 +55,10 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>

-            <version>0.5.9-SNAPSHOT</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>

-            <version>0.5.9-SNAPSHOT</version>

         </dependency>
     </dependencies>
 
         </dependency>
     </dependencies>
 


@@ -69,7 +67,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>

                 <executions>
                     <execution>
                         <goals>
                 <executions>
                     <execution>
                         <goals>


@@ -124,6 +122,9 @@
                             org.opendaylight.controller.sal.dom.broker.*,
                             org.opendaylight.controller.config.yang.md.sal.dom.impl
                         </Private-Package>
                             org.opendaylight.controller.sal.dom.broker.*,
                             org.opendaylight.controller.config.yang.md.sal.dom.impl
                         </Private-Package>

+                        <Import-Package>
+                            *
+                        </Import-Package>

                     </instructions>
                 </configuration>
             </plugin>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/opendaylight/md-sal/sal-netconf-connector/pom.xml b/opendaylight/md-sal/sal-netconf-connector/pom.xml
index 770056f..61a84b6 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/pom.xml
+++ b/opendaylight/md-sal/sal-netconf-connector/pom.xml
@@ -43,7 +43,6 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>

-            <version>0.5.9-SNAPSHOT</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>


@@ -200,11 +199,18 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>

+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>

             </plugin>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>

                 <executions>
                     <execution>
                         <goals>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
index d5648a0..ee9bc89 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
@@ -146,7 +146,7 @@
                         <Export-Package>
                             org.opendaylight.controller.config.yang.md.sal.remote.rpc,
                             org.opendaylight.controller.sal.connector.remoterpc,
                         <Export-Package>
                             org.opendaylight.controller.config.yang.md.sal.remote.rpc,
                             org.opendaylight.controller.sal.connector.remoterpc,

-                            org.opendaylight.controller.sal.connector.remoterpc.*
+                            org.opendaylight.controller.sal.connector.remoterpc.*,

                         </Export-Package>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                     </instructions>
                         </Export-Package>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                     </instructions>


@@ -157,7 +157,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>

                 <executions>
                     <execution>
                         <goals>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml
index fa7b73b..dd216c0 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>

-            <version>0.5.9-SNAPSHOT</version>
+            <version>${yangtools.version}</version>

         </dependency>
 
         <dependency>
         </dependency>
 
         <dependency>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
index 8ee61c3..d748d69 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
@@ -204,11 +204,11 @@
             <artifactId>yang-data-api</artifactId>
         </dependency>
         <!--dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId> 
             <artifactId>yang-data-api</artifactId>
         </dependency>
         <!--dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId> 

-            <version>0.5.9-SNAPSHOT</version> </dependency -->
+            <version>${yangtools.version}</version> </dependency -->

         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>

-            <version>0.5.9-SNAPSHOT</version>
+            <version>${yangtools.version}</version>

         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/md-sal/sal-rest-connector/pom.xml b/opendaylight/md-sal/sal-rest-connector/pom.xml
index 0bd86a3..2d24e66 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/pom.xml
+++ b/opendaylight/md-sal/sal-rest-connector/pom.xml
@@ -40,12 +40,10 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-impl</artifactId>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-impl</artifactId>

-      <version>${yang.version}</version>

     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-model-util</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-model-util</artifactId>

-      <version>${yang.version}</version>

     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>


@@ -73,7 +71,6 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-parser-impl</artifactId>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-parser-impl</artifactId>

-      <version>${yang.version}</version>

       <scope>test</scope>
     </dependency>
     <dependency>
       <scope>test</scope>
     </dependency>
     <dependency>


@@ -102,7 +99,7 @@
               org.opendaylight.controller.sal.restconf.impl,
               org.eclipse.xtend2.lib,
               org.eclipse.xtend.lib,
               org.opendaylight.controller.sal.restconf.impl,
               org.eclipse.xtend2.lib,
               org.eclipse.xtend.lib,

-              org.eclipse.xtext.xbase.*
+              org.eclipse.xtext.xbase.*,

             </Private-Package>
             <Import-Package>
             *,
             </Private-Package>
             <Import-Package>
             *,

diff --git a/opendaylight/md-sal/samples/toaster/pom.xml b/opendaylight/md-sal/samples/toaster/pom.xml
index f93bb33..2c97063 100644 (file)
--- a/opendaylight/md-sal/samples/toaster/pom.xml
+++ b/opendaylight/md-sal/samples/toaster/pom.xml
@@ -19,7 +19,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>

                 <executions>
                     <execution>
                         <goals>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml b/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
index aebaaeb..986b6ec 100644 (file)
--- a/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
+++ b/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
@@ -56,7 +56,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yangtools.binding.version}</version>
+                        <version>${yangtools.version}</version>

                     </dependency>
                 </dependencies>
             </plugin>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/opendaylight/netconf/ietf-netconf-monitoring/pom.xml b/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
index f564c8c..471830e 100644 (file)
--- a/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
@@ -65,7 +65,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>

-                        <version>${yangtools.binding.version}</version>
+                        <version>${yangtools.version}</version>

                     </dependency>
                 </dependencies>
             </plugin>
                     </dependency>
                 </dependencies>
             </plugin>