From 3fe6d393591dc90e1a2d7558d543fa81c7c6e71d Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Fri, 3 May 2013 15:45:49 +0200 Subject: [PATCH] Updated POM files and versions to SNAPSHOT Change-Id: I28b16eb8811d928440a18eb2e16df9253cc92562 Signed-off-by: Tony Tkacik --- .../binding-generator-api/pom.xml | 6 +- .../binding-generator-impl/pom.xml | 10 +- .../binding-generator-spi/pom.xml | 6 +- .../binding-generator-util/pom.xml | 6 +- .../binding-java-api-generator/pom.xml | 8 +- .../code-generator/binding-model-api/pom.xml | 2 +- .../code-generator-demo/pom.xml | 58 ++--- .../maven-sal-api-gen-plugin/pom.xml | 15 +- .../maven-yang-plugin-it/pom.xml | 7 +- .../src/test/resources/Correct/pom.xml | 10 +- .../test/resources/Correct_combined/pom.xml | 10 +- .../test/resources/Correct_resources/pom.xml | 10 +- .../src/test/resources/NoGenerators/pom.xml | 6 +- .../resources/NoGenerators_resources/pom.xml | 6 +- .../src/test/resources/NoYangFiles/pom.xml | 10 +- .../test/resources/UnknownGenerator/pom.xml | 10 +- .../UnknownGenerator_resources/pom.xml | 10 +- .../test/resources/YangRootNotExist/pom.xml | 6 +- .../code-generator/maven-yang-plugin/pom.xml | 17 +- .../code-generator/maven-yang/pom.xml | 9 +- .../sal/yang-prototype/code-generator/pom.xml | 171 ++++++-------- .../samples/maven-code-gen-sample/pom.xml | 10 +- .../yang-model-parser-api/pom.xml | 7 +- .../yang-model-parser-impl/pom.xml | 17 +- opendaylight/sal/yang-prototype/pom.xml | 214 ++++++++++++++++++ opendaylight/sal/yang-prototype/yang/pom.xml | 174 +++++++------- .../yang-prototype/yang/yang-binding/pom.xml | 2 +- .../yang-prototype/yang/yang-common/pom.xml | 2 +- .../yang-prototype/yang/yang-data-api/pom.xml | 4 +- .../yang/yang-data-util/pom.xml | 4 +- .../yang/yang-model-api/pom.xml | 4 +- .../yang/yang-model-util/pom.xml | 5 +- 32 files changed, 521 insertions(+), 315 deletions(-) create mode 100644 opendaylight/sal/yang-prototype/pom.xml 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 fcd599c73b..720a589771 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 @@ -3,19 +3,19 @@ org.opendaylight.controller binding-generator - 1.0 + 0.5-SNAPSHOT binding-generator-api org.opendaylight.controller binding-model-api - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller yang-model-api - 1.0 + 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 950db94ea1..ff5aafec98 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 @@ -3,30 +3,30 @@ org.opendaylight.controller binding-generator - 1.0 + 0.5-SNAPSHOT binding-generator-impl org.opendaylight.controller binding-generator-util - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller yang-model-parser-impl - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller binding-generator-api - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller binding-generator-spi - 1.0 + 0.5-SNAPSHOT jaxen 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 97e5780a4d..96539552a5 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 @@ -3,19 +3,19 @@ org.opendaylight.controller binding-generator - 1.0 + 0.5-SNAPSHOT binding-generator-spi org.opendaylight.controller binding-model-api - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller yang-model-api - 1.0 + 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 b60d108d17..8a08ab4355 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 @@ -3,19 +3,19 @@ org.opendaylight.controller binding-generator - 1.0 + 0.5-SNAPSHOT binding-generator-util org.opendaylight.controller binding-model-api - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller yang-model-api - 1.0 + 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 4517d7005d..847986c001 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 @@ -4,25 +4,25 @@ org.opendaylight.controller binding-generator - 1.0 + 0.5-SNAPSHOT binding-java-api-generator org.opendaylight.controller binding-model-api - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller binding-generator-impl - 1.0 + 0.5-SNAPSHOT test org.opendaylight.controller binding-generator-util - 1.0 + 0.5-SNAPSHOT \ No newline at end of file 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 c9e60b6a14..9c7ca316af 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 @@ -3,7 +3,7 @@ org.opendaylight.controller binding-generator - 1.0 + 0.5-SNAPSHOT binding-model-api \ 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 58608354d1..37282cc5e8 100644 --- a/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/pom.xml @@ -1,31 +1,32 @@ - - 4.0.0 - - org.opendaylight.controller - binding-generator - 1.0 - - code-generator-demo - - - - org.antlr - antlr4 - 4.0 - - - org.opendaylight.controller - binding-generator-impl - 1.0 - - - org.opendaylight.controller - binding-java-api-generator - 1.0 - - - - + + 4.0.0 + + org.opendaylight.controller + binding-generator + 0.5-SNAPSHOT + + code-generator-demo + + + + org.antlr + antlr4 + 4.0 + + + org.opendaylight.controller + binding-generator-impl + 0.5-SNAPSHOT + + + org.opendaylight.controller + binding-java-api-generator + 0.5-SNAPSHOT + + + + maven-assembly-plugin @@ -50,7 +51,6 @@ - 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 1f44e66a9e..8f5d127414 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 @@ -4,36 +4,35 @@ binding-generator org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT maven-sal-api-gen-plugin org.opendaylight.controller - maven-yang - 1.0 + yang-maven-plugin-spi + 0.5-SNAPSHOT org.opendaylight.controller binding-model-api - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller binding-generator-api - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller binding-generator-impl - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller binding-java-api-generator - 1.0 + 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 e3a54ba32a..6c574e5d85 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 @@ -2,11 +2,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - binding-generator + yang org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT + ../../yang/pom.xml - maven-yang-plugin-it + yang-maven-plugin-it 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 c48f151499..6a7c3f95b7 100644 --- 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 @@ -4,7 +4,7 @@ binding-generator org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT test @@ -12,8 +12,8 @@ org.opendaylight.controller - maven-yang-plugin - 1.0 + yang-maven-plugin + 0.5-SNAPSHOT @@ -38,8 +38,8 @@ org.opendaylight.controller - maven-yang - 1.0 + yang-maven-plugin-spi + 0.5-SNAPSHOT test-jar diff --git a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct_combined/pom.xml b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct_combined/pom.xml index 4fbffb6904..fe67c78152 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct_combined/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang-plugin-it/src/test/resources/Correct_combined/pom.xml @@ -4,7 +4,7 @@ binding-generator org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT test @@ -12,8 +12,8 @@ org.opendaylight.controller - maven-yang-plugin - 1.0 + yang-maven-plugin + 0.5-SNAPSHOT @@ -49,8 +49,8 @@ org.opendaylight.controller - maven-yang - 1.0 + yang-maven-plugin-spi + 0.5-SNAPSHOT test-jar 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 2a935158c1..0e0c96a48c 100644 --- 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 @@ -4,7 +4,7 @@ binding-generator org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT test @@ -12,8 +12,8 @@ org.opendaylight.controller - maven-yang-plugin - 1.0 + yang-maven-plugin + 0.5-SNAPSHOT @@ -38,8 +38,8 @@ org.opendaylight.controller - maven-yang - 1.0 + yang-maven-plugin-spi + 0.5-SNAPSHOT test-jar 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 a9ec4893f0..f19d84886e 100644 --- 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 @@ -4,7 +4,7 @@ binding-generator org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT test @@ -12,8 +12,8 @@ org.opendaylight.controller - maven-yang-plugin - 1.0 + yang-maven-plugin + 0.5-SNAPSHOT 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 74f9dc38e3..38028b84e9 100644 --- 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 @@ -4,7 +4,7 @@ binding-generator org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT test @@ -12,8 +12,8 @@ org.opendaylight.controller - maven-yang-plugin - 1.0 + yang-maven-plugin + 0.5-SNAPSHOT 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 a64c759394..2308da0fed 100644 --- 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 @@ -4,7 +4,7 @@ binding-generator org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT test @@ -12,8 +12,8 @@ org.opendaylight.controller - maven-yang-plugin - 1.0 + yang-maven-plugin + 0.5-SNAPSHOT @@ -38,8 +38,8 @@ org.opendaylight.controller - maven-yang - 1.0 + yang-maven-plugin-spi + 0.5-SNAPSHOT test-jar 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 2c7f922838..2101b8471b 100644 --- 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 @@ -4,7 +4,7 @@ binding-generator org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT test @@ -12,8 +12,8 @@ org.opendaylight.controller - maven-yang-plugin - 1.0 + yang-maven-plugin + 0.5-SNAPSHOT @@ -46,8 +46,8 @@ org.opendaylight.controller - maven-yang - 1.0 + yang-maven-plugin-spi + 0.5-SNAPSHOT test-jar 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 fb83dc96ec..8ee0606631 100644 --- 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 @@ -4,7 +4,7 @@ binding-generator org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT test @@ -12,8 +12,8 @@ org.opendaylight.controller - maven-yang-plugin - 1.0 + yang-maven-plugin + 0.5-SNAPSHOT @@ -46,8 +46,8 @@ org.opendaylight.controller - maven-yang - 1.0 + yang-maven-plugin-spi + 0.5-SNAPSHOT test-jar 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 6b5ae5a451..3aeb2e9535 100644 --- 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 @@ -4,7 +4,7 @@ binding-generator org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT test @@ -12,8 +12,8 @@ org.opendaylight.controller - maven-yang-plugin - 1.0 + yang-maven-plugin + 0.5-SNAPSHOT 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 4bf399f0c3..e82c737351 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 @@ -2,12 +2,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - binding-generator + yang org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT + ../../yang/pom.xml - maven-yang-plugin + yang-maven-plugin maven-plugin This plugin is a wrapper for "yang to source code" generation. @@ -39,12 +40,12 @@ ${project.groupId} yang-model-parser-impl - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller - maven-yang - 1.0 + yang-maven-plugin-spi + 0.5-SNAPSHOT @@ -55,8 +56,8 @@ ${project.groupId} - maven-yang - 1.0 + yang-maven-plugin-spi + 0.5-SNAPSHOT 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 09dc9d7279..89417b022e 100644 --- a/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/maven-yang/pom.xml @@ -2,17 +2,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - binding-generator + yang org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT + ../../yang/pom.xml - maven-yang + yang-maven-plugin-spi org.opendaylight.controller yang-model-api - 1.0 + 0.5-SNAPSHOT diff --git a/opendaylight/sal/yang-prototype/code-generator/pom.xml b/opendaylight/sal/yang-prototype/code-generator/pom.xml index 89e2794fd1..7d908c3cd0 100644 --- a/opendaylight/sal/yang-prototype/code-generator/pom.xml +++ b/opendaylight/sal/yang-prototype/code-generator/pom.xml @@ -1,100 +1,77 @@ - 4.0.0 - org.opendaylight.controller - binding-generator - 1.0 - pom - binding-generator - - - UTF-8 - - - - ../yang - ../sal/sal-schema-repository-api - code-generator-demo - yang-model-parser-api - yang-model-parser-impl - binding-model-api - binding-generator-api - binding-generator-spi - binding-generator-util - binding-generator-impl - binding-java-api-generator - maven-yang - maven-yang-plugin - maven-yang-plugin-it - maven-sal-api-gen-plugin - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - junit - junit - 4.10 - test - true - - - org.slf4j - slf4j-api - 1.7.2 - - - org.slf4j - slf4j-simple - 1.7.2 - - - - - - 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 - - - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.4.0 - - Max - Low - site - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - + + org.opendaylight.controller + yang-prototype + 0.5-SNAPSHOT + + + org.opendaylight.controller + binding-generator + 0.5-SNAPSHOT + pom + binding-generator + + + UTF-8 + + + + binding-model-api + binding-generator-api + binding-generator-spi + binding-generator-util + binding-generator-impl + binding-java-api-generator + maven-sal-api-gen-plugin + + + + + junit + junit + test + true + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-simple + + + + + + 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/code-generator/samples/maven-code-gen-sample/pom.xml b/opendaylight/sal/yang-prototype/code-generator/samples/maven-code-gen-sample/pom.xml index 5579719683..05981c4578 100644 --- 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 @@ binding-generator org.opendaylight.controller - 1.0 + 0.5-SNAPSHOT maven-code-gen-sample @@ -12,8 +12,8 @@ org.opendaylight.controller - maven-yang-plugin - 1.0 + yang-maven-plugin + 0.5-SNAPSHOT @@ -39,7 +39,7 @@ org.opendaylight.controller maven-sal-api-gen-plugin - 1.0 + 0.5-SNAPSHOT jar @@ -79,7 +79,7 @@ org.opendaylight.controller - maven-yang-plugin + yang-maven-plugin [1.0,) 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 5bfd19d47a..48ebb51f38 100644 --- 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 @@ -2,8 +2,9 @@ 4.0.0 org.opendaylight.controller - binding-generator - 1.0 + yang + 0.5-SNAPSHOT + ../../yang/pom.xml yang-model-parser-api @@ -11,7 +12,7 @@ org.opendaylight.controller yang-model-api - 1.0 + 0.5-SNAPSHOT \ 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 ce0543dafd..10ba3f2816 100644 --- 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 @@ -3,8 +3,9 @@ 4.0.0 org.opendaylight.controller - binding-generator - 1.0 + yang + 0.5-SNAPSHOT + ../../yang/pom.xml yang-model-parser-impl @@ -12,27 +13,27 @@ org.opendaylight.controller yang-common - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller yang-model-api - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller yang-model-parser-api - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller yang-model-util - 1.0 + 0.5-SNAPSHOT org.opendaylight.controller binding-model-api - 1.0 + 0.5-SNAPSHOT @@ -54,7 +55,7 @@ org.mockito mockito-all 1.8.4 - + com.google.guava guava diff --git a/opendaylight/sal/yang-prototype/pom.xml b/opendaylight/sal/yang-prototype/pom.xml new file mode 100644 index 0000000000..ab64b88b4e --- /dev/null +++ b/opendaylight/sal/yang-prototype/pom.xml @@ -0,0 +1,214 @@ + + 4.0.0 + org.opendaylight.controller + yang-prototype + 0.5-SNAPSHOT + pom + + yang + code-generator + + + + https://sonar.opendaylight.org/ + http://nexus.opendaylight.org/content + dav:http://nexus.opendaylight.org/content/sites/site + 3.2 + 2.6 + UTF-8 + 2.3.2 + 2.13 + 3.0.0 + 1.5.0 + 1.26.2 + ${user.name}-private-view + org.openflow.openflowj,net.sf.jung2 + 1.0.9 + 1.7.2 + + + + + central2 + central2 + ${nexusproxy}/repositories/central2/ + + + + + + + + + ebr-bundles-release + ebr-bundles-release + ${nexusproxy}/repositories/ebr-bundles-release/ + + + + + ebr-bundles-external + ebr-bundles-external + ${nexusproxy}/repositories/ebr-bundles-external/ + + + + + central2 + central2 + ${nexusproxy}/repositories/central2/ + + + + + central + central + ${nexusproxy}/repositories/central/ + + + + + ops4j-releases + ops4j-releases + ${nexusproxy}/repositories/ops4j-releases/ + + + + thirdparty + thirdparty + ${nexusproxy}/repositories/thirdparty/ + + + + + jboss.releases + jboss.releases + ${nexusproxy}/repositories/jboss.releases/ + + + + opendaylight-release + opendaylight-release + ${nexusproxy}/repositories/opendaylight.release/ + + + + opendaylight-snapshot + opendaylight-snapshot + ${nexusproxy}/repositories/opendaylight.snapshot/ + + + + + + opendaylight-release + ${nexusproxy}/repositories/opendaylight.release/ + + + + opendaylight-snapshot + ${nexusproxy}/repositories/opendaylight.snapshot/ + + + + + + + + + + junit + junit + 4.10 + test + true + + + org.slf4j + slf4j-api + 1.7.2 + + + org.slf4j + slf4j-simple + 1.7.2 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${compiler.version} + true + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8.1 + + maven + + + + + aggregate + + site + + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.4.0 + + Max + Low + site + + + + org.codehaus.mojo + jdepend-maven-plugin + 2.0-beta-2 + + + + + + viewbuild + + true + + + ${project.version} + + + + jenkins + + + BUILDSUFFIX + + + + ${BUILDSUFFIX} + + + + diff --git a/opendaylight/sal/yang-prototype/yang/pom.xml b/opendaylight/sal/yang-prototype/yang/pom.xml index 68134d4ac8..0ac2bbe569 100644 --- a/opendaylight/sal/yang-prototype/yang/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/pom.xml @@ -1,84 +1,94 @@ - - 4.0.0 - org.opendaylight.controller - yang - 1.0 - pom - - yang-common - yang-data-api - yang-data-util - yang-model-api - yang-model-util - yang-binding - - + + 4.0.0 + + org.opendaylight.controller + yang-prototype + 0.5-SNAPSHOT + - - junit - junit - 4.10 - test - true - - - org.slf4j - slf4j-api - 1.7.2 - - - org.slf4j - slf4j-simple - 1.7.2 - - - - - - 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 - - - - - - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.4.0 - - Max - Low - site - - - - org.codehaus.mojo - jdepend-maven-plugin - 2.0-beta-2 - - - + org.opendaylight.controller + yang + 0.5-SNAPSHOT + pom + + yang-common + yang-data-api + yang-data-util + yang-model-api + yang-model-util + yang-binding + ../code-generator/yang-model-parser-api + ../code-generator/yang-model-parser-impl + ../code-generator/maven-yang + ../code-generator/maven-yang-plugin + ../code-generator/maven-yang-plugin-it + + + + + + junit + junit + test + true + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-simple + + + + + + 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 + + + + + + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.4.0 + + Max + Low + site + + + + org.codehaus.mojo + jdepend-maven-plugin + 2.0-beta-2 + + + diff --git a/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml b/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml index 3ddd4b37fc..e679adeb11 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-binding/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 1.0 + 0.5-SNAPSHOT yang-binding \ 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 b072ab3c1b..f296579fcc 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-common/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 1.0 + 0.5-SNAPSHOT yang-common \ 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 358cabd2d5..b38c21cd79 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-data-api/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 1.0 + 0.5-SNAPSHOT yang-data-api @@ -12,7 +12,7 @@ org.opendaylight.controller yang-common - 1.0 + ${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 2595d5d8a7..7606f07484 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-data-util/pom.xml @@ -3,14 +3,14 @@ org.opendaylight.controller yang - 1.0 + 0.5-SNAPSHOT yang-data-util org.opendaylight.controller yang-data-api - 1.0 + 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 bf1a4ce76f..24bbdd5e35 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-model-api/pom.xml @@ -3,7 +3,7 @@ org.opendaylight.controller yang - 1.0 + 0.5-SNAPSHOT yang-model-api @@ -11,7 +11,7 @@ org.opendaylight.controller yang-common - 1.0 + 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 47a14e12ff..9b56180deb 100644 --- a/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml +++ b/opendaylight/sal/yang-prototype/yang/yang-model-util/pom.xml @@ -3,14 +3,15 @@ org.opendaylight.controller yang - 1.0 + 0.5-SNAPSHOT + ../../yang/pom.xml yang-model-util org.opendaylight.controller yang-model-api - 1.0 + 0.5-SNAPSHOT -- 2.36.6