From 99769546a9ae7e44221b6d63a2023a94592ceb10 Mon Sep 17 00:00:00 2001
From: Abhijeet Mohanty <abhmohanty@microsoft.com>
Date: Tue, 26 May 2026 11:17:58 -0400
Subject: [PATCH] Fix bannedDependencies failure for jackson-module-scala in
 Spark POMs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The update_versions.py script's regex (external_dependency_version_regex)
only matches values inside <version>...</version> XML elements. Custom
Maven property tags like <scala-jackson.version> were silently skipped
despite having valid {x-version-update} comments, leaving the enforcer
allowlist stale after the Jackson 2.18.6 -> 2.18.7 bump (PR #49180).

This fix eliminates the scala-jackson.version property indirection
entirely and replaces all usages with explicit versions and standard
{x-version-update}/{x-include-update} tags — the same pattern used by
all other Jackson modules in these POMs.

Changes:
- Remove scala-jackson.version property from spark_3, spark_3-5,
  spark_3-5_2-12, and spark_4 parent POMs
- Replace enforcer <include> entries with hardcoded [2.18.7] +
  {x-include-update} tags (spark_3/pom.xml)
- Replace dependency <version> elements with explicit 2.18.7 +
  {x-version-update} tags (spark_3-5, spark_4)

Fixes the bannedDependencies CI failure blocking PRs #49095 and #49258.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 sdk/cosmos/azure-cosmos-spark_3-5/pom.xml      | 3 +--
 sdk/cosmos/azure-cosmos-spark_3-5_2-12/pom.xml | 1 -
 sdk/cosmos/azure-cosmos-spark_3/pom.xml        | 5 ++---
 sdk/cosmos/azure-cosmos-spark_4/pom.xml        | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sdk/cosmos/azure-cosmos-spark_3-5/pom.xml b/sdk/cosmos/azure-cosmos-spark_3-5/pom.xml
index cf1e6433f383..9c88ec7e6e64 100644
--- a/sdk/cosmos/azure-cosmos-spark_3-5/pom.xml
+++ b/sdk/cosmos/azure-cosmos-spark_3-5/pom.xml
@@ -27,7 +27,6 @@
     <scala.binary.version>2.12</scala.binary.version>
     <spark35.version>3.5.0</spark35.version> <!-- {x-version-update;cosmos-spark_3-5_org.apache.spark:spark-sql_2.12;external_dependency} -->
     <spark-hive-version>3.5.0</spark-hive-version> <!-- {x-version-update;cosmos-spark_3-5_org.apache.spark:spark-hive_2.12;external_dependency} -->
-    <scala-jackson.version>2.18.4</scala-jackson.version> <!-- {x-version-update;com.fasterxml.jackson.module:jackson-module-scala_2.12;external_dependency} -->
   </properties>
   <profiles>
     <profile>
@@ -135,7 +134,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
-      <version>${scala-jackson.version}</version>
+      <version>2.18.7</version> <!-- {x-version-update;com.fasterxml.jackson.module:jackson-module-scala_2.12;external_dependency} -->
     </dependency>
   </dependencies>
 </project>
diff --git a/sdk/cosmos/azure-cosmos-spark_3-5_2-12/pom.xml b/sdk/cosmos/azure-cosmos-spark_3-5_2-12/pom.xml
index 92dcedb03f28..0c877a4be179 100644
--- a/sdk/cosmos/azure-cosmos-spark_3-5_2-12/pom.xml
+++ b/sdk/cosmos/azure-cosmos-spark_3-5_2-12/pom.xml
@@ -51,7 +51,6 @@
     <scalatest-flatspec.version>3.2.3</scalatest-flatspec.version> <!-- {x-version-update;cosmos_org.scalatest:scalatest-flatspec_2.12;external_dependency} -->
     <scalactic.version>3.2.3</scalactic.version> <!-- {x-version-update;cosmos_org.scalactic:scalactic_2.12;external_dependency} -->
     <scalamock.version>5.0.0</scalamock.version> <!-- {x-version-update;cosmos_org.scalamock:scalamock_2.12;external_dependency} -->
-    <scala-jackson.version>2.18.4</scala-jackson.version> <!-- {x-version-update;com.fasterxml.jackson.module:jackson-module-scala_2.12;external_dependency} -->
   </properties>
   <build>
     <plugins>
diff --git a/sdk/cosmos/azure-cosmos-spark_3/pom.xml b/sdk/cosmos/azure-cosmos-spark_3/pom.xml
index c4b6f0cd2274..71a07cedffd1 100644
--- a/sdk/cosmos/azure-cosmos-spark_3/pom.xml
+++ b/sdk/cosmos/azure-cosmos-spark_3/pom.xml
@@ -51,7 +51,6 @@
     <scalatest-flatspec.version>3.2.3</scalatest-flatspec.version> <!-- {x-version-update;cosmos_org.scalatest:scalatest-flatspec_2.12;external_dependency} -->
     <scalactic.version>3.2.3</scalactic.version> <!-- {x-version-update;cosmos_org.scalactic:scalactic_2.12;external_dependency} -->
     <scalamock.version>5.0.0</scalamock.version> <!-- {x-version-update;cosmos_org.scalamock:scalamock_2.12;external_dependency} -->
-    <scala-jackson.version>2.18.6</scala-jackson.version> <!-- {x-version-update;com.fasterxml.jackson.module:jackson-module-scala_2.12;external_dependency} -->
     <pinned-resourcemanager-cosmos.version>2.53.4</pinned-resourcemanager-cosmos.version> <!-- This should not exceed the latest stable version that has been deployed across all clouds - including non-public clouds -->
   </properties>
 
@@ -338,8 +337,8 @@
                 <include>com.fasterxml.jackson.datatype:jackson-datatype-jsr310:[2.18.7]</include> <!-- {x-include-update;com.fasterxml.jackson.datatype:jackson-datatype-jsr310;external_dependency} -->
                 <include>com.fasterxml.jackson.module:jackson-module-afterburner:[2.18.7]</include> <!-- {x-include-update;com.fasterxml.jackson.module:jackson-module-afterburner;external_dependency} -->
                 <include>com.fasterxml.jackson.dataformat:jackson-dataformat-xml:[2.18.7]</include> <!-- {x-include-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
-                <include>com.fasterxml.jackson.module:jackson-module-scala_2.12:[${scala-jackson.version}]</include>
-                <include>com.fasterxml.jackson.module:jackson-module-scala_2.13:[${scala-jackson.version}]</include>
+                <include>com.fasterxml.jackson.module:jackson-module-scala_2.12:[2.18.7]</include> <!-- {x-include-update;com.fasterxml.jackson.module:jackson-module-scala_2.12;external_dependency} -->
+                <include>com.fasterxml.jackson.module:jackson-module-scala_2.13:[2.18.7]</include> <!-- {x-include-update;com.fasterxml.jackson.module:jackson-module-scala_2.13;external_dependency} -->
                 <include>io.micrometer:micrometer-registry-azure-monitor:[1.15.1]</include> <!-- {x-include-update;cosmos_io.micrometer:micrometer-registry-azure-monitor;external_dependency} -->
                 <include>io.micrometer:micrometer-core:[1.15.1]</include> <!-- {x-include-update;cosmos_io.micrometer:micrometer-core;external_dependency} -->
                 <include>com.microsoft.azure:applicationinsights-core:[2.6.4]</include> <!-- {x-include-update;cosmos_com.microsoft.azure:applicationinsights-core;external_dependency} -->
diff --git a/sdk/cosmos/azure-cosmos-spark_4/pom.xml b/sdk/cosmos/azure-cosmos-spark_4/pom.xml
index cbfee879920b..f68309e33a18 100644
--- a/sdk/cosmos/azure-cosmos-spark_4/pom.xml
+++ b/sdk/cosmos/azure-cosmos-spark_4/pom.xml
@@ -32,7 +32,6 @@
     <scalatest-flatspec.version>3.2.3</scalatest-flatspec.version> <!-- {x-version-update;cosmos-scala213_org.scalatest:scalatest-flatspec_2.13;external_dependency} -->
     <scalactic.version>3.2.3</scalactic.version> <!-- {x-version-update;cosmos-scala213_org.scalactic:scalactic_2.13;external_dependency} -->
     <scalamock.version>5.0.0</scalamock.version> <!-- {x-version-update;cosmos-scala213_org.scalamock:scalamock_2.13;external_dependency} -->
-    <scala-jackson.version>2.18.6</scala-jackson.version> <!-- {x-version-update;com.fasterxml.jackson.module:jackson-module-scala_2.13;external_dependency} -->
   </properties>
   <profiles>
     <!-- build-scala profile: serves as template for child modules (spark_4-0, spark_4-1).
@@ -112,7 +111,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
-      <version>${scala-jackson.version}</version>
+      <version>2.18.7</version> <!-- {x-version-update;com.fasterxml.jackson.module:jackson-module-scala_2.12;external_dependency} -->
     </dependency>
   </dependencies>
 </project>