From 9f75790130810bfdbb9f83b937822d2530936ff4 Mon Sep 17 00:00:00 2001
From: Ivan Hrasko <ivan.hrasko@pantheon.tech>
Date: Mon, 1 Jun 2026 12:32:10 +0200
Subject: [PATCH 1/2] Add gNMI project to simultaneous release

Declare bundles and features of gNMI project in distribution.

The gNMI project is ready to take a part in Chromium release since
its version 3.0.0.

Change-Id: I1d2399ff4ff42da8887adcc19a3a5bdd3cccd701
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Ivan Hrasko <ivan.hrasko@pantheon.tech>
---
 artifacts/upstream/artifacts/pom.xml            | 17 +++++++++++++++++
 artifacts/upstream/properties/pom.xml           |  1 +
 features/repos/index/pom.xml                    | 15 +++++++++++++++
 .../odl-integration-compatible-with-all/pom.xml | 15 +++++++++++++++
 4 files changed, 48 insertions(+)

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 55a5a4e5..63b3c918 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -106,6 +106,23 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <profile>
+            <id>gnmi</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.gnmi</groupId>
+                        <artifactId>gnmi-artifacts</artifactId>
+                        <version>${gnmi.version}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
         <profile>
             <id>infrautils</id>
             <activation>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 1d07f990..ecf06304 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -47,6 +47,7 @@
         <bgpcep.version>1.0.0</bgpcep.version>
         <controller.version>12.0.3</controller.version>
         <daexim.version>1.19.0-SNAPSHOT</daexim.version>
+        <gnmi.version>3.0.0</gnmi.version>
         <infrautils.version>7.1.9</infrautils.version>
         <jsonrpc.version>1.20.0-SNAPSHOT</jsonrpc.version>
         <l2switch.version>3.0.0</l2switch.version>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index cc15bab8..6e8c89fa 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -130,6 +130,21 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- gNMI -->
+        <profile>
+            <id>gnmi</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.gnmi</groupId>
+                    <artifactId>features-gnmi</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- InfraUtils -->
         <profile>
             <id>infrautils</id>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 25e88784..d1214438 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -114,6 +114,21 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- gNMI -->
+        <profile>
+            <id>gnmi</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.gnmi</groupId>
+                    <artifactId>odl-gnmi-all</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- jsonrpc -->
         <profile>
             <id>jsonrpc</id>
-- 
2.34.1


From 97187533aa2aba14eb321e07de343fd68ec307e4 Mon Sep 17 00:00:00 2001
From: jenkins-releng <jenkins-releng@opendaylight.org>
Date: Mon, 1 Jun 2026 14:38:04 +0000
Subject: [PATCH 2/2] Release Validate

---
 artifacts/all/pom.xml                                  |  2 +-
 artifacts/distribution/pom.xml                         |  2 +-
 artifacts/pom.xml                                      |  2 +-
 artifacts/upstream/all/pom.xml                         |  2 +-
 artifacts/upstream/artifacts/pom.xml                   |  2 +-
 artifacts/upstream/other/pom.xml                       |  2 +-
 artifacts/upstream/pom.xml                             |  2 +-
 artifacts/upstream/properties/pom.xml                  | 10 +++++-----
 features/pom.xml                                       |  2 +-
 features/repos/index/pom.xml                           |  2 +-
 features/repos/pom.xml                                 |  2 +-
 features/repos/test/pom.xml                            |  2 +-
 features/singles/odl-integration-all/pom.xml           |  2 +-
 .../odl-integration-compatible-with-all/pom.xml        |  2 +-
 features/singles/pom.xml                               |  2 +-
 karaf-scripts/pom.xml                                  |  2 +-
 karaf/pom.xml                                          |  6 +++---
 onap-karaf/pom.xml                                     |  2 +-
 pom.xml                                                |  2 +-
 19 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index 4abfacce..ef1261bf 100644
--- a/artifacts/all/pom.xml
+++ b/artifacts/all/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>all-artifacts</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>pom</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index d059c325..f7a9b4b3 100644
--- a/artifacts/distribution/pom.xml
+++ b/artifacts/distribution/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>distribution-artifacts</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>pom</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 41ee9da3..1fdf3ae8 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>artifacts-aggregator</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>pom</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index 2311dc6e..0ab72017 100644
--- a/artifacts/upstream/all/pom.xml
+++ b/artifacts/upstream/all/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>upstream-all-artifacts</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>pom</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 63b3c918..705a09cd 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.integration</groupId>
         <artifactId>properties</artifactId>
-        <version>0.24.0-SNAPSHOT</version>
+        <version>0.24.0</version>
         <relativePath>../properties</relativePath>
     </parent>
     <artifactId>artifact-artifacts</artifactId>
diff --git a/artifacts/upstream/other/pom.xml b/artifacts/upstream/other/pom.xml
index af29b0d8..eb22eb60 100644
--- a/artifacts/upstream/other/pom.xml
+++ b/artifacts/upstream/other/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.integration</groupId>
         <artifactId>properties</artifactId>
-        <version>0.24.0-SNAPSHOT</version>
+        <version>0.24.0</version>
         <relativePath>../properties</relativePath>
     </parent>
     <artifactId>other-artifacts</artifactId>
diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index 9052792e..5a89a255 100644
--- a/artifacts/upstream/pom.xml
+++ b/artifacts/upstream/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>upstream-aggregator</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>pom</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index ecf06304..851dd2f6 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>properties</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <!-- This is a parent POM, it cannot act as an aggregator, to avoid cyclic imports. -->
     <packaging>pom</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
@@ -46,17 +46,17 @@
         <aaa.version>0.22.3</aaa.version>
         <bgpcep.version>1.0.0</bgpcep.version>
         <controller.version>12.0.3</controller.version>
-        <daexim.version>1.19.0-SNAPSHOT</daexim.version>
+        <daexim.version>1.19.0</daexim.version>
         <gnmi.version>3.0.0</gnmi.version>
         <infrautils.version>7.1.9</infrautils.version>
-        <jsonrpc.version>1.20.0-SNAPSHOT</jsonrpc.version>
+        <jsonrpc.version>1.20.0</jsonrpc.version>
         <l2switch.version>3.0.0</l2switch.version>
-        <lispflowmapping.version>1.23.0-SNAPSHOT</lispflowmapping.version>
+        <lispflowmapping.version>1.23.0</lispflowmapping.version>
         <mdsal.version>15.0.2</mdsal.version>
         <netconf.version>10.0.2</netconf.version>
         <odlparent.version>14.1.6</odlparent.version>
         <openflowplugin.version>0.21.2</openflowplugin.version>
-        <ovsdb.version>1.22.0-SNAPSHOT</ovsdb.version>
+        <ovsdb.version>1.22.0</ovsdb.version>
         <transportpce.version>12.0.1</transportpce.version>
         <transportpce.models.version>23.0.1</transportpce.models.version>
         <yangtools.version>14.0.20</yangtools.version>
diff --git a/features/pom.xml b/features/pom.xml
index a4103e28..ae81ffc2 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>features-aggregator</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>pom</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 6e8c89fa..e3dbaccd 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>features-index</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index c152c086..6da3e384 100644
--- a/features/repos/pom.xml
+++ b/features/repos/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>repos-aggregator</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>pom</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index bda4b5d9..f159eeac 100644
--- a/features/repos/test/pom.xml
+++ b/features/repos/test/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>features-test</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 6ba7ff44..d68eddc2 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -17,7 +17,7 @@
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>odl-integration-all</artifactId>
     <!-- TODO: Diferent name? -->
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index d1214438..df238507 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -17,7 +17,7 @@
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>odl-integration-compatible-with-all</artifactId>
     <!-- TODO: Shorter name? -->
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>feature</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index 5bc5d311..0948337d 100644
--- a/features/singles/pom.xml
+++ b/features/singles/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>singles-aggregator</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>pom</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml
index 8cfbcae3..b32ca3cd 100644
--- a/karaf-scripts/pom.xml
+++ b/karaf-scripts/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>karaf-scripts</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>jar</packaging>
     <name>ODL :: integration :: Karaf :: Scripts :: ${project.artifactId}</name>
     <description>The actual Karaf archive building sub-project.</description>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 81996000..83437c41 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -18,7 +18,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>karaf</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>pom</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
@@ -43,7 +43,7 @@
             <dependency>
                 <groupId>org.opendaylight.integration</groupId>
                 <artifactId>all-artifacts</artifactId>
-                <version>0.24.0-SNAPSHOT</version>
+                <version>0.24.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>org.opendaylight.integration</groupId>
             <artifactId>karaf-scripts</artifactId>
-            <version>0.24.0-SNAPSHOT</version>
+            <version>0.24.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml
index 533202da..ea1bc1bc 100644
--- a/onap-karaf/pom.xml
+++ b/onap-karaf/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>onap-karaf</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>pom</packaging>
     <name>ODL :: integration :: ${project.artifactId}</name>
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 8184e072..09044711 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>distribution-aggregator</artifactId>
-    <version>0.24.0-SNAPSHOT</version>
+    <version>0.24.0</version>
     <packaging>pom</packaging>
     <!-- <name> value is used by Sonar to set project name -->
     <name>Integration/Distribution</name>
-- 
2.34.1