Bumped version of Maven YANG tools to 0.5.1-SNAPSHOT

 - Removed unnecessary dependencies from YANG Maven Tools integration tests.
 - Added Attach Sources and Javadoc to deploy phase

Change-Id: I456c06538c944ae53d4f12827be4a64726b8233b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-api/pom.xml b/opendaylight/sal/yang-prototype/code-generator/binding-generator-api/pom.xml
index 51771e5204b7cc35eecf3cca70dd96c97e845ad8..efb655ff1497f78ac843c92a43d9b2f061ec631c 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-api/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-api/pom.xml
@@ -3,10 +3,9 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>binding-generator</artifactId>\r
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>binding-generator</artifactId>\r

-    <version>0.5-SNAPSHOT</version>\r
+    <version>0.5.1-SNAPSHOT</version>\r

   </parent>\r
   <artifactId>binding-generator-api</artifactId>\r
   </parent>\r
   <artifactId>binding-generator-api</artifactId>\r

-  <version>${release.version}</version>\r

   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/pom.xml b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/pom.xml
index d9509e89b0563cd5abb950a7ef1541192444f005..9ba61667ed98a3e206798d24aacb678d02707a6b 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/pom.xml
@@ -3,10 +3,9 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>binding-generator</artifactId>\r
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>binding-generator</artifactId>\r

-    <version>0.5-SNAPSHOT</version>\r
+    <version>0.5.1-SNAPSHOT</version>\r

   </parent>\r
   <artifactId>binding-generator-impl</artifactId>\r
   </parent>\r
   <artifactId>binding-generator-impl</artifactId>\r

-  <version>${release.version}</version>\r

   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-spi/pom.xml b/opendaylight/sal/yang-prototype/code-generator/binding-generator-spi/pom.xml
index ebaecde2059fee1f382752eb01e12907e036ba9f..2ec8845dde0f8fdcbfcd1751bcd30eaf4e6dd7bc 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-spi/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-spi/pom.xml
@@ -3,10 +3,9 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>binding-generator</artifactId>\r
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>binding-generator</artifactId>\r

-    <version>0.5-SNAPSHOT</version>\r
+    <version>0.5.1-SNAPSHOT</version>\r

   </parent>\r
   <artifactId>binding-generator-spi</artifactId>\r
   </parent>\r
   <artifactId>binding-generator-spi</artifactId>\r

-  <version>${release.version}</version>\r

   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/pom.xml b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/pom.xml
index 44a3bc8bd7dc5106969378fc4dc01710261753c3..3fa8f3379aa609b7738834281c6240f6cbfeb8cc 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/pom.xml
@@ -3,10 +3,9 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>binding-generator</artifactId>\r
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>binding-generator</artifactId>\r

-    <version>0.5-SNAPSHOT</version>\r
+    <version>0.5.1-SNAPSHOT</version>\r

   </parent>\r
   <artifactId>binding-generator-util</artifactId>\r
   </parent>\r
   <artifactId>binding-generator-util</artifactId>\r

-  <version>${release.version}</version>\r

   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/pom.xml
index a7d564909f8ab22baef38bda4d5db7fb76a7122c..1eb30d3d6e381485f217ecceca758ada8ae33ff5 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/pom.xml
@@ -4,10 +4,9 @@
        <parent>\r
                <groupId>org.opendaylight.controller</groupId>\r
                <artifactId>binding-generator</artifactId>\r
        <parent>\r
                <groupId>org.opendaylight.controller</groupId>\r
                <artifactId>binding-generator</artifactId>\r

-               <version>0.5-SNAPSHOT</version>\r
+               <version>0.5.1-SNAPSHOT</version>\r

        </parent>\r
        <artifactId>binding-java-api-generator</artifactId>\r
        </parent>\r
        <artifactId>binding-java-api-generator</artifactId>\r

-    <version>${release.version}</version>\r

        <dependencies>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
        <dependencies>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r

diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-model-api/pom.xml b/opendaylight/sal/yang-prototype/code-generator/binding-model-api/pom.xml
index de5e35a7fa86a610ea99d544cca17bbe33303d08..b00739d0fbd76356f5833cc8bd710362447eed60 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/binding-model-api/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/binding-model-api/pom.xml
@@ -3,8 +3,7 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>binding-generator</artifactId>\r
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>binding-generator</artifactId>\r

-    <version>0.5-SNAPSHOT</version>\r
+    <version>0.5.1-SNAPSHOT</version>\r

   </parent>\r
   <artifactId>binding-model-api</artifactId>\r
   </parent>\r
   <artifactId>binding-model-api</artifactId>\r

-  <version>${release.version}</version>\r

 </project>
\ No newline at end of file
 </project>
\ No newline at end of file

diff --git a/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/pom.xml b/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/pom.xml
index 93c6a12cd1a52f3fc415b11593bfc392fb6eff11..d4c5b05731b51311bb2d0d102a98dcaf35dd4d93 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/pom.xml
@@ -15,12 +15,10 @@
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>binding-generator-impl</artifactId>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>binding-generator-impl</artifactId>\r

-                       <version>0.5-SNAPSHOT</version>\r

                </dependency>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>binding-java-api-generator</artifactId>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>binding-java-api-generator</artifactId>\r

-                       <version>0.5-SNAPSHOT</version>\r

                </dependency>\r
        </dependencies>\r
 \r
                </dependency>\r
        </dependencies>\r
 \r

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/pom.xml
index 8ee48aaa3e4283ca674d02e477e6eb22d85b5ec1..207ed964d3bded70a0254b17ef6cb555b5839dee 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/pom.xml
@@ -4,10 +4,9 @@
     <parent>
         <artifactId>binding-generator</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>binding-generator</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.5-SNAPSHOT</version>
+        <version>0.5.1-SNAPSHOT</version>

     </parent>
     <artifactId>maven-sal-api-gen-plugin</artifactId>
     </parent>
     <artifactId>maven-sal-api-gen-plugin</artifactId>

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

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

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml
index 81ff631e9d24d7300b2be016485930f2978201d4..896827ee45414e0d0b2d0dd8b621f296ac583444 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml
@@ -4,11 +4,10 @@
     <parent>
         <artifactId>yang</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>yang</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.5-SNAPSHOT</version>
+        <version>0.5.1-SNAPSHOT</version>

         <relativePath>../../yang/pom.xml</relativePath>
     </parent>
     <artifactId>yang-maven-plugin-it</artifactId>
         <relativePath>../../yang/pom.xml</relativePath>
     </parent>
     <artifactId>yang-maven-plugin-it</artifactId>

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

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

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml
index 1b10c641836c7cd80e007bf831928940063e3c85..353416d2ac0ddb2d12708e11f85f45a2c3a9e00f 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct/pom.xml
@@ -1,18 +1,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>

-       <parent>
-               <artifactId>binding-generator</artifactId>
-               <groupId>org.opendaylight.controller</groupId>
-               <version>0.5-SNAPSHOT</version>
-       </parent>
+
+        <groupId>org.opendaylight.controller</groupId>
+               <version>0.5.1-SNAPSHOT</version>

        <artifactId>test</artifactId>
 
        <dependencies>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>yang-maven-plugin-spi</artifactId>
        <artifactId>test</artifactId>
 
        <dependencies>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>yang-maven-plugin-spi</artifactId>

-                       <version>0.5-SNAPSHOT</version>
+                       <version>0.5.1-SNAPSHOT</version>

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


@@ -21,7 +19,7 @@
                        <plugin>
                                <groupId>org.opendaylight.controller</groupId>
                                <artifactId>yang-maven-plugin</artifactId>
                        <plugin>
                                <groupId>org.opendaylight.controller</groupId>
                                <artifactId>yang-maven-plugin</artifactId>

-                               <version>0.5-SNAPSHOT</version>
+                               <version>0.5.1-SNAPSHOT</version>

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


@@ -54,7 +52,7 @@
                                        <dependency>
                                                <groupId>org.opendaylight.controller</groupId>
                                                <artifactId>yang-maven-plugin-spi</artifactId>
                                        <dependency>
                                                <groupId>org.opendaylight.controller</groupId>
                                                <artifactId>yang-maven-plugin-spi</artifactId>

-                                               <version>0.5-SNAPSHOT</version>
+                                               <version>0.5.1-SNAPSHOT</version>

                                                <type>test-jar</type>
                                        </dependency>
                                </dependencies>
                                                <type>test-jar</type>
                                        </dependency>
                                </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct_resources/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct_resources/pom.xml
index 5f51935191633fae9a61d038f75b6a5eba559948..356f1c6386dc5fd4fad68ef69dc009310756d158 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct_resources/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct_resources/pom.xml
@@ -1,11 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>

-    <parent>
-        <artifactId>binding-generator</artifactId>
+

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

-        <version>0.5-SNAPSHOT</version>
-    </parent>
+        <version>0.5.1-SNAPSHOT</version>
+

     <artifactId>test</artifactId>
 
     <build>
     <artifactId>test</artifactId>
 
     <build>


@@ -13,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5-SNAPSHOT</version>
+                <version>0.5.1-SNAPSHOT</version>

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


@@ -39,7 +38,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>

-                        <version>0.5-SNAPSHOT</version>
+                        <version>0.5.1-SNAPSHOT</version>

                         <type>test-jar</type>
                     </dependency>
                 </dependencies>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml
index df213580d1a14c9d28e61fdcc33adea84a429383..fdef8ad5954d1708a7b585ddf1352f246ed1d424 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest1/pom.xml
@@ -4,14 +4,14 @@
 
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>generator-test1</artifactId>
 
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>generator-test1</artifactId>

-       <version>0.5-SNAPSHOT</version>
+       <version>0.5.1-SNAPSHOT</version>

 
        <build>
                <plugins>
                        <plugin>
                                <groupId>org.opendaylight.controller</groupId>
                                <artifactId>yang-maven-plugin</artifactId>
 
        <build>
                <plugins>
                        <plugin>
                                <groupId>org.opendaylight.controller</groupId>
                                <artifactId>yang-maven-plugin</artifactId>

-                               <version>0.5-SNAPSHOT</version>
+                               <version>0.5.1-SNAPSHOT</version>

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


@@ -41,7 +41,7 @@
                                        <dependency>
                                                <groupId>org.opendaylight.controller</groupId>
                                                <artifactId>yang-maven-plugin-spi</artifactId>
                                        <dependency>
                                                <groupId>org.opendaylight.controller</groupId>
                                                <artifactId>yang-maven-plugin-spi</artifactId>

-                                               <version>0.5-SNAPSHOT</version>
+                                               <version>0.5.1-SNAPSHOT</version>

                                                <type>test-jar</type>
                                        </dependency>
                                </dependencies>
                                                <type>test-jar</type>
                                        </dependency>
                                </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml
index 7948efc85bd92df444053f5e44dabcfec9ca6dec..2fcbd622845caf5700d832fbc266122238c01e7a 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/GenerateTest2/pom.xml
@@ -3,16 +3,17 @@
        <modelVersion>4.0.0</modelVersion>
 
        <groupId>org.opendaylight.controller</groupId>
        <modelVersion>4.0.0</modelVersion>
 
        <groupId>org.opendaylight.controller</groupId>

+       <version>0.5.1-SNAPSHOT</version>

        <artifactId>generator-test2</artifactId>
        <artifactId>generator-test2</artifactId>

-       <version>0.5-SNAPSHOT</version>
+       

 
        <dependencies>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>generator-test1</artifactId>
 
        <dependencies>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>generator-test1</artifactId>

-                       <version>0.5-SNAPSHOT</version>
+                       <version>0.5.1-SNAPSHOT</version>

                        <scope>system</scope>
                        <scope>system</scope>

-                       <systemPath>${project.basedir}/../GenerateTest1/target/generator-test1-0.5-SNAPSHOT.jar</systemPath>
+                       <systemPath>${project.basedir}/../GenerateTest1/target/generator-test1-0.5.1-SNAPSHOT.jar</systemPath>

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


@@ -21,7 +22,7 @@
                        <plugin>
                                <groupId>org.opendaylight.controller</groupId>
                                <artifactId>yang-maven-plugin</artifactId>
                        <plugin>
                                <groupId>org.opendaylight.controller</groupId>
                                <artifactId>yang-maven-plugin</artifactId>

-                               <version>0.5-SNAPSHOT</version>
+                               <version>0.5.1-SNAPSHOT</version>

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


@@ -57,7 +58,7 @@
                                        <dependency>
                                                <groupId>org.opendaylight.controller</groupId>
                                                <artifactId>yang-maven-plugin-spi</artifactId>
                                        <dependency>
                                                <groupId>org.opendaylight.controller</groupId>
                                                <artifactId>yang-maven-plugin-spi</artifactId>

-                                               <version>0.5-SNAPSHOT</version>
+                                               <version>0.5.1-SNAPSHOT</version>

                                                <type>test-jar</type>
                                        </dependency>
                                </dependencies>
                                                <type>test-jar</type>
                                        </dependency>
                                </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml
index ab600924a8c0c7eb42fa29edc87fd0e0e126fe7f..5581882a31d68773f507db11774c30f480f9938b 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Generator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>binding-generator</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>binding-generator</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.5-SNAPSHOT</version>
+        <version>0.5.1-SNAPSHOT</version>

     </parent>
     <artifactId>test</artifactId>
 
     </parent>
     <artifactId>test</artifactId>
 


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

-                <version>0.5-SNAPSHOT</version>
+                <version>0.5.1-SNAPSHOT</version>

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


@@ -49,7 +49,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>

-                        <version>0.5-SNAPSHOT</version>
+                        <version>0.5.1-SNAPSHOT</version>

                         <type>test-jar</type>
                     </dependency>
                 </dependencies>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml
index 87844cd295fdcf696a0090bd52ef7fd6abd7bc16..7d3291a304da85723285b0212cae28d3ee055d57 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators/pom.xml
@@ -1,11 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>

-    <parent>
-        <artifactId>binding-generator</artifactId>
+

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

-        <version>0.5-SNAPSHOT</version>
-    </parent>
+        <version>0.5.1-SNAPSHOT</version>

     <artifactId>test</artifactId>
 
     <build>
     <artifactId>test</artifactId>
 
     <build>


@@ -13,7 +11,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5-SNAPSHOT</version>
+                <version>0.5.1-SNAPSHOT</version>

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


@@ -40,7 +38,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>

-                        <version>0.5-SNAPSHOT</version>
+                        <version>0.5.1-SNAPSHOT</version>

                         <type>test-jar</type>
                     </dependency>
                 </dependencies>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators_resources/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators_resources/pom.xml
index 0d56c039e3ffed53d1c042d6e53cbada12ef21c6..90220bae4fb8fce00c21104cc9410bf7a60b7493 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators_resources/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoGenerators_resources/pom.xml
@@ -1,11 +1,11 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>

-    <parent>
-        <artifactId>binding-generator</artifactId>
+
+

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

-        <version>0.5-SNAPSHOT</version>
-    </parent>
+        <version>0.5.1-SNAPSHOT</version>
+

     <artifactId>test</artifactId>
 
     <build>
     <artifactId>test</artifactId>
 
     <build>


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

-                <version>0.5-SNAPSHOT</version>
+                <version>0.5.1-SNAPSHOT</version>

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


@@ -40,7 +40,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>

-                        <version>0.5-SNAPSHOT</version>
+                        <version>0.5.1-SNAPSHOT</version>

                         <type>test-jar</type>
                     </dependency>
                 </dependencies>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml
index de5f8cf7795711b30da621922ed64b94c598c832..00ddbdd344cffad03eda9f3dac81d1a2bff5f5eb 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoOutputDir/pom.xml
@@ -1,11 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>

-    <parent>
-        <artifactId>binding-generator</artifactId>
+

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

-        <version>0.5-SNAPSHOT</version>
-    </parent>
+        <version>0.5.1-SNAPSHOT</version>
+

     <artifactId>test</artifactId>
 
     <build>
     <artifactId>test</artifactId>
 
     <build>


@@ -13,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5-SNAPSHOT</version>
+                <version>0.5.1-SNAPSHOT</version>

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


@@ -43,7 +42,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>

-                        <version>0.5-SNAPSHOT</version>
+                        <version>0.5.1-SNAPSHOT</version>

                         <type>test-jar</type>
                     </dependency>
                 </dependencies>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml
index 70aa82aae5d90797624e47b301e2057703db7edc..1fc7ab34d60b3c8dc0dd1d161a1db0ed493eafeb 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/NoYangFiles/pom.xml
@@ -1,11 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>

-    <parent>
-        <artifactId>binding-generator</artifactId>
+

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

-        <version>0.5-SNAPSHOT</version>
-    </parent>
+        <version>0.5.1-SNAPSHOT</version>
+

     <artifactId>test</artifactId>
 
     <build>
     <artifactId>test</artifactId>
 
     <build>


@@ -13,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5-SNAPSHOT</version>
+                <version>0.5.1-SNAPSHOT</version>

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


@@ -49,7 +48,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>

-                        <version>0.5-SNAPSHOT</version>
+                        <version>0.5.1-SNAPSHOT</version>

                         <type>test-jar</type>
                     </dependency>
                 </dependencies>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml
index ec5c606aa494c6b121336e96b8d6b382757c61c0..15f4322360fd9ec76cc4acb830e356c4cb01bcfc 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator/pom.xml
@@ -1,11 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>

-    <parent>
-        <artifactId>binding-generator</artifactId>
+

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

-        <version>0.5-SNAPSHOT</version>
-    </parent>
+        <version>0.5.1-SNAPSHOT</version>
+

     <artifactId>test</artifactId>
 
     <build>
     <artifactId>test</artifactId>
 
     <build>


@@ -13,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5-SNAPSHOT</version>
+                <version>0.5.1-SNAPSHOT</version>

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


@@ -57,7 +56,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>

-                        <version>0.5-SNAPSHOT</version>
+                        <version>0.5.1-SNAPSHOT</version>

                         <type>test-jar</type>
                     </dependency>
                 </dependencies>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator_resources/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator_resources/pom.xml
index defae7e4b3bdb65a9c23f69ac50d798928ec9b3e..438ef945f63475c8473b308fa49fed3bdcf2fbe1 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator_resources/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/UnknownGenerator_resources/pom.xml
@@ -1,11 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>

-    <parent>
-        <artifactId>binding-generator</artifactId>
+

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

-        <version>0.5-SNAPSHOT</version>
-    </parent>
+        <version>0.5.1-SNAPSHOT</version>
+

     <artifactId>test</artifactId>
 
     <build>
     <artifactId>test</artifactId>
 
     <build>


@@ -13,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5-SNAPSHOT</version>
+                <version>0.5.1-SNAPSHOT</version>

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


@@ -57,7 +56,7 @@
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
                         <artifactId>yang-maven-plugin-spi</artifactId>

-                        <version>0.5-SNAPSHOT</version>
+                        <version>0.5.1-SNAPSHOT</version>

                         <type>test-jar</type>
                     </dependency>
                 </dependencies>
                         <type>test-jar</type>
                     </dependency>
                 </dependencies>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml
index 6208231c6feb9d42c01419b480ff87c7537aa169..9986438d0b71c842d845a0e989675589ace764dd 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/YangRootNotExist/pom.xml
@@ -1,11 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>

-    <parent>
-        <artifactId>binding-generator</artifactId>
+

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

-        <version>0.5-SNAPSHOT</version>
-    </parent>
+        <version>0.5.1-SNAPSHOT</version>
+

     <artifactId>test</artifactId>
 
     <build>
     <artifactId>test</artifactId>
 
     <build>


@@ -13,7 +12,7 @@
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
             <plugin>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-maven-plugin</artifactId>

-                <version>0.5-SNAPSHOT</version>
+                <version>0.5.1-SNAPSHOT</version>

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

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml
index 188fb925ba05a22624a2a416ea05c17afc6a08e7..5afd588541382de8584324e028cd9f1a6d222ebb 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml
@@ -4,12 +4,11 @@
     <parent>
         <artifactId>yang</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>yang</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.5-SNAPSHOT</version>
+        <version>0.5.1-SNAPSHOT</version>

         <relativePath>../../yang/pom.xml</relativePath>
     </parent>
 
     <artifactId>yang-maven-plugin</artifactId>
         <relativePath>../../yang/pom.xml</relativePath>
     </parent>
 
     <artifactId>yang-maven-plugin</artifactId>

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

     <packaging>maven-plugin</packaging>
     <description>
         This plugin is a wrapper for "yang to source code" generation.
     <packaging>maven-plugin</packaging>
     <description>
         This plugin is a wrapper for "yang to source code" generation.


@@ -61,7 +60,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>

-            <version>${release.version}</version>
+            <version>${project.version}</version>

             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml
index 628e74348df396e02e76a51b3268db3edc6c1f10..ca7a320247d258e81c72d2556e0d0193c3c5ae40 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml
@@ -4,11 +4,10 @@
     <parent>
         <artifactId>yang</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>yang</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.5-SNAPSHOT</version>
+        <version>0.5.1-SNAPSHOT</version>

         <relativePath>../../yang/pom.xml</relativePath>
     </parent>
     <artifactId>yang-maven-plugin-spi</artifactId>
         <relativePath>../../yang/pom.xml</relativePath>
     </parent>
     <artifactId>yang-maven-plugin-spi</artifactId>

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

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

diff --git a/opendaylight/sal/yang-prototype/code-generator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/pom.xml
index a1962e52d5bc44b70b877148261f72ab013281d2..9edca3cd228b5cfd8caeead7dcd2b01a8d1376dd 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/pom.xml
@@ -8,6 +8,7 @@
         <artifactId>yang-prototype</artifactId>
         <version>0.5-SNAPSHOT</version>
     </parent>
         <artifactId>yang-prototype</artifactId>
         <version>0.5-SNAPSHOT</version>
     </parent>

+    <version>0.5.1-SNAPSHOT</version>

 
     <artifactId>binding-generator</artifactId>
     <packaging>pom</packaging>
 
     <artifactId>binding-generator</artifactId>
     <packaging>pom</packaging>


@@ -16,9 +17,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- version of YANG tools dependencies -->
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- version of YANG tools dependencies -->

-        <yang.version>0.5-SNAPSHOT</yang.version>
-        <!-- Version of all child artifacts -->
-        <release.version>0.5-SNAPSHOT</release.version>
+        <yang.version>0.5.1-SNAPSHOT</yang.version>

     </properties>
 
     <modules>
     </properties>
 
     <modules>


@@ -36,37 +35,37 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>binding-model-api</artifactId>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>binding-model-api</artifactId>

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

-                <version>${release.version}</version>
+                <version>${project.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>binding-generator-spi</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>binding-generator-spi</artifactId>

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

-                <version>${release.version}</version>
+                <version>${project.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>maven-sal-api-gen-plugin</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>maven-sal-api-gen-plugin</artifactId>

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

diff --git a/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml b/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml
index 8ee1bf0f33a51ae643a3829b9eccd1f1f342a2c7..03a2e8588e6d5e908b7bf32286d38614b5e0838a 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>binding-generator</artifactId>
         <groupId>org.opendaylight.controller</groupId>
     <parent>
         <artifactId>binding-generator</artifactId>
         <groupId>org.opendaylight.controller</groupId>

-        <version>0.5-SNAPSHOT</version>
+        <version>0.5.1-SNAPSHOT</version>

     </parent>
     <artifactId>maven-code-gen-sample</artifactId>
 
     </parent>
     <artifactId>maven-code-gen-sample</artifactId>
 


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

-                <version>0.5-SNAPSHOT</version>
+                <version>0.5.1-SNAPSHOT</version>

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


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

-                        <version>0.5-SNAPSHOT</version>
+                        <version>0.5.1-SNAPSHOT</version>

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


@@ -107,7 +107,7 @@
     <dependency>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>yang-binding</artifactId>
     <dependency>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>yang-binding</artifactId>

-    <version>0.5-SNAPSHOT</version>
+    <version>0.5.1-SNAPSHOT</version>

     </dependency>
     </dependencies>
 </project>
\ No newline at end of file
     </dependency>
     </dependencies>
 </project>
\ No newline at end of file

diff --git a/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/src/main/java/Example.java b/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/src/main/java/Example.java
index cc2656405c858153d29f1e883ca0facc4151d7a1..b15c0e5122d87d9d9537f2bb877d77019b711b48 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/src/main/java/Example.java
+++ b/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/src/main/java/Example.java
@@ -1,3 +1,11 @@
+import java.util.List;
+
+import org.opendaylight.yang.gen.v1.urn.opendaylight.controller.network.rev2013520.ControllerNetworkData;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.controller.network.rev2013520.Network;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.controller.network.rev2013520.network.topologies.Topology;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.controller.network.rev2013520.network.topologies.topology.nodes.Node;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.controller.openflow.rev2013520.Node1;
+

 /*
  * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
  *
 /*
  * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
  *


@@ -9,4 +17,18 @@
 public class Example {
     
 
 public class Example {
     
 

+    
+    void udpateTopology(ControllerNetworkData network) {
+        List<Topology> topologies = network.getNetwork().getTopologies().getTopology();
+        for (Topology topology : topologies) {
+            List<Node> nodes = topology.getNodes().getNode();
+            for (Node node : nodes) {
+                
+                
+                Node1 ofNode = node.getAugmentation(Node1.class);
+                ofNode.getDatapathId();
+            }
+        }
+        
+    }

 }
 }

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml
index 48ebb51f389571fd8d964e24760678409702250a..547d83adc8ed617db4d421e3835f1911b5bc5b39 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-api/pom.xml
@@ -3,16 +3,14 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>yang</artifactId>
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>yang</artifactId>

-    <version>0.5-SNAPSHOT</version>
+    <version>0.5.1-SNAPSHOT</version>

     <relativePath>../../yang/pom.xml</relativePath>
   </parent>
   <artifactId>yang-model-parser-api</artifactId>
     <relativePath>../../yang/pom.xml</relativePath>
   </parent>
   <artifactId>yang-model-parser-api</artifactId>

-  

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

-          <version>0.5-SNAPSHOT</version>

       </dependency>
   </dependencies>
 </project>
\ No newline at end of file
       </dependency>
   </dependencies>
 </project>
\ No newline at end of file

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml
index 27ef15e1569cbf7365336184f1bfd63d58904298..16a746905e0fc2d5f192b05ee404aad18aa5ee44 100644 (file)
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/pom.xml
@@ -4,36 +4,26 @@
        <parent>\r
                <groupId>org.opendaylight.controller</groupId>\r
                <artifactId>yang</artifactId>\r
        <parent>\r
                <groupId>org.opendaylight.controller</groupId>\r
                <artifactId>yang</artifactId>\r

-               <version>0.5-SNAPSHOT</version>\r
+               <version>0.5.1-SNAPSHOT</version>\r

                <relativePath>../../yang/pom.xml</relativePath>\r
        </parent>\r
        <artifactId>yang-model-parser-impl</artifactId>\r
                <relativePath>../../yang/pom.xml</relativePath>\r
        </parent>\r
        <artifactId>yang-model-parser-impl</artifactId>\r

-\r

        <dependencies>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>yang-common</artifactId>\r
        <dependencies>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>yang-common</artifactId>\r

-                       <version>0.5-SNAPSHOT</version>\r

                </dependency>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>yang-model-api</artifactId>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>yang-model-api</artifactId>\r

-                       <version>0.5-SNAPSHOT</version>\r

                </dependency>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>yang-model-parser-api</artifactId>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>yang-model-parser-api</artifactId>\r

-                       <version>0.5-SNAPSHOT</version>\r

                </dependency>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>yang-model-util</artifactId>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>yang-model-util</artifactId>\r

-                       <version>0.5-SNAPSHOT</version>\r
-               </dependency>\r
-               <dependency>\r
-                       <groupId>org.opendaylight.controller</groupId>\r
-                       <artifactId>binding-model-api</artifactId>\r
-                       <version>0.5-SNAPSHOT</version>\r

                </dependency>\r
 \r
                <dependency>\r
                </dependency>\r
 \r
                <dependency>\r

diff --git a/opendaylight/sal/yang-prototype/pom.xml b/opendaylight/sal/yang-prototype/pom.xml
index 1ba93ea298e10afed761d20e7f0ce291757d66d8..cf931cb2451352a45ca19aeee5a0fa1da54c1ad0 100644 (file)
--- a/opendaylight/sal/yang-prototype/pom.xml
+++ b/opendaylight/sal/yang-prototype/pom.xml
@@ -1,209 +1,235 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <modelVersion>4.0.0</modelVersion>
-       <groupId>org.opendaylight.controller</groupId>
-       <artifactId>yang-prototype</artifactId>
-       <version>0.5-SNAPSHOT</version>
-       <packaging>pom</packaging>
-       <modules>
-               <module>yang</module>
-               <module>code-generator</module>
-       </modules>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>yang-prototype</artifactId>
+    <version>0.5-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <modules>
+        <module>yang</module>
+        <module>code-generator</module>
+    </modules>

 
 

-       <properties>
-               <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
-               <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
-               <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
-               <siteplugin>3.2</siteplugin>
-               <projectinfo>2.6</projectinfo>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <compiler.version>2.3.2</compiler.version>
-               <surefire.version>2.13</surefire.version>
-               <exam.version>3.0.0</exam.version>
-               <url.version>1.5.0</url.version>
-               <enunciate.version>1.26.2</enunciate.version>
-               <sonar.branch>${user.name}-private-view</sonar.branch>
-               <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>
-               <logback.version>1.0.9</logback.version>
-               <slf4j.version>1.7.2</slf4j.version>
-       </properties>
+    <properties>
+        <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
+        <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
+        <sitedeploy>dav:http://nexus.opendaylight.org/content/sites/site</sitedeploy>
+        <siteplugin>3.2</siteplugin>
+        <projectinfo>2.6</projectinfo>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <compiler.version>2.3.2</compiler.version>
+        <surefire.version>2.13</surefire.version>
+        <exam.version>3.0.0</exam.version>
+        <url.version>1.5.0</url.version>
+        <enunciate.version>1.26.2</enunciate.version>
+        <sonar.branch>${user.name}-private-view</sonar.branch>
+        <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>
+        <logback.version>1.0.9</logback.version>
+        <slf4j.version>1.7.2</slf4j.version>
+    </properties>

 
 

-       <pluginRepositories>
-               <pluginRepository>
-                       <id>central2</id>
-                       <name>central2</name>
-                       <url>${nexusproxy}/repositories/central2/</url>
-               </pluginRepository>
-       </pluginRepositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>central2</id>
+            <name>central2</name>
+            <url>${nexusproxy}/repositories/central2/</url>
+        </pluginRepository>
+    </pluginRepositories>

 
 
 
 

-       <repositories>
-               <!-- EBR release -->
-               <!-- http://repository.springsource.com/maven/bundles/release -->
-               <repository>
-                       <id>ebr-bundles-release</id>
-                       <name>ebr-bundles-release</name>
-                       <url>${nexusproxy}/repositories/ebr-bundles-release/</url>
-               </repository>
-               <!-- EBR external -->
-               <!-- http://repository.springsource.com/maven/bundles/external -->
-               <repository>
-                       <id>ebr-bundles-external</id>
-                       <name>ebr-bundles-external</name>
-                       <url>${nexusproxy}/repositories/ebr-bundles-external/</url>
-               </repository>
-               <!-- Maven repo2 mirror -->
-               <!-- http://repo2.maven.org/maven2 -->
-               <repository>
-                       <id>central2</id>
-                       <name>central2</name>
-                       <url>${nexusproxy}/repositories/central2/</url>
-               </repository>
-               <!-- Maven repo1 mirror -->
-               <!-- http://repo1.maven.org/maven2 -->
-               <repository>
-                       <id>central</id>
-                       <name>central</name>
-                       <url>${nexusproxy}/repositories/central/</url>
-               </repository>
-               <!-- Pax mirror -->
-               <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->
-               <repository>
-                       <id>ops4j-releases</id>
-                       <name>ops4j-releases</name>
-                       <url>${nexusproxy}/repositories/ops4j-releases/</url>
-               </repository>
-               <!-- Third Packages hosted in local maven because not available in other 
-                       places -->
-               <repository>
-                       <id>thirdparty</id>
-                       <name>thirdparty</name>
-                       <url>${nexusproxy}/repositories/thirdparty/</url>
-               </repository>
-               <!-- Jboss mirror -->
-               <!-- https://repository.jboss.org/nexus/content/repositories/releases -->
-               <repository>
-                       <id>jboss.releases</id>
-                       <name>jboss.releases</name>
-                       <url>${nexusproxy}/repositories/jboss.releases/</url>
-               </repository>
-               <!-- OpenDayLight Released artifact -->
-               <repository>
-                       <id>opendaylight-release</id>
-                       <name>opendaylight-release</name>
-                       <url>${nexusproxy}/repositories/opendaylight.release/</url>
-               </repository>
-               <!-- OpenDayLight Snapshot artifact -->
-               <repository>
-                       <id>opendaylight-snapshot</id>
-                       <name>opendaylight-snapshot</name>
-                       <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-               </repository>
-       </repositories>
-       <distributionManagement>
-               <!-- OpenDayLight Released artifact -->
-               <repository>
-                       <id>opendaylight-release</id>
-                       <url>${nexusproxy}/repositories/opendaylight.release/</url>
-               </repository>
-               <!-- OpenDayLight Snapshot artifact -->
-               <snapshotRepository>
-                       <id>opendaylight-snapshot</id>
-                       <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
-               </snapshotRepository>
-               <!-- Site deployment -->
-               <!-- site>
-                       <id>website</id>
-                       <url>${sitedeploy}</url>
-               </site -->
-       </distributionManagement>
+    <repositories>
+        <!-- EBR release -->
+        <!-- http://repository.springsource.com/maven/bundles/release -->
+        <repository>
+            <id>ebr-bundles-release</id>
+            <name>ebr-bundles-release</name>
+            <url>${nexusproxy}/repositories/ebr-bundles-release/</url>
+        </repository>
+        <!-- EBR external -->
+        <!-- http://repository.springsource.com/maven/bundles/external -->
+        <repository>
+            <id>ebr-bundles-external</id>
+            <name>ebr-bundles-external</name>
+            <url>${nexusproxy}/repositories/ebr-bundles-external/</url>
+        </repository>
+        <!-- Maven repo2 mirror -->
+        <!-- http://repo2.maven.org/maven2 -->
+        <repository>
+            <id>central2</id>
+            <name>central2</name>
+            <url>${nexusproxy}/repositories/central2/</url>
+        </repository>
+        <!-- Maven repo1 mirror -->
+        <!-- http://repo1.maven.org/maven2 -->
+        <repository>
+            <id>central</id>
+            <name>central</name>
+            <url>${nexusproxy}/repositories/central/</url>
+        </repository>
+        <!-- Pax mirror -->
+        <!-- https://oss.sonatype.org/content/repositories/ops4j-releases -->
+        <repository>
+            <id>ops4j-releases</id>
+            <name>ops4j-releases</name>
+            <url>${nexusproxy}/repositories/ops4j-releases/</url>
+        </repository>
+        <!-- Third Packages hosted in local maven because not available in other 
+            places -->
+        <repository>
+            <id>thirdparty</id>
+            <name>thirdparty</name>
+            <url>${nexusproxy}/repositories/thirdparty/</url>
+        </repository>
+        <!-- Jboss mirror -->
+        <!-- https://repository.jboss.org/nexus/content/repositories/releases -->
+        <repository>
+            <id>jboss.releases</id>
+            <name>jboss.releases</name>
+            <url>${nexusproxy}/repositories/jboss.releases/</url>
+        </repository>
+        <!-- OpenDayLight Released artifact -->
+        <repository>
+            <id>opendaylight-release</id>
+            <name>opendaylight-release</name>
+            <url>${nexusproxy}/repositories/opendaylight.release/</url>
+        </repository>
+        <!-- OpenDayLight Snapshot artifact -->
+        <repository>
+            <id>opendaylight-snapshot</id>
+            <name>opendaylight-snapshot</name>
+            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+        </repository>
+    </repositories>
+    <distributionManagement>
+        <!-- OpenDayLight Released artifact -->
+        <repository>
+            <id>opendaylight-release</id>
+            <url>${nexusproxy}/repositories/opendaylight.release/</url>
+        </repository>
+        <!-- OpenDayLight Snapshot artifact -->
+        <snapshotRepository>
+            <id>opendaylight-snapshot</id>
+            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+        </snapshotRepository>
+        <!-- Site deployment -->
+        <!-- site>
+            <id>website</id>
+            <url>${sitedeploy}</url>
+        </site -->
+    </distributionManagement>

 
 
 
 

-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>junit</groupId>
-                               <artifactId>junit</artifactId>
-                               <version>4.10</version>
-                               <scope>test</scope>
-                               <optional>true</optional>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.slf4j</groupId>
-                               <artifactId>slf4j-api</artifactId>
-                               <version>1.7.2</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>${compiler.version}</version>
-                               <inherited>true</inherited>
-                               <configuration>
-                                       <source>1.7</source>
-                                       <target>1.7</target>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>2.8.1</version>
-                               <configuration>
-                                       <stylesheet>maven</stylesheet>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>aggregate</goal>
-                                               </goals>
-                                               <phase>site</phase>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <reporting>
-               <plugins>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>findbugs-maven-plugin</artifactId>
-                               <version>2.4.0</version>
-                               <configuration>
-                                       <effort>Max</effort>
-                                       <threshold>Low</threshold>
-                                       <goal>site</goal>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>jdepend-maven-plugin</artifactId>
-                               <version>2.0-beta-2</version>
-                       </plugin>
-               </plugins>
-       </reporting>
-       <profiles>
-               <profile>
-                       <id>viewbuild</id>
-                       <activation>
-                               <activeByDefault>true</activeByDefault>
-                       </activation>
-                       <properties>
-                               <build.suffix>${project.version}</build.suffix>
-                       </properties>
-               </profile>
-               <profile>
-                       <id>jenkins</id>
-                       <activation>
-                               <property>
-                                       <name>BUILDSUFFIX</name>
-                               </property>
-                       </activation>
-                       <properties>
-                               <build.suffix>${BUILDSUFFIX}</build.suffix>
-                       </properties>
-               </profile>
-       </profiles>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.10</version>
+                <scope>test</scope>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.7.2</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${compiler.version}</version>
+                <inherited>true</inherited>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8.1</version>
+                <configuration>
+                    <stylesheet>maven</stylesheet>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>aggregate</goal>
+                        </goals>
+                        <phase>site</phase>
+                    </execution> 
+                    <execution> 
+                          <id>attach-javadocs</id>
+                          <phase>deploy</phase>
+                          <goals><goal>jar</goal></goals> 
+                    </execution> 
+                </executions> 
+            </plugin>
+            <plugin>
+            <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>deploy</phase>
+                        <goals><goal>jar-no-fork</goal></goals> 
+                    </execution>
+                 </executions>
+            </plugin>
+            <plugin> 
+                <!-- explicitly define maven-deploy-plugin after other to force exec order -->
+                <artifactId>maven-deploy-plugin</artifactId> 
+                <executions> 
+                    <execution> 
+                        <id>deploy</id>
+                        <phase>deploy</phase>
+                        <goals><goal>deploy</goal></goals> 
+                    </execution> 
+                </executions> 
+            </plugin> 
+        </plugins>
+    </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>2.4.0</version>
+                <configuration>
+                    <effort>Max</effort>
+                    <threshold>Low</threshold>
+                    <goal>site</goal>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jdepend-maven-plugin</artifactId>
+                <version>2.0-beta-2</version>
+            </plugin>
+        </plugins>
+    </reporting>
+    <profiles>
+        <profile>
+            <id>viewbuild</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <build.suffix>${project.version}</build.suffix>
+            </properties>
+        </profile>
+        <profile>
+            <id>jenkins</id>
+            <activation>
+                <property>
+                    <name>BUILDSUFFIX</name>
+                </property>
+            </activation>
+            <properties>
+                <build.suffix>${BUILDSUFFIX}</build.suffix>
+            </properties>
+        </profile>
+    </profiles>

 </project>
 </project>

diff --git a/opendaylight/sal/yang-prototype/yang/pom.xml b/opendaylight/sal/yang-prototype/yang/pom.xml
index 19d35997e3042ecfa359ed5be8c4148ba80ca258..e79e70028b6cdacdbd8ffc0130ad6a9669ab137c 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/pom.xml
@@ -6,14 +6,13 @@
                <artifactId>yang-prototype</artifactId>
                <version>0.5-SNAPSHOT</version>
        </parent>
                <artifactId>yang-prototype</artifactId>
                <version>0.5-SNAPSHOT</version>
        </parent>

-
+       <version>0.5.1-SNAPSHOT</version>

        <artifactId>yang</artifactId>
        <packaging>pom</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Version of all child artifacts -->
        <artifactId>yang</artifactId>
        <packaging>pom</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Version of all child artifacts -->

-        <release.version>0.5-SNAPSHOT</release.version>

     </properties>
 
        <modules>
     </properties>
 
        <modules>


@@ -35,53 +34,53 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-common</artifactId>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-common</artifactId>

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

-                <version>${release.version}</version>
+                <version>${project.version}</version>

             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-binding</artifactId>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>yang-binding</artifactId>

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

-                <version>${release.version}</version>
+                <version>${project.version}</version>

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

diff --git a/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml
index 0836f749a4f16e05006b6e20fa8a245745f40a81..f7df24f53f9a69ecf3e709de1bdf608fe4eddf99 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml
@@ -3,8 +3,7 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r

-    <version>0.5-SNAPSHOT</version>\r
+    <version>0.5.1-SNAPSHOT</version>\r

   </parent>\r
   <artifactId>yang-binding</artifactId>\r
   </parent>\r
   <artifactId>yang-binding</artifactId>\r

-  <version>${release.version}</version>\r

 </project>
\ No newline at end of file
 </project>
\ No newline at end of file

diff --git a/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml
index fc3e21b9b9fa2e562f597df165664886b3ee92ce..987b9b11a18a11ffb901a2adff7e8e764e8ebc3a 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml
@@ -3,10 +3,9 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r

-    <version>0.5-SNAPSHOT</version>\r
+    <version>0.5.1-SNAPSHOT</version>\r

   </parent>\r
   <artifactId>yang-common</artifactId>\r
   </parent>\r
   <artifactId>yang-common</artifactId>\r

-  <version>${release.version}</version>\r

   <dependencies>\r
       <dependency>\r
           <groupId>org.slf4j</groupId>\r
   <dependencies>\r
       <dependency>\r
           <groupId>org.slf4j</groupId>\r

diff --git a/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml
index 2677e66f03e52c63962855b06435d34c28395d40..749c9c66f439eabddf25c5da6ad3798c02003132 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml
@@ -3,10 +3,9 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r

-    <version>0.5-SNAPSHOT</version>\r
+    <version>0.5.1-SNAPSHOT</version>\r

   </parent>\r
   <artifactId>yang-data-api</artifactId>\r
   </parent>\r
   <artifactId>yang-data-api</artifactId>\r

-  <version>${release.version}</version>\r

   \r
   <dependencies>\r
        <dependency>\r
   \r
   <dependencies>\r
        <dependency>\r

diff --git a/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml
index 44c0ffbaa75bd97f0fd79d4fbab06c931fb095c8..15b391f5b896146565a785fa8e459435dfb43be4 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml
@@ -3,10 +3,9 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r

-    <version>0.5-SNAPSHOT</version>\r
+    <version>0.5.1-SNAPSHOT</version>\r

   </parent>\r
   <artifactId>yang-data-util</artifactId>\r
   </parent>\r
   <artifactId>yang-data-util</artifactId>\r

-  <version>${release.version}</version>\r

   <dependencies>\r
        <dependency>\r
                <groupId>org.opendaylight.controller</groupId>\r
   <dependencies>\r
        <dependency>\r
                <groupId>org.opendaylight.controller</groupId>\r

diff --git a/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml
index 1798d5ea5cc33e8d4c4b77d19e22405545e74a6a..3eabd7ff9f4aec09ddb4964f7b8fce95187347e3 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml
@@ -3,10 +3,9 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r

-    <version>0.5-SNAPSHOT</version>\r
+    <version>0.5.1-SNAPSHOT</version>\r

   </parent>\r
   <artifactId>yang-model-api</artifactId>\r
   </parent>\r
   <artifactId>yang-model-api</artifactId>\r

-  <version>${release.version}</version>\r

   <dependencies>\r
        <dependency>\r
                <groupId>org.opendaylight.controller</groupId>\r
   <dependencies>\r
        <dependency>\r
                <groupId>org.opendaylight.controller</groupId>\r

diff --git a/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml
index ec4a9fab252d0ac9319abece4402eccfa7e19d40..3390837be919feae17cd0484802402b7fda0f0e9 100644 (file)
--- a/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml
+++ b/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml
@@ -3,11 +3,9 @@
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r
   <parent>\r
     <groupId>org.opendaylight.controller</groupId>\r
     <artifactId>yang</artifactId>\r

-    <version>0.5-SNAPSHOT</version>\r
-    <relativePath>../../yang/pom.xml</relativePath>\r
+    <version>0.5.1-SNAPSHOT</version>\r

   </parent>\r
   <artifactId>yang-model-util</artifactId>\r
   </parent>\r
   <artifactId>yang-model-util</artifactId>\r

-  <version>${release.version}</version>\r

   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r