aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2019-02-28 10:32:39 -0600
committerInstrumental <jonathan.gathman@att.com>2019-02-28 10:32:59 -0600
commit6ac87e3e76e41b6c1e75c1216031f2e2e7129eec (patch)
treec726b4e66a54f586e13fa44b8edbaf64c0de6c20
parent5a4898a108ecf3e2e020e83eb35ef6b63fadc4cb (diff)
Fix Class Compare2.1.13
Issue-ID: AAF-771 Change-Id: I4ae41def8830939651d64954c1479f2f5dece82d Signed-off-by: Instrumental <jonathan.gathman@att.com>
-rw-r--r--pom.xml7
-rw-r--r--shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java2
-rw-r--r--shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java1
-rw-r--r--version.properties2
4 files changed, 9 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index d385804..80a8fce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -220,7 +220,12 @@
<version>1.3.2</version>
</dependency>
-
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.3</version>
+ <scope>test</scope>
+ </dependency>
<!--
diff --git a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java
index c455a4d..eb8bc60 100644
--- a/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java
+++ b/shiro/src/main/java/org/onap/aaf/cadi/shiro/AAFRealm.java
@@ -297,7 +297,7 @@ public class AAFRealm extends AuthorizingRealm {
@Override
public boolean supports(AuthenticationToken token) {
// Only one was being loaded. If more are needed uncomment the multi-class mode
- return UsernamePasswordToken.class.equals(token);
+ return token instanceof UsernamePasswordToken;
// return singleton.supports.contains(token.getClass());
}
diff --git a/shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java b/shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java
index f159a8f..9b9c295 100644
--- a/shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java
+++ b/shiro/src/test/java/org/onap/aaf/cadi/shiro/test/JU_AAFRealm.java
@@ -38,6 +38,7 @@ import org.onap.aaf.cadi.shiro.AAFShiroPermission;
public class JU_AAFRealm {
+//@Test
public void test() {
// NOTE This is a live test. This JUnit needs to be built with "Mock" before it can be
// an official JUNIT
diff --git a/version.properties b/version.properties
index cb8a88f..9b2b66e 100644
--- a/version.properties
+++ b/version.properties
@@ -25,7 +25,7 @@
# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... )
# because they are used in Jenkins, whose plug-in doesn't support
-# This TAG 2.1.13 is here to help remember to change this file. Keep it up to date with the following "real" entries:
+# This TAG <version>2.1.13</version> is here to help remember to change this file. Keep it up to date with the following "real" entries:
major=2
minor=1
patch=13