Fixed dependency management. 96/396/1
authorlsedlak <lsedlak@cisco.com>
Tue, 28 May 2013 14:44:41 +0000 (16:44 +0200)
committerlsedlak <lsedlak@cisco.com>
Tue, 28 May 2013 15:06:23 +0000 (17:06 +0200)
Fixed dependency management for Binding Generator and Yang projects.

Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
18 files changed:
opendaylight/sal/yang-prototype/code-generator/binding-generator-api/pom.xml
opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/pom.xml
opendaylight/sal/yang-prototype/code-generator/binding-generator-spi/pom.xml
opendaylight/sal/yang-prototype/code-generator/binding-generator-util/pom.xml
opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/pom.xml
opendaylight/sal/yang-prototype/code-generator/binding-model-api/pom.xml
opendaylight/sal/yang-prototype/code-generator/maven-sal-api-gen-plugin/pom.xml
opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/pom.xml
opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml
opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml
opendaylight/sal/yang-prototype/code-generator/pom.xml
opendaylight/sal/yang-prototype/yang/pom.xml
opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml
opendaylight/sal/yang-prototype/yang/yang-common/pom.xml
opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml
opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml
opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml
opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml

index 720a589..51771e5 100644 (file)
@@ -6,16 +6,15 @@
     <version>0.5-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>binding-generator-api</artifactId>\r
+  <version>${release.version}</version>\r
   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
           <artifactId>binding-model-api</artifactId>\r
-          <version>0.5-SNAPSHOT</version>\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
   </dependencies>\r
 </project>
\ No newline at end of file
index 56a32b4..d9509e8 100644 (file)
@@ -6,27 +6,23 @@
     <version>0.5-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>binding-generator-impl</artifactId>\r
+  <version>${release.version}</version>\r
   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
           <artifactId>binding-generator-util</artifactId>\r
-          <version>0.5-SNAPSHOT</version>\r
       </dependency>\r
-\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
           <artifactId>yang-model-parser-impl</artifactId>\r
-          <version>0.5-SNAPSHOT</version>\r
       </dependency>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
           <artifactId>binding-generator-api</artifactId>\r
-          <version>0.5-SNAPSHOT</version>\r
       </dependency>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
           <artifactId>binding-generator-spi</artifactId>\r
-          <version>0.5-SNAPSHOT</version>\r
       </dependency>\r
       <dependency>\r
        <groupId>junit</groupId>\r
index 9653955..ebaecde 100644 (file)
@@ -6,16 +6,15 @@
     <version>0.5-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>binding-generator-spi</artifactId>\r
+  <version>${release.version}</version>\r
   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
           <artifactId>binding-model-api</artifactId>\r
-          <version>0.5-SNAPSHOT</version>\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
   </dependencies>\r
 </project>
\ No newline at end of file
index db76760..44a3bc8 100644 (file)
@@ -6,16 +6,15 @@
     <version>0.5-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>binding-generator-util</artifactId>\r
+  <version>${release.version}</version>\r
   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
           <artifactId>binding-model-api</artifactId>\r
-          <version>0.5-SNAPSHOT</version>\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>junit</groupId>\r
@@ -24,7 +23,6 @@
       <dependency>\r
        <groupId>org.opendaylight.controller</groupId>\r
        <artifactId>yang-binding</artifactId>\r
-       <version>0.5-SNAPSHOT</version>\r
       </dependency>\r
   </dependencies>\r
 </project>
\ No newline at end of file
index 438cd6a..a7d5649 100644 (file)
@@ -7,22 +7,20 @@
                <version>0.5-SNAPSHOT</version>\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
                        <artifactId>binding-model-api</artifactId>\r
-                       <version>0.5-SNAPSHOT</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>binding-generator-impl</artifactId>\r
-                       <version>0.5-SNAPSHOT</version>\r
                        <scope>test</scope>\r
                </dependency>\r
                <dependency>\r
                        <groupId>org.opendaylight.controller</groupId>\r
                        <artifactId>binding-generator-util</artifactId>\r
-                       <version>0.5-SNAPSHOT</version>\r
                </dependency>\r
                <dependency>\r
                        <groupId>junit</groupId>\r
index 9c7ca31..de5e35a 100644 (file)
@@ -6,4 +6,5 @@
     <version>0.5-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>binding-model-api</artifactId>\r
+  <version>${release.version}</version>\r
 </project>
\ No newline at end of file
index 8f5d127..8ee48aa 100644 (file)
@@ -7,32 +7,28 @@
         <version>0.5-SNAPSHOT</version>
     </parent>
     <artifactId>maven-sal-api-gen-plugin</artifactId>
+    <version>${release.version}</version>
 
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
-            <version>0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>binding-model-api</artifactId>
-            <version>0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>binding-generator-api</artifactId>
-            <version>0.5-SNAPSHOT</version>
         </dependency>
                <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>binding-generator-impl</artifactId>
-            <version>0.5-SNAPSHOT</version>
         </dependency>
                <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>binding-java-api-generator</artifactId>
-            <version>0.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 </project>
index 6c574e5..81ff631 100644 (file)
@@ -8,7 +8,7 @@
         <relativePath>../../yang/pom.xml</relativePath>
     </parent>
     <artifactId>yang-maven-plugin-it</artifactId>
-
+    <version>${release.version}</version>
 
     <dependencies>
         <dependency>
index d542e6d..83db18e 100644 (file)
@@ -9,6 +9,7 @@
     </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.
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-model-parser-impl</artifactId>
-            <version>0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
-            <version>0.5-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -62,7 +61,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
-            <version>0.5-SNAPSHOT</version>
+            <version>${release.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
index 89417b0..628e743 100644 (file)
@@ -8,12 +8,11 @@
         <relativePath>../../yang/pom.xml</relativePath>
     </parent>
     <artifactId>yang-maven-plugin-spi</artifactId>
-
+    <version>${release.version}</version>
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>yang-model-api</artifactId>
-            <version>0.5-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
index a8cfdef..a1962e5 100644 (file)
-<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>
-               <groupId>org.opendaylight.controller</groupId>
-               <artifactId>yang-prototype</artifactId>
-               <version>0.5-SNAPSHOT</version>
-       </parent>
+    <parent>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>yang-prototype</artifactId>
+        <version>0.5-SNAPSHOT</version>
+    </parent>
 
-       <artifactId>binding-generator</artifactId>
-       <packaging>pom</packaging>
-       <name>binding-generator</name>
+    <artifactId>binding-generator</artifactId>
+    <packaging>pom</packaging>
+    <name>binding-generator</name>
 
-       <properties>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-       </properties>
+    <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>
+    </properties>
 
-       <modules>
-               <module>binding-model-api</module>
-               <module>binding-generator-api</module>
-               <module>binding-generator-spi</module>
-               <module>binding-generator-util</module>
-               <module>binding-generator-impl</module>
-               <module>binding-java-api-generator</module>
-               <module>maven-sal-api-gen-plugin</module>
-       </modules>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <version>2.0</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>
+    <modules>
+        <module>binding-model-api</module>
+        <module>binding-generator-api</module>
+        <module>binding-generator-spi</module>
+        <module>binding-generator-util</module>
+        <module>binding-generator-impl</module>
+        <module>binding-java-api-generator</module>
+        <module>maven-sal-api-gen-plugin</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>binding-model-api</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>binding-generator-api</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>binding-generator-spi</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>binding-generator-util</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>binding-generator-impl</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>binding-java-api-generator</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>maven-sal-api-gen-plugin</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-common</artifactId>
+                <version>${yang.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-data-api</artifactId>
+                <version>${yang.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-data-util</artifactId>
+                <version>${yang.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-model-api</artifactId>
+                <version>${yang.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-model-util</artifactId>
+                <version>${yang.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-binding</artifactId>
+                <version>${yang.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-model-parser-api</artifactId>
+                <version>${yang.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-model-parser-impl
+                </artifactId>
+                <version>${yang.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+                <version>${yang.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-maven-plugin-spi</artifactId>
+                <version>${yang.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0</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>
 </project>
index 4710c9f..19d3599 100644 (file)
@@ -9,6 +9,13 @@
 
        <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>
                <module>yang-common</module>
                <module>yang-data-api</module>
                <module>../code-generator/maven-yang</module>
                <module>../code-generator/maven-yang-plugin</module>
                <module>../code-generator/maven-yang-plugin-it</module>
-
        </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-common</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-data-api</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-data-util</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-model-api</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-model-util</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-binding</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-model-parser-api</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-model-parser-impl
+                </artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>yang-maven-plugin-spi</artifactId>
+                <version>${release.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
        <build>
                <plugins>
                        <plugin>
index e679ade..0836f74 100644 (file)
@@ -6,4 +6,5 @@
     <version>0.5-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>yang-binding</artifactId>\r
+  <version>${release.version}</version>\r
 </project>
\ No newline at end of file
index 796c482..fc3e21b 100644 (file)
@@ -6,11 +6,12 @@
     <version>0.5-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>yang-common</artifactId>\r
+  <version>${release.version}</version>\r
   <dependencies>\r
-       <dependency>\r
-               <groupId>org.slf4j</groupId>\r
-               <artifactId>slf4j-simple</artifactId>\r
-               <version>1.7.5</version>\r
-       </dependency>\r
+      <dependency>\r
+          <groupId>org.slf4j</groupId>\r
+          <artifactId>slf4j-api</artifactId>\r
+          <version>${slf4j.version}</version>\r
+      </dependency>\r
   </dependencies>\r
 </project>
\ No newline at end of file
index b38c21c..2677e66 100644 (file)
@@ -6,13 +6,12 @@
     <version>0.5-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>yang-data-api</artifactId>\r
-  \r
+  <version>${release.version}</version>\r
   \r
   <dependencies>\r
        <dependency>\r
                <groupId>org.opendaylight.controller</groupId>\r
                <artifactId>yang-common</artifactId>\r
-               <version>${project.version}</version>\r
        </dependency>\r
   </dependencies>\r
 </project>
\ No newline at end of file
index 7606f07..44c0ffb 100644 (file)
@@ -6,11 +6,11 @@
     <version>0.5-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>yang-data-util</artifactId>\r
+  <version>${release.version}</version>\r
   <dependencies>\r
        <dependency>\r
                <groupId>org.opendaylight.controller</groupId>\r
                <artifactId>yang-data-api</artifactId>\r
-               <version>0.5-SNAPSHOT</version>\r
        </dependency>\r
   </dependencies>\r
 </project>
\ No newline at end of file
index 24bbdd5..1798d5e 100644 (file)
@@ -6,12 +6,11 @@
     <version>0.5-SNAPSHOT</version>\r
   </parent>\r
   <artifactId>yang-model-api</artifactId>\r
-  \r
+  <version>${release.version}</version>\r
   <dependencies>\r
        <dependency>\r
                <groupId>org.opendaylight.controller</groupId>\r
                <artifactId>yang-common</artifactId>\r
-               <version>0.5-SNAPSHOT</version>\r
        </dependency>\r
   </dependencies>\r
 </project>
\ No newline at end of file
index 9b56180..ec4a9fa 100644 (file)
@@ -7,11 +7,11 @@
     <relativePath>../../yang/pom.xml</relativePath>\r
   </parent>\r
   <artifactId>yang-model-util</artifactId>\r
+  <version>${release.version}</version>\r
   <dependencies>\r
       <dependency>\r
           <groupId>org.opendaylight.controller</groupId>\r
           <artifactId>yang-model-api</artifactId>\r
-          <version>0.5-SNAPSHOT</version>\r
       </dependency>\r
   </dependencies>\r
 </project>\r

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.