Integrate upstream MRI projects 97/96097/6
authorRobert Varga <robert.varga@pantheon.tech>
Sun, 9 May 2021 19:59:42 +0000 (21:59 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Wed, 12 May 2021 12:20:46 +0000 (14:20 +0200)
Adopt latest versions, namely;
- odlparent-9.0.1
- yangtools-7.0.1
- infrautils-2.0.1
- mdsal-8.0.0-SNAPSHOT
- controller-4.0.0-SNAPSHOT

This forms the baseline for our next major release.

Change-Id: I74c0af013cbb8545e1bef515a9b7fb392f3f09a8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
28 files changed:
aaa-encrypt-service/pom.xml
aaa-password-service/pom.xml
aaa-shiro/pom.xml
aaa-shiro/repackaged-shiro-jar/pom.xml
artifacts/pom.xml
docs/pom.xml
features/features-aaa/pom.xml
features/odl-aaa-api/pom.xml
features/odl-aaa-api/src/main/feature/feature.xml
features/odl-aaa-cert/pom.xml
features/odl-aaa-cert/src/main/feature/feature.xml
features/odl-aaa-cli/pom.xml
features/odl-aaa-encryption-service/pom.xml
features/odl-aaa-encryption-service/src/main/feature/feature.xml
features/odl-aaa-password-service/pom.xml
features/odl-aaa-password-service/src/main/feature/feature.xml
features/odl-aaa-shiro/pom.xml
features/odl-aaa-shiro/src/main/feature/feature.xml
features/odl-aaa-web/pom.xml
features/odl-aaa-web/src/main/feature/feature.xml
features/odl-apache-shiro/pom.xml
features/odl-apache-shiro/src/main/feature/feature.xml
features/pom.xml
karaf/pom.xml
parent/pom.xml
pom.xml
web/pom.xml
web/testutils/pom.xml

index b71e4546db6032c2d2af3d3a0314498474835f61..68ffadbb644a5d471eaff4d44f769fa65cce5363 100644 (file)
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.2</version>
+    <version>9.0.1</version>
     <relativePath/>
   </parent>
 
index 0a1ca216234dc5be2dfd3217a19113b3cb84d773..b9174dc5762d8991fff22837c2dc248193555e88 100644 (file)
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.2</version>
+    <version>9.0.1</version>
     <relativePath/>
   </parent>
 
index 307179211ece5b930739582808644f000b0ffee9..5341809e921a88c194f30da53b86b2283e48018e 100644 (file)
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.2</version>
+    <version>9.0.1</version>
     <relativePath/>
   </parent>
 
index ac1a29832b2e9209d34f1201050bf40f3a185cbd..b8cc213d651fc9dc4f43126f3c3a40170dd8cc66 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
index 4132deeb33eb7f4641ab79a3760cf42a41631a03..07db4114102fcadda7711960702c53c7e363005f 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>8.1.2</version>
+      <version>9.0.1</version>
       <relativePath/>
     </parent>
 
index c75b79a13b328ea5f404412e79c365ccc0c99a21..221186ca7e034d85f70d5ad5200f6ac4d246ea73 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>inject.guice.testutils</artifactId>
-            <version>1.9.8</version>
+            <version>2.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.11/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.1.2/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/1.9.8/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.6/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/7.0.7/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/3.0.8/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/9.0.1/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/2.0.1/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/7.0.1/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/8.0.0-SNAPSHOT/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/4.0.0-SNAPSHOT/</link>
                     </links>
 
                     <!--groups>
index 4bfadf8376fcc0b0cd2b31c9a705e64538edde36..1ffbf1fb2c8381416020bba3eea028e29e3f90e0 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
index ac314893d99b7b72563256780da7f0120910d940..ba2aeadc5040190edb0f24e458013890a2f3d822 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>7.0.7</version>
+            <version>8.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
index a2776ae025dee64f557ad6bef6e97bb68ec41dce..04057741265bf13855cac318ead4de50141fdd97 100644 (file)
@@ -8,8 +8,8 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-aaa-${project.version}">
     <feature name="odl-aaa-api" version="${project.version}">
-        <feature version="[8.1,9)">odl-servlet-api</feature>
-        <feature version="[8.1,9)">odl-ws-rs-api</feature>
-        <feature version="[7,8)">odl-mdsal-binding-base</feature>
+        <feature version="[9,10)">odl-servlet-api</feature>
+        <feature version="[9,10)">odl-ws-rs-api</feature>
+        <feature version="[8,9)">odl-mdsal-binding-base</feature>
     </feature>
 </features>
index 0520c15ec3e2f61cf65fc046d161893ba89a1b01..cf2600d2448a59a54f080ea6aa960dd3015711bd 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>3.0.8</version>
+            <version>4.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
index 1d4bad692d77b8a542a78d2072458663bab40c02..890995d1936a07a6f8210a448d680a98705cfc74 100644 (file)
@@ -8,7 +8,7 @@
  -->
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-aaa-cert" version="${project.version}">
-        <feature version="[3,4)">odl-mdsal-broker</feature>
+        <feature version="[4,5)">odl-mdsal-broker</feature>
         <configfile finalname="etc/opendaylight/datastore/initial/config/aaa-cert-config.xml">
             mvn:org.opendaylight.aaa/aaa-cert/${project.version}/xml/config
         </configfile>
index 118de7b44d38af1f01f036318db61988e9d757c0..39ec93af2823d7d7d70b10b6bafc15537e7bfecd 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
index adcf5b400384d3cd5b96f4a30ad1e4d102de4b4b..862d0f6dce41899bca1556bc7f3564d9cb1660b4 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>3.0.8</version>
+            <version>4.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
index 823ceb9be91e23980014a9dea7c008ac7f88b24c..899a99b961a8c41727bf013541d3821632c01094 100644 (file)
@@ -8,7 +8,7 @@
  -->
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-aaa-encryption-service" version="${project.version}">
-        <feature version="[3,4)">odl-mdsal-broker</feature>
+        <feature version="[4,5)">odl-mdsal-broker</feature>
         <configfile finalname="etc/opendaylight/datastore/initial/config/aaa-encrypt-service-config.xml">
             mvn:org.opendaylight.aaa/aaa-encrypt-service-impl/${project.version}/xml/config
         </configfile>
index 8d6edfd12b15e73306b919a60b336b593f950d87..9fc8692e5145b478312a7539549322cab6319795 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>7.0.7</version>
+            <version>8.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>3.0.8</version>
+            <version>4.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
index aec0e9ea6c7ae060c9c6eb9530af8dfb07109739..42c8bd2aa251178056e4fcf4825223bd672b59e0 100644 (file)
@@ -8,8 +8,8 @@
  -->
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-aaa-password-service" version="${project.version}">
-        <feature version="[7,8)">odl-mdsal-binding-base</feature>
-        <feature version="[3,4)">odl-mdsal-broker</feature>
+        <feature version="[8,9)">odl-mdsal-binding-base</feature>
+        <feature version="[4,5)">odl-mdsal-broker</feature>
         <configfile finalname="etc/opendaylight/datastore/initial/config/aaa-password-service-config.xml">
             mvn:org.opendaylight.aaa/aaa-password-service-impl/${project.version}/xml/aaa-password-service-config
         </configfile>
index 0c0a356068399dfc16bd29d419d52251c4e5fa3f..47efc3cee17dad90e114725ba011065dfd4fd4b3 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
index 59ec7f062aee1731226d4cda89947bb2db663d39..011c5adeff235c103460b4cbc43c79394417a633 100644 (file)
@@ -23,8 +23,8 @@
         <configfile finalname="/etc/org.opendaylight.aaa.filterchain.cfg">
             mvn:org.opendaylight.aaa/aaa-filterchain/${project.version}/cfg/config
         </configfile>
-        <feature version="[8.1,9)">odl-karaf-feat-jdbc</feature>
-        <feature version="[8.1,9)">odl-karaf-feat-jetty</feature>
-        <feature version="[3,4)">odl-jolokia</feature>
+        <feature version="[9,10)">odl-karaf-feat-jdbc</feature>
+        <feature version="[9,10)">odl-karaf-feat-jetty</feature>
+        <feature version="[4,5)">odl-jolokia</feature>
     </feature>
 </features>
index e8ab8be378815c41a68d5815ac01321b20eab487..818ff0b624940bd01ad37b07893c2e9c81481368 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>6.0.6</version>
+                <version>7.0.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index 1b8d8935b4115e2fcad83286f1607cd1ccaa3f36..a3d1dffe25c9f41ceeade8ec6f24547d2497d5a6 100644 (file)
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-aaa-${project.version}">
     <feature name="odl-aaa-web" version="${project.version}">
-        <feature version="[8.1,9)">odl-karaf-feat-jetty</feature>
-        <feature version="[8.1,9)">odl-guava</feature>
-        <feature version="[8.1,9)">odl-jersey-2</feature>
-        <feature version="[6,7)">odl-yangtools-util</feature>
+        <feature version="[9,10)">odl-karaf-feat-jetty</feature>
+        <feature version="[9,10)">odl-guava</feature>
+        <feature version="[9,10)">odl-jersey-2</feature>
+        <feature version="[7,8)">odl-yangtools-util</feature>
     </feature>
 </features>
index 5d2a3694e65edd7808373f4b4b69baac601aaa06..e58d25fa061e8792d86f1807b6c05820cd890d7e 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
index b4a92d4659d7e7d9a1387536c0849752766007fd..209d3421c65e4d8ff106c94d69ab65f1344de8da 100644 (file)
@@ -8,6 +8,6 @@
  -->
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-apache-shiro" version="${project.version}">
-        <feature version="[8,9)">odl-servlet-api</feature>
+        <feature version="[9,10)">odl-servlet-api</feature>
     </feature>
 </features>
index 66c6065d8378d55f33373bac960ce893fa6b231f..5782432e948ef903a89f1a028da1f929cecc3d92 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
index 424c72da1aa36636557be3e4744b29fbd562a59b..6c165a99a2d3313a8b8896d8467d2c903eee2273 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>8.1.2</version>
+        <version>9.0.1</version>
         <relativePath/>
     </parent>
 
index 82bb6dabf80158ae943b9c6796b73cd20583204a..c66fbe103aeb72f64fc407e61d5781c365e9347c 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>7.0.7</version>
+    <version>8.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>3.0.8</version>
+        <version>4.0.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/pom.xml b/pom.xml
index 15b6a0b93787bccb35ea72292cd4ac4bed7eae40..c326e0b3e0d2e07b81652587c4a62593945ecbae 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.2</version>
+    <version>9.0.1</version>
     <relativePath/>
   </parent>
 
index c7d12e7191783da1d6004c99a8904586f8680fbc..5013f2873815afa4296496af0621c1cec63f2bb8 100644 (file)
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.2</version>
+    <version>9.0.1</version>
     <relativePath/>
   </parent>
 
index c30c466cfe181fd8d1dc9f016f996c451a5caaa2..334fc7f14b15cd03690b1da418b3bada6520323f 100644 (file)
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>1.9.8</version>
+        <version>2.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>