Adopt controller-11.0.0-SNAPSHOT

Pick up current controller to allow early integration of Apache Pekko.

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

diff --git a/docs/pom.xml b/docs/pom.xml
index ee0aed38000c6ed542802cf33ee8c0e59e44e7dc..ad54c81272113320f5975e763f54a84f920833ad 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -264,7 +264,7 @@
                         <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/7.0.4/</link>
                         <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/14.0.5/</link>
                         <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/14.0.4/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/10.0.4/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/11.0.0-SNAPSHOT/</link>
                     </links>
 
                     <!--groups>

diff --git a/features/odl-aaa-cert/pom.xml b/features/odl-aaa-cert/pom.xml
index bcb5cc9ee6b40100fdab37970ee31ba60c872857..e342b7f45733cd026816e0d22a4cc9ef03e414d9 100644 (file)
--- a/features/odl-aaa-cert/pom.xml
+++ b/features/odl-aaa-cert/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>10.0.4</version>
+            <version>11.0.0-SNAPSHOT</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 90e60c1cccf4ab2e1229636cadc177c81cf5489b..e9d5e00a7c64018371da3002977734adb8db36f5 100644 (file)
--- a/features/odl-aaa-cert/src/main/feature/feature.xml
+++ b/features/odl-aaa-cert/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-cert" version="${project.version}">
-        <feature version="[10,11)">odl-controller-blueprint</feature>
-        <feature version="[10,11)">odl-mdsal-broker</feature>
+        <feature version="[11,12)">odl-controller-blueprint</feature>
+        <feature version="[11,12)">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-encryption-service/pom.xml b/features/odl-aaa-encryption-service/pom.xml
index 59e4c9e5188a95e9c51146084ef0b080569c35ad..1f082f47b3643b949909d2c47673fdd8dd2c1be4 100644 (file)
--- a/features/odl-aaa-encryption-service/pom.xml
+++ b/features/odl-aaa-encryption-service/pom.xml
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>10.0.4</version>
+                <version>11.0.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </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 3498aa3ef30c3ea5b6cc2f3c754e1e81453d5b15..6f721988ed1cc0010adef97091952e039c575880 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="[10,11)">odl-mdsal-broker</feature>
-        <feature version="[10,11)">odl-controller-blueprint</feature>
+        <feature version="[11,12)">odl-mdsal-broker</feature>
+        <feature version="[11,12)">odl-controller-blueprint</feature>
     </feature>
 </features>

diff --git a/features/odl-aaa-password-service/pom.xml b/features/odl-aaa-password-service/pom.xml
index 2b7137fa435aa701a2ee4a444030ad04ac232b09..5a8411466dc7ff188b29e7a02a852e83efa33f2b 100644 (file)
--- a/features/odl-aaa-password-service/pom.xml
+++ b/features/odl-aaa-password-service/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>10.0.4</version>
+            <version>11.0.0-SNAPSHOT</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 ebade9129694310b4aad604d41d1b45cd6520699..c7df073c0ea4ad3ff282ade71350a6a378fdcdec 100644 (file)
--- a/features/odl-aaa-password-service/src/main/feature/feature.xml
+++ b/features/odl-aaa-password-service/src/main/feature/feature.xml
@@ -9,7 +9,7 @@
 <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="[14,15)">odl-mdsal-binding-base</feature>
-        <feature version="[10,11)">odl-mdsal-broker</feature>
+        <feature version="[11,12)">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/src/main/feature/feature.xml b/features/odl-aaa-shiro/src/main/feature/feature.xml
index b9f05ab8fbf3d89154265c0886dcc0b67e6290a5..07c82ef76f3c3b07949ab08db7d38e4eee879e55 100644 (file)
--- a/features/odl-aaa-shiro/src/main/feature/feature.xml
+++ b/features/odl-aaa-shiro/src/main/feature/feature.xml
@@ -25,6 +25,6 @@
         </configfile>
         <feature version="[14,15)">odl-karaf-feat-jdbc</feature>
         <feature version="[14,15)">odl-karaf-feat-jetty</feature>
-        <feature version="[10,11)">odl-jolokia</feature>
+        <feature version="[11,12)">odl-jolokia</feature>
     </feature>
 </features>

diff --git a/parent/pom.xml b/parent/pom.xml
index b4f63529052a58fbf46b4785ab39220afd483a00..42c6694005ce25fe212b6c480a22c77dbff94e01 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>10.0.4</version>
+        <version>11.0.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>