Sfoglia il codice sorgente

Merge pull request #11290 from keynslug/fix/EMQX-10571/bump-jq

chore: bump jq to v0.3.10
Andrew Mayorov 2 anni fa
parent
commit
89e8dc460c
4 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. 1 0
      changes/ce/feat-11290.en.md
  2. 1 1
      mix.exs
  3. 1 1
      rebar.config.erl
  4. 1 1
      scripts/macos-sign-binaries.sh

+ 1 - 0
changes/ce/feat-11290.en.md

@@ -0,0 +1 @@
+Updated `jq` dependency to version 0.3.10 which includes `oniguruma` library update to version 6.9.8 with few minor security fixes.

+ 1 - 1
mix.exs

@@ -842,7 +842,7 @@ defmodule EMQXUmbrella.MixProject do
 
   defp jq_dep() do
     if enable_jq?(),
-      do: [{:jq, github: "emqx/jq", tag: "v0.3.9", override: true}],
+      do: [{:jq, github: "emqx/jq", tag: "v0.3.10", override: true}],
       else: []
   end
 

+ 1 - 1
rebar.config.erl

@@ -42,7 +42,7 @@ quicer() ->
     {quicer, {git, "https://github.com/emqx/quic.git", {tag, "0.0.114"}}}.
 
 jq() ->
-    {jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.9"}}}.
+    {jq, {git, "https://github.com/emqx/jq", {tag, "v0.3.10"}}}.
 
 deps(Config) ->
     {deps, OldDeps} = lists:keyfind(deps, 1, Config),

+ 1 - 1
scripts/macos-sign-binaries.sh

@@ -57,7 +57,7 @@ codesign -s "${APPLE_DEVELOPER_IDENTITY}" -f --verbose=4 --timestamp --options=r
 codesign -s "${APPLE_DEVELOPER_IDENTITY}" -f --verbose=4 --timestamp --options=runtime \
          "${REL_DIR}"/lib/os_mon-*/priv/bin/{cpu_sup,memsup}
 codesign -s "${APPLE_DEVELOPER_IDENTITY}" -f --verbose=4 --timestamp --options=runtime \
-         "${REL_DIR}"/lib/jq-*/priv/{jq_nif1.so,libjq.1.dylib,libonig.4.dylib,erlang_jq_port}
+         "${REL_DIR}"/lib/jq-*/priv/{jq_nif1.so,libjq.1.dylib,libonig.5.dylib,erlang_jq_port}
 # other files from runtime and dependencies
 for f in \
         asn1rt_nif.so \