Merge "Bump upstrems" into 0.16.x

diff --git a/aaa-idm-store-h2/src/main/java/org/opendaylight/aaa/datastore/h2/UserStore.java b/aaa-idm-store-h2/src/main/java/org/opendaylight/aaa/datastore/h2/UserStore.java
index d97703632c1d668280566af049b269df4f1ca0ad..742afd7557cdad141693bd3b9df9a23c3a9ef64b 100644 (file)
--- a/aaa-idm-store-h2/src/main/java/org/opendaylight/aaa/datastore/h2/UserStore.java
+++ b/aaa-idm-store-h2/src/main/java/org/opendaylight/aaa/datastore/h2/UserStore.java
@@ -226,7 +226,6 @@ final class UserStore extends AbstractStore<User> {
 
         try (var conn = dbConnect();
              var stmt = conn.prepareStatement("DELETE FROM " + TABLE + " WHERE " + COL_ID + " = ?")) {
-            // FIXME: prepare statement instead
             stmt.setString(1, userid);
             LOG.debug("deleteUser() request: {}", stmt);
 

diff --git a/aaa-shiro/repackaged-shiro-jar/pom.xml b/aaa-shiro/repackaged-shiro-jar/pom.xml
index f663ec0b33219088f0047efa9bf4cf5a98c03e6f..688ec4bb100b1d6aed4acf665f73ee7d872e2741 100644 (file)
--- a/aaa-shiro/repackaged-shiro-jar/pom.xml
+++ b/aaa-shiro/repackaged-shiro-jar/pom.xml
@@ -32,12 +32,12 @@
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-core</artifactId>
-            <version>1.10.0</version>
+            <version>1.10.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-web</artifactId>
-            <version>1.10.0</version>
+            <version>1.10.1</version>
         </dependency>
     </dependencies>