From 98ec733aecf0e460da48a443ed9c29d881a83d81 Mon Sep 17 00:00:00 2001
From: Penghui Li <penghui@apache.org>
Date: Fri, 2 Jun 2023 14:52:36 +0800
Subject: [PATCH 1/2] [fix][misc] Use ubuntu 22.04 for Pulsar images

---
 build/docker/Dockerfile                        | 2 +-
 docker/pulsar/Dockerfile                       | 2 +-
 tests/docker-images/java-test-image/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile
index 7660325567748..3d9fc9c832bda 100644
--- a/build/docker/Dockerfile
+++ b/build/docker/Dockerfile
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 # prepare the directory for pulsar related files
 RUN mkdir /pulsar
diff --git a/docker/pulsar/Dockerfile b/docker/pulsar/Dockerfile
index 01e53e0152ac6..a5b294063d376 100644
--- a/docker/pulsar/Dockerfile
+++ b/docker/pulsar/Dockerfile
@@ -49,7 +49,7 @@ RUN chmod g+w /pulsar/trino
 ### Create 2nd stage from Ubuntu image
 ### and add OpenJDK and Python dependencies (for Pulsar functions)
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG UBUNTU_MIRROR=mirror://mirrors.ubuntu.com/mirrors.txt
diff --git a/tests/docker-images/java-test-image/Dockerfile b/tests/docker-images/java-test-image/Dockerfile
index 9e852050edf2e..5821e6eeaeae7 100644
--- a/tests/docker-images/java-test-image/Dockerfile
+++ b/tests/docker-images/java-test-image/Dockerfile
@@ -17,7 +17,7 @@
 # under the License.
 #
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN groupadd -g 10001 pulsar
 RUN adduser -u 10000 --gid 10001 --disabled-login --disabled-password --gecos '' pulsar

From 6b2ac602cc2eaff6d38b477957c121ae5c1ef984 Mon Sep 17 00:00:00 2001
From: Penghui Li <penghui@apache.org>
Date: Tue, 6 Jun 2023 09:10:23 +0800
Subject: [PATCH 2/2] Upgrade Python Client to 3.2.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 699fc1631c846..b2d4b891075ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,7 +82,7 @@ flexible messaging model and an intuitive client API.</description>
     <pulsar.broker.compiler.release>${maven.compiler.target}</pulsar.broker.compiler.release>
     <pulsar.client.compiler.release>8</pulsar.client.compiler.release>
 
-    <pulsar.client.python.version>2.10.1</pulsar.client.python.version>
+    <pulsar.client.python.version>3.2.0</pulsar.client.python.version>
 
     <!--config keys to configure test selection -->
     <include>**/Test*.java,**/*Test.java,**/*Tests.java,**/*TestCase.java</include>