[unomi] branch master updated (dbcb2ed -> bc208d5)

[sh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

shuber pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/unomi.git.


    from dbcb2ed  UNOMI-399: fix the loading of MVEL allowed script pattern from config, and return null during script execution if the script is filtered out (#211)
     add bc208d5  UNOMI-399: load allow/forbid script from files instead of configuration property to avoid script code conflicting with property value parsing (#213)

No new revisions were added by this update.

Summary of changes:
 .../main/resources/etc/custom.system.properties    |  8 ++--
 .../src/main/resources/etc/mvel-allow.json         |  0
 package/src/main/resources/etc/mvel-forbid.json    | 19 ++++++++
 .../src/main/resources/etc/ognl-allow.json         |  0
 package/src/main/resources/etc/ognl-forbid.json    | 19 ++++++++
 scripting/pom.xml                                  |  5 +++
 .../internal/ExpressionFilterFactoryImpl.java      | 51 +++++++++-------------
 7 files changed, 67 insertions(+), 35 deletions(-)
 copy scripting/src/main/resources/META-INF/cxs/expressions/ognl.json => package/src/main/resources/etc/mvel-allow.json (100%)
 create mode 100644 package/src/main/resources/etc/mvel-forbid.json
 copy scripting/src/main/resources/META-INF/cxs/expressions/ognl.json => package/src/main/resources/etc/ognl-allow.json (100%)
 create mode 100644 package/src/main/resources/etc/ognl-forbid.json