From e3a3f4584dd548727006c3b771fc788795ac0375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferm=C3=ADn=20Gal=C3=A1n=20M=C3=A1rquez?= Date: Tue, 28 May 2024 12:36:18 +0200 Subject: [PATCH] FIB use cjexl 0.2.0 --- CHANGES_NEXT_RELEASE | 2 +- ci/deb/build.sh | 2 +- docker/Dockerfile | 2 +- docker/Dockerfile.alpine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 0f5194da98..ae44980113 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -1,4 +1,4 @@ -- Add: JEXL expression support in custom notification macro replacement (using cjexl 0.1.0) (#4004) +- Add: JEXL expression support in custom notification macro replacement (using cjexl 0.2.0) (#4004) - Add: expression context build and evaluation counters in timing section in GET /statistics (#4004) - Fix: use null for non existing attributes in custom covered notifications macro substitution (instead of empty string) to make behaviour more consistent (#4004) - Fix: use null for non existing attributes in macro substitution applied to "paylaod" field (instead of empty string) to make behaviour more consistent (#4004) diff --git a/ci/deb/build.sh b/ci/deb/build.sh index 4dffcd865b..b0e5027b8a 100755 --- a/ci/deb/build.sh +++ b/ci/deb/build.sh @@ -175,7 +175,7 @@ rm -Rf /tmp/builder || true && mkdir -p /tmp/builder/{db1,db2,db,bu} if [ -z "${REPO_ACCESS_TOKEN}" ]; then echo "Builder: no REPO_ACCESS_TOKEN, skipping cjexl lib download" else - bash /opt/fiware-orion/get_cjexl.sh 0.1.0 $REPO_ACCESS_TOKEN + bash /opt/fiware-orion/get_cjexl.sh 0.2.0 $REPO_ACCESS_TOKEN fi if [ -n "${branch}" ]; then diff --git a/docker/Dockerfile b/docker/Dockerfile index 04394da083..e6c7846b56 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -104,7 +104,7 @@ RUN \ git clone https://github.com/${GIT_NAME}/fiware-orion && \ cd fiware-orion && \ git checkout ${GIT_REV_ORION} && \ - bash get_cjexl.sh 0.1.0 ${REPO_ACCESS_TOKEN} && \ + bash get_cjexl.sh 0.2.0 ${REPO_ACCESS_TOKEN} && \ make && \ make install && \ # reduce size of installed binaries diff --git a/docker/Dockerfile.alpine b/docker/Dockerfile.alpine index 5c302db67d..9e35eb3aa9 100644 --- a/docker/Dockerfile.alpine +++ b/docker/Dockerfile.alpine @@ -110,7 +110,7 @@ RUN \ git clone https://github.com/${GIT_NAME}/fiware-orion && \ cd fiware-orion && \ git checkout ${GIT_REV_ORION} && \ - bash get_cjexl.sh 0.1.0 ${REPO_ACCESS_TOKEN} && \ + bash get_cjexl.sh 0.2.0 ${REPO_ACCESS_TOKEN} && \ # patch bash and mktemp statement in build script, as in alpine is slightly different sed -i 's/mktemp \/tmp\/compileInfo.h.XXXX/mktemp/g' scripts/build/compileInfo.sh && \ sed -i 's/bash/ash/g' scripts/build/compileInfo.sh && \