Bump upstreams

Adopt:
- odlparent-13.0.1
- infrautils-6.0.0
- yangtools-11.0.0-SNAPSHOT
- mdsal-12.0.0-SNAPSHOT
- controller-8.0.0-SNAPSHOT

Also update aaa-cli-jar shading to string crypto signatures.

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

diff --git a/aaa-authn-api/pom.xml b/aaa-authn-api/pom.xml
index 0126e91c916bc0954d28d07c8954b70b411ba609..36eec85851795dbf910ff242830d967fc0846aca 100644 (file)
--- a/aaa-authn-api/pom.xml
+++ b/aaa-authn-api/pom.xml
@@ -35,5 +35,9 @@
       <groupId>jakarta.xml.bind</groupId>
       <artifactId>jakarta.xml.bind-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>org.eclipse.jdt.annotation</artifactId>
+    </dependency>
   </dependencies>
 </project>

diff --git a/aaa-cli-jar/pom.xml b/aaa-cli-jar/pom.xml
index b2e384304ab15d19486bc07cfe972ef472f12ee6..b94180fad071210f10d1373abce632235a534665 100644 (file)
--- a/aaa-cli-jar/pom.xml
+++ b/aaa-cli-jar/pom.xml
@@ -116,6 +116,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
               <createDependencyReducedPom>false</createDependencyReducedPom>
               <minimizeJar>true</minimizeJar>
               <filters>
+                  <filter>
+                    <artifact>*:*</artifact>
+                    <excludes>
+                      <exclude>META-INF/*.SF</exclude>
+                      <exclude>META-INF/*.DSA</exclude>
+                      <exclude>META-INF/*.RSA</exclude>
+                    </excludes>
+                  </filter>
                 <filter>
                   <artifact>org.opendaylight.aaa:aaa-shiro</artifact>
                   <includes>

diff --git a/aaa-cli/pom.xml b/aaa-cli/pom.xml
index 7f7e48f45b8d52cafa5630b9ef7eb0460da47f0f..29f68d877bcb54f30f26746e54fa443de6278b17 100644 (file)
--- a/aaa-cli/pom.xml
+++ b/aaa-cli/pom.xml
@@ -23,6 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>bundle</packaging>
 
   <dependencies>
+    <dependency>
+      <groupId>com.github.spotbugs</groupId>
+      <artifactId>spotbugs-annotations</artifactId>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>aaa-authn-api</artifactId>

diff --git a/aaa-encrypt-service/pom.xml b/aaa-encrypt-service/pom.xml
index 9ee843c2f5397d96df4bfe82543207bcb98f77de..fb467b4ebc7ebe4825ff303ecee71c548c3a0aeb 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>12.0.6</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-filterchain/pom.xml b/aaa-filterchain/pom.xml
index 51211a7f31623307c980a99da41627b79a60e986..1b0486e8b9fdcb407fdebccc5a216d6b53205c26 100644 (file)
--- a/aaa-filterchain/pom.xml
+++ b/aaa-filterchain/pom.xml
@@ -17,13 +17,17 @@
   <packaging>bundle</packaging>
 
   <dependencies>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
+      <groupId>org.eclipse.jdt</groupId>
+      <artifactId>org.eclipse.jdt.annotation</artifactId>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>

diff --git a/aaa-idm-store-h2/pom.xml b/aaa-idm-store-h2/pom.xml
index 18b58c8751b63c0a2b78ec2cd9ff36085d90afb5..e686c48bac57b842e5aa6d0124047c3a310aba8e 100644 (file)
--- a/aaa-idm-store-h2/pom.xml
+++ b/aaa-idm-store-h2/pom.xml
@@ -43,6 +43,11 @@
         </dependency>
 
         <!-- External dependencies -->
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

diff --git a/aaa-password-service/pom.xml b/aaa-password-service/pom.xml
index e73a68279ecb0a73742799913f0a92f7b2927bd2..123be1f297f4e7038c7c717db5c5f7cc1fc67bec 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>12.0.6</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml
index da97527ce2821265b563e2b490e3e6fdd4d86dfd..da9ada23e50f1b32b4baf3f8f3506f8614272c2c 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>12.0.6</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-shiro/repackaged-shiro-jar/pom.xml b/aaa-shiro/repackaged-shiro-jar/pom.xml
index 332b3e2b598c3eecb66bff25716ed932e836bcde..b3a15079e21628150e1008dfd7e38a28016964f4 100644 (file)
--- a/aaa-shiro/repackaged-shiro-jar/pom.xml
+++ b/aaa-shiro/repackaged-shiro-jar/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 194cd3056c4adf549f0235bff3af950b2aead183..fcadbf33df34a543facba16d446271ee1216bdb6 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>12.0.6</version>
+      <version>13.0.1</version>
       <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index 8b1019a3d3a3fcc250a308242bff4f002b4c7780..7de7991b3606f95e0774cedc58f1634a162e59d8 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 
@@ -108,10 +108,15 @@
         </dependency>
 
         <!-- Third-party dependencies -->
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>inject.guice.testutils</artifactId>
-            <version>5.0.5</version>
+            <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -254,11 +259,11 @@
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-release/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/12.0.6/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/5.0.5/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/10.0.8/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/11.0.11/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/7.0.8/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/13.0.1/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/6.0.0/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/11.0.0-SNAPSHOT/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/12.0.0-SNAPSHOT/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/8.0.0-SNAPSHOT/</link>
                     </links>
 
                     <!--groups>

diff --git a/features/features-aaa/pom.xml b/features/features-aaa/pom.xml
index 4dbdfba722ecf0fce9647b9e9d08dbd6a6035d89..7056d389a35486318da38228adc832ed4acc58eb 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>12.0.6</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index 3fd411895c6c69e5f5d65a4a5f482e0e8f9816c9..0f97d640201542cff812c7e1b7484dc07bf27952 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>12.0.6</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>11.0.11</version>
+            <version>12.0.0-SNAPSHOT</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 54a77b1eae0b4218f7f1e852807134e8a9429d37..de77fc8390fd08d017306a3e48f1a072f34fa9fd 100644 (file)
--- a/features/odl-aaa-api/src/main/feature/feature.xml
+++ b/features/odl-aaa-api/src/main/feature/feature.xml
@@ -8,9 +8,9 @@
  -->
 <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="[12,13)">odl-jakarta-activation-api</feature>
-        <feature version="[12,13)">odl-servlet-api</feature>
-        <feature version="[12,13)">odl-ws-rs-api</feature>
-        <feature version="[11,12)">odl-mdsal-binding-base</feature>
+        <feature version="[13,14)">odl-jakarta-activation-api</feature>
+        <feature version="[13,14)">odl-servlet-api</feature>
+        <feature version="[13,14)">odl-ws-rs-api</feature>
+        <feature version="[12,13)">odl-mdsal-binding-base</feature>
     </feature>
 </features>

diff --git a/features/odl-aaa-cert/pom.xml b/features/odl-aaa-cert/pom.xml
index e0b7882d3bcf45c799f072235f80f06e6e764005..f4a42ece8362b6896658ac06172fd90fd93efea2 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>12.0.6</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>7.0.8</version>
+            <version>8.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 636a5b4363863bd812dd99cbe7bce57945e45643..c4583e35630f74e39df23de878be17003261852b 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="[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>
         <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 b9a275c75609ec9ce45169b4dfd42abbbb9f953c..0f47e4b8db7c779a72da6b6380207bc8c75141f8 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>12.0.6</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-encryption-service/pom.xml b/features/odl-aaa-encryption-service/pom.xml
index fac3a5bb805db1532325173feae81179216be2ad..345bb2e9a68ff6f83c7a58a620285aa3c9deb46d 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>12.0.6</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>7.0.8</version>
+                <version>8.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 e20ae5874b85fdfcdf4b63f21282d547400b44cb..40026033366e7ffaf1b08b7df4f352e84d7f7d49 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,6 +8,6 @@
  -->
 <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="[7,8)">odl-mdsal-broker</feature>
+        <feature version="[8,9)">odl-mdsal-broker</feature>
     </feature>
 </features>

diff --git a/features/odl-aaa-password-service/pom.xml b/features/odl-aaa-password-service/pom.xml
index 526c00093787387e1a88e63a85187a5137c00f54..5b3627fc85c437968cc8fd12c11ac4ee0e22966f 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>12.0.6</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 
@@ -60,14 +60,14 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>11.0.11</version>
+            <version>12.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>7.0.8</version>
+            <version>8.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 65a0b0e01f447bf14aabdc08fdd714f480b8d87f..49ff470dad26cc819fa4ea855ffd3e4fd28ad2a5 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="[11,12)">odl-mdsal-binding-base</feature>
-        <feature version="[7,8)">odl-mdsal-broker</feature>
+        <feature version="[12,13)">odl-mdsal-binding-base</feature>
+        <feature version="[8,9)">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 a4e1cecb37836eb0ab99ea4a48f668de17156916..6b0482249260060d2647a9e55bc1cae4b9be39c6 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>12.0.6</version>
+        <version>13.0.1</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 7fb18b00c86ffa59d7e86b2cc364b16f09e70932..9cf4f8b243d2c616bb4cada8ddba70a67ee8830c 100644 (file)
--- a/features/odl-aaa-shiro/src/main/feature/feature.xml
+++ b/features/odl-aaa-shiro/src/main/feature/feature.xml
@@ -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="[12,13)">odl-karaf-feat-jdbc</feature>
-        <feature version="[12,13)">odl-karaf-feat-jetty</feature>
-        <feature version="[7,8)">odl-jolokia</feature>
+        <feature version="[13,14)">odl-karaf-feat-jdbc</feature>
+        <feature version="[13,14)">odl-karaf-feat-jetty</feature>
+        <feature version="[8,9)">odl-jolokia</feature>
     </feature>
 </features>

diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index f4982626c52e8ce3532ed3d96b39471c067eed4a..c3be3d9f0059ba642d1c6faa94d4d0c862b6e623 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>12.0.6</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>10.0.8</version>
+                <version>11.0.0-SNAPSHOT</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 f83fc64ce8d7c005a099d18be3ed969af2be2f90..7bbe5cdeb5380e494347226b315b395198a08976 100644 (file)
--- a/features/odl-aaa-web/src/main/feature/feature.xml
+++ b/features/odl-aaa-web/src/main/feature/feature.xml
@@ -2,9 +2,9 @@
 <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>pax-web-http-whiteboard</feature>
-        <feature version="[12,13)">odl-karaf-feat-jetty</feature>
-        <feature version="[12,13)">odl-guava</feature>
-        <feature version="[12,13)">odl-jersey-2</feature>
-        <feature version="[10,11)">odl-yangtools-util</feature>
+        <feature version="[13,14)">odl-karaf-feat-jetty</feature>
+        <feature version="[13,14)">odl-guava</feature>
+        <feature version="[13,14)">odl-jersey-2</feature>
+        <feature version="[11,12)">odl-yangtools-util</feature>
     </feature>
 </features>

diff --git a/features/odl-apache-shiro/pom.xml b/features/odl-apache-shiro/pom.xml
index be54e40667cf0e9f7af8388360a8a78f9be112ff..e17efdfabacaf9e8b3cccd8f80ac45b9b6549e56 100644 (file)
--- a/features/odl-apache-shiro/pom.xml
+++ b/features/odl-apache-shiro/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>12.0.6</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-apache-shiro/src/main/feature/feature.xml b/features/odl-apache-shiro/src/main/feature/feature.xml
index 6a664f15cd0fcac34073807245163b08aef28664..23f1652c7f4dd709589087ff58ef55e931fa4056 100644 (file)
--- a/features/odl-apache-shiro/src/main/feature/feature.xml
+++ b/features/odl-apache-shiro/src/main/feature/feature.xml
@@ -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="[12,13)">odl-servlet-api</feature>
+        <feature version="[13,14)">odl-servlet-api</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 37944418c7d72114a606b9edf350c91f8de489c4..1f6e16cd4f6eee1295c475ffbe927a9c877575ee 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>12.0.6</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 019801a19ce7047132119e11538810dd283dca32..22319b3f847dbd4bfbe2139a1809d1bbe783f995 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>12.0.6</version>
+        <version>13.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index c5a706e5f272e753e7910ef9a69422a513337c15..d35647f371a6fd899dcd9a950ee54aa520bf32a9 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>11.0.11</version>
+    <version>12.0.0-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>7.0.8</version>
+        <version>8.0.0-SNAPSHOT</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/pom.xml b/pom.xml
index 0b254d70cfafa74c937f721a47aab7566ddd878b..335219b434342818e185b51901b7e2f144d57ccc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>12.0.6</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/web/pom.xml b/web/pom.xml
index e48a1c08746ce6a2dfc6f16f1088a144e70d7903..bbc8a53d3d1a6293d5ebd4a1c7c5d2daa1cf1c86 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>12.0.6</version>
+    <version>13.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/web/testutils/pom.xml b/web/testutils/pom.xml
index eafb8ece5be5694862363c6a3ef069c94622cf40..a5b451bc6ab95c9caf283596668f988511fef2ad 100644 (file)
--- a/web/testutils/pom.xml
+++ b/web/testutils/pom.xml
@@ -26,7 +26,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>5.0.5</version>
+        <version>6.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>