Code Review / yangtools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: e1b97aa)
Define a feature-parent 19/111619/1 master
authorRobert Varga <robert.varga@pantheon.tech>
Sun, 5 May 2024 11:59:29 +0000 (13:59 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Sun, 5 May 2024 12:07:32 +0000 (14:07 +0200)
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 <robert.varga@pantheon.tech>
13 files changed:
features/odl-yangtools-codec/pom.xml patch | blob | history
features/odl-yangtools-common/pom.xml patch | blob | history
features/odl-yangtools-data-api/pom.xml patch | blob | history
features/odl-yangtools-data/pom.xml patch | blob | history
features/odl-yangtools-export/pom.xml patch | blob | history
features/odl-yangtools-netty/pom.xml patch | blob | history
features/odl-yangtools-parser-api/pom.xml patch | blob | history
features/odl-yangtools-parser/pom.xml patch | blob | history
features/odl-yangtools-util/pom.xml patch | blob | history
features/odl-yangtools-xpath-api/pom.xml patch | blob | history
features/odl-yangtools-xpath/pom.xml patch | blob | history
features/parent/pom.xml [new file with mode: 0644] patch | blob
features/pom.xml patch | blob | history

diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml
index 00e6d2fe7bf4bbab13a3910ec69e2c4ee07bbb72..241df7a836e3996a22eebf73e7cdf5e5248b1785 100644 (file)
--- a/features/odl-yangtools-codec/pom.xml
+++ b/features/odl-yangtools-codec/pom.xml
@@ -10,31 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>template-feature-parent</artifactId>
-        <version>13.1.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>13.0.6-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>odl-yangtools-codec</artifactId>
-    <version>13.0.6-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Yangtools :: Data Codecs</name>
     <description>Serialization/deserialization support for various formats</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml
index bf526eed9fd0ff31bddd4e2d0031fdd85b1a9f35..2cbb4f5a0726aa32fecb61eaee5db32466178261 100644 (file)
--- a/features/odl-yangtools-common/pom.xml
+++ b/features/odl-yangtools-common/pom.xml
@@ -10,31 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>template-feature-parent</artifactId>
-        <version>13.1.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>13.0.6-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>odl-yangtools-common</artifactId>
-    <version>13.0.6-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Yangtools :: Common definitions</name>
     <description>Common YANG-related definitions</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml
index 9e531dd4b278f443b56abb0b7fca9c315178681d..96f25de29eaa3d699c2e3dff616b970a99d05ccd 100644 (file)
--- a/features/odl-yangtools-data-api/pom.xml
+++ b/features/odl-yangtools-data-api/pom.xml
@@ -10,31 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>template-feature-parent</artifactId>
-        <version>13.1.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>13.0.6-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>odl-yangtools-data-api</artifactId>
-    <version>13.0.6-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Yangtools :: Data API</name>
     <description>YANG modeled data APIs</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml
index 3ddccc493d0634029ae8e301967975e43d753b77..550308ca542374b04dfbaa5387be340a4230c16f 100644 (file)
--- a/features/odl-yangtools-data/pom.xml
+++ b/features/odl-yangtools-data/pom.xml
@@ -10,31 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>template-feature-parent</artifactId>
-        <version>13.1.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>13.0.6-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>odl-yangtools-data</artifactId>
-    <version>13.0.6-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Yangtools :: Data Reference Implementation</name>
     <description>YANG modeled data implementation</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml
index 40c1eb4ee931f65debb5d0b21cf9861d43814784..6a6e5aec4b5430b4751b15abce05b0b2ce768399 100644 (file)
--- a/features/odl-yangtools-export/pom.xml
+++ b/features/odl-yangtools-export/pom.xml
@@ -10,31 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>template-feature-parent</artifactId>
-        <version>13.1.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>13.0.6-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>odl-yangtools-export</artifactId>
-    <version>13.0.6-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Yangtools :: Export</name>
     <description>YANG model export</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/features/odl-yangtools-netty/pom.xml b/features/odl-yangtools-netty/pom.xml
index aad09ff493066d2d4acc1247459b5f8b623e9773..69494b4f1176e5313f88617bb5cd65d4aaaa53e5 100644 (file)
--- a/features/odl-yangtools-netty/pom.xml
+++ b/features/odl-yangtools-netty/pom.xml
@@ -10,31 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>template-feature-parent</artifactId>
-        <version>13.1.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>13.0.6-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>odl-yangtools-netty</artifactId>
-    <version>13.0.6-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Yangtools :: Netty integration</name>
     <description>YANG Tools/netty-buffer utilities</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml
index 08e12ff806bdb77831b4ad39b4fb625db83999de..39c68bd06740edf2652bc1a36cb40293b28c7d6a 100644 (file)
--- a/features/odl-yangtools-parser-api/pom.xml
+++ b/features/odl-yangtools-parser-api/pom.xml
@@ -10,31 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>template-feature-parent</artifactId>
-        <version>13.1.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>13.0.6-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>odl-yangtools-parser-api</artifactId>
-    <version>13.0.6-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Yangtools :: Parser API</name>
     <description>YANG metamodel and parser APIs</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml
index 6ec511478f1126b4a6332543c294e8d851219dc9..ab1b206f06b9536174a52201ba0aa499d10bc6ca 100644 (file)
--- a/features/odl-yangtools-parser/pom.xml
+++ b/features/odl-yangtools-parser/pom.xml
@@ -10,31 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>template-feature-parent</artifactId>
-        <version>13.1.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>13.0.6-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>odl-yangtools-parser</artifactId>
-    <version>13.0.6-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Yangtools :: Parser </name>
     <description>YANG parser reference implementation</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml
index 6b01f54e1dde2f1c2f4400ff76bfe886111ac37c..e6b53e16f8cc9589884f2765a9018b5f1385f594 100644 (file)
--- a/features/odl-yangtools-util/pom.xml
+++ b/features/odl-yangtools-util/pom.xml
@@ -10,31 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>template-feature-parent</artifactId>
-        <version>13.1.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>13.0.6-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>odl-yangtools-util</artifactId>
-    <version>13.0.6-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Yangtools :: Utilities</name>
     <description>YANG Tools common concepts and utilities</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>tech.pantheon.triemap</groupId>
diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml
index b35588d059bd52f40a65ac045fff80b24cd4dd75..f3357a7226c04373e938da8e5db440749594c47d 100644 (file)
--- a/features/odl-yangtools-xpath-api/pom.xml
+++ b/features/odl-yangtools-xpath-api/pom.xml
@@ -10,30 +10,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>template-feature-parent</artifactId>
-        <version>13.1.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>13.0.6-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>odl-yangtools-xpath-api</artifactId>
-    <version>13.0.6-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Yangtools :: XPath API</name>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>13.0.6-SNAPSHOT</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml
index 40e333b0d40354552211631fea63fea390d8d924..a9f99208e1f9dcca6ae6d810f978748b194d02eb 100644 (file)
--- a/features/odl-yangtools-xpath/pom.xml
+++ b/features/odl-yangtools-xpath/pom.xml
@@ -10,31 +10,17 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>template-feature-parent</artifactId>
-        <version>13.1.2</version>
-        <relativePath/>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>feature-parent</artifactId>
+        <version>13.0.6-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>odl-yangtools-xpath</artifactId>
-    <version>13.0.6-SNAPSHOT</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Yangtools :: XPath support</name>
     <description>YANG XPath support</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
diff --git a/features/parent/pom.xml b/features/parent/pom.xml
new file mode 100644 (file)
index 0000000..9ea1d2b
--- /dev/null
+++ b/features/parent/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2024 PANTHEON.tech, s.r.o. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>template-feature-parent</artifactId>
+        <version>13.1.2</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.yangtools</groupId>
+    <artifactId>feature-parent</artifactId>
+    <version>13.0.6-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>${project.artifactId}</name>
+    <description>Feature parent (based on template-feature-parent)</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/yangtools.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/yangtools.git</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://wiki.opendaylight.org/display/ODL/YANG+Tools</url>
+    </scm>
+</project>
diff --git a/features/pom.xml b/features/pom.xml
index f811f882f4f73994491dd0a43a63f9a4f3db1ac4..9d8a41ffaf0c055ad03f824965b98f936f1270f1 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -28,6 +28,8 @@
     </properties>
 
     <modules>
+        <module>parent</module>
+
         <!-- Stable features -->
         <module>odl-yangtools-codec</module>
         <module>odl-yangtools-common</module>
OpenDaylight YANG Tools