Fixed dependency management.

Fixed dependency management for Binding Generator and Yang projects.

Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>

diff --git a/pom.xml b/pom.xml
index 4710c9f0e8ccb1e2e9b4c132c870e6a84b4ee014..19d35997e3042ecfa359ed5be8c4148ba80ca258 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -21,8 +28,64 @@
                <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>

diff --git a/yang-binding/pom.xml b/yang-binding/pom.xml
index e679adeb11d598635e456f7111f9225204577229..0836f749a4f16e05006b6e20fa8a245745f40a81 100644 (file)
--- a/yang-binding/pom.xml
+++ b/yang-binding/pom.xml
@@ -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

diff --git a/yang-common/pom.xml b/yang-common/pom.xml
index 796c482ddcfe056bd4fa38a664facdeefdfaff9b..fc3e21b9b9fa2e562f597df165664886b3ee92ce 100644 (file)
--- a/yang-common/pom.xml
+++ b/yang-common/pom.xml
@@ -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

diff --git a/yang-data-api/pom.xml b/yang-data-api/pom.xml
index b38c21cd79612a825f3365cc75ce76439b52041a..2677e66f03e52c63962855b06435d34c28395d40 100644 (file)
--- a/yang-data-api/pom.xml
+++ b/yang-data-api/pom.xml
@@ -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

diff --git a/yang-data-util/pom.xml b/yang-data-util/pom.xml
index 7606f07484a051e0377750d027739af02019e30a..44c0ffbaa75bd97f0fd79d4fbab06c931fb095c8 100644 (file)
--- a/yang-data-util/pom.xml
+++ b/yang-data-util/pom.xml
@@ -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

diff --git a/yang-model-api/pom.xml b/yang-model-api/pom.xml
index 24bbdd5e35d0dcb36c228157aa91abb2994c617a..1798d5ea5cc33e8d4c4b77d19e22405545e74a6a 100644 (file)
--- a/yang-model-api/pom.xml
+++ b/yang-model-api/pom.xml
@@ -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

diff --git a/yang-model-util/pom.xml b/yang-model-util/pom.xml
index 9b56180deb37cdc9bd732f5e24c49a11c2b61a2c..ec4a9fab252d0ac9319abece4402eccfa7e19d40 100644 (file)
--- a/yang-model-util/pom.xml
+++ b/yang-model-util/pom.xml
@@ -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