[zeppelin] branch master updated: [ZEPPELIN-4675] Add commons-configuration2 for shiro string interpolation

[zj...@apache.org]

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

zjffdu 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 233f39a  [ZEPPELIN-4675] Add commons-configuration2 for shiro string interpolation
233f39a is described below

commit 233f39a24bd84c1ba5dd56679297134a4b026068
Author: Philipp Dallig <ph...@gmail.com>
AuthorDate: Wed Mar 11 19:23:53 2020 +0100

    [ZEPPELIN-4675] Add commons-configuration2 for shiro string interpolation
    
    ### What is this PR for?
    Adding the library commons-configuration2 with is needed by Apache/shiro for string interpolation.
    String interpolation is useful, when working with containers. You can interpolate several values, when starting the container.
    
    Guide for String interpolation with shiro: https://stormpath.com/blog/string-interpolation-apache-shiro
    Shiro-Commit with includes string interpolation: https://github.com/apache/shiro/commit/af75fb584ef6981c3c5263d00a396ec5f900716c
    
    ### What type of PR is it?
    * Feature
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4675
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Philipp Dallig <ph...@gmail.com>
    
    Closes #3689 from Reamer/configuration_interpolation and squashes the following commits:
    
    af141c499 [Philipp Dallig] Add commons-configuration2 for shiro string interpolation
---
 zeppelin-server/pom.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 2371f2a..9d5451c 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -43,6 +43,7 @@
     <javax.ws.rsapi.version>2.1</javax.ws.rsapi.version>
     <libpam4j.version>1.8</libpam4j.version>
     <jna.version>4.1.0</jna.version>
+    <commons.configuration2.version>2.2</commons.configuration2.version>
 
     <!--test library versions-->
     <selenium.java.version>2.48.2</selenium.java.version>
@@ -177,6 +178,19 @@
       <version>1.9.4</version>
     </dependency>
 
+    <!-- Needed for string interpolation in shiro.ini -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-configuration2</artifactId>
+      <version>${commons.configuration2.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.shiro</groupId>
       <artifactId>shiro-web</artifactId>