From e4034bf1deb7d8af682ab6e6ef0b9bc4dbaca31f Mon Sep 17 00:00:00 2001
From: Marc Alff <marc.alff@oracle.com>
Date: Fri, 10 Jun 2022 11:09:56 +0200
Subject: [PATCH 1/2] Upgrade nlohmann_json to 3.10.5 (#1438)

---
 bazel/repository.bzl | 13 +++++++++++--
 third_party_release  | 11 ++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/bazel/repository.bzl b/bazel/repository.bzl
index 7d50e12d31..e1ac4fc218 100644
--- a/bazel/repository.bzl
+++ b/bazel/repository.bzl
@@ -10,6 +10,15 @@ filegroup(
 )
 """
 
+#
+# MAINTAINER
+#
+# When changing (add, upgrade, remove) dependencies
+# in this file for the Bazel build,
+# please update the CMake build as well,
+# see <root>/third_party_release
+#
+
 def opentelemetry_cpp_deps():
     """Loads dependencies need to compile the opentelemetry-cpp library."""
 
@@ -86,9 +95,9 @@ def opentelemetry_cpp_deps():
         http_archive,
         name = "github_nlohmann_json",
         build_file = "@io_opentelemetry_cpp//bazel:nlohmann_json.BUILD",
-        sha256 = "69cc88207ce91347ea530b227ff0776db82dcb8de6704e1a3d74f4841bc651cf",
+        sha256 = "b94997df68856753b72f0d7a3703b7d484d4745c567f3584ef97c96c25a5798e",
         urls = [
-            "https://github.com/nlohmann/json/releases/download/v3.6.1/include.zip",
+            "https://github.com/nlohmann/json/releases/download/v3.10.5/include.zip",
         ],
     )
 
diff --git a/third_party_release b/third_party_release
index 964cbfb871..50540454b6 100644
--- a/third_party_release
+++ b/third_party_release
@@ -1,10 +1,19 @@
+#
+# MAINTAINER
+#
+# When changing (add, upgrade, remove) dependencies
+# in this file for the CMake build,
+# please update the Bazel build as well,
+# see <root>/bazel/repository.bzl
+#
+
 gRPC=v1.43.2
 thrift=0.14.1
 abseil=20210324.0
 benchmark=v1.5.3
 googletest=release-1.10.0-459-ga6dfd3ac
 ms-gsl=v3.1.0-67-g6f45293
-nlohmann-json=v3.9.1
+nlohmann-json=v3.10.5
 opentelemetry-proto=v0.17.0
 prometheus-cpp=v1.0.0
 vcpkg=2022.04.12

From 64cafa3a6d439909dc6c73a723313884fe13acf8 Mon Sep 17 00:00:00 2001
From: Marc Alff <marc.alff@oracle.com>
Date: Fri, 10 Jun 2022 22:32:43 +0200
Subject: [PATCH 2/2] Upgrade nlohmann_json to 3.10.5 (#1438)

Fixed git submodule nlohmann_json.
---
 bazel/repository.bzl      | 10 +++++++---
 third_party/nlohmann-json |  2 +-
 third_party_release       | 10 +++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/bazel/repository.bzl b/bazel/repository.bzl
index e1ac4fc218..30a34fb2fd 100644
--- a/bazel/repository.bzl
+++ b/bazel/repository.bzl
@@ -13,10 +13,14 @@ filegroup(
 #
 # MAINTAINER
 #
+# This file is used for the Bazel build.
+#
 # When changing (add, upgrade, remove) dependencies
-# in this file for the Bazel build,
-# please update the CMake build as well,
-# see <root>/third_party_release
+# please update:
+# - the CMake build, see file
+#   <root>/third_party_release
+# - git submodule, see command
+#   git submodule status
 #
 
 def opentelemetry_cpp_deps():
diff --git a/third_party/nlohmann-json b/third_party/nlohmann-json
index db78ac1d77..4f8fba1406 160000
--- a/third_party/nlohmann-json
+++ b/third_party/nlohmann-json
@@ -1 +1 @@
-Subproject commit db78ac1d7716f56fc9f1b030b715f872f93964e4
+Subproject commit 4f8fba14066156b73f1189a2b8bd568bde5284c5
diff --git a/third_party_release b/third_party_release
index 50540454b6..e8ad402c06 100644
--- a/third_party_release
+++ b/third_party_release
@@ -1,10 +1,14 @@
 #
 # MAINTAINER
 #
+# This file is used for the CMake build.
+#
 # When changing (add, upgrade, remove) dependencies
-# in this file for the CMake build,
-# please update the Bazel build as well,
-# see <root>/bazel/repository.bzl
+# please update:
+# - the Bazel build, see file
+#   <root>/bazel/repository.bzl
+# - git submodule, see command
+#   git submodule status
 #
 
 gRPC=v1.43.2