Repository: zeppelin Updated Branches: refs/heads/master 550701508 -> 73ff98b79
ZEPPELIN-3791: Bump-Up shiro version from 1.3.2 to 1.4.0 ### What is this PR for? Bump Up the Shiro version in zeppelin from 1.3.2 to 1.4.0. Bumping up the Shiro version will help in using the newer pac4j versions. This will also help in integrating Zeppelin and OpenID Connect using latest versions of pac4j. Pac4j also mentions that it is compatible with Shiro 1.4 version. ### What type of PR is it? Improvement ### What is the Jira issue? ZEPPELIN-3791 ### How should this be tested? **Basic User Authentication** - Use the attached Basic Shiro.ini file - Start Zeppelin with "bin/zeppelin-daemon.sh start" - Using browser open zeppelin UI - Try login using user1/password2 - Login successful - Try login using user1/wrong - Login fails as expected **Testing with KeyCloak - Based on Shiro + Pac4j + buij-pac4j** - Use the attached keycloakshiro.ini which uses the zeppelin realm and zeppelin-client - Copy the dependency jars to zeppelin lib folder (list of jars attached) - Configure keycloak with realms and users matching keycloakshiro.ini - Start Zeppelin with "bin/zeppelin-daemon.sh start". - Using browser open zeppelin UI - You will be redirected to Keycloak UI. - Try login using username/password registered in keycloak - success - Try login using user/wrongPassword - Login fails as expected For more details related to Zeppelin keycloak integration refer to [PR-2373](https://github.com/apache/zeppelin/pull/2373) [dependency-jar.txt](https://github.com/apache/zeppelin/files/2415208/dependency-jar.txt) [keycloakshiro.ini.txt](https://github.com/apache/zeppelin/files/2415209/keycloakshiro.ini.txt) [shiro.ini.txt](https://github.com/apache/zeppelin/files/2415210/shiro.ini.txt) Author: G <aja...@nokia.com> Closes #3188 from ajaygk95/master and squashes the following commits: dab87e058 [G] ZEPPELIN-3791: Bump-Up shiro version from 1.3.2 to 1.4.0 Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/73ff98b7 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/73ff98b7 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/73ff98b7 Branch: refs/heads/master Commit: 73ff98b7903a0cf60c93d35ac758d76f7f0cbc6f Parents: 5507015 Author: G <aja...@nokia.com> Authored: Tue Sep 25 17:05:05 2018 +0530 Committer: Jeff Zhang <zjf...@apache.org> Committed: Mon Oct 1 21:34:38 2018 +0800 ---------------------------------------------------------------------- pom.xml | 2 +- zeppelin-distribution/src/bin_license/LICENSE | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/73ff98b7/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e416d55..786c337 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ <commons.collections.version>3.2.2</commons.collections.version> <commons.logging.version>1.1.1</commons.logging.version> <commons.cli.version>1.3.1</commons.cli.version> - <shiro.version>1.3.2</shiro.version> + <shiro.version>1.4.0</shiro.version> <joda.version>2.9.9</joda.version> <!-- test library versions --> http://git-wip-us.apache.org/repos/asf/zeppelin/blob/73ff98b7/zeppelin-distribution/src/bin_license/LICENSE ---------------------------------------------------------------------- diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE index d9b0797..54356e1 100644 --- a/zeppelin-distribution/src/bin_license/LICENSE +++ b/zeppelin-distribution/src/bin_license/LICENSE @@ -95,8 +95,8 @@ The following components are provided under Apache License. (Apache 2.0) Lucene Suggest (org.apache.lucene:lucene-suggest:5.3.1 - http://lucene.apache.org/lucene-parent/lucene-suggest) (Apache 2.0) Elasticsearch: Core (org.elasticsearch:elasticsearch:2.1.0 - http://nexus.sonatype.org/oss-repository-hosting.html/parent/elasticsearch) (Apache 2.0) Joda convert (org.joda:joda-convert:1.8.1 - http://joda-convert.sourceforge.net) - (Apache 2.0) Shiro Core (org.apache.shiro:shiro-core:1.3.2 - https://shiro.apache.org) - (Apache 2.0) Shiro Web (org.apache.shiro:shiro-web:1.3.2 - https://shiro.apache.org) + (Apache 2.0) Shiro Core (org.apache.shiro:shiro-core:1.4.0 - https://shiro.apache.org) + (Apache 2.0) Shiro Web (org.apache.shiro:shiro-web:1.4.0 - https://shiro.apache.org) (Apache 2.0) SnakeYAML (org.yaml:snakeyaml:1.15 - http://www.snakeyaml.org) (Apache 2.0) Protocol Buffers (com.google.protobuf:protobuf-java:2.5.0 - https://github.com/google/protobuf/releases) (Apache 2.0) Alluxio Shell (org.alluxio:alluxio-shell:1.0.0 - http://alluxio.org)
