From 05f457af2c261021bb00a4e1fe77f91b449870db Mon Sep 17 00:00:00 2001
From: James Turton <james@somecomputer.xyz>
Date: Thu, 30 Mar 2023 10:41:29 +0200
Subject: [PATCH 1/6] Add RPC and HTTP bind address lines to
 drill-override-example.conf.

---
 distribution/src/main/resources/drill-override-example.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/distribution/src/main/resources/drill-override-example.conf b/distribution/src/main/resources/drill-override-example.conf
index 35fcb1ccb74..e9dde901e78 100644
--- a/distribution/src/main/resources/drill-override-example.conf
+++ b/distribution/src/main/resources/drill-override-example.conf
@@ -44,7 +44,8 @@ drill.exec: {
         threads: 1
       }
     },
-    use.ip : false
+    use.ip : false,
+    bind_addr: 0.0.0.0
   },
   operator: {
     packages += "org.apache.drill.exec.physical.config"
@@ -95,6 +96,7 @@ drill.exec: {
   http: {
     enabled: true,
     ssl_enabled: false,
+    bind_addr: 0.0.0.0,
     port: 8047
     session_max_idle_secs: 3600, # Default value 1hr
     cors: {

From e6afa18e7d91d24eb93adfe9fad2942f6743adae Mon Sep 17 00:00:00 2001
From: James Turton <james@somecomputer.xyz>
Date: Thu, 30 Mar 2023 10:41:55 +0200
Subject: [PATCH 2/6] Revert ci.yml to ubuntu-latest.

GtiHub have updated the Ubuntu 22.04 (latest) runner image again
and suggested that we test for the regression found in the 20220305
image.
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b341fb6e3af..e83615ec90e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ on: [push, pull_request]
 jobs:
   build:
     name: Main Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 150
     strategy:
       matrix:

From 10c498ae9a42a5cdeb7f6040754d9c6190652a79 Mon Sep 17 00:00:00 2001
From: James Turton <james@somecomputer.xyz>
Date: Mon, 3 Apr 2023 14:24:58 +0200
Subject: [PATCH 3/6] Move Splunk Maven repository declaration to
 contrib/storage-splunk/pom.xml.

---
 contrib/storage-splunk/pom.xml | 8 ++++++++
 pom.xml                        | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/contrib/storage-splunk/pom.xml b/contrib/storage-splunk/pom.xml
index ac78467145f..1286c97b129 100644
--- a/contrib/storage-splunk/pom.xml
+++ b/contrib/storage-splunk/pom.xml
@@ -33,6 +33,14 @@
     <okhttp.version>4.5.0</okhttp.version>
   </properties>
 
+  <repositories>
+    <repository>
+      <id>splunk-artifactory</id>
+      <name>Splunk Releases</name>
+      <url>https://splunk.jfrog.io/artifactory/ext-releases-local</url>
+    </repository>
+  </repositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.drill.exec</groupId>
diff --git a/pom.xml b/pom.xml
index 4d2075e23bd..cc994c7e84e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,11 +218,6 @@
       <id>jitpack.io</id>
       <url>https://jitpack.io</url>
     </repository>
-    <repository>
-      <id>splunk-artifactory</id>
-      <name>Splunk Releases</name>
-      <url>https://splunk.jfrog.io/artifactory/ext-releases-local</url>
-    </repository>
   </repositories>
 
   <issueManagement>

From b9db78acab7360a6c75280f8c8c3ac71f54ca55a Mon Sep 17 00:00:00 2001
From: James Turton <james@somecomputer.xyz>
Date: Mon, 3 Apr 2023 14:26:42 +0200
Subject: [PATCH 4/6] Upgrade parquet to 1.12.3 and parquet-format to 2.9.0.

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index cc994c7e84e..3a2afab600c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,8 @@
     <shaded.guava.version>28.2-jre</shaded.guava.version>
     <guava.version>30.1.1-jre</guava.version>
     <forkCount>1</forkCount>
-    <parquet.version>1.12.2</parquet.version>
-    <parquet.format.version>2.8.0</parquet.format.version>
+    <parquet.version>1.12.3</parquet.version>
+    <parquet.format.version>2.9.0</parquet.format.version>
     <calcite.groupId>org.apache.calcite</calcite.groupId>
     <calcite.version>1.34.0</calcite.version>
     <avatica.version>1.23.0</avatica.version>

From d0facd030c9c7d476106d60d3b24e8d9e4deabc9 Mon Sep 17 00:00:00 2001
From: James Turton <james@somecomputer.xyz>
Date: Mon, 3 Apr 2023 15:23:28 +0200
Subject: [PATCH 5/6] Drop conjars repository.

---
 pom.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3a2afab600c..3b74b6f0cf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,21 +175,6 @@
   </mailingLists>
 
   <repositories>
-    <repository>
-      <id>conjars</id>
-      <name>Conjars</name>
-      <url>https://conjars.org/repo</url>
-      <layout>default</layout>
-      <releases>
-        <enabled>true</enabled>
-        <updatePolicy>never</updatePolicy>
-        <checksumPolicy>fail</checksumPolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-
     <repository>
       <id>mapr-releases</id>
       <url>https://repository.mapr.com/maven/</url>

From dc0d64c3461ec9be4b38f2f7d7c9d2f268edf656 Mon Sep 17 00:00:00 2001
From: James Turton <james@somecomputer.xyz>
Date: Mon, 3 Apr 2023 18:02:11 +0200
Subject: [PATCH 6/6] Set drill.version in drill-udf/pom.xml to 1.21.0.

---
 exec/java-exec/src/test/resources/drill-udf/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/exec/java-exec/src/test/resources/drill-udf/pom.xml b/exec/java-exec/src/test/resources/drill-udf/pom.xml
index 6b79425d5f6..0d6372e25cb 100644
--- a/exec/java-exec/src/test/resources/drill-udf/pom.xml
+++ b/exec/java-exec/src/test/resources/drill-udf/pom.xml
@@ -32,7 +32,7 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <jar.finalName>${project.name}</jar.finalName>
     <custom.buildDirectory>${project.basedir}/target</custom.buildDirectory>
-    <drill.version>1.17.0</drill.version>
+    <drill.version>1.21.0</drill.version>
     <include.files>**/*.java</include.files>
     <include.resources>**/*.conf</include.resources>
   </properties>