Bump upstreams to snapshots

Adopt:
- odlparent-11.0.0-SNAPSHOT
- yangtools-9.0.0-SNAPSHOT
- mdsal-10.0.0-SNAPSHOT

Also adjust to identity mapping change by referencing .VALUE instead of
.class.

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

diff --git a/akka/pom.xml b/akka/pom.xml
index 2331e54b18fabdb88c11947a23f26fff37a6447a..2861c77c988f34625ce0f4fee81ab6d8ed054b60 100644 (file)
--- a/akka/pom.xml
+++ b/akka/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/akka/repackaged-akka-jar/pom.xml b/akka/repackaged-akka-jar/pom.xml
index 7e3996420078a53fe376778bc2af6495f22a6369..7a6da32e159b89573bc766cfcaf1969abfa2654d 100644 (file)
--- a/akka/repackaged-akka-jar/pom.xml
+++ b/akka/repackaged-akka-jar/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index fca5728c63aef06666c9bed14dee747cd088a2f9..ea610b2a1521519acf280d09327a7cb75905fd5e 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index f70fe2c09af87150bf7071f1beab69fa2b608aa4..4f710c74e81b65839235963ab265e12e7343bc4a 100644 (file)
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index a95960dea25f5d9e24dc08860d513ce1a4295a6d..d3c813dcbe844cdab494419de77b74b6543f42a4 100644 (file)
--- a/bundle-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>dom-parent</artifactId>
-        <version>9.0.2</version>
+        <version>10.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index fa9b9a7a0e984cebb2006ae4c27607e522dc7908..012cbc29f09db4636c619c618c6e189191b9e9e9 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
@@ -111,11 +111,19 @@
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
+            <artifactId>org.osgi.framework</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <artifactId>org.osgi.service.component</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.metatype.annotations</artifactId>
         </dependency>
     </dependencies>
 
@@ -224,9 +232,9 @@
                         <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/10.0.0/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/8.0.3/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/9.0.2/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/11.0.0-SNAPSHOT/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/9.0.0-SNAPSHOT/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/10.0.0-SNAPSHOT/</link>
                     </links>
                     <groups>
                         <group>

diff --git a/features/features-controller-experimental/pom.xml b/features/features-controller-experimental/pom.xml
index 899dd251103a97e12b069d7a1c3f944b6926ba7d..d2d978ee88cb015a2d66a8e70dae453507961100 100644 (file)
--- a/features/features-controller-experimental/pom.xml
+++ b/features/features-controller-experimental/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-controller-testing/pom.xml b/features/features-controller-testing/pom.xml
index 265221aa6e9438cba9827a61ca77ca28b2eefb81..257a9191b1933182e0e8be9d8b5516a9d9aa80ed 100644 (file)
--- a/features/features-controller-testing/pom.xml
+++ b/features/features-controller-testing/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-controller/pom.xml b/features/features-controller/pom.xml
index df433e6dd439bf3d1ee98fc1052646917994eda9..98302bf620a3f8bb043e2742ca163679d1b84b43 100644 (file)
--- a/features/features-controller/pom.xml
+++ b/features/features-controller/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-clustering-test-app/src/main/feature/feature.xml b/features/odl-clustering-test-app/src/main/feature/feature.xml
index e4abdffd55fedbe7a2bd9a876cf05615f5bd0b79..e31d50148ba2de38e722988241280739de99e42a 100644 (file)
--- a/features/odl-clustering-test-app/src/main/feature/feature.xml
+++ b/features/odl-clustering-test-app/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-clustering-test-app-${project.version}">
     <feature name="odl-clustering-test-app" version="${project.version}">
-        <feature version="[9,10)">odl-mdsal-model-rfc6991</feature>
+        <feature version="[10,11)">odl-mdsal-model-rfc6991</feature>
     </feature>
 </features>

diff --git a/features/odl-controller-blueprint/src/main/feature/feature.xml b/features/odl-controller-blueprint/src/main/feature/feature.xml
index 4016e0c2a7bb959821626fc54ce768b4c0023b89..e0e9c955d3f7b038cb20780052916dbdeb1e6834 100644 (file)
--- a/features/odl-controller-blueprint/src/main/feature/feature.xml
+++ b/features/odl-controller-blueprint/src/main/feature/feature.xml
@@ -8,10 +8,10 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-blueprint-${project.version}">
     <feature name="odl-controller-blueprint" version="${project.version}">
-        <feature version="[8,9)">odl-yangtools-codec</feature>
-        <feature version="[9,10)">odl-mdsal-binding-api</feature>
-        <feature version="[9,10)">odl-mdsal-binding-runtime</feature>
-        <feature version="[9,10)">odl-mdsal-dom-api</feature>
+        <feature version="[9,10)">odl-yangtools-codec</feature>
+        <feature version="[10,11)">odl-mdsal-binding-api</feature>
+        <feature version="[10,11)">odl-mdsal-binding-runtime</feature>
+        <feature version="[10,11)">odl-mdsal-dom-api</feature>
         <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${project.version}</bundle>
     </feature>
 </features>

diff --git a/features/odl-controller-broker-local/src/main/feature/feature.xml b/features/odl-controller-broker-local/src/main/feature/feature.xml
index 0272cec8e59c846fd58859f6eb32570a922724d7..d5fe32cb9619b30d0d9f4ab923233eb39d0ff03f 100644 (file)
--- a/features/odl-controller-broker-local/src/main/feature/feature.xml
+++ b/features/odl-controller-broker-local/src/main/feature/feature.xml
@@ -8,9 +8,9 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
     <feature name="odl-controller-broker-local" version="${project.version}">
-        <feature version="[9,10)">odl-mdsal-dom</feature>
-        <feature version="[9,10)">odl-mdsal-eos-binding</feature>
-        <feature version="[9,10)">odl-mdsal-eos-dom</feature>
-        <feature version="[9,10)">odl-mdsal-singleton-dom</feature>
+        <feature version="[10,11)">odl-mdsal-dom</feature>
+        <feature version="[10,11)">odl-mdsal-eos-binding</feature>
+        <feature version="[10,11)">odl-mdsal-eos-dom</feature>
+        <feature version="[10,11)">odl-mdsal-singleton-dom</feature>
     </feature>
 </features>

diff --git a/features/odl-controller-exp-netty-config/src/main/feature/feature.xml b/features/odl-controller-exp-netty-config/src/main/feature/feature.xml
index c2261cea6943e4f97dd0c7febdfd4a576d84f4d3..5e6bc3c088d6c737a51e224767e3f9b07ed831a2 100644 (file)
--- a/features/odl-controller-exp-netty-config/src/main/feature/feature.xml
+++ b/features/odl-controller-exp-netty-config/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-exp-netty-config">
     <feature name="odl-controller-exp-netty-config">
-        <feature version="[10,11)">odl-netty-4</feature>
+        <feature version="[11,12)">odl-netty-4</feature>
     </feature>
 </features>

diff --git a/features/odl-controller-mdsal-common/src/main/feature/feature.xml b/features/odl-controller-mdsal-common/src/main/feature/feature.xml
index 08bc95441b1ffb6c97959670707fadab076ebb2d..567080d1d9e7b9de627c13b120e87a9160579d79 100644 (file)
--- a/features/odl-controller-mdsal-common/src/main/feature/feature.xml
+++ b/features/odl-controller-mdsal-common/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-mdsal-common-${project.version}">
     <feature name="odl-controller-mdsal-common" version="${project.version}">
-        <feature version="[9,10)">odl-mdsal-common</feature>
-        <feature version="[9,10)">odl-mdsal-binding-runtime</feature>
+        <feature version="[10,11)">odl-mdsal-common</feature>
+        <feature version="[10,11)">odl-mdsal-binding-runtime</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-broker/src/main/feature/feature.xml b/features/odl-mdsal-broker/src/main/feature/feature.xml
index f20c516e0e7cebc0bb867e190aa409c31ef10f3a..f10a915c9a2c8d88c5bec860b8d2994e5207b7ca 100644 (file)
--- a/features/odl-mdsal-broker/src/main/feature/feature.xml
+++ b/features/odl-mdsal-broker/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
     <feature name="odl-mdsal-broker" version="${project.version}">
-        <feature version="[9,10)">odl-mdsal-singleton-dom</feature>
-        <feature version="[9,10)">odl-mdsal-eos-binding</feature>
+        <feature version="[10,11)">odl-mdsal-singleton-dom</feature>
+        <feature version="[10,11)">odl-mdsal-eos-binding</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml b/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml
index 82c96ac699e1e59fc8ead07774d5be11f8a77c2a..b206e7f439b3f5851ec5c8b250674802f349d2af 100644 (file)
--- a/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml
+++ b/features/odl-mdsal-clustering-commons/src/main/feature/feature.xml
@@ -8,10 +8,10 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
     <feature name="odl-mdsal-clustering-commons" version="${project.version}">
-        <feature version="[10,11)">odl-apache-commons-lang3</feature>
-        <feature version="[10,11)">odl-dropwizard-metrics</feature>
-        <feature version="[10,11)">odl-servlet-api</feature>
-        <feature version="[8,9)">odl-yangtools-data</feature>
-        <feature version="[8,9)">odl-yangtools-codec</feature>
+        <feature version="[11,12)">odl-apache-commons-lang3</feature>
+        <feature version="[11,12)">odl-dropwizard-metrics</feature>
+        <feature version="[11,12)">odl-servlet-api</feature>
+        <feature version="[9,10)">odl-yangtools-data</feature>
+        <feature version="[9,10)">odl-yangtools-codec</feature>
     </feature>
 </features>

diff --git a/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml b/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
index 9d12ed2d390ef9b769463c2da9bb60ee670f780e..d5c676706561d723e09e9b0ab1522935bba7a10c 100644 (file)
--- a/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
+++ b/features/odl-mdsal-distributed-datastore/src/main/feature/feature.xml
@@ -8,11 +8,11 @@
   -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
     <feature name="odl-mdsal-distributed-datastore" version="${project.version}">
-        <feature version="[10,11)">odl-apache-commons-text</feature>
-        <feature version="[8,9)">odl-yangtools-codec</feature>
-        <feature version="[9,10)">odl-mdsal-eos-dom</feature>
-        <feature version="[9,10)">odl-mdsal-dom-broker</feature>
-        <feature version="[9,10)">odl-mdsal-binding-dom-adapter</feature>
+        <feature version="[11,12)">odl-apache-commons-text</feature>
+        <feature version="[9,10)">odl-yangtools-codec</feature>
+        <feature version="[10,11)">odl-mdsal-eos-dom</feature>
+        <feature version="[10,11)">odl-mdsal-dom-broker</feature>
+        <feature version="[10,11)">odl-mdsal-binding-dom-adapter</feature>
         <configfile finalname="configuration/initial/akka.conf">
             mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf
         </configfile>

diff --git a/features/odl-toaster/src/main/feature/feature.xml b/features/odl-toaster/src/main/feature/feature.xml
index 4466dbe52b5a8f1584f8897e911063a733dbe3ad..cb2bf7e3017a325683776ebd54e465891109a809 100644 (file)
--- a/features/odl-toaster/src/main/feature/feature.xml
+++ b/features/odl-toaster/src/main/feature/feature.xml
@@ -8,6 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-toaster-${project.version}">
     <feature name="odl-toaster" version="${project.version}">
-        <feature version="[9,10)">odl-mdsal-binding-runtime</feature>
+        <feature version="[10,11)">odl-mdsal-binding-runtime</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index df58dc2d1f3f18c157e67f6d0dfe1728f0ad7483..8d09bead9a03824e41f8a28e2a6881b922780860 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>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/features/single-feature-parent/pom.xml b/features/single-feature-parent/pom.xml
index 506f6b8d4320c57df87b1aacc23ff9fb6ede4c92..4e2d0c329084a46292adad026b8f36f557f5eacd 100644 (file)
--- a/features/single-feature-parent/pom.xml
+++ b/features/single-feature-parent/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/jolokia/pom.xml b/jolokia/pom.xml
index fd778b7cc8645107b3f349eecc2b662ec87f935d..b99d6cb7e79bd5ae5699313f806a91fcd0a57b48 100644 (file)
--- a/jolokia/pom.xml
+++ b/jolokia/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 957fae5d295769e1b7dc43a918c1ec1af2dbab01..e2321029d130481a50b0406d41fd5df1401ba40c 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index a66c391cad8a3c1830fe360dcccafacc84ac90c8..074343f8a0a26ba85a0a2bb5e478c10d1e375148 100644 (file)
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -27,14 +27,14 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>8.0.3</version>
+        <version>9.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>9.0.2</version>
+        <version>10.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/config/netty-event-executor-config/pom.xml b/opendaylight/config/netty-event-executor-config/pom.xml
index 75046ee5246d33d921af26182cfea0f24968c20d..1af0d727b96fdf8e89f301fb621d5e8c5093ba8d 100644 (file)
--- a/opendaylight/config/netty-event-executor-config/pom.xml
+++ b/opendaylight/config/netty-event-executor-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/netty-threadgroup-config/pom.xml b/opendaylight/config/netty-threadgroup-config/pom.xml
index dbfb99a18ca7a663b620c4812676d0ca4b74d0be..bb5889ecc236137cac800f7dbd72b4a24dcdf624 100644 (file)
--- a/opendaylight/config/netty-threadgroup-config/pom.xml
+++ b/opendaylight/config/netty-threadgroup-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/netty-timer-config/pom.xml b/opendaylight/config/netty-timer-config/pom.xml
index cf273dc73d356dd01197e12515fe2555d402ca3d..7d38f13e00a4acc1d4bcc8954a2b17f377a5bec1 100644 (file)
--- a/opendaylight/config/netty-timer-config/pom.xml
+++ b/opendaylight/config/netty-timer-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 75bcdc3e8fca200b5ad9d4db2840b6ae8ed8cddf..9a018e794a195ff86f5575cf612bb85fb31769b1 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/threadpool-config-api/pom.xml b/opendaylight/config/threadpool-config-api/pom.xml
index d3a996ecab962bbd7e4e188a4d7e3e7666450215..2726a6a2ba70fa82a73bf249cd90836274a50996 100644 (file)
--- a/opendaylight/config/threadpool-config-api/pom.xml
+++ b/opendaylight/config/threadpool-config-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/config/threadpool-config-impl/pom.xml b/opendaylight/config/threadpool-config-impl/pom.xml
index bb918e1f6b9984ac11fdabbbf04c7b68b24ceb62..392db674d3d0389ef9a2c75896801770f086150b 100644 (file)
--- a/opendaylight/config/threadpool-config-impl/pom.xml
+++ b/opendaylight/config/threadpool-config-impl/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml
index 559c20c89a2a338f9167293ab1099189040162eb..0e98cdca6c1874ffaafe538aa36b9061a0ced338 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-base/pom.xml
@@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>9.0.2</version>
+        <version>10.0.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index 53f18d93747d6d435761435cb9dc630634f0d804..f6d082e5203f8cca804682518d0b25c96d9f6073 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml
index 74a33fc65e3a6f85a9a5fa24e7110f2cf8ae8fb7..a2d7eda34cd8921fc3d8ee9ac700bb6ee89d4a50 100644 (file)
--- a/opendaylight/md-sal/parent/pom.xml
+++ b/opendaylight/md-sal/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>9.0.2</version>
+    <version>10.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 9b1beb98971280c069c39cf9a60e5de7c9e24c47..4a85bfd2a55f08def3fe6d1ab3a7b2358eec60f9 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AddShardReplicaCommand.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AddShardReplicaCommand.java
index 77c039e9a39a312c92588c7413b0a15722295955..341195bc4e5e303d5a0504d7d63e50f39b068f93 100644 (file)
--- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AddShardReplicaCommand.java
+++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/AddShardReplicaCommand.java
@@ -33,7 +33,7 @@ public class AddShardReplicaCommand extends AbstractRpcAction {
         return rpcConsumerRegistry.getRpcService(ClusterAdminService.class)
                 .addShardReplica(new AddShardReplicaInputBuilder()
                         .setShardName(shardName)
-                        .setDataStoreType(DataStoreType.forName(dataStoreType).orElse(null))
+                        .setDataStoreType(DataStoreType.forName(dataStoreType))
                         .build());
     }
 }

diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/ChangeMemberVotingStatesForShardCommand.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/ChangeMemberVotingStatesForShardCommand.java
index cbfd5704afd172de5968cef134c457ad739e78fa..52f3794ee5a47356978d0d5cbc6e4e053b0678d3 100644 (file)
--- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/ChangeMemberVotingStatesForShardCommand.java
+++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/ChangeMemberVotingStatesForShardCommand.java
@@ -47,7 +47,7 @@ public class ChangeMemberVotingStatesForShardCommand extends AbstractRpcAction {
         return rpcConsumerRegistry.getRpcService(ClusterAdminService.class)
                 .changeMemberVotingStatesForShard(new ChangeMemberVotingStatesForShardInputBuilder()
                         .setShardName(shardName)
-                        .setDataStoreType(DataStoreType.forName(dataStoreType).orElse(null))
+                        .setDataStoreType(DataStoreType.forName(dataStoreType))
                         .setMemberVotingState(List.of(memberVotingState))
                         .build());
     }

diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/GetShardRoleCommand.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/GetShardRoleCommand.java
index 8e914279ea68ce2f9fd3d17f515b762d0bb5f099..617b2dc32b93f47558afcd500aa5316065373b32 100644 (file)
--- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/GetShardRoleCommand.java
+++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/GetShardRoleCommand.java
@@ -33,7 +33,7 @@ public class GetShardRoleCommand extends AbstractRpcAction {
         return rpcConsumerRegistry.getRpcService(ClusterAdminService.class)
                 .getShardRole(new GetShardRoleInputBuilder()
                         .setShardName(shardName)
-                        .setDataStoreType(DataStoreType.forName(dataStoreType).orElse(null))
+                        .setDataStoreType(DataStoreType.forName(dataStoreType))
                         .build());
     }
 }

diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/LocateShardCommand.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/LocateShardCommand.java
index 13d99a8e0385fd64cd4ee42bec89367199908c6d..a7acab15b82bc5a5e6a00c644f50fa4e9db175c6 100644 (file)
--- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/LocateShardCommand.java
+++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/LocateShardCommand.java
@@ -33,7 +33,7 @@ public class LocateShardCommand extends AbstractRpcAction {
         return rpcConsumerRegistry.getRpcService(ClusterAdminService.class)
                 .locateShard(new LocateShardInputBuilder()
                         .setShardName(shardName)
-                        .setDataStoreType(DataStoreType.forName(dataStoreType).orElse(null))
+                        .setDataStoreType(DataStoreType.forName(dataStoreType))
                         .build());
     }
 }

diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/MakeLeaderLocalCommand.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/MakeLeaderLocalCommand.java
index 3b1c1453d06bcd5ddc8a9f19230f50f2fb395900..a585f191a1f3ab3b346ab0ed297945d23f7dbeef 100644 (file)
--- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/MakeLeaderLocalCommand.java
+++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/MakeLeaderLocalCommand.java
@@ -33,7 +33,7 @@ public class MakeLeaderLocalCommand extends AbstractRpcAction {
         return rpcConsumerRegistry.getRpcService(ClusterAdminService.class)
                 .makeLeaderLocal(new MakeLeaderLocalInputBuilder()
                         .setShardName(shardName)
-                        .setDataStoreType(DataStoreType.forName(dataStoreType).orElse(null))
+                        .setDataStoreType(DataStoreType.forName(dataStoreType))
                         .build());
     }
 }

diff --git a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/RemoveShardReplicaCommand.java b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/RemoveShardReplicaCommand.java
index e4a786432b7af6195202ed1697af85e2118c10be..1db5707f8bfec59fcb2e14bd7e47a631a040ef13 100644 (file)
--- a/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/RemoveShardReplicaCommand.java
+++ b/opendaylight/md-sal/sal-cluster-admin-karaf-cli/src/main/java/org/opendaylight/controller/cluster/datastore/admin/command/RemoveShardReplicaCommand.java
@@ -35,7 +35,7 @@ public class RemoveShardReplicaCommand extends AbstractRpcAction {
         return rpcConsumerRegistry.getRpcService(ClusterAdminService.class)
                 .removeShardReplica(new RemoveShardReplicaInputBuilder()
                         .setShardName(shardName)
-                        .setDataStoreType(DataStoreType.forName(dataStoreType).orElse(null))
+                        .setDataStoreType(DataStoreType.forName(dataStoreType))
                         .setMemberName(memberName)
                         .build());
     }

diff --git a/opendaylight/md-sal/sal-clustering-config/pom.xml b/opendaylight/md-sal/sal-clustering-config/pom.xml
index 8f9ada4cd334e19e7e18d32831b0dc120cf21500..98f76205cd882e411a9237c84e9eda03b5a505c8 100644 (file)
--- a/opendaylight/md-sal/sal-clustering-config/pom.xml
+++ b/opendaylight/md-sal/sal-clustering-config/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java
index 0ee005a708c8d4c660ee3df2980b08045bb964d6..06d57595be891c88cade0387584e0296a1805aef 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospector.java
@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
 import javax.management.ConstructorParameters;
@@ -84,7 +83,7 @@ public class DatastoreContextIntrospector {
     private static void introspectPrimitiveTypes() {
         final Set<Class<?>> primitives = ImmutableSet.<Class<?>>builder().addAll(
                 Primitives.allWrapperTypes()).add(String.class).build();
-        for (final Class<?> primitive: primitives) {
+        for (final Class<?> primitive : primitives) {
             try {
                 processPropertyType(primitive);
             } catch (final NoSuchMethodException e) {
@@ -382,9 +381,8 @@ public class DatastoreContextIntrospector {
         if (propertyType.isEnum()) {
             try {
                 final Method enumConstructor = propertyType.getDeclaredMethod("forName", String.class);
-                final Object optional =  enumConstructor.invoke(null, from.toString().toLowerCase(Locale.ROOT));
-                if (optional instanceof Optional) {
-                    return ((Optional<Object>)optional).orElseThrow();
+                if (enumConstructor.getReturnType().equals(propertyType)) {
+                    return enumConstructor.invoke(null, from.toString().toLowerCase(Locale.ROOT));
                 }
             } catch (NoSuchMethodException e) {
                 LOG.error("Error constructing value ({}) for enum {}", from, propertyType);

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java
index 21ef8967aecaa2c3d512cbb48146eec01c7c3798..2dbbaa324555f054fb3ce51d5aa3b63918f06a32 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ClientBackedWriteTransactionTest.java
@@ -30,8 +30,6 @@ public class ClientBackedWriteTransactionTest extends ClientBackedTransactionTes
     @Mock
     private NormalizedNode data;
     @Mock
-    private YangInstanceIdentifier path;
-    @Mock
     private DOMStoreThreePhaseCommitCohort readyCohort;
 
     @Before
@@ -49,20 +47,20 @@ public class ClientBackedWriteTransactionTest extends ClientBackedTransactionTes
 
     @Test
     public void testWrite() {
-        object().write(path, data);
-        verify(delegate).write(path, data);
+        object().write(YangInstanceIdentifier.empty(), data);
+        verify(delegate).write(YangInstanceIdentifier.empty(), data);
     }
 
     @Test
     public void testMerge() {
-        object().merge(path, data);
-        verify(delegate).merge(path, data);
+        object().merge(YangInstanceIdentifier.empty(), data);
+        verify(delegate).merge(YangInstanceIdentifier.empty(), data);
     }
 
     @Test
     public void testDelete() {
-        object().delete(path);
-        verify(delegate).delete(path);
+        object().delete(YangInstanceIdentifier.empty());
+        verify(delegate).delete(YangInstanceIdentifier.empty());
     }
 
     @Test

diff --git a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
index a7b3819d52ea79ec6e73e7bc32e52d8662556aaa..636d730addb6dc756aadf1166e9988405606bb2a 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/configuration/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/samples/clustering-test-app/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/pom.xml
index cafcb75cc90e15768c71be0e29b3b381b5db6207..7f76087006f81e19a4cc4517babc1518f42855b8 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>10.0.0</version>
+        <version>11.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 

diff --git a/opendaylight/md-sal/samples/pom.xml b/opendaylight/md-sal/samples/pom.xml
index 0ddc30c784a80705e812d615a88876f69d5231af..b686a5003439917aa244f3fb2bdb5e6282ed1725 100644 (file)
--- a/opendaylight/md-sal/samples/pom.xml
+++ b/opendaylight/md-sal/samples/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 

diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java
index b4c621797987a5e14da6b24cc238185f708d355f..e3034dd4828b29adb31ab47bf0a1f8de9044f253 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java
+++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.sample.kitchen.api;
 
-import java.util.concurrent.Future;
+import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToastType;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
 public interface KitchenService {
-    Future<RpcResult<Void>> makeBreakfast(EggsType eggs, Class<? extends ToastType> toast, int toastDoneness);
+
+    ListenableFuture<RpcResult<Void>> makeBreakfast(EggsType eggs, ToastType toast, int toastDoneness);
 }

diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java
index 1e5c10c0c1f8bb4c5a29b400889b22ec18fb12c7..4f245685aa6318f9a477b2ea576222b655142117 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java
+++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java
@@ -16,7 +16,6 @@ import com.google.common.util.concurrent.MoreExecutors;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean;
 import org.opendaylight.controller.sample.kitchen.api.EggsType;
 import org.opendaylight.controller.sample.kitchen.api.KitchenService;
@@ -58,7 +57,7 @@ public class KitchenServiceImpl extends AbstractMXBean
     }
 
     @Override
-    public Future<RpcResult<Void>> makeBreakfast(final EggsType eggsType, final Class<? extends ToastType> toastType,
+    public ListenableFuture<RpcResult<Void>> makeBreakfast(final EggsType eggsType, final ToastType toastType,
             final int toastDoneness) {
         // Call makeToast, The OpendaylightToaster impl already returns a ListenableFuture so the conversion is
         // actually a no-op.
@@ -95,9 +94,7 @@ public class KitchenServiceImpl extends AbstractMXBean
         return executor.submit(() -> RpcResultBuilder.<Void>success().build());
     }
 
-    private ListenableFuture<RpcResult<MakeToastOutput>> makeToast(final Class<? extends ToastType> toastType,
-            final int toastDoneness) {
-
+    private ListenableFuture<RpcResult<MakeToastOutput>> makeToast(final ToastType toastType, final int toastDoneness) {
         if (toasterOutOfBread) {
             LOG.info("We're out of toast but we can make eggs");
             return RpcResultBuilder.success(EMPTY_MAKE_OUTPUT)
@@ -118,7 +115,7 @@ public class KitchenServiceImpl extends AbstractMXBean
     public Boolean makeScrambledWithWheat() {
         try {
             // This call has to block since we must return a result to the JMX client.
-            RpcResult<Void> result = makeBreakfast(EggsType.SCRAMBLED, WheatBread.class, 2).get();
+            RpcResult<Void> result = makeBreakfast(EggsType.SCRAMBLED, WheatBread.VALUE, 2).get();
             if (result.isSuccessful()) {
                 LOG.info("makeBreakfast succeeded");
             } else {

diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
index ed2e47b0619c240e1e1115ebb4cb5577dc8ef4ba..dd5535697d437f70d8dc2a0ceb70b54a84a84fd6 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
+++ b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
@@ -55,8 +55,8 @@ public class ToasterTest extends AbstractMdsalTestBase {
         boolean success = true;
 
         // Make toasts using OSGi service
-        success &= kitchenService.makeBreakfast(EggsType.SCRAMBLED, HashBrown.class, 4).get().isSuccessful();
-        success &= kitchenService.makeBreakfast(EggsType.POACHED, WhiteBread.class, 8).get().isSuccessful();
+        success &= kitchenService.makeBreakfast(EggsType.SCRAMBLED, HashBrown.VALUE, 4).get().isSuccessful();
+        success &= kitchenService.makeBreakfast(EggsType.POACHED, WhiteBread.VALUE, 8).get().isSuccessful();
 
         assertTrue("Not all breakfasts succeeded", success);
 

diff --git a/opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java b/opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java
index 1b6dc3cc2c1413fae485dd08f0c3d1bfde80e0e4..4851522cb81a691d6bc538dc9a6e9374fc05901b 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java
+++ b/opendaylight/md-sal/samples/toaster-provider/src/test/java/org/opendaylight/controller/sample/toaster/provider/OpenDaylightToasterTest.java
@@ -73,7 +73,7 @@ public class OpenDaylightToasterTest extends AbstractConcurrentDataBrokerTest {
     @Ignore //ignored because it is not a test right now. Illustrative purposes only.
     public void testSomething() throws Exception {
         MakeToastInput toastInput = new MakeToastInputBuilder().setToasterDoneness(Uint32.valueOf(1))
-                .setToasterToastType(WheatBread.class).build();
+                .setToasterToastType(WheatBread.VALUE).build();
 
         // NOTE: In a real test we would want to override the Thread.sleep() to
         // prevent our junit test

diff --git a/pom.xml b/pom.xml
index 5f3ec0ac9fb245aae9cc62e545c911f9c047d2b2..30b208c6dbb7f66337af9e5bce78e0d8ce92f623 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>10.0.0</version>
+    <version>11.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>