Bump upstreams for Silicon

Adopt the following upstream versions:
- odlparent-8.0.0
- yangtools-6.0.0
- mdsal-7.0.0
- controller-3.0.0
- infrautils-1.9.0

Change-Id: Ib11bf960c231a999220b0225ec4ff16e02b1a417
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-encrypt-service/pom.xml b/aaa-encrypt-service/pom.xml
index 8e181736a16310beae95dd76a5a36c51d33bd7d3..754e28d3eef92a328f79289ba236cb2a5e21c405 100644 (file)
--- a/aaa-encrypt-service/pom.xml
+++ b/aaa-encrypt-service/pom.xml
@@ -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>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-password-service/pom.xml b/aaa-password-service/pom.xml
index c99b3c58397ba75594a40b2c1b288e6b5aba0de7..80b1acd3b80c610e427b57ca9b90f6d656184d0c 100644 (file)
--- a/aaa-password-service/pom.xml
+++ b/aaa-password-service/pom.xml
@@ -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>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml
index 88629390d62137c0fafd4d5bd0e7f87ee0ccb850..1366bcaca795dda9013d075efc9e01eab8c0bb8b 100644 (file)
--- a/aaa-shiro/pom.xml
+++ b/aaa-shiro/pom.xml
@@ -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>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 55fedc395ca5a9019b2e2986e53d987ce1884a79..206c93e060b98d121de69955762572cfe382c8fd 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>7.0.6</version>
+      <version>8.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index 2c55f401c5a074c543686db83af56ef24ee6f04a..ca5be410132b0be8c06de5a446576d0b576f8724 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>inject.guice.testutils</artifactId>
-            <version>1.8.1</version>
+            <version>1.9.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -247,11 +247,11 @@
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.9/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/7.0.6/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/1.8.1/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/5.0.6/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/6.0.5/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/2.0.4/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/1.9.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/7.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/3.0.0/</link>
                     </links>
 
                     <!--groups>

diff --git a/features/features-aaa/pom.xml b/features/features-aaa/pom.xml
index f27721718d377ccda9cf7462a701b5014c32b276..084623ee52aaa59ed46388b51ba6072a5ea84617 100644 (file)
--- a/features/features-aaa/pom.xml
+++ b/features/features-aaa/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index 3788e72e6dd24ecedb6d067603bacfe085ca2d54..a102711429986cf445315b01f1f4bcdb5cdf033f 100644 (file)
--- a/features/odl-aaa-api/pom.xml
+++ b/features/odl-aaa-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>6.0.5</version>
+            <version>7.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-aaa-api/src/main/feature/feature.xml b/features/odl-aaa-api/src/main/feature/feature.xml
index 1b3c34459096af4b184b4703dc358394fdc3d805..d659b718d8232af17e0703e542ef18fc0f97e512 100644 (file)
--- a/features/odl-aaa-api/src/main/feature/feature.xml
+++ b/features/odl-aaa-api/src/main/feature/feature.xml
@@ -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="[7,8)">odl-servlet-api</feature>
-        <feature version="[7,8)">odl-ws-rs-api</feature>
-        <feature version="[6,7)">odl-mdsal-binding-base</feature>
+        <feature version="[8,9)">odl-servlet-api</feature>
+        <feature version="[8,9)">odl-ws-rs-api</feature>
+        <feature version="[7,8)">odl-mdsal-binding-base</feature>
     </feature>
 </features>

diff --git a/features/odl-aaa-cert/pom.xml b/features/odl-aaa-cert/pom.xml
index 1615fcd9a52804249b45d5d027f2b737f271636f..1227c0604d66a4e08a9f09a0725778dc9e6bbc1e 100644 (file)
--- a/features/odl-aaa-cert/pom.xml
+++ b/features/odl-aaa-cert/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>2.0.4</version>
+            <version>3.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-aaa-cert/src/main/feature/feature.xml b/features/odl-aaa-cert/src/main/feature/feature.xml
index 9be871281ddda77d0773b6cf387424eefb762bfc..1d4bad692d77b8a542a78d2072458663bab40c02 100644 (file)
--- a/features/odl-aaa-cert/src/main/feature/feature.xml
+++ b/features/odl-aaa-cert/src/main/feature/feature.xml
@@ -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="[2,3)">odl-mdsal-broker</feature>
+        <feature version="[3,4)">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>

diff --git a/features/odl-aaa-cli/pom.xml b/features/odl-aaa-cli/pom.xml
index a7b604720e40a26352871a9725fde5cc079df848..a775e25abe0d53578135f3339e5dd528f4ceec14 100644 (file)
--- a/features/odl-aaa-cli/pom.xml
+++ b/features/odl-aaa-cli/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-encryption-service/pom.xml b/features/odl-aaa-encryption-service/pom.xml
index b60d7090b15aec8374980a1e43b0013f760bf817..db4c7f45b8b09889ce7f098a9e4c5bd5f869b4f9 100644 (file)
--- a/features/odl-aaa-encryption-service/pom.xml
+++ b/features/odl-aaa-encryption-service/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>2.0.4</version>
+            <version>3.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-aaa-encryption-service/src/main/feature/feature.xml b/features/odl-aaa-encryption-service/src/main/feature/feature.xml
index 1aee87fab3b81dec77f5ea1ecce5d32c8adb4d2a..823ceb9be91e23980014a9dea7c008ac7f88b24c 100644 (file)
--- a/features/odl-aaa-encryption-service/src/main/feature/feature.xml
+++ b/features/odl-aaa-encryption-service/src/main/feature/feature.xml
@@ -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="[2,3)">odl-mdsal-broker</feature>
+        <feature version="[3,4)">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>

diff --git a/features/odl-aaa-password-service/pom.xml b/features/odl-aaa-password-service/pom.xml
index 4b5cc13165cd13db36b9080c42cfe66360668473..2aa7132a63ba7d5aed1ff7aefee0f929b1c23c58 100644 (file)
--- a/features/odl-aaa-password-service/pom.xml
+++ b/features/odl-aaa-password-service/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 
@@ -54,14 +54,14 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>6.0.5</version>
+            <version>7.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>2.0.4</version>
+            <version>3.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-aaa-password-service/src/main/feature/feature.xml b/features/odl-aaa-password-service/src/main/feature/feature.xml
index c898ee8767162c2f11a2bc3f44bd13d411ac8acc..aec0e9ea6c7ae060c9c6eb9530af8dfb07109739 100644 (file)
--- a/features/odl-aaa-password-service/src/main/feature/feature.xml
+++ b/features/odl-aaa-password-service/src/main/feature/feature.xml
@@ -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="[6,7)">odl-mdsal-binding-base</feature>
-        <feature version="[2,3)">odl-mdsal-broker</feature>
+        <feature version="[7,8)">odl-mdsal-binding-base</feature>
+        <feature version="[3,4)">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>

diff --git a/features/odl-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index f46392e150bd051b95d108e2e6b66af4f356ecf1..ce84a7ad0f6630f837097be0ed02309a7cd6fc38 100644 (file)
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-shiro/src/main/feature/feature.xml b/features/odl-aaa-shiro/src/main/feature/feature.xml
index b18f26ad42bbdf32c311f2f591d3ae92c36c29c9..d9dbaf3d8f33aff072c23fcae396a8df73384db8 100644 (file)
--- a/features/odl-aaa-shiro/src/main/feature/feature.xml
+++ b/features/odl-aaa-shiro/src/main/feature/feature.xml
@@ -23,9 +23,9 @@
         <configfile finalname="/etc/org.opendaylight.aaa.filterchain.cfg">
             mvn:org.opendaylight.aaa/aaa-filterchain/${project.version}/cfg/config
         </configfile>
-        <feature version="[7,8)">odl-karaf-feat-jdbc</feature>
-        <feature version="[7,8)">odl-karaf-feat-jetty</feature>
-        <feature version="[7,8)">odl-apache-commons-codec</feature>
-        <feature version="[2,3)">odl-jolokia</feature>
+        <feature version="[8,9)">odl-karaf-feat-jdbc</feature>
+        <feature version="[8,9)">odl-karaf-feat-jetty</feature>
+        <feature version="[8,9)">odl-apache-commons-codec</feature>
+        <feature version="[3,4)">odl-jolokia</feature>
     </feature>
 </features>

diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index d5c183a26824ae5d03d9280d9fc53e9207fd2bce..2caf283e585317da6ef174dd36231dbbf19f3feb 100644 (file)
--- a/features/odl-aaa-web/pom.xml
+++ b/features/odl-aaa-web/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>5.0.6</version>
+                <version>6.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/odl-aaa-web/src/main/feature/feature.xml b/features/odl-aaa-web/src/main/feature/feature.xml
index a8a1b00711f7d389c53616556442767e3fbc088e..0f00391c0000bacb9d8313744bc0516b4ec9018a 100644 (file)
--- a/features/odl-aaa-web/src/main/feature/feature.xml
+++ b/features/odl-aaa-web/src/main/feature/feature.xml
@@ -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="[7,8)">odl-karaf-feat-jetty</feature>
-        <feature version="[7,8)">odl-guava</feature>
-        <feature version="[7,8)">odl-jersey-2</feature>
-        <feature version="[5,6)">odl-yangtools-util</feature>
+        <feature version="[8,9)">odl-karaf-feat-jetty</feature>
+        <feature version="[8,9)">odl-guava</feature>
+        <feature version="[8,9)">odl-jersey-2</feature>
+        <feature version="[6,7)">odl-yangtools-util</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 91a568a48999e8361fad1975ba28b2bf26feb73c..39c690b78f3e79852ed6986515bc037a67b35deb 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 12ae00851cdc6b52e27d3ba9075fd39e2ddb66d6..e95976be28a3f0c45c237affd1b2332ae990f78d 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index 283af4f8f6ec4a8f909051842e79277578136c1f..af315c73898af2ca3d914f2c4b2f593f15ca6d42 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>6.0.5</version>
+    <version>7.0.0</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>2.0.4</version>
+        <version>3.0.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -58,6 +58,16 @@
         <artifactId>shiro-core</artifactId>
         <version>1.3.2</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.dependencymanager</artifactId>
+        <version>4.4.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
+        <version>4.0.6</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/pom.xml b/pom.xml
index 986c2db98799e18851a42aa3562e55fb723cf09e..2f537a4e8e21e86369f50794e0de68831e1a5c1d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/web/pom.xml b/web/pom.xml
index acef507be12d0a231fe1b2d43f401780c66cc5fa..26b5046d5caf89042fff52911be9ef2d3bef4de8 100644 (file)
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/web/testutils/pom.xml b/web/testutils/pom.xml
index 56466eb4c991248d740bca61d30b637cdd143faa..35611348c4b28eafbb9a0eac1fcee864a2aeb4ea 100644 (file)
--- a/web/testutils/pom.xml
+++ b/web/testutils/pom.xml
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>1.8.1</version>
+        <version>1.9.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>