From 1d1f542fc1ecfc5a74942e72a48052f1e2aed9eb Mon Sep 17 00:00:00 2001
From: Chao Sun <sunchao@apple.com>
Date: Wed, 16 Dec 2020 18:26:02 -0800
Subject: [PATCH 1/5] HIVE-24551

---
 ql/pom.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/ql/pom.xml b/ql/pom.xml
index 08a3bbbd16e6..594c0dc62ed6 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -880,6 +880,12 @@
                   <include>joda-time:joda-time</include>
                   <include>org.apache.calcite:*</include>
                   <include>org.apache.calcite.avatica:avatica</include>
+                  <!-- include all of calcite's transitive dependencies as well since
+                    otherwise they'll be removed in assembly packaging -->
+                  <include>net.hydromatic:eigenbase-properties</include>
+                  <include>org.codehaus.janino:janino</include>
+                  <include>org.codehaus.janino:commons-compiler</include>
+                  <include>org.pentaho:pentaho-aggdesigner-algorithm</include>
                 </includes>
               </artifactSet>
               <relocations>
@@ -900,6 +906,16 @@
                   <shadedPattern>org.apache.hive.com.google.thirdparty.publicsuffix</shadedPattern>
                 </relocation>
               </relocations>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
             </configuration>
           </execution>
         </executions>

From 700112a4e869c3881f3e5158743f701bd3f01b11 Mon Sep 17 00:00:00 2001
From: Chao Sun <sunchao@apache.org>
Date: Thu, 17 Dec 2020 09:40:02 -0800
Subject: [PATCH 2/5] Empty commit to trigger CI again


From 2a970908ee515dc70e05cff3cd16ed1722db21ba Mon Sep 17 00:00:00 2001
From: Chao Sun <sunchao@apache.org>
Date: Thu, 17 Dec 2020 18:42:47 -0800
Subject: [PATCH 3/5] revert previous change

---
 ql/pom.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/ql/pom.xml b/ql/pom.xml
index 594c0dc62ed6..08a3bbbd16e6 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -880,12 +880,6 @@
                   <include>joda-time:joda-time</include>
                   <include>org.apache.calcite:*</include>
                   <include>org.apache.calcite.avatica:avatica</include>
-                  <!-- include all of calcite's transitive dependencies as well since
-                    otherwise they'll be removed in assembly packaging -->
-                  <include>net.hydromatic:eigenbase-properties</include>
-                  <include>org.codehaus.janino:janino</include>
-                  <include>org.codehaus.janino:commons-compiler</include>
-                  <include>org.pentaho:pentaho-aggdesigner-algorithm</include>
                 </includes>
               </artifactSet>
               <relocations>
@@ -906,16 +900,6 @@
                   <shadedPattern>org.apache.hive.com.google.thirdparty.publicsuffix</shadedPattern>
                 </relocation>
               </relocations>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/*.SF</exclude>
-                    <exclude>META-INF/*.DSA</exclude>
-                    <exclude>META-INF/*.RSA</exclude>
-                  </excludes>
-                </filter>
-              </filters>
             </configuration>
           </execution>
         </executions>

From 11f3d3b22bc9293640e294cf59847b82e7f3cc01 Mon Sep 17 00:00:00 2001
From: Chao Sun <sunchao@apache.org>
Date: Thu, 17 Dec 2020 18:41:55 -0800
Subject: [PATCH 4/5] add dependencies instead

---
 pom.xml    | 34 ++++++++++++++++++++++++++++++++++
 ql/pom.xml | 16 ++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/pom.xml b/pom.xml
index 42f6757b8cdd..41d41e81b2c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,6 +135,7 @@
     <dropwizard.version>3.1.0</dropwizard.version>
     <dropwizard-metrics-hadoop-metrics2-reporter.version>0.1.2</dropwizard-metrics-hadoop-metrics2-reporter.version>
     <druid.version>0.9.2</druid.version>
+    <eigenbase-properties.version>1.1.5</eigenbase-properties.version>
     <guava.version>14.0.1</guava.version>
     <groovy.version>2.4.4</groovy.version>
     <h2database.version>1.3.166</h2database.version>
@@ -155,6 +156,7 @@
     <jasper.version>5.5.23</jasper.version>
     <jamon.plugin.version>2.3.4</jamon.plugin.version>
     <jamon-runtime.version>2.3.1</jamon-runtime.version>
+    <janino.version>2.7.6</janino.version>
     <javaewah.version>0.3.2</javaewah.version>
     <javax-servlet.version>3.0.0.v201112011016</javax-servlet.version>
     <javolution.version>5.5.1</javolution.version>
@@ -180,6 +182,7 @@
     <mina.version>2.0.0-M5</mina.version>
     <netty.version>4.0.52.Final</netty.version>
     <parquet.version>1.8.1</parquet.version>
+    <pentaho-aggdesigner.version>5.1.5-jhyde</pentaho-aggdesigner.version>
     <pig.version>0.16.0</pig.version>
     <protobuf.version>2.5.0</protobuf.version>
     <stax.version>1.0.1</stax.version>
@@ -217,6 +220,17 @@
         <checksumPolicy>warn</checksumPolicy>
       </releases>
     </repository>
+    <repository>
+      <id>conjars</id>
+      <name>Conjars</name>
+      <url>http://conjars.org/repo</url>
+      <layout>default</layout>
+      <releases>
+        <enabled>true</enabled>
+        <updatePolicy>always</updatePolicy>
+        <checksumPolicy>warn</checksumPolicy>
+      </releases>
+    </repository>
   </repositories>
 
   <dependencyManagement>
@@ -359,6 +373,11 @@
         <artifactId>junit</artifactId>
         <version>${junit.version}</version>
       </dependency>
+      <dependency>
+        <groupId>net.hydromatic</groupId>
+        <artifactId>eigenbase-properties</artifactId>
+        <version>${eigenbase-properties.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-1.2-api</artifactId>
@@ -573,6 +592,16 @@
         <artifactId>jackson-xc</artifactId>
         <version>${jackson.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.janino</groupId>
+        <artifactId>commons-compiler</artifactId>
+        <version>${janino.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.codehaus.janino</groupId>
+        <artifactId>janino</artifactId>
+        <version>${janino.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.codehaus.jettison</groupId>
         <artifactId>jettison</artifactId>
@@ -728,6 +757,11 @@
         <artifactId>hadoop-minicluster</artifactId>
         <version>${hadoop.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.pentaho</groupId>
+        <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+        <version>${pentaho-aggdesigner.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.scala-lang</groupId>
         <artifactId>scala-library</artifactId>
diff --git a/ql/pom.xml b/ql/pom.xml
index 08a3bbbd16e6..3dfb510a983e 100644
--- a/ql/pom.xml
+++ b/ql/pom.xml
@@ -711,6 +711,22 @@
       <version>${glassfish.jersey.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>net.hydromatic</groupId>
+      <artifactId>eigenbase-properties</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.janino</groupId>
+      <artifactId>commons-compiler</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.janino</groupId>
+      <artifactId>janino</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.pentaho</groupId>
+      <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+    </dependency>
   </dependencies>
 
   <profiles>

From 09c4e3ea0324553e4ff1a8074bb16e6b14a5ae39 Mon Sep 17 00:00:00 2001
From: Chao Sun <sunchao@apache.org>
Date: Sat, 19 Dec 2020 12:23:20 -0800
Subject: [PATCH 5/5] bump accumulo version to 1.7.3 and decrease test timeout
 to 4hr

---
 Jenkinsfile | 2 +-
 pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5c5c239e4f59..7d66b3ec1fbf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -67,7 +67,7 @@ setPrLabel("PENDING");
 
 def executorNode(run) {
   hdbPodTemplate {
-    timeout(time: 24, unit: 'HOURS') {
+    timeout(time: 4, unit: 'HOURS') {
       node(POD_LABEL) {
         container('hdb') {
           run()
diff --git a/pom.xml b/pom.xml
index 41d41e81b2c0..eebc7fa340fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
     <maven.build-helper.plugin.version>1.8</maven.build-helper.plugin.version>
 
     <!-- Library Dependency Versions -->
-    <accumulo.version>1.6.0</accumulo.version>
+    <accumulo.version>1.7.3</accumulo.version>
     <activemq.version>5.5.0</activemq.version>
     <ant.version>1.9.1</ant.version>
     <antlr.version>3.5.2</antlr.version>