Fixes rm-cosmos regression (Azure#41748)

* Fixes rm-cosmos regression * Iterating on rm-cosmos fix * Update pom.xml
mssfang · Sep 6, 2024 · 87354f6 · 87354f6
1 parent 2c55485
commit 87354f6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt
@@ -383,7 +383,6 @@ cosmos_org.scala-lang.modules:scala-java8-compat_2.12;0.8.0
 cosmos_io.projectreactor:reactor-scala-extensions_2.12;0.8.0
 cosmos_commons-io:commons-io;2.4
 cosmos_com.microsoft.azure:applicationinsights-core;2.6.4
-cosmos_com.azure.resourcemanager:azure-resourcemanager-cosmos;2.41.0
 
 # Cosmos Spark connector tests only
 cosmos_org.scalatest:scalatest_2.12;3.2.2

diff --git a/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml
@@ -81,10 +81,15 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-core-serializer-json-jackson</artifactId>
+      <version>1.5.0</version> <!-- {x-version-update;com.azure:azure-core-serializer-json-jackson;dependency} -->
+    </dependency>
     <dependency>
       <groupId>com.azure.resourcemanager</groupId>
       <artifactId>azure-resourcemanager-cosmos</artifactId>
-      <version>2.41.0</version> <!-- {x-version-update;cosmos_com.azure.resourcemanager:azure-resourcemanager-cosmos;external_dependency} -->
+      <version>2.42.0</version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager-cosmos;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

diff --git a/...2-12/src/main/scala/com/azure/cosmos/spark/catalog/CosmosCatalogManagementSDKClient.scala b/...2-12/src/main/scala/com/azure/cosmos/spark/catalog/CosmosCatalogManagementSDKClient.scala
@@ -35,7 +35,8 @@ private[spark] case class CosmosCatalogManagementSDKClient(resourceGroupName: St
 
     private val objectMapper: ObjectMapper = new ObjectMapper()
     objectMapper.setSerializationInclusion(Include.NON_NULL)
-
+    objectMapper.registerModule(
+      com.azure.core.serializer.json.jackson.JacksonJsonProvider.getJsonSerializableDatabindModule())
     private val sqlResourcesClient = cosmosManager.serviceClient().getSqlResources()
 
     override def close(): Unit = {}