From: Instrumental <jcgmisc@stl.gathman.org>
Date: Wed, 11 Apr 2018 17:29:32 +0000 (-0500)
Subject: Update Shiro Version
X-Git-Tag: Beijing-2.1.1~123
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F42303%2F1;p=aaf%2Fauthz.git

Update Shiro Version

Issue-ID: AAF-228
Change-Id: I17ba5973672b3c1baed736b28476f1301621d63e
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>
---

diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index e4427bd5..2345a273 100644
--- a/auth/auth-certman/pom.xml
+++ b/auth/auth-certman/pom.xml
@@ -68,7 +68,6 @@
 			<artifactId>jscep</artifactId>
 			<version>2.4.0</version>
 		</dependency>
-
 	</dependencies>
 
 	<build>
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/client/sample/Sample.java b/cadi/aaf/src/test/java/org/onap/aaf/client/sample/Sample.java
index f338c726..ff170772 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/client/sample/Sample.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/client/sample/Sample.java
@@ -161,7 +161,7 @@ public class Sample {
 				// See the CODE for Java Methods used
 				List<Permission> permL = singleton().allAuthorization(fqi);
 				if(permL.size()==0) {
-					System.out.printf("User %s has no Permissions THAT THE CALLER CAN SEE",fqi.getName());
+					System.out.printf("User %s has no Permissions THAT THE CALLER CAN SEE\n",fqi.getName());
 				} else {
 					System.out.print("Success:\n");
 					for(Permission p : permL) {
diff --git a/cadi/oauth-enduser/src/main/java/com/att/cadi/enduser/OAuthExample.java b/cadi/oauth-enduser/src/test/java/com/att/cadi/enduser/OAuthExample.java
similarity index 100%
rename from cadi/oauth-enduser/src/main/java/com/att/cadi/enduser/OAuthExample.java
rename to cadi/oauth-enduser/src/test/java/com/att/cadi/enduser/OAuthExample.java
diff --git a/cadi/shiro/pom.xml b/cadi/shiro/pom.xml
index 5374ef48..b5838c5b 100644
--- a/cadi/shiro/pom.xml
+++ b/cadi/shiro/pom.xml
@@ -91,12 +91,11 @@
 		<dependency>
 			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-core</artifactId>
-			<version>1.3.2</version>
+			<version>1.4.0</version>
 		</dependency>
 	</dependencies>
 	<build>