From 8c891b6ae42dc804473f491786ac48e4439ac389 Mon Sep 17 00:00:00 2001
From: Prabhjyot Singh <prabhjyotsingh@gmail.com>
Date: Thu, 19 Apr 2018 16:08:09 +0530
Subject: [PATCH 1/2] ZEPPELIN-3416: Update xercesImpl to 2.11.0.SP5

Change-Id: Ic6b87bad7a13db1bb0bc32478fe302c53818fa0e
---
 jdbc/pom.xml |  2 +-
 pom.xml      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index eef9aa84ce1..ad35a469a61 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -100,7 +100,7 @@
         <dependency>
           <groupId>xerces</groupId>
           <artifactId>xercesImpl</artifactId>
-          <version>2.11.0</version>
+          <version>2.11.0.SP5</version>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 86883c8c211..2d2f75f34d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,6 +260,12 @@
         <groupId>org.apache.shiro</groupId>
         <artifactId>shiro-core</artifactId>
         <version>${shiro.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.shiro</groupId>
@@ -771,6 +777,10 @@
           <id>cloudera</id>
           <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
         </repository>
+        <repository>
+          <id>hortonworks</id>
+          <url>http://repo.hortonworks.com/content/groups/public/</url>
+        </repository>
       </repositories>
     </profile>
 

From 54677f1354f2d786695a49340c488cfe8ccc4987 Mon Sep 17 00:00:00 2001
From: Prabhjyot Singh <prabhjyotsingh@gmail.com>
Date: Fri, 20 Apr 2018 00:05:53 +0530
Subject: [PATCH 2/2] bump version of beanutils to 1.9.2

Change-Id: I6b429ee563efc5ef33713f87bc3045c4f5e45a3b
---
 pom.xml                 |  6 ------
 zeppelin-server/pom.xml | 11 +++++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2d2f75f34d8..534662dd181 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,12 +260,6 @@
         <groupId>org.apache.shiro</groupId>
         <artifactId>shiro-core</artifactId>
         <version>${shiro.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.shiro</groupId>
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index 411a97f65e7..46cdd65274b 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -165,6 +165,17 @@
     <dependency>
       <groupId>org.apache.shiro</groupId>
       <artifactId>shiro-core</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-beanutils</groupId>
+          <artifactId>commons-beanutils</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.9.2</version>
     </dependency>
 
     <dependency>