Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
58c21fd
Added missing package name in entity relationship
dixitdeepak Feb 2, 2023
a152cf6
Merge pull request #567 from dixitdeepak/entity-package-fix
jonesde Feb 2, 2023
24f1c22
Add StatusFlowTransitionFromAndTo view-entity
jonesde Feb 3, 2023
5cb8247
In ServiceFacadeImpl add classes for Service LoadRunner, used for loa…
jonesde Feb 4, 2023
63b510d
In Service LoadRunner add stats broken down by artifact type with det…
jonesde Feb 4, 2023
f747175
Service LoadRunner improved stats gathering with time bin based stats…
jonesde Feb 5, 2023
d850f11
In Service LoadRunner add small random delay support, use available t…
jonesde Feb 6, 2023
3775dbe
In build.gradle also delete the SaveOpenSearch.zip file in cleanLoadS…
jonesde Feb 6, 2023
74f4935
Fix PIT testing against ElasticSearch 7.10.2, the last open source ve…
jonesde Feb 6, 2023
1947553
Add new moqui-demo component repo to addons.xml
jonesde Feb 6, 2023
f8a51c2
Add getScreenPathHasTransition in ScreenRenderImpl
acetousk Feb 15, 2023
47f0015
In ElasticDatasourceFactory add better exceptions than NPE when no El…
jonesde Feb 19, 2023
1e75341
Increase default worker-pool-core to 16 threads, and max to 32 or CPU…
jonesde Feb 20, 2023
c994d1a
In ScreenRenderImpl remove token created requirement when checking fo…
aabiabdallah Feb 21, 2023
1c56a39
Merge pull request #574 from moqui/session-token-condition
jonesde Feb 22, 2023
cc4d9ef
Revert "Update to session token condition"
jonesde Feb 22, 2023
3eacb4a
Merge pull request #575 from moqui/revert-574-session-token-condition
jonesde Feb 22, 2023
a018a1e
Merge pull request #573 from resistmanagement/pwa
jonesde Feb 22, 2023
a6f5ee5
Fixed a runtime error if Currency is BTC (#555)
hellozhangwei Feb 22, 2023
4666aa6
Anonymous usage of screens with transitions (#541)
jenshp Feb 22, 2023
080a232
Small fix for new authz changes for anonymous-view/-all, handle no sc…
jonesde Feb 23, 2023
9fc0778
Handle usernames with different casing in session data
jenshp Feb 23, 2023
f14bd6c
Merge pull request #576 from moqui/usernameCasing
jonesde Mar 2, 2023
64d9224
Add common java includes to the xml actions ftl file
acetousk Mar 7, 2023
91ba9b7
Add subTopic field to NotificationMessage
jonesde Mar 7, 2023
3c40f0b
Merge pull request #577 from resistmanagement/xml-action-includes
jonesde Mar 7, 2023
e04b65f
Refactor getTitle to prioritize title() method call over data
acetousk Mar 13, 2023
8a9feba
Merge pull request #578 from resistmanagement/notification-title
jonesde Mar 14, 2023
3a3089a
In MoquiStart add support for webapp_session_cookie_max_age env var t…
jonesde Apr 11, 2023
c95e6a3
Merge branch 'master' of github.com:moqui/moqui-framework
jonesde Apr 11, 2023
1417b44
BugFix for DataFeed could not find backward relationship for DataDocu…
chunlinyao Apr 14, 2023
498b947
Add new WeCreate application component to addons.xml
jonesde Apr 27, 2023
a650649
Allow for properties to be marked "is-secret" so their values don't get
eigood May 8, 2023
9ec342e
Add weight microgram weight unit of measure.
eigood May 8, 2023
5686295
Merge pull request #581 from Brainfood-com/allow-any-property-to-be-s…
jonesde May 16, 2023
b2c8c78
Small change to new default-property.@is-secret attribute so that a f…
jonesde May 16, 2023
e2c794d
Merge pull request #582 from Brainfood-com/add-weight-microgram-uom
jonesde May 16, 2023
e8e881a
Fix regression with partitioned tables in PostgreSQL
chunlinyao May 23, 2023
bf4e68f
In ScreenRenderImpl add methods needed for section-include to support…
jonesde May 26, 2023
e9d158f
Add new moqui-image repo, fork of original work be acetousk
jonesde Jun 12, 2023
0a06a90
Add Sales app from xolvegroup (third party component)
jonesde Jun 13, 2023
9bd047b
Added support for loading data on start with entity_on_start_load_typ…
jonesde Jun 14, 2023
df07e4e
Merge pull request #585 from chunlinyao/fix-pgjdbc-regression-partiti…
jonesde Jul 24, 2023
d93b4ee
Add subscreensItem.menuInclude to menu data (#600)
Jul 26, 2023
86c3e0c
Docker-Image-Pull Feature (#553)
rohitpawar2811 Jul 26, 2023
fba8006
Library updates, including Jetty 10.0.13 to 10.015 which had reported…
jonesde Jul 26, 2023
e9e7a13
In ScreenRenderImpl change addFormFieldValue() and related methods to…
jonesde Jul 29, 2023
2e08c17
In root build.gradle change gitStatusAll task to be more tolerant of …
jonesde Aug 4, 2023
753e67f
Add text-area.@autogrow attribute, supported only in qvt for now
jonesde Sep 4, 2023
a619a06
Update various libraries including Groovy to 3.0.19 (which has some m…
jonesde Sep 5, 2023
aab56c9
In build.gradle gitStatusAll task also handle upstream remotes with n…
jonesde Sep 5, 2023
df5e4cc
Currency (#614)
jenshp Sep 12, 2023
7a8739b
Add and Handle Hmac Sha256 with timestamp
acetousk Oct 6, 2023
41970a7
Merge pull request #617 from coarchy/hmac-sha256-timestamp2
jonesde Oct 7, 2023
04b535b
A couple of minor bug fixes in the EntityAutoServiceRunner and Contex…
aabiabdallah Oct 13, 2023
648ae4d
Allow for 10 second threshold in nowTimestamp
acetousk Oct 17, 2023
2f7923e
Merge pull request #619 from moqui/allow-now-threshold
jonesde Oct 17, 2023
49ad11b
In L10nFacadeImpl.formatCurrency() use disableAuthz() for entity find…
jonesde Oct 17, 2023
432df20
In addons.xml, added new moqui-sso component.
aabiabdallah Oct 18, 2023
ef129ed
Merge pull request #620 from moqui/sso-component
jonesde Oct 18, 2023
d82db61
Add AutoCloseable extension to EntityListIterator for use with try wi…
jonesde Nov 15, 2023
746d85c
BugFix EntityListIterator not closed in NotificationMessageImpl#getNo…
chunlinyao Nov 29, 2023
e6135fa
Implemented withCloseable/try-with-resources where needed in the code…
dixitdeepak Nov 29, 2023
b4287f1
Change EntityDataWriterImpl to use groovy CompileStatic, without this…
jonesde Nov 29, 2023
d76763a
Add sentDate field to WikiBlogCategory entity
jonesde Dec 7, 2023
62b98b2
Library updates: Jetty to 10.0.18, Log4J to 2.22.0, H2 to 2.2.224, co…
jonesde Dec 19, 2023
22f3a16
create a service to unify login attempts
pythys Jan 8, 2024
a2fb0f4
Merge pull request #628 from pythys/user-vulnerability
jonesde Jan 10, 2024
f1f5f05
Follow up on PR #628: formatting changes only to reduce indentation a…
jonesde Jan 10, 2024
ba5fa64
Re-ordered Console Appender in log4j2.xml
AyanF Feb 7, 2024
5cd501f
Merge pull request #629 from AyanF/improved-log4j2-config
jonesde Feb 9, 2024
d750346
Add screen resource type for a footer script
acetousk Feb 16, 2024
f264e9e
Add xolvegroup/WorkManagement, corrected branch on xolvegroup/Sales i…
jonesde Feb 17, 2024
86dc2c9
Merge pull request #630 from moqui/footer-screen-resource
jonesde Feb 20, 2024
b9d8cf9
In addons.xml add moqui-demo and moqui-poi to demo component set
jonesde Feb 24, 2024
dd78edc
In EntityDbMeta fix issue with datasources that do not use JDBC, bulk…
jonesde Feb 24, 2024
1c69844
In ElasticFacadeImpl fix issue with index name prefixing and unprefix…
jonesde Feb 27, 2024
b06e04b
Basic reproduction of condition type with before, after, and contains…
acetousk Jul 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -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

===========================================================================

Expand Down Expand Up @@ -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

===========================================================================
9 changes: 8 additions & 1 deletion addons.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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 -->
Expand All @@ -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
Expand All @@ -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:
Expand Down
30 changes: 22 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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']) }

Expand Down Expand Up @@ -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::")
Expand Down
88 changes: 44 additions & 44 deletions framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
}
}
Expand Down Expand Up @@ -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)
Expand All @@ -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'
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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'
}

Expand Down
3 changes: 3 additions & 0 deletions framework/data/EntityTypeData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading