Merge branch 'master' into 26223-add-replaceable-monitoring-cluster-d…

…efinition

examples/java-matter-controller/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023 Project CHIP Authors
+# Copyright (c) 2022 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -38,7 +38,6 @@ kotlin_binary("java-matter-controller") {
   output_name = "java-matter-controller"
   deps = [
     ":java",
-    "${chip_root}/src/controller/java:json_to_tlv_to_json_test",
     "${chip_root}/src/controller/java:tlv_read_write_test",
     "${chip_root}/src/controller/java:tlv_reader_test",
     "${chip_root}/src/controller/java:tlv_writer_test",

src/controller/java/BUILD.gn

@@ -1,4 +1,4 @@
-# Copyright (c) 2020-2023 Project CHIP Authors
+# Copyright (c) 2020-2021 Project CHIP Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -204,39 +204,6 @@ kotlin_library("tlv_read_write_test") {
   kotlinc_flags = [ "-Xlint:deprecation" ]
 }
 
-kotlin_library("json") {
-  output_name = "libCHIPJson.jar"
-
-  deps = [
-    ":tlv",
-    "${chip_root}/third_party/java_deps:gson",
-  ]
-
-  sources = [
-    "src/chip/json/JsonToTlv.kt",
-    "src/chip/json/TlvToJson.kt",
-  ]
-
-  kotlinc_flags = [ "-Xlint:deprecation" ]
-}
-
-kotlin_library("json_to_tlv_to_json_test") {
-  output_name = "JsonToTlvToJsonTest.jar"
-
-  deps = [
-    ":json",
-    ":tlv",
-    "${chip_root}/third_party/java_deps:gson",
-    "${chip_root}/third_party/java_deps:junit-4",
-    "${chip_root}/third_party/java_deps:kotlin-test",
-    "${chip_root}/third_party/java_deps:truth",
-  ]
-
-  sources = [ "tests/chip/json/JsonToTlvToJsonTest.kt" ]
-
-  kotlinc_flags = [ "-Xlint:deprecation" ]
-}
-
 android_library("java") {
   output_name = "CHIPController.jar"