From d17552a4c4c9a7a9d98cbc30e243975ea50f54d2 Mon Sep 17 00:00:00 2001
From: basapuram-kumar <bsprmkumar@gmail.com>
Date: Fri, 14 Jun 2024 12:05:00 +0530
Subject: [PATCH] ODP-1640: fixing jdk11 compilation with hive-4.0 branch

---
 packaging/pom.xml                   | 10 +++++++++-
 packaging/src/main/assembly/bin.xml |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packaging/pom.xml b/packaging/pom.xml
index 2cf0fca54bd7..b6afbfa2a180 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -153,7 +153,15 @@
               </licenseUrlReplacements>
               <licenseUrlFileNames>
                 <APACHE-2.0>
-                  https?://www\.apache\.org/licenses/LICENSE-2\.0.*
+                  http://apache.org/licenses/LICENSE-2.0.txt
+                  \Qhttp://www.apache.org/licenses/LICENSE-2.0
+                  \Qhttps://www.apache.org/licenses/LICENSE-2.0.txt
+                  \Qhttp://www.apache.org/licenses/LICENSE-2.0.txt
+                  \Qhttp://www.apache.org/licenses/LICENSE-2.0.html
+                  \Qhttps://www.apache.org/licenses/LICENSE-2.0
+                  \Qhttps://www.apache.org/licenses/LICENSE-2.0
+                  \Qhttps://aws.amazon.com/apache2.0
+                  \Qhttps?://www.apache.org/licenses/LICENSE-2.0.*
                   \Qhttps://aws.amazon.com/apache2.0\E
                   \Qhttps://opensource.org/licenses/Apache-2.0\E
                   \Qhttp://www.apache.org/licenses/\E
diff --git a/packaging/src/main/assembly/bin.xml b/packaging/src/main/assembly/bin.xml
index 6b43dd9bec9f..afda80ae65f4 100644
--- a/packaging/src/main/assembly/bin.xml
+++ b/packaging/src/main/assembly/bin.xml
@@ -39,11 +39,11 @@
       <useStrictFiltering>false</useStrictFiltering>
       <useTransitiveFiltering>true</useTransitiveFiltering>
       <excludes>
-        <exclude>org.apache.calcite:*</exclude>
+        <!--exclude>org.apache.calcite:*</exclude-->
         <exclude>org.apache.hadoop:*</exclude>
         <exclude>org.apache.hive.hcatalog:*</exclude>
         <exclude>org.slf4j:*</exclude>
-        <exclude>log4j:*</exclude>
+        <!--exclude>log4j:*</exclude-->
         <exclude>ch.qos.reload4j:*</exclude>
         <exclude>junit:*</exclude>
         <exclude>commons-configuration:commons-configuration</exclude>
@@ -103,7 +103,7 @@
       <excludes>
         <exclude>org.apache.hadoop:*</exclude>
         <exclude>org.apache.hive:hive-jdbc:jar:standalone</exclude>
-        <exclude>org.apache.httpcomponents:*</exclude>
+        <!--exclude>org.apache.httpcomponents:*</exclude-->
       </excludes>
       <includes>
         <include>org.apache.hive.hcatalog:hive-webhcat:*</include>