From ff619a29004a12b90c05ebccb4346a9baba0d542 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 23 Jan 2024 21:06:45 +0100
Subject: [PATCH] Bump upstreams

Adopt:
- odparent-13.0.10
- infrautils-6.0.5
- yangtools-11.0.5
- mdsal-12.0.4
- controller-8.0.4
- aaa-0.18.4
- netconf-6.0.6
- bgpcep-0.20.6

Change-Id: If100700691b5e182b8d9d1e350f08f930d33041a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit d61f973d0c1c24488d01ba6787d00916e44c0c3d)
---
 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           |  4 ++--
 artifacts/upstream/pom.xml                     |  2 +-
 artifacts/upstream/properties/pom.xml          | 18 +++++++++---------
 docs/platform-versions.rst                     | 14 +++++++-------
 features/pom.xml                               |  2 +-
 features/repos/index/pom.xml                   |  6 +++---
 features/repos/pom.xml                         |  2 +-
 features/repos/test/pom.xml                    |  2 +-
 features/singles/odl-integration-all/pom.xml   |  2 +-
 .../pom.xml                                    |  6 +++---
 features/singles/pom.xml                       |  2 +-
 karaf-scripts/pom.xml                          |  2 +-
 karaf/pom.xml                                  |  2 +-
 onap-karaf/pom.xml                             |  2 +-
 pom.xml                                        |  2 +-
 19 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index 9363479b..0215c7db 100644
--- a/artifacts/all/pom.xml
+++ b/artifacts/all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>13.0.7</version>
+      <version>13.0.10</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index df6b80a4..692d5428 100644
--- a/artifacts/distribution/pom.xml
+++ b/artifacts/distribution/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>13.0.7</version>
+      <version>13.0.10</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 3f3758f0..ab309170 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index ca238aba..3e4fc1b3 100644
--- a/artifacts/upstream/all/pom.xml
+++ b/artifacts/upstream/all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>13.0.7</version>
+      <version>13.0.10</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index eb503c43..194a4104 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -278,7 +278,7 @@
         <profile>
             <id>transportpce-models</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
@@ -295,7 +295,7 @@
         <profile>
             <id>transportpce</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencyManagement>
                 <dependencies>
diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index 6ec29a8e..bd6e56f1 100644
--- a/artifacts/upstream/pom.xml
+++ b/artifacts/upstream/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>13.0.7</version>
+      <version>13.0.10</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 6f2c4ace..af9b3d3d 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -43,22 +43,22 @@
     <properties>
         <!-- Version properties by project or component. -->
         <!-- Keep this list sorted alphabetically please. -->
-        <aaa.version>0.18.3</aaa.version>
-        <bgpcep.version>0.20.5</bgpcep.version>
-        <controller.version>8.0.3</controller.version>
+        <aaa.version>0.18.4</aaa.version>
+        <bgpcep.version>0.20.6</bgpcep.version>
+        <controller.version>8.0.4</controller.version>
         <daexim.version>1.15.0-SNAPSHOT</daexim.version>
-        <infrautils.version>6.0.4</infrautils.version>
+        <infrautils.version>6.0.5</infrautils.version>
         <jsonrpc.version>1.16.0-SNAPSHOT</jsonrpc.version>
         <lispflowmapping.version>1.19.0-SNAPSHOT</lispflowmapping.version>
-        <mdsal.version>12.0.3</mdsal.version>
-        <netconf.version>6.0.5</netconf.version>
-        <odlparent.version>13.0.7</odlparent.version>
+        <mdsal.version>12.0.4</mdsal.version>
+        <netconf.version>6.0.6</netconf.version>
+        <odlparent.version>13.0.10</odlparent.version>
         <openflowplugin.version>0.18.0-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.18.0-SNAPSHOT</ovsdb.version>
         <serviceutils.version>0.13.0-SNAPSHOT</serviceutils.version>
         <transportpce.version>8.1.0</transportpce.version>
         <transportpce.models.version>19.1.0</transportpce.models.version>
-        <yangtools.version>11.0.4</yangtools.version>
+        <yangtools.version>11.0.5</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>
 </project>
diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst
index 9d00d702..de6994f3 100644
--- a/docs/platform-versions.rst
+++ b/docs/platform-versions.rst
@@ -13,31 +13,31 @@ Platform versions
 
    * - org.opendaylight.odlparent
      - \*
-     - 13.0.7
+     - 13.0.10
 
    * - org.opendaylight.infrautils
      - \*
-     - 6.0.4
+     - 6.0.5
 
    * - org.opendaylight.yangtools
      - \*
-     - 11.0.4
+     - 11.0.5
 
    * - org.opendaylight.mdsal
      - \*
-     - 12.0.3
+     - 12.0.4
 
    * - org.opendaylight.controller
      - \*
-     - 8.0.3
+     - 8.0.4
 
    * - org.opendaylight.aaa
      - \*
-     - 0.18.3
+     - 0.18.4
 
    * - org.opendaylight.netconf
      - \*
-     - 6.0.5
+     - 6.0.6
 
 .. note:: Most projects get their YANG Tools version via MD-SAL.
   ${project}-artifacts are maven `bill of materials <https://howtodoinjava.com/maven/maven-bom-bill-of-materials-dependency/>`__
diff --git a/features/pom.xml b/features/pom.xml
index 4e3c862b..04a89904 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 208c61a7..a94546f7 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -317,7 +317,7 @@
         <profile>
             <id>transportpce-models</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -332,7 +332,7 @@
         <profile>
             <id>transportpce</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index e2f29d22..a616d911 100644
--- a/features/repos/pom.xml
+++ b/features/repos/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index a6bf7215..f8347f85 100644
--- a/features/repos/test/pom.xml
+++ b/features/repos/test/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index b7b7945c..6d9dc3e3 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 65255da6..72d7808e 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -223,7 +223,7 @@
         <profile>
             <id>transportpce</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -262,7 +262,7 @@
         <profile>
             <id>transportpce-models</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index 482224d3..6b055bd5 100644
--- a/features/singles/pom.xml
+++ b/features/singles/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml
index 03f98e10..a1087c90 100644
--- a/karaf-scripts/pom.xml
+++ b/karaf-scripts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index e7679de6..ba5e3143 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml
index ed362568..924379a4 100644
--- a/onap-karaf/pom.xml
+++ b/onap-karaf/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 6791f7c2..44cfdf8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.7</version>
+        <version>13.0.10</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
-- 
2.36.6