From 45462112d86f120c27fa7cc8ba8418d04a6954ce Mon Sep 17 00:00:00 2001
From: Ricardo Arat Ibarra Campa <5161960+RickArt@users.noreply.github.com>
Date: Wed, 28 Jun 2023 13:12:03 -0600
Subject: [PATCH 1/3] fix: upgrade gh actions runner

---
 .github/workflows/main.yml    | 2 +-
 .github/workflows/release.yml | 2 +-
 CHANGELOG.md                  | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 637b757..41eb17a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,7 +5,7 @@ on: [pull_request]
 jobs:
   apiary-docker-image:
     name: Apiary Docker Image Checks
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out code  
       uses: actions/checkout@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e6b096e..d16e8ed 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   apiary-docker-image:
     name: Apiary Docker Release
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out code  
       uses: actions/checkout@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c9f37b..e17ae4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ## [3.0.10] - 2023-06-28
 ### Added
 - Added variable `LIMIT_PARTITION_REQUEST_NUMBER` to protect the cluster, this controls how many partitions can be scanned for each partitioned table. The default value "-1" means no limit. The limit on partitions does not affect metadata-only queries.
+### Changed
+- Upgraded github actions ubuntu runner to `22.04` (was `18.04`).
 
 ## [3.0.9] - 2022-11-23
 ### Added

From 43ea993d3c77a0e8cae6b0ce49ef18007cc8198d Mon Sep 17 00:00:00 2001
From: Ricardo Arat Ibarra Campa <5161960+RickArt@users.noreply.github.com>
Date: Wed, 28 Jun 2023 13:16:55 -0600
Subject: [PATCH 2/3] fix: set amazonlinux version to 2

---
 CHANGELOG.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e17ae4a..03cddd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 - Added variable `LIMIT_PARTITION_REQUEST_NUMBER` to protect the cluster, this controls how many partitions can be scanned for each partitioned table. The default value "-1" means no limit. The limit on partitions does not affect metadata-only queries.
 ### Changed
 - Upgraded github actions ubuntu runner to `22.04` (was `18.04`).
+- Set `amazonlinux` version to `2` (was `latest`).
 
 ## [3.0.9] - 2022-11-23
 ### Added
diff --git a/Dockerfile b/Dockerfile
index 00c7fe3..03b3a29 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Copyright (C) 2018 Expedia Inc.
 # Licensed under the Apache License, Version 2.0 (the "License");
 
-from amazonlinux:latest
+from amazonlinux:2
 
 ENV RANGER_VERSION 2.0.0
 ENV APIARY_EXTENSIONS_VERSION 7.3.4

From 4897e5325de93f81c5baf19264a06951dc21eb79 Mon Sep 17 00:00:00 2001
From: Ricardo Arat Ibarra Campa <5161960+RickArt@users.noreply.github.com>
Date: Wed, 28 Jun 2023 13:37:59 -0600
Subject: [PATCH 3/3] fix: upgrade mvn version

---
 CHANGELOG.md | 1 +
 Dockerfile   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03cddd3..6e56dbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ### Changed
 - Upgraded github actions ubuntu runner to `22.04` (was `18.04`).
 - Set `amazonlinux` version to `2` (was `latest`).
+- Upgraded mvn version to `3.9.3`(was `3.6.3`). 
 
 ## [3.0.9] - 2022-11-23
 ### Added
diff --git a/Dockerfile b/Dockerfile
index 03b3a29..47604f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,7 +46,7 @@ wget -q https://search.maven.org/remotecontent?filepath=com/kstruct/gethostname4
 wget -q https://search.maven.org/remotecontent?filepath=com/sun/jna/jna/${JNA_VERSION}/jna-${JNA_VERSION}.jar -O jna-${JNA_VERSION}.jar && \
 wget -q https://search.maven.org/remotecontent?filepath=io/prometheus/jmx/jmx_prometheus_javaagent/${EXPORTER_VERSION}/jmx_prometheus_javaagent-${EXPORTER_VERSION}.jar -O jmx_prometheus_javaagent-${EXPORTER_VERSION}.jar
 
-ENV MAVEN_VERSION 3.6.3
+ENV MAVEN_VERSION 3.9.3
 
 RUN wget -q -O - https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz | tar -C /opt -xzf - && \
     ln -sf /opt/apache-maven-${MAVEN_VERSION}/bin/mvn /bin/mvn