Basic reproduction of condition type with before, after, and contains fields

AUTHORS

@@ -46,20 +46,22 @@ Written in 2015 by Sam Hamilton - samhamilton
 Written in 2015 by Leonardo Carvalho - CarvalhoLeonardo
 Written in 2015 by Swapnil M Mane - swapnilmmane
 Written in 2015 by Anton Akhiar - akhiar
-Written in 2015-2018 by Jens Hardings - jenshp
+Written in 2015-2023 by Jens Hardings - jenshp
 Written in 2016 by Shifeng Zhang - zhangshifeng
 Written in 2016 by Scott Gray - lektran
 Written in 2016 by Mark Haney - mphaney
 Written in 2016 by Qiushi Yan - yanqiushi
 Written in 2017 by Oleg Andrieiev - oandreyev
 Written in 2018 by Zhang Wei - zhangwei1979
 Written in 2018 by Nirendra Singh - nirendra10695
-Written in 2018-2021 by Ayman Abi Abdallah - aabiabdallah
+Written in 2018-2023 by Ayman Abi Abdallah - aabiabdallah
 Written in 2019 by Daniel Taylor - danieltaylor-nz
 Written in 2020 by Jacob Barnes - Tellan
 Written in 2020 by Amir Anjomshoaa - amiranjom
 Written in 2021 by Deepak Dixit - dixitdeepak
 Written in 2021 by Taher Alkhateeb - pythys
+Written in 2022 by Zhang Wei - hellozhangwei
+Written in 2023 by Rohit Pawar - rohitpawar2811
 
 ===========================================================================
 
@@ -92,19 +94,21 @@ Written in 2015 by Jimmy Shen - shendepu
 Written in 2015-2016 by Sam Hamilton - samhamilton
 Written in 2015 by Leonardo Carvalho - CarvalhoLeonardo
 Written in 2015 by Anton Akhiar - akhiar
-Written in 2015-2016 by Jens Hardings - jenshp
+Written in 2015-2023 by Jens Hardings - jenshp
 Written in 2016 by Shifeng Zhang - zhangshifeng
 Written in 2016 by Scott Gray - lektran
 Written in 2016 by Mark Haney - mphaney
 Written in 2016 by Qiushi Yan - yanqiushi
 Written in 2017 by Oleg Andrieiev - oandreyev
 Written in 2018 by Zhang Wei - zhangwei1979
 Written in 2018 by Nirendra Singh - nirendra10695
-Written in 2018-2020 by Ayman Abi Abdallah - aabiabdallah
+Written in 2018-2023 by Ayman Abi Abdallah - aabiabdallah
 Written in 2019 by Daniel Taylor - danieltaylor-nz
 Written in 2020 by Jacob Barnes - Tellan
 Written in 2020 by Amir Anjomshoaa - amiranjom
 Written in 2021 by Deepak Dixit - dixitdeepak
 Written in 2021 by Taher Alkhateeb - pythys
+Written in 2022 by Zhang Wei - hellozhangwei
+Written in 2023 by Rohit Pawar - rohitpawar2811
 
 ===========================================================================

addons.xml

@@ -47,10 +47,12 @@
     <!-- no longer supported: <component name="moqui-elasticsearch" group="moqui" version="1.2.2" branch="master"/> -->
     <component name="moqui-fop" group="moqui" version="1.1.3" branch="master"/>
     <component name="moqui-hazelcast" group="moqui" version="1.1.3" branch="master"/>
+    <component name="moqui-image" group="moqui" version="" branch="master"/><!-- no releases yet -->
     <component name="moqui-kie" group="moqui" version="1.0.4" branch="master"/>
     <component name="moqui-orientdb" group="moqui" version="1.0.4" branch="master"/>
     <component name="moqui-poi" group="moqui" version="1.0.1" branch="master"/>
     <component name="moqui-sftp" group="moqui" version="1.0.1" branch="master"/>
+    <component name="moqui-sso" group="moqui" version="1.0.1" branch="master"/>
     <component name="moqui-wikitext" group="moqui" version="1.0.3" branch="master"/>
 
     <component name="moqui-atomikos" group="moqui" version="1.0.0" branch="master"/><!-- not actively maintained -->
@@ -77,7 +79,10 @@
     <component name="PopCommerce" group="moqui" version="2.2.0" branch="master"/>
     <component name="MarbleERP" group="moqui" version="1.0.0" branch="master"/>
     <component name="PopRestStore" group="moqui" version="1.1.0" branch="master"/>
+    <component name="WeCreate" group="moqui" version="" branch="master"/><!-- no releases yet -->
+    <!-- Moqui Web and Demo Sites -->
     <component name="moqui-org" group="moqui" version="" branch="master"/><!-- no releases -->
+    <component name="moqui-demo" group="moqui" version="" branch="master"/><!-- no releases -->
 
     <!-- Third Party Components -->
     <component name="moqui-captcha" group="shendepu" version="" branch="master"/><!-- no releases -->
@@ -90,6 +95,8 @@
     <component name="moqui-easyexcel" group="chunlinyao" version="" branch="master"/><!-- no releases -->
     <component name="OFBizToMantle" group="jonesde" version="" branch="master"/><!-- no releases -->
     <component name="ServiceJobMonitor" group="tailorsoft" version="" branch="master"/><!-- no releases -->
+    <component name="Sales" group="xolvegroup" version="" branch="main"/><!-- no releases -->
+    <component name="WorkManagement" group="xolvegroup" version="" branch="main"/><!-- no releases -->
 
     <!-- Component Sets -->
     <!-- NOTE: using these component sets is NOT recommended, with so many components doing
@@ -100,7 +107,7 @@
     <component-set name="apps" components="HiveMind,PopCommerce,PopRestStore,MarbleERP"/>
     <component-set name="ecosystem" sets="framework,mantle,apps"/>
 
-    <component-set name="demo" components="example,HiveMind,PopCommerce,PopRestStore,MarbleERP"/>
+    <component-set name="demo" components="moqui-poi,moqui-demo,example,HiveMind,PopCommerce,PopRestStore,MarbleERP"/>
     <component-set name="popc" components="PopCommerce,PopRestStore"/>
 
     <!-- Release builds:

build.gradle

@@ -75,8 +75,9 @@ task cleanDb { doLast {
 } }
 task cleanLog(type: Delete) { delete fileTree(dir: moquiRuntime+'/log', include: '*') }
 task cleanSessions(type: Delete) { delete fileTree(dir: moquiRuntime+'/sessions', include: '*') }
-task cleanLoadSave(type: Delete) { delete file('SaveH2.zip'); delete file('SaveDEFAULT.zip');
-    delete file('SaveTransactional.zip'); delete file('SaveAnalytical.zip'); delete file('SaveOrientDb.zip'); delete file('SaveElasticSearch.zip') }
+task cleanLoadSave(type: Delete) { delete file('SaveH2.zip'); delete file('SaveDEFAULT.zip')
+    delete file('SaveTransactional.zip'); delete file('SaveAnalytical.zip'); delete file('SaveOrientDb.zip')
+    delete file('SaveElasticSearch.zip'); delete file('SaveOpenSearch.zip') }
 task cleanPlusRuntime(type: Delete) { delete file(plusRuntimeName) }
 task cleanOther(type: Delete) { delete fileTree(dir: '.', includes: ['**/.nbattrs', '**/*~', '**/.#*', '**/.DS_Store', '**/*.rej', '**/*.orig']) }
 
@@ -416,13 +417,26 @@ task gitStatusAll {
             def curGrgit = Grgit.open(dir: gitDir)
             logger.lifecycle("\nGit status for ${gitDir} (branch:${curGrgit.branch.current()?.name}, tracking:${curGrgit.branch.current()?.trackingBranch?.name})")
 
-            if (curGrgit.remote.list().find({ it.name == 'upstream'})) {
-                def upstreamAhead = curGrgit.log { range curGrgit.resolve.toCommit('refs/remotes/upstream/master'), curGrgit.resolve.toCommit('refs/remotes/origin/master') }
-                if (upstreamAhead) logger.lifecycle("- origin/master ${upstreamAhead.size()} commits ahead of upstream/master")
+            try {
+                if (curGrgit.remote.list().find({ it.name == 'upstream'})) {
+                    def upstreamAhead = curGrgit.log { range curGrgit.resolve.toCommit('refs/remotes/upstream/master'), curGrgit.resolve.toCommit('refs/remotes/origin/master') }
+                    if (upstreamAhead) logger.lifecycle("- origin/master ${upstreamAhead.size()} commits ahead of upstream/master")
+                }
+            } catch (Exception e) {
+                logger.error("Error finding commits ahead of upstream", e)
+            }
+            try {
+                def masterLatest = curGrgit.resolve.toCommit('refs/remotes/origin/master')
+                if (masterLatest == null) {
+                    logger.error("No origin/master branch exists, can't determine unpushed commits")
+                } else {
+                    def unpushed = curGrgit.log { range masterLatest, curGrgit.resolve.toCommit('HEAD') }
+                    if (unpushed) logger.lifecycle("--- ${unpushed.size()} commits unpushed (ahead of origin/master)")
+                    for (Commit commit in unpushed) logger.lifecycle(" - ${commit.getAbbreviatedId(8)} - ${commit.shortMessage}")
+                }
+            } catch (Exception e) {
+                logger.error("Error finding unpushed commits", e)
             }
-            def unpushed = curGrgit.log { range curGrgit.resolve.toCommit('refs/remotes/origin/master'), curGrgit.resolve.toCommit('HEAD') }
-            if (unpushed) logger.lifecycle("--- ${unpushed.size()} commits unpushed (ahead of origin/master)")
-            for (Commit commit in unpushed) logger.lifecycle(" - ${commit.getAbbreviatedId(8)} - ${commit.shortMessage}")
             def curStatus = curGrgit.status()
             if (curStatus.isClean()) logger.lifecycle("* nothing to commit, working directory clean")
             if (curStatus.staged.added || curStatus.staged.modified || curStatus.staged.removed) logger.lifecycle("--- Changes to be committed::")

framework/build.gradle

@@ -12,7 +12,7 @@
  * <http://creativecommons.org/publicdomain/zero/1.0/>.
  */
 
-version = '3.1.0-rc1'
+version = '3.1.0-rc2'
 
 apply plugin: 'java-library'
 apply plugin: 'groovy'
@@ -27,7 +27,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.45.0'
+        classpath 'com.github.ben-manes:gradle-versions-plugin:0.50.0'
         // uncomment to add the Error Prone compiler: classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.0.8'
     }
 }
@@ -68,17 +68,17 @@ tasks.withType(GroovyCompile) { options.compilerArgs << "-proc:none" }
 // NOTE: for dependency types and 'api' definition see: https://docs.gradle.org/current/userguide/java_library_plugin.html
 dependencies {
     // Groovy
-    // NOTE: Groovy 3.0.10-3.0.12 has a bug that somehow causes EntityDefinition.isViewEntity (public final boolean) to switch
+    // NOTE: Groovy 3.0.10-3.0.18 has a bug that somehow causes EntityDefinition.isViewEntity (public final boolean) to switch
     //     from true during constructor to false later on; see EntityFindBuilder.java:112-114 and EntityDefinition.groovy:50-53,94-95;
     //     for now using Boolean instead of boolean to resolve, but staying at 3.0.9 to avoid risk with other code
-    api 'org.codehaus.groovy:groovy:3.0.9' // Apache 2.0
-    api 'org.codehaus.groovy:groovy-dateutil:3.0.9' // Apache 2.0
-    api 'org.codehaus.groovy:groovy-groovysh:3.0.9' // Apache 2.0
+    api 'org.codehaus.groovy:groovy:3.0.19' // Apache 2.0
+    api 'org.codehaus.groovy:groovy-dateutil:3.0.19' // Apache 2.0
+    api 'org.codehaus.groovy:groovy-groovysh:3.0.19' // Apache 2.0
     // jline, an older version, is required by groovy-groovysh but not in its dependencies
     implementation 'jline:jline:2.14.6' // BSD
-    api 'org.codehaus.groovy:groovy-json:3.0.9' // Apache 2.0
-    api 'org.codehaus.groovy:groovy-templates:3.0.9' // Apache 2.0
-    api 'org.codehaus.groovy:groovy-xml:3.0.9' // Apache 2.0
+    api 'org.codehaus.groovy:groovy-json:3.0.19' // Apache 2.0
+    api 'org.codehaus.groovy:groovy-templates:3.0.19' // Apache 2.0
+    api 'org.codehaus.groovy:groovy-xml:3.0.19' // Apache 2.0
     // jansi is needed for groovydoc only, so in compileOnly (not included in war) - don't update to version 2, keep at version 1 for compatibility
     compileOnly 'org.fusesource.jansi:jansi:1.18'
     // Findbugs need only during compile (used by freemarker and various moqui classes)
@@ -93,33 +93,33 @@ dependencies {
     // ========== General Libraries from Maven Central ==========
 
     // Apache Commons
-    api 'org.apache.commons:commons-csv:1.9.0' // Apache 2.0
+    api 'org.apache.commons:commons-csv:1.10.0' // Apache 2.0
     // NOTE: commons-email depends on com.sun.mail:javax.mail, included below, so use module() here to not get dependencies
     api module('org.apache.commons:commons-email:1.5') // Apache 2.0
-    api 'org.apache.commons:commons-lang3:3.12.0' // Apache 2.0; used by cron-utils
+    api 'org.apache.commons:commons-lang3:3.14.0' // Apache 2.0; used by cron-utils
     api 'commons-beanutils:commons-beanutils:1.9.4' // Apache 2.0
-    api 'commons-codec:commons-codec:1.15' // Apache 2.0
+    api 'commons-codec:commons-codec:1.16.0' // Apache 2.0
     api 'commons-collections:commons-collections:3.2.2' // Apache 2.0
     api 'commons-digester:commons-digester:2.1' // Apache 2.0
-    api 'commons-fileupload:commons-fileupload:1.4' // Apache 2.0
-    api 'commons-io:commons-io:2.11.0' // Apache 2.0
-    api 'commons-logging:commons-logging:1.2' // Apache 2.0
-    api 'commons-validator:commons-validator:1.7' // Apache 2.0
+    api 'commons-fileupload:commons-fileupload:1.5' // Apache 2.0
+    api 'commons-io:commons-io:2.15.1' // Apache 2.0
+    api 'commons-logging:commons-logging:1.3.0' // Apache 2.0
+    api 'commons-validator:commons-validator:1.8.0' // Apache 2.0
 
     // Cron Utils
-    api 'com.cronutils:cron-utils:9.2.0' // Apache 2.0
+    api 'com.cronutils:cron-utils:9.2.1' // Apache 2.0
 
     // Flexmark (markdown)
-    api 'com.vladsch.flexmark:flexmark:0.64.0'
-    api 'com.vladsch.flexmark:flexmark-ext-tables:0.64.0'
-    api 'com.vladsch.flexmark:flexmark-ext-toc:0.64.0'
+    api 'com.vladsch.flexmark:flexmark:0.64.8'
+    api 'com.vladsch.flexmark:flexmark-ext-tables:0.64.8'
+    api 'com.vladsch.flexmark:flexmark-ext-toc:0.64.8'
 
     // Freemarker
     // Remember to change the version number in FtlTemplateRenderer and MNode class when upgrading
     api 'org.freemarker:freemarker:2.3.32' // Apache 2.0
 
     // H2 Database
-    api 'com.h2database:h2:2.1.214' // MPL 2.0, EPL 1.0
+    api 'com.h2database:h2:2.2.224' // MPL 2.0, EPL 1.0
 
     // Java Specifications
     api 'javax.transaction:jta:1.1'
@@ -144,38 +144,38 @@ dependencies {
     api 'com.beust:jcommander:1.82'
 
     // Jackson Databind (JSON, etc)
-    api 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
+    api 'com.fasterxml.jackson.core:jackson-databind:2.16.0'
 
     // Jetty HTTP Client and Proxy Servlet
-    api 'org.eclipse.jetty:jetty-client:10.0.13' // Apache 2.0
-    api 'org.eclipse.jetty:jetty-proxy:10.0.13' // Apache 2.0
+    api 'org.eclipse.jetty:jetty-client:10.0.18' // Apache 2.0
+    api 'org.eclipse.jetty:jetty-proxy:10.0.18' // Apache 2.0
 
     // javax.mail
     // NOTE: javax.mail depends on 'javax.activation:activation' which is the old package for 'javax.activation:javax.activation-api' used by jaxb-api
     api module('com.sun.mail:javax.mail:1.6.2') // CDDL
 
     // Joda Time (used by elasticsearch, aws)
-    api 'joda-time:joda-time:2.12.2' // Apache 2.0
+    api 'joda-time:joda-time:2.12.5' // Apache 2.0
 
     // JSoup (HTML parser, cleaner)
-    api 'org.jsoup:jsoup:1.15.3' // MIT
+    api 'org.jsoup:jsoup:1.17.1' // MIT
 
     // Apache Shiro
-    api module('org.apache.shiro:shiro-core:1.11.0') // Apache 2.0
-    api module('org.apache.shiro:shiro-web:1.11.0') // Apache 2.0
+    api module('org.apache.shiro:shiro-core:1.13.0') // Apache 2.0
+    api module('org.apache.shiro:shiro-web:1.13.0') // Apache 2.0
 
     // SLF4J, Log4j 2 (note Log4j 2 is used by various libraries, best not to replace it even if mostly possible with SLF4J)
-    api 'org.slf4j:slf4j-api:2.0.6'
-    implementation 'org.apache.logging.log4j:log4j-core:2.19.0'
-    implementation 'org.apache.logging.log4j:log4j-api:2.19.0'
-    runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.19.0'
-    runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl:2.19.0'
+    api 'org.slf4j:slf4j-api:2.0.9'
+    implementation 'org.apache.logging.log4j:log4j-core:2.22.0'
+    implementation 'org.apache.logging.log4j:log4j-api:2.22.0'
+    runtimeOnly 'org.apache.logging.log4j:log4j-jcl:2.22.0'
+    runtimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl:2.22.0'
 
     // SubEtha SMTP (module as depends on old javax.mail location; also uses SLF4J, activation included elsewhere)
     api module('org.subethamail:subethasmtp:3.1.7')
 
     // Snake YAML
-    api 'org.yaml:snakeyaml:1.33' // Apache 2.0
+    api 'org.yaml:snakeyaml:2.2' // Apache 2.0
 
     // Apache Jackrabbit - uncomment here or include elsewhere when Jackrabbit repository configurations are used
     // api 'org.apache.jackrabbit:jackrabbit-jcr-rmi:2.12.1' // Apache 2.0
@@ -190,11 +190,11 @@ dependencies {
     // ========== test dependencies ==========
 
     // junit-platform-launcher is a dependency from spock-core, included explicitly to get more recent version as needed
-    testImplementation 'org.junit.platform:junit-platform-launcher:1.9.2'
+    testImplementation 'org.junit.platform:junit-platform-launcher:1.10.1'
     // junit-platform-suite required for test suites to specify test class order, etc
-    testImplementation 'org.junit.platform:junit-platform-suite:1.9.2'
+    testImplementation 'org.junit.platform:junit-platform-suite:1.10.1'
     // junit-jupiter-api for using JUnit directly, not generally needed for Spock based tests
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
     // Spock Framework
     testImplementation platform("org.spockframework:spock-bom:2.1-groovy-3.0") // Apache 2.0
     testImplementation 'org.spockframework:spock-core:2.1-groovy-3.0' // Apache 2.0
@@ -203,16 +203,16 @@ dependencies {
 
     // ========== executable war dependencies ==========
     // Jetty
-    execWarRuntimeOnly 'org.eclipse.jetty:jetty-server:10.0.13' // Apache 2.0
-    execWarRuntimeOnly 'org.eclipse.jetty:jetty-webapp:10.0.13' // Apache 2.0
-    execWarRuntimeOnly 'org.eclipse.jetty:jetty-jndi:10.0.13' // Apache 2.0
-    execWarRuntimeOnly 'org.eclipse.jetty.websocket:websocket-javax-server:10.0.13' // Apache 2.0
-    execWarRuntimeOnly ('org.eclipse.jetty.websocket:websocket-javax-client:10.0.13') { // Apache 2.0
+    execWarRuntimeOnly 'org.eclipse.jetty:jetty-server:10.0.18' // Apache 2.0
+    execWarRuntimeOnly 'org.eclipse.jetty:jetty-webapp:10.0.18' // Apache 2.0
+    execWarRuntimeOnly 'org.eclipse.jetty:jetty-jndi:10.0.18' // Apache 2.0
+    execWarRuntimeOnly 'org.eclipse.jetty.websocket:websocket-javax-server:10.0.18' // Apache 2.0
+    execWarRuntimeOnly ('org.eclipse.jetty.websocket:websocket-javax-client:10.0.18') { // Apache 2.0
         exclude group: 'javax.websocket' } // we have the full websocket API, including the client one causes problems
     execWarRuntimeOnly 'javax.websocket:javax.websocket-api:1.1'
-    execWarRuntimeOnly ('org.eclipse.jetty.websocket:websocket-jetty-server:10.0.13') // Apache 2.0
+    execWarRuntimeOnly ('org.eclipse.jetty.websocket:websocket-jetty-server:10.0.18') // Apache 2.0
     // only include this if using Endpoint and MessageHandler annotations:
-    // execWarRuntime ('org.eclipse.jetty:jetty-annotations:10.0.13') // Apache 2.0
+    // execWarRuntime ('org.eclipse.jetty:jetty-annotations:10.0.18') // Apache 2.0
     execWarRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j18-impl:2.18.0'
 }
 

framework/data/EntityTypeData.xml

@@ -26,6 +26,9 @@ along with this software (see the LICENSE.md file). If not, see
     <moqui.basic.Enumeration description="not-between" enumCode="NOT_BETWEEN" enumId="ENTCO_NOT_BETWEEN" enumTypeId="ComparisonOperator"/>
     <moqui.basic.Enumeration description="like" enumCode="LIKE" enumId="ENTCO_LIKE" enumTypeId="ComparisonOperator"/>
     <moqui.basic.Enumeration description="not-like" enumCode="NOT_LIKE" enumId="ENTCO_NOT_LIKE" enumTypeId="ComparisonOperator"/>
+    <moqui.basic.Enumeration description="begins-field" enumCode="BEGINS_FIELD" enumId="ENTCO_BEGINS_FIELD" enumTypeId="ComparisonOperator"/>
+    <moqui.basic.Enumeration description="ends-field" enumCode="ENDS_FIELD" enumId="ENTCO_ENDS_FIELD" enumTypeId="ComparisonOperator"/>
+    <moqui.basic.Enumeration description="contains-field" enumCode="CONTAINS_FIELD" enumId="ENTCO_CONTAINS_FIELD" enumTypeId="ComparisonOperator"/>
     <moqui.basic.Enumeration description="is-null" enumCode="IS_NULL" enumId="ENTCO_IS_NULL" enumTypeId="ComparisonOperator"/>
     <moqui.basic.Enumeration description="is-not-null" enumCode="IS_NOT_NULL" enumId="ENTCO_IS_NOT_NULL" enumTypeId="ComparisonOperator"/>
 </entity-facade-xml>