Bump upstreams

Adopt:
- odparent-13.0.3
- infrautils-6.0.1
- yangtools-11.0.0
- mdsal-12.0.0
- controller-8.0.0

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index f074cb64e183652e8737d5c7a3558805219d78ac..0c0078b873bdff36e98f64d86b601130d101b002 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,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>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index ca08afc241cd065abf062512a028706f090bee09..fcd3c2d934d4a25c05f040d7062f33c14432ea2b 100644 (file)
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>11.0.7</version>
+    <version>12.0.0</version>
     <relativePath/>
   </parent>
 
@@ -29,7 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>7.0.4</version>
+        <version>8.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/commons/pom.xml b/commons/pom.xml
index c87140b2ee6c784adcd47c363475d59ce6612bfc..42d6dd49c700333e502034148f8f51ee3863848f 100644 (file)
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -12,7 +12,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>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/commons/quality-parent/pom.xml b/commons/quality-parent/pom.xml
index 2f0841e08be621670cd4accf8914735a0aac624f..3ece087387eb0f47f4cb31cfd2b8a7030761cdcd 100644 (file)
--- a/commons/quality-parent/pom.xml
+++ b/commons/quality-parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.infrautils</groupId>
     <artifactId>parent</artifactId>
-    <version>5.0.3</version>
+    <version>6.0.1</version>
     <relativePath/>
   </parent>
 
@@ -29,21 +29,21 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>10.0.4</version>
+        <version>11.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>11.0.7</version>
+        <version>12.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>7.0.4</version>
+        <version>8.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/odl-infrautils-metrics-prometheus/src/main/feature/feature.xml b/features/odl-infrautils-metrics-prometheus/src/main/feature/feature.xml
index 570932137a929d48a9bb0f7d89662ad24857fd2c..fef1b6e4de80d1f952e86618f554ebbd50ffb780 100644 (file)
--- a/features/odl-infrautils-metrics-prometheus/src/main/feature/feature.xml
+++ b/features/odl-infrautils-metrics-prometheus/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-infrautils-metrics-prometheus">
     <feature name="odl-infrautils-metrics-prometheus">
-        <feature version="[12,13)">odl-servlet-api</feature>
-        <feature version="[12,13)">odl-karaf-feat-jetty</feature>
+        <feature version="[13,14)">odl-servlet-api</feature>
+        <feature version="[13,14)">odl-karaf-feat-jetty</feature>
     </feature>
 </features>

diff --git a/features/odl-serviceutils-listener/pom.xml b/features/odl-serviceutils-listener/pom.xml
index 7f4b5ffc3b43f3057db8fe753bb54cedd7a910fa..1a0a3426cc524ea05618d631d236ef4baf9e13f7 100644 (file)
--- a/features/odl-serviceutils-listener/pom.xml
+++ b/features/odl-serviceutils-listener/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
 
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>11.0.7</version>
+                <version>12.0.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features/odl-serviceutils-listener/src/main/feature/feature.xml b/features/odl-serviceutils-listener/src/main/feature/feature.xml
index 38c3a5a41785911bf23954086e7fe2c14c201679..0ce615eb63e4a00a05536f6af564f59e45a3b731 100644 (file)
--- a/features/odl-serviceutils-listener/src/main/feature/feature.xml
+++ b/features/odl-serviceutils-listener/src/main/feature/feature.xml
@@ -4,6 +4,6 @@
   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
   <feature name='odl-serviceutils-listener' version='${project.version}'>
-    <feature version="[11,12)">odl-mdsal-binding-api</feature>
+    <feature version="[12,13)">odl-mdsal-binding-api</feature>
   </feature>
 </features>

diff --git a/features/odl-serviceutils-metrics/pom.xml b/features/odl-serviceutils-metrics/pom.xml
index 7054affade55b2fae770198e86919640a087e96d..83f36432df52dd960b2779e32d2edc0abd64618a 100644 (file)
--- a/features/odl-serviceutils-metrics/pom.xml
+++ b/features/odl-serviceutils-metrics/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 
@@ -20,14 +20,14 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>5.0.3</version>
+        <version>6.0.1</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>10.0.4</version>
+        <version>11.0.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/features/odl-serviceutils-metrics/src/main/feature/feature.xml b/features/odl-serviceutils-metrics/src/main/feature/feature.xml
index ef9167554066ceda170f8debd697be006d855c5f..182140e3a3d528a49a5c8ffa56a1408b94869649 100644 (file)
--- a/features/odl-serviceutils-metrics/src/main/feature/feature.xml
+++ b/features/odl-serviceutils-metrics/src/main/feature/feature.xml
@@ -11,7 +11,7 @@
         <configfile finalname="etc/org.opendaylight.serviceutils.metrics.cfg">
             mvn:org.opendaylight.serviceutils/metrics-impl/${project.version}/cfg/config
         </configfile>
-        <feature version="[12,13)">odl-dropwizard-metrics</feature>
-        <feature version="[10,11)">odl-yangtools-util</feature>
+        <feature version="[13,14)">odl-dropwizard-metrics</feature>
+        <feature version="[11,12)">odl-yangtools-util</feature>
     </feature>
 </features>

diff --git a/features/odl-serviceutils-rpc/pom.xml b/features/odl-serviceutils-rpc/pom.xml
index 6ab7b52ad17a6d07c135562189af1a27a15e0202..c62dbb28d018b4a1d8a9ccbeaa2370e5f826c282 100644 (file)
--- a/features/odl-serviceutils-rpc/pom.xml
+++ b/features/odl-serviceutils-rpc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>10.0.4</version>
+                <version>11.0.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/odl-serviceutils-rpc/src/main/feature/feature.xml b/features/odl-serviceutils-rpc/src/main/feature/feature.xml
index 1a5811c243c373a6322c20b3a05504bd8e7a938b..202ca6937bb9083c7b44cff7584ede3610030e25 100644 (file)
--- a/features/odl-serviceutils-rpc/src/main/feature/feature.xml
+++ b/features/odl-serviceutils-rpc/src/main/feature/feature.xml
@@ -4,6 +4,6 @@
   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
   <feature name='odl-serviceutils-rpc' version='${project.version}'>
-    <feature version="[10,11)">odl-yangtools-common</feature>
+    <feature version="[11,12)">odl-yangtools-common</feature>
   </feature>
 </features>

diff --git a/features/odl-serviceutils-srm/pom.xml b/features/odl-serviceutils-srm/pom.xml
index a4870bfb1c25dd9b074a3b8477d365f36a463153..877204a791936171d96af1a774225b3c70b1bbcc 100644 (file)
--- a/features/odl-serviceutils-srm/pom.xml
+++ b/features/odl-serviceutils-srm/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/features/odl-serviceutils-tools/pom.xml b/features/odl-serviceutils-tools/pom.xml
index b63fd2f755a79edf446fc7c791980231153ee87c..a256aff5471676e1f7f3b5d3573d60e370ac0c8a 100644 (file)
--- a/features/odl-serviceutils-tools/pom.xml
+++ b/features/odl-serviceutils-tools/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 
@@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>7.0.4</version>
+        <version>8.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/odl-serviceutils-tools/src/main/feature/feature.xml b/features/odl-serviceutils-tools/src/main/feature/feature.xml
index bbc2e76899c5134b94ff222618941f0e6e54afa7..20327d1ce5775af067dec0a940243a95adb85191 100644 (file)
--- a/features/odl-serviceutils-tools/src/main/feature/feature.xml
+++ b/features/odl-serviceutils-tools/src/main/feature/feature.xml
@@ -6,7 +6,7 @@
   <feature name='odl-serviceutils-tools' version='${project.version}'>
     <configfile
       finalname="etc/opendaylight/datastore/initial/config/serviceutils-upgrade-config.xml">mvn:org.opendaylight.serviceutils/upgrade/${project.version}/xml/config</configfile>
-    <feature version="[7,8)">odl-controller-blueprint</feature>
-    <feature version="[7,8)">odl-mdsal-broker</feature>
+    <feature version="[8,9)">odl-controller-blueprint</feature>
+    <feature version="[8,9)">odl-mdsal-broker</feature>
   </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 4e7a38486a09e4708371766d27847eecb21db47d..e6b899cf75bc0c2c423ed2debacba924ba1424b3 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,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>12.0.3</version>
+        <version>13.0.3</version>
         <relativePath/>
     </parent>
 

diff --git a/features/serviceutils-features/pom.xml b/features/serviceutils-features/pom.xml
index 31dce039863f1884b66d1b5abb251894f1427835..76fe745109df37201aa17344a961c8e97d8aa740 100644 (file)
--- a/features/serviceutils-features/pom.xml
+++ b/features/serviceutils-features/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 21c72e59497b889c6878eae0a60bc0d4fa1996a1..f97177e10952324ec66ccf2ed3c1051c63ba370b 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/metrics/impl/pom.xml b/metrics/impl/pom.xml
index 240880dc67873e29b7ccf7f1179127527754c3d8..66504e2cb1701da8756f09678d9f4c5637bc7e0a 100644 (file)
--- a/metrics/impl/pom.xml
+++ b/metrics/impl/pom.xml
@@ -28,6 +28,11 @@
       <artifactId>metrics-api</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>

diff --git a/metrics/it/pom.xml b/metrics/it/pom.xml
index f8f2aa33fbe022f44f67318c1fc496a2bb095833..5db6c487b28ebdd48b9092b7e3341b23a21b70b4 100644 (file)
--- a/metrics/it/pom.xml
+++ b/metrics/it/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.infrautils</groupId>
     <artifactId>itestutils-parent</artifactId>
-    <version>5.0.3</version>
+    <version>6.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/metrics/pom.xml b/metrics/pom.xml
index 6f0e0ec758dd9fd2595cb20c80033c4ffb27e77a..874fdebd27d2fc902ea498fa861c8767beed6439 100644 (file)
--- a/metrics/pom.xml
+++ b/metrics/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 708d39d2e5c0087232a2f3d34a6d1261e3983aec..97b1ecb52158c7fa9c1ea63993e18129a0cad76a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,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>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/srm/pom.xml b/srm/pom.xml
index 6c132e2b309a05aa06b02e6aae1b3b794d640790..14ae55d3671d4da9646aa7f0d02089366f13a95e 100644 (file)
--- a/srm/pom.xml
+++ b/srm/pom.xml
@@ -12,7 +12,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>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/tools/api/pom.xml b/tools/api/pom.xml
index c4ee9953558378a5768b6fe612862b2463666a5a..f4e0f8e6e4dbcd2ecfce947b180fe04650fdd740 100644 (file)
--- a/tools/api/pom.xml
+++ b/tools/api/pom.xml
@@ -26,6 +26,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: serviceutils :: ${project.artifactId}</name>
 
   <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>org.eclipse.jdt.annotation</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>concepts</artifactId>
@@ -57,10 +61,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.immutables</groupId>
-      <artifactId>value</artifactId>
-      <classifier>annotations</classifier>
-    </dependency>
   </dependencies>
 </project>

diff --git a/tools/pom.xml b/tools/pom.xml
index 1be842ab9b47e081c4f281b0ae77b32ea4e6b96b..7578bb9be4fa68796170e5f4fbd14ef86748d9a9 100644 (file)
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -12,7 +12,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>12.0.3</version>
+    <version>13.0.3</version>
     <relativePath/>
   </parent>
 

diff --git a/tools/rpc-api/pom.xml b/tools/rpc-api/pom.xml
index 5a0d60f2a1a9a93498b5ab42887b92c6d9b4659f..0055053795347747090e19c0e4663a676c2f56c2 100644 (file)
--- a/tools/rpc-api/pom.xml
+++ b/tools/rpc-api/pom.xml
@@ -17,10 +17,19 @@
     <packaging>bundle</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>org.eclipse.jdt.annotation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>

diff --git a/upgrade/pom.xml b/upgrade/pom.xml
index 77326e118b257be7852e5fb5c6f19ab9481b40f7..a8fcd7945d4cee8fc10e225a30dd4670ec1572a7 100644 (file)
--- a/upgrade/pom.xml
+++ b/upgrade/pom.xml
@@ -26,6 +26,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <name>ODL :: serviceutils :: ${project.artifactId}</name>
 
   <dependencies>
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>concepts</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>