You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by pd...@apache.org on 2020/11/20 08:23:30 UTC

[zeppelin] branch master updated: [ZEPPELIN-5015] Update shiro to 1.7.0

This is an automated email from the ASF dual-hosted git repository.

pdallig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 8508055  [ZEPPELIN-5015] Update shiro to 1.7.0
8508055 is described below

commit 8508055c1cd1d6006294ccee708dea1bbccfe5c4
Author: Philipp Dallig <ph...@gmail.com>
AuthorDate: Thu Nov 19 11:58:05 2020 +0100

    [ZEPPELIN-5015] Update shiro to 1.7.0
    
    ### What is this PR for?
    This updates shiro to 1.7.0
    
    ### What type of PR is it?
     - Improvement
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-5015
    
    ### How should this be tested?
    * Travis-CI: https://travis-ci.com/github/Reamer/zeppelin/builds/202702821
    
    ### Questions:
    * Does the licenses files need update? Only the used version
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Philipp Dallig <ph...@gmail.com>
    
    Closes #3976 from Reamer/shiro_1_7_0 and squashes the following commits:
    
    f0feda817 [Philipp Dallig] update shiro to 1.7.0
---
 pom.xml                                       | 2 +-
 zeppelin-distribution/src/bin_license/LICENSE | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 53ab50c..bdafb27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
     <commons.io.version>2.6</commons.io.version>
     <commons.collections.version>3.2.2</commons.collections.version>
     <commons.cli.version>1.4</commons.cli.version>
-    <shiro.version>1.4.2</shiro.version>
+    <shiro.version>1.7.0</shiro.version>
     <joda.version>2.9.9</joda.version>
     <bouncycastle.version>1.60</bouncycastle.version>
     <maven.version>3.6.3</maven.version>
diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE
index fb2b835..8d88b7c 100644
--- a/zeppelin-distribution/src/bin_license/LICENSE
+++ b/zeppelin-distribution/src/bin_license/LICENSE
@@ -96,8 +96,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.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) Shiro Core (org.apache.shiro:shiro-core:1.7.0 - https://shiro.apache.org)
+    (Apache 2.0) Shiro Web (org.apache.shiro:shiro-web:1.7.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)