Merge pull request #13769 from thalesmg/20240905-m-fix-jesse-draft3-extends

fix(json schema): update `jesse` -> 1.8.0.1

apps/emqx_gateway_ocpp/mix.exs

@@ -23,7 +23,7 @@ defmodule EMQXGatewayOcpp.MixProject do
 
   def deps() do
     [
-      {:jesse, github: "emqx/jesse", tag: "1.8.0"},
+      UMP.common_dep(:jesse),
       {:emqx, in_umbrella: true},
       {:emqx_utils, in_umbrella: true},
       {:emqx_gateway, in_umbrella: true}

apps/emqx_gateway_ocpp/rebar.config

@@ -1,7 +1,7 @@
 %% -*- mode: erlang; -*-
 
 {deps, [
-    {jesse, {git, "https://github.com/emqx/jesse.git", {tag, "1.8.0"}}},
+    {jesse, {git, "https://github.com/emqx/jesse.git", {tag, "1.8.0.1"}}},
     {emqx, {path, "../../apps/emqx"}},
     {emqx_utils, {path, "../emqx_utils"}},
     {emqx_gateway, {path, "../../apps/emqx_gateway"}}

apps/emqx_plugins/mix.exs

@@ -22,6 +22,9 @@ defmodule EMQXPlugins.MixProject do
   end
 
   def deps() do
-    [{:emqx, in_umbrella: true}, {:erlavro, github: "emqx/erlavro", tag: "2.10.0"}]
+    [
+      {:emqx, in_umbrella: true},
+      UMP.common_dep(:erlavro),
+    ]
   end
 end

apps/emqx_schema_registry/mix.exs

@@ -26,8 +26,8 @@ defmodule EMQXSchemaRegistry.MixProject do
       {:emqx, in_umbrella: true},
       {:emqx_utils, in_umbrella: true},
       {:emqx_rule_engine, in_umbrella: true},
-      {:erlavro, github: "emqx/erlavro", tag: "2.10.0"},
-      {:jesse, github: "emqx/jesse", tag: "1.8.0"},
+      UMP.common_dep(:erlavro),
+      UMP.common_dep(:jesse),
       UMP.common_dep(:gpb, runtime: true),
     ]
   end

apps/emqx_schema_registry/rebar.config

@@ -6,7 +6,7 @@
     {emqx_utils, {path, "../emqx_utils"}},
     {emqx_rule_engine, {path, "../emqx_rule_engine"}},
     {erlavro, {git, "https://github.com/emqx/erlavro.git", {tag, "2.10.0"}}},
-    {jesse, {git, "https://github.com/emqx/jesse.git", {tag, "1.8.0"}}},
+    {jesse, {git, "https://github.com/emqx/jesse.git", {tag, "1.8.0.1"}}},
     {gpb, "4.19.9"}
 ]}.
 

changes/ee/fix-13769.en.md

@@ -0,0 +1 @@
+Fixed an issue where using JSON schema validation (draft 3) with the `extends` property would lead to validation always failing.

mix.exs

@@ -284,6 +284,8 @@ defmodule EMQXUmbrella.MixProject do
   ## TODO: remove `mix.exs` from `pulsar` and remove this override
   def common_dep(:snappyer), do: {:snappyer, "1.2.9", override: true}
   def common_dep(:crc32cer), do: {:crc32cer, "0.1.8", override: true}
+  def common_dep(:jesse), do: {:jesse, github: "emqx/jesse", tag: "1.8.0.1"}
+  def common_dep(:erlavro), do: {:erlavro, github: "emqx/erlavro", tag: "2.10.0"}
 
   ###############################################################################################
   # BEGIN DEPRECATED FOR MIX BLOCK