From 943ff6354365428b458cd4d1eff7e6460651a884 Mon Sep 17 00:00:00 2001
From: Stuart Lynn <stuart.lynn@databricks.com>
Date: Thu, 9 Nov 2023 11:37:10 +0000
Subject: [PATCH] bump spark ver for 12.2LTS and remove ubuntugis deps (test)

---
 .github/actions/scala_build/action.yml | 7 +------
 .github/workflows/build_main.yml       | 2 +-
 .github/workflows/build_python.yml     | 2 +-
 .github/workflows/build_r.yml          | 2 +-
 .github/workflows/build_scala.yml      | 2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/actions/scala_build/action.yml b/.github/actions/scala_build/action.yml
index d58d79100..5e12ead9a 100644
--- a/.github/actions/scala_build/action.yml
+++ b/.github/actions/scala_build/action.yml
@@ -26,12 +26,7 @@ runs:
         - name: Test and build the scala JAR - skip tests is false
           if: inputs.skip_tests == 'false'
           shell: bash
-          run: |
-            sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable
-            sudo apt clean && sudo apt -o Acquire::Retries=3 update --fix-missing -y
-            sudo apt-get -o Acquire::Retries=3 update -y
-            sudo apt-get -o Acquire::Retries=3 install -y gdal-bin=${{ matrix.gdal }}+dfsg-1~focal0 libgdal-dev=${{ matrix.gdal }}+dfsg-1~focal0 python3-gdal=${{ matrix.gdal }}+dfsg-1~focal0
-            sudo mvn -q clean install
+          run: sudo mvn -q clean install
         - name: Build the scala JAR - skip tests is true
           if: inputs.skip_tests == 'true'
           shell: bash
diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml
index 8f54400d9..5d303827b 100644
--- a/.github/workflows/build_main.yml
+++ b/.github/workflows/build_main.yml
@@ -19,7 +19,7 @@ jobs:
         python: [ 3.9.5 ]
         numpy: [ 1.21.5 ]
         gdal: [ 3.4.3 ]
-        spark: [ 3.2.1 ]
+        spark: [ 3.3.2 ]
         R: [ 4.1.2 ]
     steps:
       - name: checkout code
diff --git a/.github/workflows/build_python.yml b/.github/workflows/build_python.yml
index ec9f4c28f..cf9771037 100644
--- a/.github/workflows/build_python.yml
+++ b/.github/workflows/build_python.yml
@@ -15,7 +15,7 @@ jobs:
         python: [ 3.9.5 ]
         numpy: [ 1.21.5 ]
         gdal: [ 3.4.3 ]
-        spark: [ 3.2.1 ]
+        spark: [ 3.3.2 ]
         R: [ 4.1.2 ]
     steps:
       - name: checkout code
diff --git a/.github/workflows/build_r.yml b/.github/workflows/build_r.yml
index 6e725ebd1..28d8172d5 100644
--- a/.github/workflows/build_r.yml
+++ b/.github/workflows/build_r.yml
@@ -16,7 +16,7 @@ jobs:
         python: [ 3.9.5 ]
         numpy: [ 1.21.5 ]
         gdal: [ 3.4.3 ]
-        spark: [ 3.2.1 ]
+        spark: [ 3.3.2 ]
         R: [ 4.1.2 ]
     steps:
       - name: checkout code
diff --git a/.github/workflows/build_scala.yml b/.github/workflows/build_scala.yml
index 0d25ee63c..b94dbe686 100644
--- a/.github/workflows/build_scala.yml
+++ b/.github/workflows/build_scala.yml
@@ -14,7 +14,7 @@ jobs:
         python: [ 3.9.5 ]
         numpy: [ 1.21.5 ]
         gdal: [ 3.4.3 ]
-        spark: [ 3.2.1 ]
+        spark: [ 3.3.2 ]
         R: [ 4.1.2 ]
     steps:
       - name: checkout code