From 3b4b7c6b4d5776dd6d41889d363a9c903b30faa3 Mon Sep 17 00:00:00 2001 From: Vaishali Mithbaokar Date: Wed, 9 Apr 2014 18:39:04 -0700 Subject: [PATCH] bug 1128:POM Restructuring for Automated Release Temporarily hosting odlrootparent as part of the project just for review purpose Change-Id: Ia9f14f1f5544e3ef5a543cf8e0e904fb31ffbeee Signed-off-by: Surekha Bejgam Signed-off-by: Vaishali Mithbaokar Signed-off-by: Robert Varga --- .../binding-java-api-generator/pom.xml | 9 +++ .../maven-sal-api-gen-plugin/pom.xml | 3 +- code-generator/pom.xml | 8 ++- .../samples/maven-code-gen-sample/pom.xml | 46 +-------------- .../samples/modeling-sample/pom.xml | 47 +-------------- model/iana/iana-afn-safi/pom.xml | 1 + model/iana/iana-if-type/pom.xml | 1 + model/iana/pom.xml | 1 + model/ietf/ietf-inet-types/pom.xml | 3 + model/ietf/ietf-netconf/pom.xml | 2 +- model/ietf/ietf-restconf/pom.xml | 1 + model/ietf/ietf-ted/pom.xml | 1 + model/ietf/ietf-topology-isis/pom.xml | 1 + .../ietf/ietf-topology-l3-unicast-igp/pom.xml | 2 + model/ietf/ietf-topology-ospf/pom.xml | 1 + model/ietf/ietf-topology/pom.xml | 1 - model/ietf/pom.xml | 12 ++-- model/l2-types/pom.xml | 1 + model/pom.xml | 59 ++----------------- model/yang-ext/pom.xml | 3 +- yang/yang-binding/pom.xml | 4 +- 21 files changed, 53 insertions(+), 154 deletions(-) diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml index 6666e155a6..5b16fa7eec 100644 --- a/code-generator/binding-java-api-generator/pom.xml +++ b/code-generator/binding-java-api-generator/pom.xml @@ -44,6 +44,15 @@ maven-clean-plugin + diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml index d5bc18d4d9..9f8ac51670 100644 --- a/code-generator/maven-sal-api-gen-plugin/pom.xml +++ b/code-generator/maven-sal-api-gen-plugin/pom.xml @@ -10,11 +10,10 @@ - binding-generator org.opendaylight.yangtools + binding-generator 0.6.2-SNAPSHOT - 4.0.0 maven-sal-api-gen-plugin diff --git a/code-generator/pom.xml b/code-generator/pom.xml index 74f1007f60..58846d1c45 100644 --- a/code-generator/pom.xml +++ b/code-generator/pom.xml @@ -11,10 +11,12 @@ org.opendaylight.yangtools - yangtools + yangtools-parent 0.6.2-SNAPSHOT + ../common/parent - + org.opendaylight.yangtools + 0.6.2-SNAPSHOT 4.0.0 binding-generator pom @@ -32,6 +34,7 @@ maven-sal-api-gen-plugin + @@ -181,4 +184,5 @@ + diff --git a/code-generator/samples/maven-code-gen-sample/pom.xml b/code-generator/samples/maven-code-gen-sample/pom.xml index a42be7582e..e355f24a33 100644 --- a/code-generator/samples/maven-code-gen-sample/pom.xml +++ b/code-generator/samples/maven-code-gen-sample/pom.xml @@ -11,9 +11,9 @@ 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 org.opendaylight.yangtools - 0.6.0-SNAPSHOT + binding-generator + 0.6.2-SNAPSHOT maven-code-gen-sample @@ -49,7 +49,6 @@ org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.6.0-SNAPSHOT jar @@ -57,7 +56,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.8 generate-sources @@ -73,45 +71,7 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.opendaylight.yangtools - - - yang-maven-plugin - - - [0.5,) - - - - generate-sources - - - - - - - - - - - - - - + org.opendaylight.yangtools diff --git a/code-generator/samples/modeling-sample/pom.xml b/code-generator/samples/modeling-sample/pom.xml index b7f4ce3505..ab3bac3035 100644 --- a/code-generator/samples/modeling-sample/pom.xml +++ b/code-generator/samples/modeling-sample/pom.xml @@ -11,9 +11,9 @@ 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 org.opendaylight.yangtools - 0.6.0-SNAPSHOT + binding-generator + 0.6.2-SNAPSHOT modeling-sample @@ -22,7 +22,6 @@ org.opendaylight.yangtools yang-maven-plugin - 0.5.8-SNAPSHOT @@ -49,7 +48,6 @@ org.opendaylight.yangtools maven-sal-api-gen-plugin - 0.6.0-SNAPSHOT jar @@ -57,7 +55,6 @@ org.codehaus.mojo build-helper-maven-plugin - 1.8 generate-sources @@ -73,45 +70,7 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.opendaylight.yangtools - - - yang-maven-plugin - - - [0.5,) - - - - generate-sources - - - - - - - - - - - - - - + org.opendaylight.yangtools diff --git a/model/iana/iana-afn-safi/pom.xml b/model/iana/iana-afn-safi/pom.xml index ab12e14c2e..34b54a6a73 100644 --- a/model/iana/iana-afn-safi/pom.xml +++ b/model/iana/iana-afn-safi/pom.xml @@ -13,6 +13,7 @@ model-iana org.opendaylight.yangtools.model 0.6.2-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/model/iana/iana-if-type/pom.xml b/model/iana/iana-if-type/pom.xml index 9e20bee8c9..dbb472788a 100644 --- a/model/iana/iana-if-type/pom.xml +++ b/model/iana/iana-if-type/pom.xml @@ -13,6 +13,7 @@ model-iana org.opendaylight.yangtools.model 0.6.2-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/model/iana/pom.xml b/model/iana/pom.xml index 7bc1abe2e0..9ad48a2a83 100644 --- a/model/iana/pom.xml +++ b/model/iana/pom.xml @@ -13,6 +13,7 @@ model-parent org.opendaylight.yangtools.model 0.6.2-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/model/ietf/ietf-inet-types/pom.xml b/model/ietf/ietf-inet-types/pom.xml index 0186ca2498..18ceb60480 100644 --- a/model/ietf/ietf-inet-types/pom.xml +++ b/model/ietf/ietf-inet-types/pom.xml @@ -21,6 +21,8 @@ ${project.artifactId} ${project.artifactId} + + @@ -36,6 +38,7 @@ + diff --git a/model/ietf/ietf-netconf/pom.xml b/model/ietf/ietf-netconf/pom.xml index 299cfddbf1..2316600520 100644 --- a/model/ietf/ietf-netconf/pom.xml +++ b/model/ietf/ietf-netconf/pom.xml @@ -13,7 +13,7 @@ model-ietf org.opendaylight.yangtools.model - 0.6.0-SNAPSHOT + 0.6.2-SNAPSHOT 4.0.0 diff --git a/model/ietf/ietf-restconf/pom.xml b/model/ietf/ietf-restconf/pom.xml index 9e8aff00ca..8b62c3e1c7 100644 --- a/model/ietf/ietf-restconf/pom.xml +++ b/model/ietf/ietf-restconf/pom.xml @@ -16,6 +16,7 @@ 0.6.2-SNAPSHOT + 4.0.0 ietf-restconf 2013.10.19.1-SNAPSHOT diff --git a/model/ietf/ietf-ted/pom.xml b/model/ietf/ietf-ted/pom.xml index 5fdaa6aa80..8265a7c135 100644 --- a/model/ietf/ietf-ted/pom.xml +++ b/model/ietf/ietf-ted/pom.xml @@ -15,6 +15,7 @@ 0.6.2-SNAPSHOT + 4.0.0 ietf-ted 2013.10.21.2-SNAPSHOT diff --git a/model/ietf/ietf-topology-isis/pom.xml b/model/ietf/ietf-topology-isis/pom.xml index 8995299e67..b5048c9cc0 100644 --- a/model/ietf/ietf-topology-isis/pom.xml +++ b/model/ietf/ietf-topology-isis/pom.xml @@ -15,6 +15,7 @@ 0.6.2-SNAPSHOT + 4.0.0 ietf-topology-isis 2013.10.21.2-SNAPSHOT diff --git a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml index bbc643ab0b..2db65be1cd 100644 --- a/model/ietf/ietf-topology-l3-unicast-igp/pom.xml +++ b/model/ietf/ietf-topology-l3-unicast-igp/pom.xml @@ -9,12 +9,14 @@ --> + model-ietf org.opendaylight.yangtools.model 0.6.2-SNAPSHOT + 4.0.0 ietf-topology-l3-unicast-igp 2013.10.21.2-SNAPSHOT diff --git a/model/ietf/ietf-topology-ospf/pom.xml b/model/ietf/ietf-topology-ospf/pom.xml index 331b610c47..04d847ef7c 100644 --- a/model/ietf/ietf-topology-ospf/pom.xml +++ b/model/ietf/ietf-topology-ospf/pom.xml @@ -15,6 +15,7 @@ 0.6.2-SNAPSHOT + 4.0.0 ietf-topology-ospf 2013.10.21.2-SNAPSHOT diff --git a/model/ietf/ietf-topology/pom.xml b/model/ietf/ietf-topology/pom.xml index 4b72df53a2..86b8141554 100644 --- a/model/ietf/ietf-topology/pom.xml +++ b/model/ietf/ietf-topology/pom.xml @@ -14,7 +14,6 @@ org.opendaylight.yangtools.model 0.6.2-SNAPSHOT - 4.0.0 ietf-topology 2013.10.21.2-SNAPSHOT diff --git a/model/ietf/pom.xml b/model/ietf/pom.xml index 1cd98f48a3..50229c823f 100644 --- a/model/ietf/pom.xml +++ b/model/ietf/pom.xml @@ -23,7 +23,11 @@ 2013.10.21.2-SNAPSHOT + 2010.09.24.4-SNAPSHOT + 2010.09.24.4-SNAPSHOT + 2013.09.04.1-SNAPSHOT + ietf-inet-types ietf-yang-types @@ -42,17 +46,17 @@ org.opendaylight.yangtools.model ietf-inet-types - 2010.09.24.4-SNAPSHOT + ${ietf.inet.types.version} org.opendaylight.yangtools.model ietf-yang-types - 2010.09.24.4-SNAPSHOT + ${ietf.yang.types.version} org.opendaylight.yangtools.model ietf-restconf - 2013.09.04.1-SNAPSHOT + ${ietf.restconf.version} ${project.groupId} @@ -81,4 +85,4 @@ - + diff --git a/model/l2-types/pom.xml b/model/l2-types/pom.xml index 99fc9dec41..bbea425cd1 100644 --- a/model/l2-types/pom.xml +++ b/model/l2-types/pom.xml @@ -15,6 +15,7 @@ 0.6.2-SNAPSHOT + 4.0.0 opendaylight-l2-types 2013.08.27.4-SNAPSHOT diff --git a/model/pom.xml b/model/pom.xml index 3dc26a7439..f0b7c6549d 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -11,21 +11,18 @@ org.opendaylight.yangtools - yangtools + yangtools-parent 0.6.2-SNAPSHOT + ../common/parent - - 4.0.0 org.opendaylight.yangtools.model + + 4.0.0 model-parent pom ${project.artifactId} ${project.artifactId} - - UTF-8 - - yang-ext iana @@ -96,64 +93,16 @@ - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.opendaylight.yangtools - yang-maven-plugin - [0.5,) - - - generate-sources - - - - - - - - - - org.apache.felix - maven-bundle-plugin - [1.0,) - - manifest - - - - - - - - - - - - org.opendaylight.yangtools yang-binding - 0.6.2-SNAPSHOT org.opendaylight.yangtools yang-common - 0.6.2-SNAPSHOT - diff --git a/model/yang-ext/pom.xml b/model/yang-ext/pom.xml index 6fc7a801ca..6a1d7d84e5 100644 --- a/model/yang-ext/pom.xml +++ b/model/yang-ext/pom.xml @@ -10,11 +10,12 @@ - org.opendaylight.yangtools.model model-parent + org.opendaylight.yangtools.model 0.6.2-SNAPSHOT + 4.0.0 yang-ext 2013.09.07.4-SNAPSHOT diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml index 679ba67a45..30c62fb271 100644 --- a/yang/yang-binding/pom.xml +++ b/yang/yang-binding/pom.xml @@ -11,11 +11,13 @@ org.opendaylight.yangtools - yang + yangtools-parent 0.6.2-SNAPSHOT + /../../common/parent/pom.xml 4.0.0 + org.opendaylight.yangtools yang-binding ${project.artifactId} Java binding for YANG -- 2.36.6