From e3cdb395a4009f118900397c8a2086620b436455 Mon Sep 17 00:00:00 2001
From: Varun Thacker <varun@apache.org>
Date: Fri, 3 Aug 2018 09:46:36 -0700
Subject: [PATCH] SOLR-12617: Remove Commons BeanUtils as a dependency

---
 lucene/ivy-versions.properties                 | 1 -
 solr/CHANGES.txt                               | 2 ++
 solr/contrib/velocity/ivy.xml                  | 1 -
 solr/licenses/commons-beanutils-1.8.3.jar.sha1 | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 solr/licenses/commons-beanutils-1.8.3.jar.sha1

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 9d5303dfe21..3a1ef2b58d3 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -46,7 +46,6 @@ com.sun.jersey.version = 1.9
 
 /com.tdunning/t-digest = 3.1
 /com.vaadin.external.google/android-json = 0.0.20131108.vaadin1
-/commons-beanutils/commons-beanutils = 1.8.3
 /commons-cli/commons-cli = 1.2
 /commons-codec/commons-codec = 1.10
 /commons-collections/commons-collections = 3.2.2
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index fdccfb8ce9b..b9846bd6d66 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -250,6 +250,8 @@ Other Changes
 
 * SOLR-12164: Improve Ref Guide main landing page. (Cassandra Targett)
 
+* SOLR-12617: Remove Commons BeanUtils as a dependency (Varun Thacker)
+
 ==================  7.4.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/contrib/velocity/ivy.xml b/solr/contrib/velocity/ivy.xml
index 426a636a0bd..561492da7f4 100644
--- a/solr/contrib/velocity/ivy.xml
+++ b/solr/contrib/velocity/ivy.xml
@@ -23,7 +23,6 @@
     <conf name="test" transitive="false"/>
   </configurations>
   <dependencies>
-    <dependency org="commons-beanutils" name="commons-beanutils" rev="${/commons-beanutils/commons-beanutils}" conf="compile"/>
     <dependency org="commons-collections" name="commons-collections" rev="${/commons-collections/commons-collections}" conf="compile"/>
     <dependency org="org.apache.velocity" name="velocity" rev="${/org.apache.velocity/velocity}" conf="compile"/>
     <dependency org="org.apache.velocity" name="velocity-tools" rev="${/org.apache.velocity/velocity-tools}" conf="compile"/>
diff --git a/solr/licenses/commons-beanutils-1.8.3.jar.sha1 b/solr/licenses/commons-beanutils-1.8.3.jar.sha1
deleted file mode 100644
index 98b35bbe17a..00000000000
--- a/solr/licenses/commons-beanutils-1.8.3.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-686ef3410bcf4ab8ce7fd0b899e832aaba5facf7