From 2ff033011f17e50f148ede396a70e921faa7c23f Mon Sep 17 00:00:00 2001
From: Mike Kruskal <mkruskal@google.com>
Date: Fri, 18 Oct 2024 10:45:00 -0700
Subject: [PATCH] Upgrade to jsoncpp 1.9.6.

This version supports cmake builds, so that we can depend on the same pin for both cmake and bazel.

PiperOrigin-RevId: 687354677
---
 MODULE.bazel            | 2 +-
 cmake/conformance.cmake | 3 +--
 protobuf_deps.bzl       | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index c4524dc2ae..f056cb7555 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -14,7 +14,7 @@ module(
 # Thus the highest version in their module graph is resolved.
 bazel_dep(name = "abseil-cpp", version = "20240722.0", repo_name = "com_google_absl")
 bazel_dep(name = "bazel_skylib", version = "1.7.0")
-bazel_dep(name = "jsoncpp", version = "1.9.5")
+bazel_dep(name = "jsoncpp", version = "1.9.6")
 bazel_dep(name = "rules_cc", version = "0.0.13")
 bazel_dep(name = "rules_fuzzing", version = "0.5.2")
 bazel_dep(name = "rules_java", version = "7.12.2")
diff --git a/cmake/conformance.cmake b/cmake/conformance.cmake
index a819d2cd80..abe9a36860 100644
--- a/cmake/conformance.cmake
+++ b/cmake/conformance.cmake
@@ -9,8 +9,7 @@ elseif (protobuf_FETCH_DEPENDENCIES AND protobuf_JSONCPP_PROVIDER STREQUAL "fetc
   FetchContent_Declare(
     jsoncpp
     GIT_REPOSITORY "https://github.com/open-source-parsers/jsoncpp.git"
-    # TODO Use ${jsoncpp-version} here once it supports cmake.
-    GIT_TAG "1.9.4"
+    GIT_TAG "${jsoncpp-version}"
   )
   FetchContent_MakeAvailable(jsoncpp)
 else ()
diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl
index caa8c220af..aee4a9117f 100644
--- a/protobuf_deps.bzl
+++ b/protobuf_deps.bzl
@@ -84,8 +84,8 @@ def protobuf_deps():
         _github_archive(
             name = "jsoncpp",
             repo = "https://github.com/open-source-parsers/jsoncpp",
-            commit = "5defb4ed1a4293b8e2bf641e16b156fb9de498cc",  # 1.9.5
-            sha256 = "a03d3136ff6dd092143bba8d3ded641e87b44e6c0b1f632b368f6cc8587524b5",
+            commit = "89e2973c754a9c02a49974d839779b151e95afd6",  # 1.9.6
+            sha256 = "02f0804596c1e18c064d890ac9497fa17d585e822fcacf07ff8a8aa0b344a7bd",
             build_file = Label("//:third_party/jsoncpp.BUILD"),
         )