From 87308bd2078479fbe9a67561f8c45a479b09a97a Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 5 May 2024 13:59:29 +0200 Subject: [PATCH] Define a feature-parent We have quite a bit of repetition going on, centralize what we can in a common pom.xml. Change-Id: Ia42f26e9043a47a918e60c2c7b18d6fecfbfff16 Signed-off-by: Robert Varga --- features/odl-yangtools-codec/pom.xml | 22 +++--------- features/odl-yangtools-common/pom.xml | 22 +++--------- features/odl-yangtools-data-api/pom.xml | 22 +++--------- features/odl-yangtools-data/pom.xml | 22 +++--------- features/odl-yangtools-export/pom.xml | 22 +++--------- features/odl-yangtools-netty/pom.xml | 22 +++--------- features/odl-yangtools-parser-api/pom.xml | 22 +++--------- features/odl-yangtools-parser/pom.xml | 22 +++--------- features/odl-yangtools-util/pom.xml | 22 +++--------- features/odl-yangtools-xpath-api/pom.xml | 22 +++--------- features/odl-yangtools-xpath/pom.xml | 22 +++--------- features/parent/pom.xml | 44 +++++++++++++++++++++++ features/pom.xml | 2 ++ 13 files changed, 90 insertions(+), 198 deletions(-) create mode 100644 features/parent/pom.xml diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml index 00e6d2fe7b..241df7a836 100644 --- a/features/odl-yangtools-codec/pom.xml +++ b/features/odl-yangtools-codec/pom.xml @@ -10,31 +10,17 @@ 4.0.0 - org.opendaylight.odlparent - template-feature-parent - 13.1.2 - + org.opendaylight.yangtools + feature-parent + 13.0.6-SNAPSHOT + ../parent - org.opendaylight.yangtools odl-yangtools-codec - 13.0.6-SNAPSHOT feature OpenDaylight :: Yangtools :: Data Codecs Serialization/deserialization support for various formats - - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - - org.opendaylight.odlparent diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml index bf526eed9f..2cbb4f5a07 100644 --- a/features/odl-yangtools-common/pom.xml +++ b/features/odl-yangtools-common/pom.xml @@ -10,31 +10,17 @@ 4.0.0 - org.opendaylight.odlparent - template-feature-parent - 13.1.2 - + org.opendaylight.yangtools + feature-parent + 13.0.6-SNAPSHOT + ../parent - org.opendaylight.yangtools odl-yangtools-common - 13.0.6-SNAPSHOT feature OpenDaylight :: Yangtools :: Common definitions Common YANG-related definitions - - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - - org.opendaylight.yangtools diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml index 9e531dd4b2..96f25de29e 100644 --- a/features/odl-yangtools-data-api/pom.xml +++ b/features/odl-yangtools-data-api/pom.xml @@ -10,31 +10,17 @@ 4.0.0 - org.opendaylight.odlparent - template-feature-parent - 13.1.2 - + org.opendaylight.yangtools + feature-parent + 13.0.6-SNAPSHOT + ../parent - org.opendaylight.yangtools odl-yangtools-data-api - 13.0.6-SNAPSHOT feature OpenDaylight :: Yangtools :: Data API YANG modeled data APIs - - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - - org.opendaylight.yangtools diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml index 3ddccc493d..550308ca54 100644 --- a/features/odl-yangtools-data/pom.xml +++ b/features/odl-yangtools-data/pom.xml @@ -10,31 +10,17 @@ 4.0.0 - org.opendaylight.odlparent - template-feature-parent - 13.1.2 - + org.opendaylight.yangtools + feature-parent + 13.0.6-SNAPSHOT + ../parent - org.opendaylight.yangtools odl-yangtools-data - 13.0.6-SNAPSHOT feature OpenDaylight :: Yangtools :: Data Reference Implementation YANG modeled data implementation - - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - - org.opendaylight.odlparent diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml index 40c1eb4ee9..6a6e5aec4b 100644 --- a/features/odl-yangtools-export/pom.xml +++ b/features/odl-yangtools-export/pom.xml @@ -10,31 +10,17 @@ 4.0.0 - org.opendaylight.odlparent - template-feature-parent - 13.1.2 - + org.opendaylight.yangtools + feature-parent + 13.0.6-SNAPSHOT + ../parent - org.opendaylight.yangtools odl-yangtools-export - 13.0.6-SNAPSHOT feature OpenDaylight :: Yangtools :: Export YANG model export - - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - - org.opendaylight.yangtools diff --git a/features/odl-yangtools-netty/pom.xml b/features/odl-yangtools-netty/pom.xml index aad09ff493..69494b4f11 100644 --- a/features/odl-yangtools-netty/pom.xml +++ b/features/odl-yangtools-netty/pom.xml @@ -10,31 +10,17 @@ 4.0.0 - org.opendaylight.odlparent - template-feature-parent - 13.1.2 - + org.opendaylight.yangtools + feature-parent + 13.0.6-SNAPSHOT + ../parent - org.opendaylight.yangtools odl-yangtools-netty - 13.0.6-SNAPSHOT feature OpenDaylight :: Yangtools :: Netty integration YANG Tools/netty-buffer utilities - - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - - org.opendaylight.odlparent diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml index 08e12ff806..39c68bd067 100644 --- a/features/odl-yangtools-parser-api/pom.xml +++ b/features/odl-yangtools-parser-api/pom.xml @@ -10,31 +10,17 @@ 4.0.0 - org.opendaylight.odlparent - template-feature-parent - 13.1.2 - + org.opendaylight.yangtools + feature-parent + 13.0.6-SNAPSHOT + ../parent - org.opendaylight.yangtools odl-yangtools-parser-api - 13.0.6-SNAPSHOT feature OpenDaylight :: Yangtools :: Parser API YANG metamodel and parser APIs - - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - - org.opendaylight.yangtools diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml index 6ec511478f..ab1b206f06 100644 --- a/features/odl-yangtools-parser/pom.xml +++ b/features/odl-yangtools-parser/pom.xml @@ -10,31 +10,17 @@ 4.0.0 - org.opendaylight.odlparent - template-feature-parent - 13.1.2 - + org.opendaylight.yangtools + feature-parent + 13.0.6-SNAPSHOT + ../parent - org.opendaylight.yangtools odl-yangtools-parser - 13.0.6-SNAPSHOT feature OpenDaylight :: Yangtools :: Parser YANG parser reference implementation - - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - - org.opendaylight.odlparent diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml index 6b01f54e1d..e6b53e16f8 100644 --- a/features/odl-yangtools-util/pom.xml +++ b/features/odl-yangtools-util/pom.xml @@ -10,31 +10,17 @@ 4.0.0 - org.opendaylight.odlparent - template-feature-parent - 13.1.2 - + org.opendaylight.yangtools + feature-parent + 13.0.6-SNAPSHOT + ../parent - org.opendaylight.yangtools odl-yangtools-util - 13.0.6-SNAPSHOT feature OpenDaylight :: Yangtools :: Utilities YANG Tools common concepts and utilities - - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - - tech.pantheon.triemap diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml index b35588d059..f3357a7226 100644 --- a/features/odl-yangtools-xpath-api/pom.xml +++ b/features/odl-yangtools-xpath-api/pom.xml @@ -10,30 +10,16 @@ 4.0.0 - org.opendaylight.odlparent - template-feature-parent - 13.1.2 - + org.opendaylight.yangtools + feature-parent + 13.0.6-SNAPSHOT + ../parent - org.opendaylight.yangtools odl-yangtools-xpath-api - 13.0.6-SNAPSHOT feature OpenDaylight :: Yangtools :: XPath API - - - - org.opendaylight.yangtools - yangtools-artifacts - 13.0.6-SNAPSHOT - import - pom - - - - org.opendaylight.yangtools diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml index 40e333b0d4..a9f99208e1 100644 --- a/features/odl-yangtools-xpath/pom.xml +++ b/features/odl-yangtools-xpath/pom.xml @@ -10,31 +10,17 @@ 4.0.0 - org.opendaylight.odlparent - template-feature-parent - 13.1.2 - + org.opendaylight.yangtools + feature-parent + 13.0.6-SNAPSHOT + ../parent - org.opendaylight.yangtools odl-yangtools-xpath - 13.0.6-SNAPSHOT feature OpenDaylight :: Yangtools :: XPath support YANG XPath support - - - - org.opendaylight.yangtools - yangtools-artifacts - ${project.version} - import - pom - - - - org.opendaylight.odlparent diff --git a/features/parent/pom.xml b/features/parent/pom.xml new file mode 100644 index 0000000000..9ea1d2b754 --- /dev/null +++ b/features/parent/pom.xml @@ -0,0 +1,44 @@ + + + + 4.0.0 + + + org.opendaylight.odlparent + template-feature-parent + 13.1.2 + + + + org.opendaylight.yangtools + feature-parent + 13.0.6-SNAPSHOT + pom + ${project.artifactId} + Feature parent (based on template-feature-parent) + + + + + org.opendaylight.yangtools + yangtools-artifacts + ${project.version} + import + pom + + + + + + scm:git:ssh://git.opendaylight.org:29418/yangtools.git + scm:git:ssh://git.opendaylight.org:29418/yangtools.git + HEAD + https://wiki.opendaylight.org/display/ODL/YANG+Tools + + diff --git a/features/pom.xml b/features/pom.xml index f811f882f4..9d8a41ffaf 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -28,6 +28,8 @@ + parent + odl-yangtools-codec odl-yangtools-common -- 2.36.6