Bump up athenz version (apache#540)

drianpauL · Jun 30, 2017 · 5fa4cb6 · 5fa4cb6
1 parent 435a664
commit 5fa4cb6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -105,7 +105,7 @@ flexible messaging model and an intuitive client API.</description>
     <netty.version>4.0.46.Final</netty.version>
     <storm.version>0.9.5</storm.version>
     <jetty.version>9.3.11.v20160721</jetty.version>
-    <athenz.version>1.1.8</athenz.version>
+    <athenz.version>1.7.17</athenz.version>
     <prometheus.version>0.0.21</prometheus.version>
     <aspectj.version>1.8.9</aspectj.version>
   </properties>
@@ -406,13 +406,13 @@ flexible messaging model and an intuitive client API.</description>
 
       <dependency>
         <groupId>com.yahoo.athenz</groupId>
-        <artifactId>zts_java_client</artifactId>
+        <artifactId>athenz-zts-java-client</artifactId>
         <version>${athenz.version}</version>
       </dependency>
 
       <dependency>
         <groupId>com.yahoo.athenz</groupId>
-        <artifactId>zpe_java_client</artifactId>
+        <artifactId>athenz-zpe-java-client</artifactId>
         <version>${athenz.version}</version>
       </dependency>
 

diff --git a/pulsar-broker-auth-athenz/pom.xml b/pulsar-broker-auth-athenz/pom.xml
@@ -51,7 +51,7 @@
 
     <dependency>
       <groupId>com.yahoo.athenz</groupId>
-      <artifactId>zpe_java_client</artifactId>
+      <artifactId>athenz-zpe-java-client</artifactId>
     </dependency>
 
   </dependencies>

diff --git a/...z/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenz.java b/...z/src/main/java/org/apache/pulsar/broker/authentication/AuthenticationProviderAthenz.java
@@ -101,12 +101,12 @@ public String authenticate(AuthenticationDataSource authData) throws Authenticat
                 throw new AuthenticationException("Unable to retrieve ZTS Public Key");
             }
 
-            if (token.validate(ztsPublicKey, allowedOffset, null)) {
-                log.info("Athenz Role Token : {}, Authorized for Client: {}", roleToken, clientAddress);
+            if (token.validate(ztsPublicKey, allowedOffset, false, null)) {
+                log.debug("Athenz Role Token : {}, Authenticated for Client: {}", roleToken, clientAddress);
                 return token.getPrincipal();
             } else {
                 throw new AuthenticationException(
-                        String.format("Athenz Role Token Not Authorized from Client: %s", clientAddress));
+                        String.format("Athenz Role Token Not Authenticated from Client: %s", clientAddress));
             }
         }
     }

diff --git a/pulsar-client-auth-athenz/pom.xml b/pulsar-client-auth-athenz/pom.xml
@@ -43,7 +43,7 @@
 
     <dependency>
       <groupId>com.yahoo.athenz</groupId>
-      <artifactId>zts_java_client</artifactId>
+      <artifactId>athenz-zts-java-client</artifactId>
     </dependency>
 
   </dependencies>