From 8b270293f144b87be898c2509415b65b69b41673 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 29 Jul 2025 15:54:14 +0200
Subject: [PATCH 1/2] Integrate l2switch

Add l2switch packaging into the simultaneous release.

Change-Id: Ifd28e4a14dc40bc0f6ae3aba6864fbe1cc457145
Signed-off-by: Robert Varga <robert.varga@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 34bd63fb..f13cfdc4 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -140,6 +140,23 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <profile>
+            <id>l2switch</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.l2switch</groupId>
+                        <artifactId>l2switch-artifacts</artifactId>
+                        <version>${l2switch.version}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
         <profile>
             <id>lispflowmapping</id>
             <activation>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index e1276c9b..16b6ff40 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -49,6 +49,7 @@
         <daexim.version>1.18.0-SNAPSHOT</daexim.version>
         <infrautils.version>7.1.4</infrautils.version>
         <jsonrpc.version>1.19.0-SNAPSHOT</jsonrpc.version>
+        <l2switch.version>2.0.0</l2switch.version>
         <lispflowmapping.version>1.22.0-SNAPSHOT</lispflowmapping.version>
         <mdsal.version>14.0.13</mdsal.version>
         <netconf.version>9.0.0</netconf.version>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 23441358..6a9001cc 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -166,6 +166,21 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- L2 Switch -->
+        <profile>
+            <id>l2switch</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.l2switch</groupId>
+                    <artifactId>features-l2switch</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- LISP Flow Mapping -->
         <profile>
             <id>lispflowmapping</id>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index eeff949d..3c2651db 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -129,6 +129,21 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- L2 Switch -->
+        <profile>
+            <id>l2switch</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.l2switch</groupId>
+                    <artifactId>odl-l2switch-switch</artifactId>
+                    <type>xml</type>
+                    <classifier>features</classifier>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- LISP Flow Mapping -->
         <profile>
             <id>lispflowmapping</id>
-- 
2.34.1


From 12b47b1a96036efb9fcc802f22a9917cf6ca3b68 Mon Sep 17 00:00:00 2001
From: jenkins-releng <jenkins-releng@opendaylight.org>
Date: Tue, 29 Jul 2025 14:14:30 +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 b15b332c..d6026cc9 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 e9a2d7f9..8d965a41 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 afbc7e9e..dddc6f7f 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 0df1d0d2..ff10a8ce 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 f13cfdc4..01c64a88 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.23.0-SNAPSHOT</version>
+        <version>0.23.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 49a73dc4..2d7e7bd8 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.23.0-SNAPSHOT</version>
+        <version>0.23.0</version>
         <relativePath>../properties</relativePath>
     </parent>
     <artifactId>other-artifacts</artifactId>
diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index 2333c09d..16213b0d 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 16b6ff40..4eea6bd4 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.23.0-SNAPSHOT</version>
+    <version>0.23.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,16 +46,16 @@
         <aaa.version>0.21.0</aaa.version>
         <bgpcep.version>0.23.0</bgpcep.version>
         <controller.version>11.0.0</controller.version>
-        <daexim.version>1.18.0-SNAPSHOT</daexim.version>
+        <daexim.version>1.18.0</daexim.version>
         <infrautils.version>7.1.4</infrautils.version>
-        <jsonrpc.version>1.19.0-SNAPSHOT</jsonrpc.version>
+        <jsonrpc.version>1.19.0</jsonrpc.version>
         <l2switch.version>2.0.0</l2switch.version>
-        <lispflowmapping.version>1.22.0-SNAPSHOT</lispflowmapping.version>
+        <lispflowmapping.version>1.22.0</lispflowmapping.version>
         <mdsal.version>14.0.13</mdsal.version>
         <netconf.version>9.0.0</netconf.version>
         <odlparent.version>14.1.0</odlparent.version>
         <openflowplugin.version>0.20.0</openflowplugin.version>
-        <ovsdb.version>1.21.0-SNAPSHOT</ovsdb.version>
+        <ovsdb.version>1.21.0</ovsdb.version>
         <transportpce.version>10.0.1</transportpce.version>
         <transportpce.models.version>21.0.0</transportpce.models.version>
         <yangtools.version>14.0.14</yangtools.version>
diff --git a/features/pom.xml b/features/pom.xml
index 35358760..a5b13dc9 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 6a9001cc..3f77c3aa 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 613c97af..9e2afb22 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 b4356727..a8876336 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 47823063..ffb0a796 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 3c2651db..60a8cf04 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 489e24ce..04259b83 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 3612f9a8..e9479339 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 437f7663..cbfedf5f 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -18,7 +18,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>karaf</artifactId>
-    <version>0.23.0-SNAPSHOT</version>
+    <version>0.23.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.23.0-SNAPSHOT</version>
+                <version>0.23.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.23.0-SNAPSHOT</version>
+            <version>0.23.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml
index 47190339..5d31505a 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.23.0-SNAPSHOT</version>
+    <version>0.23.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 8c2b43c2..7359a411 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>distribution-aggregator</artifactId>
-    <version>0.23.0-SNAPSHOT</version>
+    <version>0.23.0</version>
     <packaging>pom</packaging>
     <!-- <name> value is used by Sonar to set project name -->
     <name>Integration/Distribution</name>
-- 
2.34.1