From: lsedlak Date: Tue, 28 May 2013 14:44:41 +0000 (+0200) Subject: Fixed dependency management. X-Git-Tag: releasepom-0.1.0~416^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=e22eced84fe50a32df6ab3984a1ac54a382f0cb3 Fixed dependency management. Fixed dependency management for Binding Generator and Yang projects. Signed-off-by: Lukas Sedlak --- 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 720a589771..51771e5204 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-api/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-api/pom.xml @@ -6,16 +6,15 @@ 0.5-SNAPSHOT binding-generator-api + ${release.version} org.opendaylight.controller binding-model-api - 0.5-SNAPSHOT org.opendaylight.controller yang-model-api - 0.5-SNAPSHOT \ No newline at end of file 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 56a32b46cf..d9509e89b0 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/pom.xml @@ -6,27 +6,23 @@ 0.5-SNAPSHOT binding-generator-impl + ${release.version} org.opendaylight.controller binding-generator-util - 0.5-SNAPSHOT - org.opendaylight.controller yang-model-parser-impl - 0.5-SNAPSHOT org.opendaylight.controller binding-generator-api - 0.5-SNAPSHOT org.opendaylight.controller binding-generator-spi - 0.5-SNAPSHOT junit 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 96539552a5..ebaecde205 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-spi/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-spi/pom.xml @@ -6,16 +6,15 @@ 0.5-SNAPSHOT binding-generator-spi + ${release.version} org.opendaylight.controller binding-model-api - 0.5-SNAPSHOT org.opendaylight.controller yang-model-api - 0.5-SNAPSHOT \ No newline at end of file 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 db7676040d..44a3bc8bd7 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-util/pom.xml @@ -6,16 +6,15 @@ 0.5-SNAPSHOT binding-generator-util + ${release.version} org.opendaylight.controller binding-model-api - 0.5-SNAPSHOT org.opendaylight.controller yang-model-api - 0.5-SNAPSHOT junit @@ -24,7 +23,6 @@ org.opendaylight.controller yang-binding - 0.5-SNAPSHOT \ No newline at end of file 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 438cd6a993..a7d564909f 100644 --- 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 @@ -7,22 +7,20 @@ 0.5-SNAPSHOT binding-java-api-generator + ${release.version} org.opendaylight.controller binding-model-api - 0.5-SNAPSHOT org.opendaylight.controller binding-generator-impl - 0.5-SNAPSHOT test org.opendaylight.controller binding-generator-util - 0.5-SNAPSHOT junit 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 9c7ca316af..de5e35a7fa 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-model-api/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/binding-model-api/pom.xml @@ -6,4 +6,5 @@ 0.5-SNAPSHOT binding-model-api + ${release.version} \ No newline at end of file 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 8f5d127414..8ee48aaa3e 100644 --- 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 @@ -7,32 +7,28 @@ 0.5-SNAPSHOT maven-sal-api-gen-plugin + ${release.version} org.opendaylight.controller yang-maven-plugin-spi - 0.5-SNAPSHOT org.opendaylight.controller binding-model-api - 0.5-SNAPSHOT org.opendaylight.controller binding-generator-api - 0.5-SNAPSHOT org.opendaylight.controller binding-generator-impl - 0.5-SNAPSHOT org.opendaylight.controller binding-java-api-generator - 0.5-SNAPSHOT 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 6c574e5d85..81ff631e9d 100644 --- 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 @@ -8,7 +8,7 @@ ../../yang/pom.xml yang-maven-plugin-it - + ${release.version} 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 d542e6d93f..83db18ed12 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin/pom.xml @@ -9,6 +9,7 @@ yang-maven-plugin + ${release.version} maven-plugin This plugin is a wrapper for "yang to source code" generation. @@ -45,12 +46,10 @@ ${project.groupId} yang-model-parser-impl - 0.5-SNAPSHOT org.opendaylight.controller yang-maven-plugin-spi - 0.5-SNAPSHOT @@ -62,7 +61,7 @@ ${project.groupId} yang-maven-plugin-spi - 0.5-SNAPSHOT + ${release.version} test-jar test 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 89417b022e..628e74348d 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml @@ -8,12 +8,11 @@ ../../yang/pom.xml yang-maven-plugin-spi - + ${release.version} org.opendaylight.controller yang-model-api - 0.5-SNAPSHOT diff --git a/opendaylight/sal/yang-prototype/code-generator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/pom.xml index a8cfdef0f3..a1962e52d5 100644 --- a/opendaylight/sal/yang-prototype/code-generator/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/pom.xml @@ -1,58 +1,155 @@ - - 4.0.0 + + 4.0.0 - - org.opendaylight.controller - yang-prototype - 0.5-SNAPSHOT - + + org.opendaylight.controller + yang-prototype + 0.5-SNAPSHOT + - binding-generator - pom - binding-generator + binding-generator + pom + binding-generator - - UTF-8 - + + UTF-8 + + 0.5-SNAPSHOT + + 0.5-SNAPSHOT + - - binding-model-api - binding-generator-api - binding-generator-spi - binding-generator-util - binding-generator-impl - binding-java-api-generator - maven-sal-api-gen-plugin - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0 - true - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8.1 - - maven - - - - - aggregate - - site - - - - - + + binding-model-api + binding-generator-api + binding-generator-spi + binding-generator-util + binding-generator-impl + binding-java-api-generator + maven-sal-api-gen-plugin + + + + + + org.opendaylight.controller + binding-model-api + ${release.version} + + + org.opendaylight.controller + binding-generator-api + ${release.version} + + + org.opendaylight.controller + binding-generator-spi + ${release.version} + + + org.opendaylight.controller + binding-generator-util + ${release.version} + + + org.opendaylight.controller + binding-generator-impl + ${release.version} + + + org.opendaylight.controller + binding-java-api-generator + ${release.version} + + + org.opendaylight.controller + maven-sal-api-gen-plugin + ${release.version} + + + org.opendaylight.controller + yang-common + ${yang.version} + + + org.opendaylight.controller + yang-data-api + ${yang.version} + + + org.opendaylight.controller + yang-data-util + ${yang.version} + + + org.opendaylight.controller + yang-model-api + ${yang.version} + + + org.opendaylight.controller + yang-model-util + ${yang.version} + + + org.opendaylight.controller + yang-binding + ${yang.version} + + + org.opendaylight.controller + yang-model-parser-api + ${yang.version} + + + org.opendaylight.controller + yang-model-parser-impl + + ${yang.version} + + + org.opendaylight.controller + yang-maven-plugin + ${yang.version} + + + org.opendaylight.controller + yang-maven-plugin-spi + ${yang.version} + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0 + true + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + maven + + + + + aggregate + + site + + + + + diff --git a/opendaylight/sal/yang-prototype/yang/pom.xml b/opendaylight/sal/yang-prototype/yang/pom.xml index 4710c9f0e8..19d35997e3 100644 --- a/opendaylight/sal/yang-prototype/yang/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/pom.xml @@ -9,6 +9,13 @@ yang pom + + + UTF-8 + + 0.5-SNAPSHOT + + yang-common yang-data-api @@ -21,8 +28,64 @@ ../code-generator/maven-yang ../code-generator/maven-yang-plugin ../code-generator/maven-yang-plugin-it - + + + + + org.opendaylight.controller + yang-common + ${release.version} + + + org.opendaylight.controller + yang-data-api + ${release.version} + + + org.opendaylight.controller + yang-data-util + ${release.version} + + + org.opendaylight.controller + yang-model-api + ${release.version} + + + org.opendaylight.controller + yang-model-util + ${release.version} + + + org.opendaylight.controller + yang-binding + ${release.version} + + + org.opendaylight.controller + yang-model-parser-api + ${release.version} + + + org.opendaylight.controller + yang-model-parser-impl + + ${release.version} + + + org.opendaylight.controller + yang-maven-plugin + ${release.version} + + + org.opendaylight.controller + yang-maven-plugin-spi + ${release.version} + + + + diff --git a/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml index e679adeb11..0836f749a4 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml @@ -6,4 +6,5 @@ 0.5-SNAPSHOT yang-binding + ${release.version} \ 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 796c482ddc..fc3e21b9b9 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml @@ -6,11 +6,12 @@ 0.5-SNAPSHOT yang-common + ${release.version} - - org.slf4j - slf4j-simple - 1.7.5 - + + org.slf4j + slf4j-api + ${slf4j.version} + \ No newline at end of file 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 b38c21cd79..2677e66f03 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml @@ -6,13 +6,12 @@ 0.5-SNAPSHOT yang-data-api - + ${release.version} org.opendaylight.controller yang-common - ${project.version} \ No newline at end of file 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 7606f07484..44c0ffbaa7 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml @@ -6,11 +6,11 @@ 0.5-SNAPSHOT yang-data-util + ${release.version} org.opendaylight.controller yang-data-api - 0.5-SNAPSHOT \ No newline at end of file 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 24bbdd5e35..1798d5ea5c 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml @@ -6,12 +6,11 @@ 0.5-SNAPSHOT yang-model-api - + ${release.version} org.opendaylight.controller yang-common - 0.5-SNAPSHOT \ No newline at end of file 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 9b56180deb..ec4a9fab25 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml @@ -7,11 +7,11 @@ ../../yang/pom.xml yang-model-util + ${release.version} org.opendaylight.controller yang-model-api - 0.5-SNAPSHOT