From c716cf9a9170d044c5f885f197338930f7afecd9 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 3 Jul 2023 23:10:35 +0200
Subject: [PATCH] Bump platform versions

Adopt:
- odlparent-13.0.3
- infrautils-6.0.1
- yangtools-11.0.0
- mdsal-12.0.0
- controller-8.0.0
- aaa-0.18.0
- netconf-6.0.0
- bgpcep-0.20.0

Also adjust feature repositories and feature names:
- odl-mdsal-apidocs is now known as odl-restconf-openapi
- bgpcep and netconf have harmonized their feature repositories

Finally this disables transportpce and transportpce/models until they
have a corresponding release.

Change-Id: I1a098c04d6ad056f033781672cd8a01296fbc991
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 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                  | 50 +++----------------
 features/repos/pom.xml                        |  2 +-
 features/repos/test/pom.xml                   |  2 +-
 features/singles/odl-integration-all/pom.xml  |  2 +-
 .../pom.xml                                   | 10 ++--
 features/singles/pom.xml                      |  2 +-
 karaf-scripts/pom.xml                         |  2 +-
 karaf/pom.xml                                 |  2 +-
 onap-karaf/pom.xml                            | 18 +------
 pom.xml                                       |  2 +-
 19 files changed, 45 insertions(+), 95 deletions(-)

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index 7cc8a376..04af2549 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>12.0.3</version>
+      <version>13.0.3</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index d5ba2938..512d5def 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>12.0.3</version>
+      <version>13.0.3</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 3094690b..2b50761d 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index 8ecd69c3..735f7a8e 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>12.0.3</version>
+      <version>13.0.3</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index ac75c7ae..17c982b1 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 8bf1d479..9d0cd4a4 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>12.0.3</version>
+      <version>13.0.3</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index ed1113f7..4e598623 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>12.0.3</version>
+        <version>13.0.3</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.17.7</aaa.version>
-        <bgpcep.version>0.19.4</bgpcep.version>
-        <controller.version>7.0.4</controller.version>
+        <aaa.version>0.18.0</aaa.version>
+        <bgpcep.version>0.20.0</bgpcep.version>
+        <controller.version>8.0.0</controller.version>
         <daexim.version>1.14.0-SNAPSHOT</daexim.version>
-        <infrautils.version>5.0.3</infrautils.version>
+        <infrautils.version>6.0.1</infrautils.version>
         <jsonrpc.version>1.15.0-SNAPSHOT</jsonrpc.version>
         <lispflowmapping.version>1.18.0-SNAPSHOT</lispflowmapping.version>
-        <mdsal.version>11.0.7</mdsal.version>
-        <netconf.version>5.0.4</netconf.version>
-        <odlparent.version>12.0.3</odlparent.version>
+        <mdsal.version>12.0.0</mdsal.version>
+        <netconf.version>6.0.0</netconf.version>
+        <odlparent.version>13.0.3</odlparent.version>
         <openflowplugin.version>0.17.0-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.17.0-SNAPSHOT</ovsdb.version>
         <serviceutils.version>0.12.0-SNAPSHOT</serviceutils.version>
         <transportpce.version>7.0.1</transportpce.version>
         <transportpce.models.version>18.0.1</transportpce.models.version>
-        <yangtools.version>10.0.4</yangtools.version>
+        <yangtools.version>11.0.0</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>
 </project>
diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst
index 34578788..0ba44686 100644
--- a/docs/platform-versions.rst
+++ b/docs/platform-versions.rst
@@ -13,31 +13,31 @@ Platform versions
 
    * - org.opendaylight.odlparent
      - \*
-     - 12.0.3
+     - 13.0.3
 
    * - org.opendaylight.infrautils
      - \*
-     - 5.0.3
+     - 6.0.1
 
    * - org.opendaylight.yangtools
      - \*
-     - 10.0.4
+     - 11.0.0
 
    * - org.opendaylight.mdsal
      - \*
-     - 11.0.7
+     - 12.0.0
 
    * - org.opendaylight.controller
      - \*
-     - 7.0.4
+     - 8.0.0
 
    * - org.opendaylight.aaa
      - \*
-     - 0.17.7
+     - 0.18.0
 
    * - org.opendaylight.netconf
      - \*
-     - 5.0.4
+     - 6.0.0
 
 .. 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 3191e947..f0585f20 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index e36d7c05..692fd36e 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>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -76,43 +76,13 @@
             <dependencies>
                 <dependency>
                     <groupId>org.opendaylight.bgpcep</groupId>
-                    <artifactId>features-algo</artifactId>
+                    <artifactId>features-bgpcep</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>
                 <dependency>
                     <groupId>org.opendaylight.bgpcep</groupId>
-                    <artifactId>features-bgp</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.bgpcep</groupId>
-                    <artifactId>features-bgpcep-extras</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.bgpcep</groupId>
-                    <artifactId>features-bmp</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.bgpcep</groupId>
-                    <artifactId>features-graph</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.bgpcep</groupId>
-                    <artifactId>features-pcep</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.bgpcep</groupId>
-                    <artifactId>features-rsvp</artifactId>
+                    <artifactId>features-bgpcep-testing</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>
@@ -247,19 +217,13 @@
                 </dependency>
                 <dependency>
                     <groupId>org.opendaylight.netconf</groupId>
-                    <artifactId>features-netconf-connector</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.netconf</groupId>
-                    <artifactId>features-restconf</artifactId>
+                    <artifactId>features-netconf-experimental</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>
                 <dependency>
                     <groupId>org.opendaylight.netconf</groupId>
-                    <artifactId>features-yanglib</artifactId>
+                    <artifactId>features-netconf-testing</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>
@@ -353,7 +317,7 @@
         <profile>
             <id>transportpce-models</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
@@ -368,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 0d60f355..d99feb09 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>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index 84181f95..f33ad194 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>12.0.3</version>
+        <version>13.0.3</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 fbb47c65..890ed5c1 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>12.0.3</version>
+        <version>13.0.3</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 c3ce5999..78e8f0db 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>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -153,13 +153,13 @@
             <dependencies>
                 <dependency>
                     <groupId>org.opendaylight.netconf</groupId>
-                    <artifactId>odl-mdsal-apidocs</artifactId>
+                    <artifactId>odl-restconf</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>
                 <dependency>
                     <groupId>org.opendaylight.netconf</groupId>
-                    <artifactId>odl-restconf</artifactId>
+                    <artifactId>odl-restconf-openapi</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>
@@ -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 c5bd7a68..5518ef96 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>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml
index 568ab112..803800b0 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>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index a3c9d4db..68e1841f 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml
index afa1f82c..66c38763 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>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
 
@@ -96,21 +96,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-netconf-connector</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-restconf</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features-yanglib</artifactId>
+            <artifactId>features-netconf-experimental</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
diff --git a/pom.xml b/pom.xml
index c6bc463a..525fcfee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
-- 
2.36.6