From d0ee2e3a4807a8f09aeaddb45b556130961a21cd Mon Sep 17 00:00:00 2001
From: Igor Dvorzhak <idv@google.com>
Date: Fri, 18 Sep 2020 20:38:45 +0000
Subject: [PATCH] Upgrade ORC to 1.5.10 version (#10291)

---
 distribution/bin/check-licenses.py         |  1 +
 extensions-core/druid-bloom-filter/pom.xml |  1 -
 extensions-core/orc-extensions/pom.xml     |  2 +-
 licenses.yaml                              | 20 +++++++++++++++++---
 pom.xml                                    |  2 +-
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/distribution/bin/check-licenses.py b/distribution/bin/check-licenses.py
index 5704adc0ba2..9d55ee54bca 100755
--- a/distribution/bin/check-licenses.py
+++ b/distribution/bin/check-licenses.py
@@ -238,6 +238,7 @@ def build_compatible_license_names():
     compatible_licenses['BSD licence'] = 'BSD-3-Clause License'
     compatible_licenses['BSD License'] = 'BSD-3-Clause License'
     compatible_licenses['BSD-like'] = 'BSD-3-Clause License'
+    compatible_licenses['BSD 3-clause'] = 'BSD-3-Clause License'
     compatible_licenses['The BSD 3-Clause License'] = 'BSD-3-Clause License'
     compatible_licenses['Revised BSD'] = 'BSD-3-Clause License'
     compatible_licenses['New BSD License'] = 'BSD-3-Clause License'
diff --git a/extensions-core/druid-bloom-filter/pom.xml b/extensions-core/druid-bloom-filter/pom.xml
index 53163afb38d..fc7a3a8d234 100644
--- a/extensions-core/druid-bloom-filter/pom.xml
+++ b/extensions-core/druid-bloom-filter/pom.xml
@@ -62,7 +62,6 @@
     <dependency>
       <groupId>org.apache.hive</groupId>
       <artifactId>hive-storage-api</artifactId>
-      <version>2.7.0</version>
       <exclusions>
         <exclusion>
           <groupId>org.slf4j</groupId>
diff --git a/extensions-core/orc-extensions/pom.xml b/extensions-core/orc-extensions/pom.xml
index a687f18657e..649ae478aeb 100644
--- a/extensions-core/orc-extensions/pom.xml
+++ b/extensions-core/orc-extensions/pom.xml
@@ -33,7 +33,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>
-        <orc.version>1.5.6</orc.version>
+        <orc.version>1.5.10</orc.version>
     </properties>
     <dependencies>
         <dependency>
diff --git a/licenses.yaml b/licenses.yaml
index fe4eb5c84eb..041bc6ce599 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -3197,7 +3197,7 @@ name: Apache Hive
 license_category: binary
 module: extensions/druid-bloom-filter
 license_name: Apache License version 2.0
-version: 2.7.0
+version: 2.7.1
 libraries:
   - org.apache.hive: hive-storage-api
 notices:
@@ -4040,7 +4040,7 @@ name: Apache ORC libraries
 license_category: binary
 module: extensions/druid-orc-extensions
 license_name: Apache License version 2.0
-version: 1.5.6
+version: 1.5.10
 libraries:
   - org.apache.orc: orc-mapreduce
   - org.apache.orc: orc-core
@@ -4058,6 +4058,20 @@ notices:
 
 ---
 
+name: ThreeTen
+license_category: binary
+module: extensions/druid-orc-extensions
+license_name: BSD-3-Clause License
+version: 1.5.0
+libraries:
+  - org.threeten: threeten-extra
+notices:
+  - threeten-extra: |
+      ThreeTen-Extra
+      Copyright (c) 2007-present, Stephen Colebourne & Michael Nascimento Santos.
+
+---
+
 name: aircompressor
 license_category: binary
 module: extensions/druid-orc-extensions
@@ -4072,7 +4086,7 @@ name: Hive storage API
 license_category: binary
 module: extensions/druid-orc-extensions
 license_name: Apache License version 2.0
-version: 2.6.0
+version: 2.7.1
 libraries:
   - org.apache.hive: hive-storage-api
 notices:
diff --git a/pom.xml b/pom.xml
index a8d9d827465..b8b36877e5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -381,7 +381,7 @@
             <dependency>
                 <groupId>org.apache.hive</groupId>
                 <artifactId>hive-storage-api</artifactId>
-                <version>2.6.0</version>
+                <version>2.7.1</version>
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>