From c0535a56e46c6616d7e2278787278c5254429035 Mon Sep 17 00:00:00 2001
From: Keerthana Srikanth <ksrikanth@confluent.io>
Date: Tue, 14 Nov 2023 21:18:15 +0530
Subject: [PATCH] [backport] Upgrade Avro to latest version (#14440) (#162)

Upgraded Avro to 1.11.1

(cherry picked from commit 72cf91fbc0ed9cc2abce91df878ab431678b12f3)

Co-authored-by: Tejaswini Bandlamudi <96047043+tejaswini-imply@users.noreply.github.com>
---
 pom.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 00d324e7f1b1..ba14853a61f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,15 +79,16 @@
         <apache.kafka.version>3.5.1</apache.kafka.version>
         <apache.ranger.version>2.0.0</apache.ranger.version>
         <apache.ranger.gson.version>2.2.4</apache.ranger.gson.version>
-        <scala.library.version>2.13.11</scala.library.version>
-        <avatica.version>1.23.0</avatica.version>
+        <scala.library.version>2.13.9</scala.library.version>
+        <avatica.version>1.17.0</avatica.version>
         <avro.version>1.11.1</avro.version>
-        <!-- When updating Calcite, also propagate updates to these files which we've copied and modified:
-             default_config.fmpp
-          -->
-        <calcite.version>1.35.0</calcite.version>
-        <datasketches.version>4.2.0</datasketches.version>
-        <datasketches.memory.version>2.2.0</datasketches.memory.version>
+        <!-- sql/src/main/codegen/config.fmpp is based on a file from calcite-core, and needs to be
+          updated when upgrading Calcite. Refer to the top-level comments in that file for details.
+          Also, CalcitePlanner is a clone of Calcite's PlannerImpl and may require updates when
+          Calcite is upgrade. -->
+        <calcite.version>1.21.0</calcite.version>
+        <datasketches.version>3.2.0</datasketches.version>
+        <datasketches.memory.version>2.0.0</datasketches.memory.version>
         <derby.version>10.14.2.0</derby.version>
         <dropwizard.metrics.version>4.2.19</dropwizard.metrics.version>
         <errorprone.version>2.20.0</errorprone.version>