From 93cd11da22448dbfa379d6ded27d59b938149657 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 29 Sep 2025 17:54:29 +0200
Subject: [PATCH 1/2] Bump upstreams

Adopt:
- odlparent-14.1.4
- infrautils-7.1.8
- yangtools-14.0.18
- ietf-1.0.1
- mdsal-15.0.1
- controller-12.0.1
- aaa-0.22.1
- netconf-10.0.0

Change-Id: I26289d13d6e2263e92b0cd39f2d1037ca5ee5f36
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/pom.xml                                    |  2 +-
 features/daexim-features/pom.xml                     |  2 +-
 features/odl-daexim-all/pom.xml                      |  4 ++--
 features/odl-daexim-all/src/main/feature/feature.xml |  2 +-
 features/odl-daexim/pom.xml                          | 10 +++++-----
 features/odl-daexim/src/main/feature/feature.xml     |  6 +++---
 features/pom.xml                                     |  2 +-
 impl/pom.xml                                         |  2 +-
 karaf/pom.xml                                        |  2 +-
 model/pom.xml                                        | 10 +++++-----
 parent/pom.xml                                       |  6 +++---
 pom.xml                                              |  2 +-
 spi/pom.xml                                          |  2 +-
 test-model/pom.xml                                   |  2 +-
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 5ee1036..e4a18bf 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>14.1.3</version>
+    <version>14.1.4</version>
     <relativePath/>
   </parent>
 
diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml
index 4d9b9fa..4d40cd9 100644
--- a/features/daexim-features/pom.xml
+++ b/features/daexim-features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>14.1.3</version>
+        <version>14.1.4</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml
index 25bbb30..f180313 100644
--- a/features/odl-daexim-all/pom.xml
+++ b/features/odl-daexim-all/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>14.1.3</version>
+        <version>14.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.daexim</groupId>
@@ -34,7 +34,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>
                 <type>pom</type>
-                <version>9.0.1</version>
+                <version>10.0.0</version>
                 <scope>import</scope>
             </dependency>
         </dependencies>
diff --git a/features/odl-daexim-all/src/main/feature/feature.xml b/features/odl-daexim-all/src/main/feature/feature.xml
index 45b5d53..a25354e 100644
--- a/features/odl-daexim-all/src/main/feature/feature.xml
+++ b/features/odl-daexim-all/src/main/feature/feature.xml
@@ -9,6 +9,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name='odl-daexim-all' version='${project.version}'>
-        <feature version="[9,10)">odl-restconf</feature>
+        <feature version="[10,11)">odl-restconf</feature>
     </feature>
 </features>
diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml
index ff3c50b..069e2fe 100644
--- a/features/odl-daexim/pom.xml
+++ b/features/odl-daexim/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>14.1.3</version>
+        <version>14.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.daexim</groupId>
@@ -34,14 +34,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.infrautils</groupId>
-            <artifactId>odl-infrautils-ready</artifactId>
+            <groupId>org.opendaylight.ietf</groupId>
+            <artifactId>odl-ietf-model-rfc6991</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-model-rfc6991</artifactId>
+            <groupId>org.opendaylight.infrautils</groupId>
+            <artifactId>odl-infrautils-ready</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/odl-daexim/src/main/feature/feature.xml b/features/odl-daexim/src/main/feature/feature.xml
index 20156a8..9a11fd8 100644
--- a/features/odl-daexim/src/main/feature/feature.xml
+++ b/features/odl-daexim/src/main/feature/feature.xml
@@ -12,10 +12,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <feature name='odl-daexim' version='${project.version}'>
         <configfile finalname="etc/org.opendaylight.daexim.cfg">mvn:org.opendaylight.daexim/daexim-impl/${project.version}/cfg</configfile>
-        <feature version="[14,15)">odl-mdsal-binding</feature>
-        <feature version="[14,15)">odl-mdsal-model-rfc6991</feature>
-        <feature version="[11,12)">odl-mdsal-broker</feature>
+        <feature version="[1,2)">odl-ietf-model-rfc6991</feature>
         <feature version="[7,8)">odl-infrautils-ready</feature>
         <feature version="[7,8)">odl-infrautils-utils</feature>
+        <feature version="[15,16)">odl-mdsal-binding</feature>
+        <feature version="[12,13)">odl-mdsal-broker</feature>
     </feature>
 </features>
diff --git a/features/pom.xml b/features/pom.xml
index 2c930ac..983e774 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>14.1.3</version>
+        <version>14.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.daexim</groupId>
diff --git a/impl/pom.xml b/impl/pom.xml
index 22bc95a..0882af8 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -111,7 +111,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>mdsal-dom-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+            <groupId>org.opendaylight.ietf.model</groupId>
             <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
         <dependency>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 9ffc461..d4bcfc2 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>14.1.3</version>
+    <version>14.1.4</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.daexim</groupId>
diff --git a/model/pom.xml b/model/pom.xml
index 4cb9513..1b1972a 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>14.0.18</version>
+        <version>15.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.daexim</groupId>
@@ -40,12 +40,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-common</artifactId>
+            <groupId>org.opendaylight.ietf.model</groupId>
+            <artifactId>rfc6991-ietf-yang-types</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991-ietf-yang-types</artifactId>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-common</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/parent/pom.xml b/parent/pom.xml
index e831139..10bd5b2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>14.0.18</version>
+        <version>15.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.daexim</groupId>
@@ -25,13 +25,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
                 <type>pom</type>
-                <version>7.1.7</version>
+                <version>7.1.8</version>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>11.0.2</version>
+                <version>12.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/pom.xml b/pom.xml
index 3faa8d5..26fd412 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
  <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>14.1.3</version>
+    <version>14.1.4</version>
     <relativePath/>
   </parent>
 
diff --git a/spi/pom.xml b/spi/pom.xml
index e20131d..361026f 100644
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>14.1.3</version>
+        <version>14.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.daexim</groupId>
diff --git a/test-model/pom.xml b/test-model/pom.xml
index 6690e9b..ef1c575 100644
--- a/test-model/pom.xml
+++ b/test-model/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>14.0.18</version>
+        <version>15.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.daexim</groupId>
-- 
2.34.1


From 76fd7fa1ade3d3f9f8d0015e7e7ca82653c54d8d Mon Sep 17 00:00:00 2001
From: jenkins-releng <jenkins-releng@opendaylight.org>
Date: Fri, 17 Oct 2025 11:28:38 +0000
Subject: [PATCH 2/2] Release Validate

---
 akka-infoprovider-impl/pom.xml   | 2 +-
 artifacts/pom.xml                | 2 +-
 features/daexim-features/pom.xml | 2 +-
 features/odl-daexim-all/pom.xml  | 2 +-
 features/odl-daexim/pom.xml      | 2 +-
 features/pom.xml                 | 2 +-
 impl/pom.xml                     | 2 +-
 karaf/pom.xml                    | 2 +-
 model/pom.xml                    | 2 +-
 parent/pom.xml                   | 2 +-
 pom.xml                          | 2 +-
 spi/pom.xml                      | 2 +-
 test-model/pom.xml               | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/akka-infoprovider-impl/pom.xml b/akka-infoprovider-impl/pom.xml
index 9bc5919..be98168 100644
--- a/akka-infoprovider-impl/pom.xml
+++ b/akka-infoprovider-impl/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.daexim</groupId>
         <artifactId>parent</artifactId>
-        <version>1.18.0-SNAPSHOT</version>
+        <version>1.18.0</version>
         <relativePath>../parent</relativePath>
     </parent>
     <artifactId>daexim-akka-infoprovider-impl</artifactId>
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index e4a18bf..cec7e50 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -20,7 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <groupId>org.opendaylight.daexim</groupId>
   <artifactId>daexim-artifacts</artifactId>
-  <version>1.18.0-SNAPSHOT</version>
+  <version>1.18.0</version>
   <packaging>pom</packaging>
 
   <dependencyManagement>
diff --git a/features/daexim-features/pom.xml b/features/daexim-features/pom.xml
index 4d40cd9..f141d14 100644
--- a/features/daexim-features/pom.xml
+++ b/features/daexim-features/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
     <groupId>org.opendaylight.daexim</groupId>
     <artifactId>daexim-features</artifactId>
-    <version>1.18.0-SNAPSHOT</version>
+    <version>1.18.0</version>
     <packaging>feature</packaging>
     <name>ODL :: daexim :: ${project.artifactId}</name>
 
diff --git a/features/odl-daexim-all/pom.xml b/features/odl-daexim-all/pom.xml
index f180313..1c240e8 100644
--- a/features/odl-daexim-all/pom.xml
+++ b/features/odl-daexim-all/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </parent>
     <groupId>org.opendaylight.daexim</groupId>
     <artifactId>odl-daexim-all</artifactId>
-    <version>1.18.0-SNAPSHOT</version>
+    <version>1.18.0</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: Daexim :: All</name>
     <dependencyManagement>
diff --git a/features/odl-daexim/pom.xml b/features/odl-daexim/pom.xml
index 069e2fe..5778548 100644
--- a/features/odl-daexim/pom.xml
+++ b/features/odl-daexim/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </parent>
     <groupId>org.opendaylight.daexim</groupId>
     <artifactId>odl-daexim</artifactId>
-    <version>1.18.0-SNAPSHOT</version>
+    <version>1.18.0</version>
     <packaging>feature</packaging>
     <name>OpenDaylight :: daexim (Karaf feature)</name>
     <dependencyManagement>
diff --git a/features/pom.xml b/features/pom.xml
index 983e774..17de731 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -16,7 +16,7 @@
     </parent>
     <groupId>org.opendaylight.daexim</groupId>
     <artifactId>features-aggregator</artifactId>
-    <version>1.18.0-SNAPSHOT</version>
+    <version>1.18.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/impl/pom.xml b/impl/pom.xml
index 0882af8..65234fb 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.daexim</groupId>
         <artifactId>parent</artifactId>
-        <version>1.18.0-SNAPSHOT</version>
+        <version>1.18.0</version>
         <relativePath>../parent</relativePath>
     </parent>
     <artifactId>daexim-impl</artifactId>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index d4bcfc2..73dee19 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </parent>
   <groupId>org.opendaylight.daexim</groupId>
   <artifactId>daexim-karaf</artifactId>
-  <version>1.18.0-SNAPSHOT</version>
+  <version>1.18.0</version>
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 
diff --git a/model/pom.xml b/model/pom.xml
index 1b1972a..587f827 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <groupId>org.opendaylight.daexim</groupId>
     <artifactId>daexim-model</artifactId>
     <packaging>bundle</packaging>
-    <version>1.18.0-SNAPSHOT</version>
+    <version>1.18.0</version>
     <build>
         <plugins>
             <plugin>
diff --git a/parent/pom.xml b/parent/pom.xml
index 10bd5b2..60e9dfa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -16,7 +16,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </parent>
     <groupId>org.opendaylight.daexim</groupId>
     <artifactId>parent</artifactId>
-    <version>1.18.0-SNAPSHOT</version>
+    <version>1.18.0</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 26fd412..cc58d4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <packaging>pom</packaging>
     <groupId>org.opendaylight.daexim</groupId>
     <artifactId>daexim</artifactId>
-    <version>1.18.0-SNAPSHOT</version>
+    <version>1.18.0</version>
     <modules>
         <module>test-model</module>
         <module>model</module>
diff --git a/spi/pom.xml b/spi/pom.xml
index 361026f..f14e379 100644
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -18,5 +18,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <groupId>org.opendaylight.daexim</groupId>
     <artifactId>daexim-spi</artifactId>
     <packaging>bundle</packaging>
-    <version>1.18.0-SNAPSHOT</version>
+    <version>1.18.0</version>
 </project>
diff --git a/test-model/pom.xml b/test-model/pom.xml
index ef1c575..38c5fd1 100644
--- a/test-model/pom.xml
+++ b/test-model/pom.xml
@@ -18,5 +18,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <groupId>org.opendaylight.daexim</groupId>
     <artifactId>daexim-test-model</artifactId>
     <packaging>bundle</packaging>
-    <version>1.18.0-SNAPSHOT</version>
+    <version>1.18.0</version>
 </project>
-- 
2.34.1