Update MRI projects for Aluminium

This bumps versions to the following:
- odlparent-7.0.1
- yangtools-5.0.1
- mdsal-6.0.0
- controller-2.0.0

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

diff --git a/aaa-authn-api/pom.xml b/aaa-authn-api/pom.xml
index c6fbed7677c47a65b39503be122ff7db1056930d..8cc525c6e9021fbafbfc73c28862b450fba624b5 100644 (file)
--- a/aaa-authn-api/pom.xml
+++ b/aaa-authn-api/pom.xml
@@ -32,8 +32,8 @@
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
     </dependency>
   </dependencies>
 </project>

diff --git a/aaa-cert/pom.xml b/aaa-cert/pom.xml
index 830062d84cced6a7760aa83bd0b5e0cdae1fb579..58c4518a18fbf48582f57c97e0ba8ee84a488dcd 100644 (file)
--- a/aaa-cert/pom.xml
+++ b/aaa-cert/pom.xml
@@ -34,8 +34,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
     </dependency>
 
     <!-- Bouncy Castle dependency -->

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/MdsalUtils.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/MdsalUtils.java
index 7e3003fff1394fe27c0c29228ec58b29583ee48e..a5bee25b333ec9e79eb27bed8f1b1a4dea3584c7 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/MdsalUtils.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/utils/MdsalUtils.java
@@ -44,8 +44,8 @@ public final class MdsalUtils {
      * @param <D> the data object type
      * @return the result of the request
      */
-    public static <D extends org.opendaylight.yangtools.yang.binding.DataObject> boolean delete(
-            final DataBroker dataBroker, final LogicalDatastoreType store, final InstanceIdentifier<D> path)  {
+    public static <D extends DataObject> boolean delete(final DataBroker dataBroker, final LogicalDatastoreType store,
+            final InstanceIdentifier<D> path)  {
         final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
         transaction.delete(store, path);
         try {
@@ -95,11 +95,10 @@ public final class MdsalUtils {
      * @param <D> the data object type
      * @return the result of the request
      */
-    public static <D extends org.opendaylight.yangtools.yang.binding.DataObject> boolean merge(
-            final DataBroker dataBroker, final LogicalDatastoreType logicalDatastoreType,
-            final InstanceIdentifier<D> path, final D data) {
+    public static <D extends DataObject> boolean merge(final DataBroker dataBroker,
+            final LogicalDatastoreType logicalDatastoreType, final InstanceIdentifier<D> path, final D data) {
         final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
-        transaction.merge(logicalDatastoreType, path, data, true);
+        transaction.mergeParentStructureMerge(logicalDatastoreType, path, data);
         try {
             transaction.commit().get();
             return true;
@@ -118,11 +117,10 @@ public final class MdsalUtils {
      * @param <D> the data object type
      * @return the result of the request
      */
-    public static <D extends org.opendaylight.yangtools.yang.binding.DataObject> boolean put(
-            final DataBroker dataBroker, final LogicalDatastoreType logicalDatastoreType,
-            final InstanceIdentifier<D> path, final D data) {
+    public static <D extends DataObject> boolean put(final DataBroker dataBroker,
+            final LogicalDatastoreType logicalDatastoreType, final InstanceIdentifier<D> path, final D data) {
         final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
-        transaction.put(logicalDatastoreType, path, data, true);
+        transaction.mergeParentStructurePut(logicalDatastoreType, path, data);
         try {
             transaction.commit().get();
             return true;
@@ -140,8 +138,8 @@ public final class MdsalUtils {
      * @param <D> the data object type
      * @return the result as the data object requested
      */
-    public static <D extends org.opendaylight.yangtools.yang.binding.DataObject> D read(
-            final DataBroker dataBroker, final LogicalDatastoreType store, final InstanceIdentifier<D> path)  {
+    public static <D extends DataObject> D read(final DataBroker dataBroker, final LogicalDatastoreType store,
+            final InstanceIdentifier<D> path)  {
         try (ReadTransaction transaction = dataBroker.newReadOnlyTransaction()) {
             Optional<D> optionalDataObject = transaction.read(store, path).get();
             if (optionalDataObject.isPresent()) {

diff --git a/aaa-cli-jar/src/test/java/org/opendaylight/aaa/cli/jar/MainIT.java b/aaa-cli-jar/src/test/java/org/opendaylight/aaa/cli/jar/MainIT.java
index 40fefb5741b84e374c5e29aafe1bc25875aab3a2..27511a11c6ec3b0104982c8fa98e1404a4c10bc4 100644 (file)
--- a/aaa-cli-jar/src/test/java/org/opendaylight/aaa/cli/jar/MainIT.java
+++ b/aaa-cli-jar/src/test/java/org/opendaylight/aaa/cli/jar/MainIT.java
@@ -8,6 +8,7 @@
 package org.opendaylight.aaa.cli.jar;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import java.io.File;
 import java.io.IOException;
@@ -66,8 +67,8 @@ public class MainIT {
             && name.endsWith(".jar")
             && !name.contains("-javadoc")
             && !name.contains("-sources"));
-        assertThat(jarFiles).named("*jar-with-dependencies.jar files in " + targetDirectory).isNotNull();
-        assertThat(jarFiles).named("*jar-with-dependencies.jar files in " + targetDirectory).hasLength(1);
+        assertWithMessage("*jar-with-dependencies.jar files in " + targetDirectory).that(jarFiles).isNotNull();
+        assertWithMessage("*jar-with-dependencies.jar files in " + targetDirectory).that(jarFiles).hasLength(1);
         return jarFiles[0];
     }
 

diff --git a/aaa-encrypt-service/impl/pom.xml b/aaa-encrypt-service/impl/pom.xml
index fdc7917ea3207a05404951396cd2733475a4c58e..7fabc68da8da06187bb1457757e09cc0204dc904 100644 (file)
--- a/aaa-encrypt-service/impl/pom.xml
+++ b/aaa-encrypt-service/impl/pom.xml
@@ -52,8 +52,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>bcprov-jdk15on</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/aaa-encrypt-service/pom.xml b/aaa-encrypt-service/pom.xml
index 602e600d268e3fde227bb63e347c202ad778a5c5..fba4564481b6fc2d1c63dfd753d78dfb4be852a8 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>6.0.4</version>
+    <version>7.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-password-service/pom.xml b/aaa-password-service/pom.xml
index fa6b68fc019d127cad9ead1c50c43c38a94d0a20..5246b77f1a47e7379cf77e8f8678b48b0d0cdc5f 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>6.0.4</version>
+    <version>7.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MdsalRealm.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MdsalRealm.java
index 42a42f3b056e5f7a57ab986f7d74060896a5ade5..6b11845b0738709e46ac7ce0814a8610ca8e8cac 100644 (file)
--- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MdsalRealm.java
+++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/MdsalRealm.java
@@ -14,7 +14,6 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
@@ -53,7 +52,6 @@ import org.slf4j.LoggerFactory;
  * A Realm based on <code>aaa.yang</code> model.
  */
 public class MdsalRealm extends AuthorizingRealm implements Destroyable {
-
     private static final Logger LOG = LoggerFactory.getLogger(MdsalRealm.class);
 
     /**
@@ -98,16 +96,12 @@ public class MdsalRealm extends AuthorizingRealm implements Destroyable {
 
             // iterate through and determine the appropriate roles based on the programmed grants
             final Grants grants = auth.getGrants();
-            final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.authentication
-                    .grants.Grants> grantsList = grants.getGrants();
-            for (Grant grant : grantsList) {
+            for (Grant grant : grants.nonnullGrants().values()) {
                 if (grant.getUserid().equals(odlPrincipal.getUserId())) {
                     final Roles roles = auth.getRoles();
                     if (roles != null) {
-                        final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214
-                                .authentication.roles.Roles> rolesList = roles.getRoles();
                         for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214
-                                .authentication.roles.Roles role : rolesList) {
+                                .authentication.roles.Roles role : roles.nonnullRoles().values()) {
                             if (role.getRoleid().equals(grant.getRoleid())) {
                                 authRoles.add(role.getRoleid());
                             }
@@ -142,10 +136,8 @@ public class MdsalRealm extends AuthorizingRealm implements Destroyable {
         if (opt.isPresent()) {
             final Authentication auth = opt.get();
             final Users users = auth.getUsers();
-            final List<org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.authentication
-                    .users.Users> usersList = users.getUsers();
             for (org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.aaa.rev161214.authentication.users
-                    .Users u : usersList) {
+                    .Users u : users.nonnullUsers().values()) {
                 final String inputUsername = HeaderUtils.extractUsername(username);
                 final String domainId = HeaderUtils.extractDomain(username);
                 final String inputUserId = String.format("%s@%s", inputUsername, domainId);

diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml
index 610d69a800b403871252f0740da7123618212a0a..45192d99db7c9d0d00478f22399032d4de2464f2 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>6.0.4</version>
+    <version>7.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 5c35dc83a3fb1a02cacd6a0dee1e29ba0c87396b..9a649f69d3d64630ef2fce411fc91682bad6f18d 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>6.0.4</version>
+      <version>7.0.1</version>
       <relativePath/>
     </parent>
 

diff --git a/docs/pom.xml b/docs/pom.xml
index 4ac9e09612d4871ff7242ed571989a7868e8570f..0f0f2b0440519b252469dba43562f2359efa7a1f 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-aaa/pom.xml b/features/features-aaa/pom.xml
index 66e2865ac535222a31bc22ea6c95c1f7661d4d88..1a76a51cdcb5efdb54b319b9963b1781aa2bb1f1 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index 9f847708190d2ea5718ada8714e5c0cd8fb803dc..06cc20f5a6034369e7d69c49ebf3214559d000ee 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>5.0.9</version>
+            <version>6.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-aaa-api/src/main/feature/feature.xml b/features/odl-aaa-api/src/main/feature/feature.xml
index 2e92ccfe8800a2db2f58b0b75959227f63449057..1b3c34459096af4b184b4703dc358394fdc3d805 100644 (file)
--- a/features/odl-aaa-api/src/main/feature/feature.xml
+++ b/features/odl-aaa-api/src/main/feature/feature.xml
@@ -8,7 +8,8 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-aaa-${project.version}">
     <feature name="odl-aaa-api" version="${project.version}">
-        <feature version="[6,7)">odl-servlet-api</feature>
-        <feature version="[6,7)">odl-ws-rs-api</feature>
+        <feature version="[7,8)">odl-servlet-api</feature>
+        <feature version="[7,8)">odl-ws-rs-api</feature>
+        <feature version="[6,7)">odl-mdsal-binding-base</feature>
     </feature>
 </features>

diff --git a/features/odl-aaa-cert/pom.xml b/features/odl-aaa-cert/pom.xml
index 791c28fe3437fc9924189916bb7ddcf275699fc2..3b1614865e2d50a8da3e126fa5e3dd5a41157a39 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>1.11.0</version>
+            <version>2.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-aaa-cert/src/main/feature/feature.xml b/features/odl-aaa-cert/src/main/feature/feature.xml
index 9909ec841058ed5552682c52b0007816bdcf79de..9be871281ddda77d0773b6cf387424eefb762bfc 100644 (file)
--- a/features/odl-aaa-cert/src/main/feature/feature.xml
+++ b/features/odl-aaa-cert/src/main/feature/feature.xml
@@ -8,6 +8,7 @@
  -->
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-aaa-cert" version="${project.version}">
+        <feature version="[2,3)">odl-mdsal-broker</feature>
         <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 56a0396e33d850788cd08d6a8b2c330c5ce463e3..29abf4606f9fa8a25a7e68df792271a1477c619b 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-encryption-service/pom.xml b/features/odl-aaa-encryption-service/pom.xml
index c46ff19d4b23f058cf1482bc5c66b75ee99af59c..dae97fb9c2b5b7dbc999fc76bc375df74a45015f 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>1.11.0</version>
+            <version>2.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-aaa-encryption-service/src/main/feature/feature.xml b/features/odl-aaa-encryption-service/src/main/feature/feature.xml
index 4fd17a4ee4e97c055094028cdadf149800f6cb10..1aee87fab3b81dec77f5ea1ecce5d32c8adb4d2a 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,7 @@
  -->
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-aaa-encryption-service" version="${project.version}">
+        <feature version="[2,3)">odl-mdsal-broker</feature>
         <configfile finalname="etc/opendaylight/datastore/initial/config/aaa-encrypt-service-config.xml">
             mvn:org.opendaylight.aaa/aaa-encrypt-service-impl/${project.version}/xml/config
         </configfile>

diff --git a/features/odl-aaa-password-service/pom.xml b/features/odl-aaa-password-service/pom.xml
index c1590d7b9a3eb4e7e7822adf548582090609f28e..0d63dba1533ab3e801e9647a50b448ecca0a34e3 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 
@@ -54,14 +54,14 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>5.0.9</version>
+            <version>6.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>1.11.0</version>
+            <version>2.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-aaa-password-service/src/main/feature/feature.xml b/features/odl-aaa-password-service/src/main/feature/feature.xml
index 00741425b27a8378a5b1310519fa30fd2e9743d4..c898ee8767162c2f11a2bc3f44bd13d411ac8acc 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,6 +8,8 @@
  -->
 <features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-aaa-password-service" version="${project.version}">
+        <feature version="[6,7)">odl-mdsal-binding-base</feature>
+        <feature version="[2,3)">odl-mdsal-broker</feature>
         <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 05f2c0497bcc4838bbd30fbf91809bfd267fb596..2b82e5f4645ad529e7a20086258364d76f33991e 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>6.0.4</version>
+        <version>7.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 97af3bb8e3818cbd95b9f8d83ff8c87cf89b90a5..938d8b4712643c6ab80a1339a05156a55974652e 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="[6,7)">odl-karaf-feat-jdbc</feature>
-        <feature version="[6,7)">odl-karaf-feat-jetty</feature>
-        <feature version="[6,7)">odl-apache-commons-codec</feature>
+        <feature version="[7,8)">odl-karaf-feat-jdbc</feature>
+        <feature version="[7,8)">odl-karaf-feat-jetty</feature>
+        <feature version="[7,8)">odl-apache-commons-codec</feature>
     </feature>
 </features>

diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index 441beeaba997431a09a02c894c1a181dd1dd7d2d..b9573c97a69a2cd15ebc3a23179c27f2351672f9 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>4.0.6</version>
+                <version>5.0.1</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 1ffc907d06251b9755cbb936be7039d973f2f681..a8a1b00711f7d389c53616556442767e3fbc088e 100644 (file)
--- a/features/odl-aaa-web/src/main/feature/feature.xml
+++ b/features/odl-aaa-web/src/main/feature/feature.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-aaa-${project.version}">
     <feature name="odl-aaa-web" version="${project.version}">
-        <feature version="[6,7)">odl-karaf-feat-jetty</feature>
-        <feature version="[6,7)">odl-guava</feature>
-        <feature version="[6,7)">odl-jersey-2</feature>
-        <feature version="[4,5)">odl-yangtools-util</feature>
+        <feature version="[7,8)">odl-karaf-feat-jetty</feature>
+        <feature version="[7,8)">odl-guava</feature>
+        <feature version="[7,8)">odl-jersey-2</feature>
+        <feature version="[5,6)">odl-yangtools-util</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 7ca8b49aeffa972a6a873f044a41a3b06760832b..c3437bdf6a5e45db06c445911d6b37a6ecb08870 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 23f82bb58a4a149193d1d1f8c840eb0110473e5a..940d8684d2163c0108fd238b4c6cf346c4cd6ce8 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index b180b3009577b66d02484fcfe6ce562faf163be0..076961f9f273205d4db8a0b07ed8743428bbba87 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>5.0.9</version>
+    <version>6.0.0</version>
     <relativePath/>
   </parent>
 
@@ -27,8 +27,8 @@
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>1.11.0</version>
+        <artifactId>controller-artifacts</artifactId>
+        <version>2.0.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -48,6 +48,16 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>org.apache.felix.metatype</artifactId>
       </dependency>
+      <dependency>
+        <groupId>org.apache.shiro</groupId>
+        <artifactId>shiro-web</artifactId>
+        <version>1.3.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.shiro</groupId>
+        <artifactId>shiro-core</artifactId>
+        <version>1.3.2</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/pom.xml b/pom.xml
index 55a13aed50c5dbe83369b508c3240dcab9b12ab5..0363f38195aa18507c906aef0da225b86d92b494 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>6.0.4</version>
+    <version>7.0.1</version>
     <relativePath/>
   </parent>
 

diff --git a/web/pom.xml b/web/pom.xml
index fab76adec2dfcbd09d77e93d927bf0059a2cceb0..61cb207409e21710a143d77d29b6dabfabf28f8c 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>6.0.4</version>
+    <version>7.0.1</version>
     <relativePath/>
   </parent>