From: Robert Varga Date: Wed, 10 Oct 2018 12:46:41 +0000 (+0200) Subject: Add bundle-parent and use it X-Git-Tag: v2.1.2~4 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=37d58dd8ce4b1d3a0c682c74a33dbb46257693a4;hp=eeb3076563314a67ccbe2d083dede2051d12e060;p=yangtools.git Add bundle-parent and use it This concentrates common version definitions into a yangtools bundle-parent and reuses it them where possible -- shaving almost 500 lines of XML. Change-Id: Ifc79fee557dc0a49fc0a277c2fafa34199171151 Signed-off-by: Robert Varga --- diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml new file mode 100644 index 0000000000..3a25ed8313 --- /dev/null +++ b/bundle-parent/pom.xml @@ -0,0 +1,44 @@ + + + + + 4.0.0 + + org.opendaylight.odlparent + bundle-parent + 4.0.2 + + + + org.opendaylight.yangtools + bundle-parent + 2.1.2-SNAPSHOT + pom + ${project.artifactId} + Bundle parent + + + + + tech.pantheon.triemap + bom + 1.0.1 + import + pom + + + org.opendaylight.yangtools + yangtools-artifacts + 2.1.2-SNAPSHOT + import + pom + + + + diff --git a/common/checkstyle-logging/pom.xml b/common/checkstyle-logging/pom.xml index a45435b40f..12472ec9a4 100644 --- a/common/checkstyle-logging/pom.xml +++ b/common/checkstyle-logging/pom.xml @@ -10,15 +10,13 @@ 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - org.opendaylight.yangtools checkstyle-logging - 2.1.2-SNAPSHOT bundle diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml index 0ba50f1cc7..fba5113688 100644 --- a/common/concepts/pom.xml +++ b/common/concepts/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - bundle - 4.0.0 - org.opendaylight.yangtools concepts - 2.1.2-SNAPSHOT + bundle ${project.artifactId} Common concepts - - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - - com.google.guava diff --git a/common/util/pom.xml b/common/util/pom.xml index e9bc11ef57..9204c57214 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -8,37 +8,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - bundle - 4.0.0 - org.opendaylight.yangtools - util - 2.1.2-SNAPSHOT - - - - tech.pantheon.triemap - bom - 1.0.1 - import - pom - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - + util + bundle + ${project.artifactId} + Common utilities diff --git a/pom.xml b/pom.xml index 089cb9a5e0..e5ce5ce08f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,6 +33,7 @@ artifacts benchmarks + bundle-parent common features yang diff --git a/third-party/triemap/pom.xml b/third-party/triemap/pom.xml index 6d0eec8c38..cc72fe7491 100644 --- a/third-party/triemap/pom.xml +++ b/third-party/triemap/pom.xml @@ -16,34 +16,20 @@ limitations under the License. --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools triemap 1.1.2-SNAPSHOT bundle Java implementation of a concurrent trie hash map from Scala collections library - - - - tech.pantheon.triemap - bom - 1.0.1 - import - pom - - - - tech.pantheon.triemap diff --git a/yang/odlext-model-api/pom.xml b/yang/odlext-model-api/pom.xml index 1568c2e852..4269d14784 100644 --- a/yang/odlext-model-api/pom.xml +++ b/yang/odlext-model-api/pom.xml @@ -8,45 +8,30 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools odlext-model-api - 2.1.2-SNAPSHOT bundle ${project.artifactId} OpenDaylight yang-ext metamodel - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} + org.opendaylight.yangtools concepts - ${project.groupId} + org.opendaylight.yangtools yang-common - ${project.groupId} + org.opendaylight.yangtools yang-model-api diff --git a/yang/odlext-parser-support/pom.xml b/yang/odlext-parser-support/pom.xml index 6947c0a362..39ab3f6af2 100644 --- a/yang/odlext-parser-support/pom.xml +++ b/yang/odlext-parser-support/pom.xml @@ -8,51 +8,34 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools odlext-parser-support - 2.1.2-SNAPSHOT bundle ${project.artifactId} OpenDaylight yang-ext parser support - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} + org.opendaylight.yangtools concepts - ${project.groupId} + org.opendaylight.yangtools yang-common - - ${project.groupId} + org.opendaylight.yangtools odlext-model-api - - ${project.groupId} + org.opendaylight.yangtools yang-parser-rfc7950 diff --git a/yang/openconfig-model-api/pom.xml b/yang/openconfig-model-api/pom.xml index 712f426d61..2dc880891e 100644 --- a/yang/openconfig-model-api/pom.xml +++ b/yang/openconfig-model-api/pom.xml @@ -8,45 +8,30 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools openconfig-model-api - 2.1.2-SNAPSHOT bundle ${project.artifactId} OpenConfig extensions metamodel - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} + org.opendaylight.yangtools concepts - ${project.groupId} + org.opendaylight.yangtools yang-common - ${project.groupId} + org.opendaylight.yangtools yang-model-api diff --git a/yang/openconfig-parser-support/pom.xml b/yang/openconfig-parser-support/pom.xml index 4a08ca3cdb..fcda3579f9 100644 --- a/yang/openconfig-parser-support/pom.xml +++ b/yang/openconfig-parser-support/pom.xml @@ -8,51 +8,36 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools openconfig-parser-support - 2.1.2-SNAPSHOT bundle ${project.artifactId} OpenConfig extensions parser support - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} + org.opendaylight.yangtools concepts - ${project.groupId} + org.opendaylight.yangtools yang-common - ${project.groupId} + org.opendaylight.yangtools openconfig-model-api - ${project.groupId} + org.opendaylight.yangtools yang-parser-rfc7950 diff --git a/yang/rfc6536-model-api/pom.xml b/yang/rfc6536-model-api/pom.xml index 74e8c670d0..5c44bf561b 100644 --- a/yang/rfc6536-model-api/pom.xml +++ b/yang/rfc6536-model-api/pom.xml @@ -8,45 +8,30 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools rfc6536-model-api - 2.1.2-SNAPSHOT bundle ${project.artifactId} RFC6536 metamodel - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} + org.opendaylight.yangtools concepts - ${project.groupId} + org.opendaylight.yangtools yang-common - ${project.groupId} + org.opendaylight.yangtools yang-model-api diff --git a/yang/rfc6536-parser-support/pom.xml b/yang/rfc6536-parser-support/pom.xml index e7b65c05d1..8e9a118ed4 100644 --- a/yang/rfc6536-parser-support/pom.xml +++ b/yang/rfc6536-parser-support/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools rfc6536-parser-support - 2.1.2-SNAPSHOT bundle ${project.artifactId} RFC6536 parser support - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - ${project.groupId} diff --git a/yang/rfc7952-model-api/pom.xml b/yang/rfc7952-model-api/pom.xml index 13d4ee135f..e561bcf844 100644 --- a/yang/rfc7952-model-api/pom.xml +++ b/yang/rfc7952-model-api/pom.xml @@ -8,45 +8,30 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools rfc7952-model-api - 2.1.2-SNAPSHOT bundle ${project.artifactId} RFC7952 metamodel - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} + org.opendaylight.yangtools concepts - ${project.groupId} + org.opendaylight.yangtools yang-common - ${project.groupId} + org.opendaylight.yangtools yang-model-api diff --git a/yang/rfc7952-parser-support/pom.xml b/yang/rfc7952-parser-support/pom.xml index d4be4bef65..e0089017ae 100644 --- a/yang/rfc7952-parser-support/pom.xml +++ b/yang/rfc7952-parser-support/pom.xml @@ -8,51 +8,36 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools rfc7952-parser-support - 2.1.2-SNAPSHOT bundle ${project.artifactId} RFC7952 parser support - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} + org.opendaylight.yangtools concepts - ${project.groupId} + org.opendaylight.yangtools yang-common - ${project.groupId} + org.opendaylight.yangtools rfc7952-model-api - ${project.groupId} + org.opendaylight.yangtools yang-parser-rfc7950 diff --git a/yang/rfc8040-model-api/pom.xml b/yang/rfc8040-model-api/pom.xml index 2f494bf62f..c2b387d653 100644 --- a/yang/rfc8040-model-api/pom.xml +++ b/yang/rfc8040-model-api/pom.xml @@ -8,45 +8,30 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools rfc8040-model-api - 2.1.2-SNAPSHOT bundle ${project.artifactId} RFC8040 model API - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} + org.opendaylight.yangtools concepts - ${project.groupId} + org.opendaylight.yangtools yang-common - ${project.groupId} + org.opendaylight.yangtools yang-model-api diff --git a/yang/rfc8040-parser-support/pom.xml b/yang/rfc8040-parser-support/pom.xml index 1db22bc277..6cc4fc2f32 100644 --- a/yang/rfc8040-parser-support/pom.xml +++ b/yang/rfc8040-parser-support/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools rfc8040-parser-support - 2.1.2-SNAPSHOT bundle ${project.artifactId} RFC8040 parser support - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - ${project.groupId} diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml index b99c8a5c6c..9d0361f05c 100644 --- a/yang/yang-common/pom.xml +++ b/yang/yang-common/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-common - 2.1.2-SNAPSHOT bundle ${project.artifactId} ODL :: YANG Tools :: ${project.artifactId} - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - com.google.guava diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml index 7b4e9fd067..7822282eb4 100644 --- a/yang/yang-data-api/pom.xml +++ b/yang/yang-data-api/pom.xml @@ -8,50 +8,35 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-data-api - 2.1.2-SNAPSHOT bundle ${project.artifactId} ${project.artifactId} - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} - util + com.google.guava + guava - ${project.groupId} - yang-common + org.opendaylight.yangtools + concepts org.opendaylight.yangtools - concepts + util - com.google.guava - guava + org.opendaylight.yangtools + yang-common org.opendaylight.yangtools diff --git a/yang/yang-data-codec-gson/pom.xml b/yang/yang-data-codec-gson/pom.xml index d03bf9fc43..ff004df934 100644 --- a/yang/yang-data-codec-gson/pom.xml +++ b/yang/yang-data-codec-gson/pom.xml @@ -8,33 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-data-codec-gson - 2.1.2-SNAPSHOT bundle ${project.artifactId} ${project.artifactId} - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - org.opendaylight.yangtools diff --git a/yang/yang-data-codec-xml/pom.xml b/yang/yang-data-codec-xml/pom.xml index 7756c25d97..2a4e128591 100644 --- a/yang/yang-data-codec-xml/pom.xml +++ b/yang/yang-data-codec-xml/pom.xml @@ -8,33 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-data-codec-xml - 2.1.2-SNAPSHOT bundle ${project.artifactId} ${project.artifactId} - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - org.codehaus.woodstox diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index 4af4e35c54..5555ca7b7e 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -5,34 +5,19 @@ terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-data-impl - 2.1.2-SNAPSHOT bundle ${project.artifactId} ${project.artifactId} - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - diff --git a/yang/yang-data-jaxen/pom.xml b/yang/yang-data-jaxen/pom.xml index e691e8c956..a8dd94d0d6 100644 --- a/yang/yang-data-jaxen/pom.xml +++ b/yang/yang-data-jaxen/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-data-jaxen - 2.1.2-SNAPSHOT ${project.artifactId} ${project.artifactId} bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - com.google.guava diff --git a/yang/yang-data-transform/pom.xml b/yang/yang-data-transform/pom.xml index 3d7fedb00f..129ea982ec 100644 --- a/yang/yang-data-transform/pom.xml +++ b/yang/yang-data-transform/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-data-transform - 2.1.2-SNAPSHOT ${project.artifactId} ${project.artifactId} bundle - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - ${project.groupId} diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml index fb54e93b61..7d87a9e6fa 100644 --- a/yang/yang-data-util/pom.xml +++ b/yang/yang-data-util/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-data-util - 2.1.2-SNAPSHOT bundle ${project.artifactId} ${project.artifactId} - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - ${project.groupId} diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml index da20efb93e..1bba6cfbcd 100644 --- a/yang/yang-model-api/pom.xml +++ b/yang/yang-model-api/pom.xml @@ -8,41 +8,26 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-model-api - 2.1.2-SNAPSHOT bundle ${project.artifactId} ${project.artifactId} - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} + org.opendaylight.yangtools util - ${project.groupId} + org.opendaylight.yangtools yang-common diff --git a/yang/yang-model-export/pom.xml b/yang/yang-model-export/pom.xml index 9ee279ee86..c497b180e4 100644 --- a/yang/yang-model-export/pom.xml +++ b/yang/yang-model-export/pom.xml @@ -8,50 +8,35 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-model-export - 2.1.2-SNAPSHOT bundle ${project.artifactId} ${project.artifactId} - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} + org.opendaylight.yangtools yang-model-api - ${project.groupId} + org.opendaylight.yangtools yang-model-util - ${project.groupId} + org.opendaylight.yangtools yang-parser-impl test - ${project.groupId} + org.opendaylight.yangtools yang-test-util test diff --git a/yang/yang-model-immutable/pom.xml b/yang/yang-model-immutable/pom.xml index 0c762294a9..c3bd903aee 100644 --- a/yang/yang-model-immutable/pom.xml +++ b/yang/yang-model-immutable/pom.xml @@ -8,37 +8,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-model-immutable - 2.1.2-SNAPSHOT bundle ${project.artifactId} ${project.artifactId} - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} + org.opendaylight.yangtools yang-model-api diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml index 1904262e41..39ad3bf8ca 100644 --- a/yang/yang-model-util/pom.xml +++ b/yang/yang-model-util/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-model-util - 2.1.2-SNAPSHOT bundle ${project.artifactId} ${project.artifactId} - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - ${project.groupId} diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml index 33f2a40f42..2f6cc1ac36 100644 --- a/yang/yang-parser-api/pom.xml +++ b/yang/yang-parser-api/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-parser-api - 2.1.2-SNAPSHOT bundle ${project.artifactId} YANG parser API - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - ${project.groupId} diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml index 4242e2cb48..3fe1c0ecd9 100644 --- a/yang/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -8,109 +8,94 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-parser-impl - 2.1.2-SNAPSHOT bundle ${project.artifactId} YANG parser - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - - ${project.groupId} + org.opendaylight.yangtools concepts - ${project.groupId} + org.opendaylight.yangtools yang-common - ${project.groupId} + org.opendaylight.yangtools yang-model-api - ${project.groupId} + org.opendaylight.yangtools yang-parser-api - ${project.groupId} + org.opendaylight.yangtools yang-parser-reactor - ${project.groupId} + org.opendaylight.yangtools yang-parser-spi - ${project.groupId} + org.opendaylight.yangtools yang-model-util - ${project.groupId} + org.opendaylight.yangtools yang-parser-rfc7950 - ${project.groupId} + org.opendaylight.yangtools odlext-model-api - ${project.groupId} + org.opendaylight.yangtools odlext-parser-support - ${project.groupId} + org.opendaylight.yangtools openconfig-model-api - ${project.groupId} + org.opendaylight.yangtools openconfig-parser-support - ${project.groupId} + org.opendaylight.yangtools rfc6536-model-api - ${project.groupId} + org.opendaylight.yangtools rfc6536-parser-support - ${project.groupId} + org.opendaylight.yangtools rfc7952-model-api - ${project.groupId} + org.opendaylight.yangtools rfc7952-parser-support - ${project.groupId} + org.opendaylight.yangtools rfc8040-model-api - ${project.groupId} + org.opendaylight.yangtools rfc8040-parser-support diff --git a/yang/yang-parser-reactor/pom.xml b/yang/yang-parser-reactor/pom.xml index 735d727f94..1a10cc547f 100644 --- a/yang/yang-parser-reactor/pom.xml +++ b/yang/yang-parser-reactor/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-parser-reactor - 2.1.2-SNAPSHOT bundle ${project.artifactId} YANG parser - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - com.google.guava diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml index 2a1b61eca4..6bc89c567c 100644 --- a/yang/yang-parser-rfc7950/pom.xml +++ b/yang/yang-parser-rfc7950/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-parser-rfc7950 - 2.1.2-SNAPSHOT bundle ${project.artifactId} RFC6020/RFC7950 parser support - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - com.google.guava diff --git a/yang/yang-parser-spi/pom.xml b/yang/yang-parser-spi/pom.xml index 31dfe3afba..80bee3006f 100644 --- a/yang/yang-parser-spi/pom.xml +++ b/yang/yang-parser-spi/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-parser-spi - 2.1.2-SNAPSHOT bundle ${project.artifactId} YANG parser SPI - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - ${project.groupId} diff --git a/yang/yang-test-util/pom.xml b/yang/yang-test-util/pom.xml index 7ee3f06f8e..3152383839 100644 --- a/yang/yang-test-util/pom.xml +++ b/yang/yang-test-util/pom.xml @@ -8,34 +8,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-test-util - 2.1.2-SNAPSHOT bundle ${project.artifactId} ${project.artifactId} - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - org.opendaylight.yangtools diff --git a/yang/yang-xpath-api/pom.xml b/yang/yang-xpath-api/pom.xml index e8a26de77e..dd9c4466e3 100644 --- a/yang/yang-xpath-api/pom.xml +++ b/yang/yang-xpath-api/pom.xml @@ -8,34 +8,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-xpath-api 0.2.2-SNAPSHOT bundle ${project.artifactId} YANG XPath ${project.artifactId} - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - com.google.guava diff --git a/yang/yang-xpath-impl/pom.xml b/yang/yang-xpath-impl/pom.xml index 865c37b8c7..bcddb9aef8 100644 --- a/yang/yang-xpath-impl/pom.xml +++ b/yang/yang-xpath-impl/pom.xml @@ -8,34 +8,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html --> - + 4.0.0 - org.opendaylight.odlparent + org.opendaylight.yangtools bundle-parent - 4.0.2 - + 2.1.2-SNAPSHOT + ../../bundle-parent - 4.0.0 - org.opendaylight.yangtools yang-xpath-impl 0.2.2-SNAPSHOT bundle ${project.artifactId} YANG XPath parser - - - - org.opendaylight.yangtools - yangtools-artifacts - 2.1.2-SNAPSHOT - import - pom - - - - com.google.guava