Skip to content

Commit 564ec93

Browse files
acetouskacetousk
committed
Update addons with pre moqui 4.0 release version tags, and fix for no versions
1 parent 6136030 commit 564ec93

2 files changed

Lines changed: 24 additions & 21 deletions

File tree

‎addons.xml‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,52 +35,53 @@
3535
</repository>
3636

3737
<!-- Where to get runtime directory if not present -->
38-
<runtime name="moqui-runtime" group="moqui" version="3.0.0" branch="master"/>
38+
<runtime name="moqui-runtime" group="moqui" version="3.9.9" branch="master"/>
3939

4040
<!-- Example Component -->
41-
<component name="example" group="moqui" version="3.0.0" branch="master"/>
42-
<component name="start" group="moqui" version="1.0.0" branch="master"/>
41+
<component name="example" group="moqui" version="3.9.9" branch="master"/>
42+
<component name="start" group="moqui" version="1.0.1" branch="master"/>
4343

4444
<!-- Moqui Tool Components -->
45-
<component name="moqui-aws" group="moqui" version="1.1.0" branch="master"/>
46-
<component name="moqui-camel" group="moqui" version="1.0.4" branch="master"/>
47-
<component name="moqui-cups" group="moqui" version="1.0.0" branch="master"/>
45+
<component name="moqui-aws" group="moqui" version="1.1.1" branch="master"/>
46+
<component name="moqui-camel" group="moqui" version="1.9.9" branch="master"/>
47+
<component name="moqui-cups" group="moqui" version="1.0.1" branch="master"/>
4848
<!-- no longer supported: <component name="moqui-elasticsearch" group="moqui" version="1.2.2" branch="master"/> -->
49-
<component name="moqui-fop" group="moqui" version="1.1.3" branch="master"/>
50-
<component name="moqui-hazelcast" group="moqui" version="1.1.3" branch="master"/>
51-
<component name="moqui-image" group="moqui" version="" branch="master"/><!-- no releases yet -->
52-
<component name="moqui-kie" group="moqui" version="1.0.4" branch="master"/>
53-
<component name="moqui-orientdb" group="moqui" version="1.0.4" branch="master"/>
54-
<component name="moqui-poi" group="moqui" version="1.0.1" branch="master"/>
55-
<component name="moqui-sftp" group="moqui" version="1.0.1" branch="master"/>
56-
<component name="moqui-sso" group="moqui" version="1.0.1" branch="master"/>
57-
<component name="moqui-wikitext" group="moqui" version="1.0.3" branch="master"/>
49+
<component name="moqui-fop" group="moqui" version="1.9.9" branch="master"/>
50+
<component name="moqui-hazelcast" group="moqui" version="1.9.9" branch="master"/>
51+
<component name="moqui-image" group="moqui" version="1.0.0" branch="master"/><!-- no releases yet -->
52+
<component name="moqui-kie" group="moqui" version="1.9.9" branch="master"/>
53+
<component name="moqui-orientdb" group="moqui" version="1.9.9" branch="master"/>
54+
<component name="moqui-poi" group="moqui" version="1.0.2" branch="master"/>
55+
<component name="moqui-sftp" group="moqui" version="1.0.2" branch="master"/>
56+
<component name="moqui-sso" group="moqui" version="1.9.9" branch="master"/>
57+
<component name="moqui-wikitext" group="moqui" version="1.0.4" branch="master"/>
5858

5959
<component name="moqui-atomikos" group="moqui" version="1.0.0" branch="master"/><!-- not actively maintained -->
6060

6161
<!-- Mantle Business Artifact and Integration Components -->
6262
<component name="mantle-udm" group="moqui" version="2.2.0" branch="master"/>
63-
<component name="mantle-usl" group="moqui" version="2.2.0" branch="master"/>
63+
<component name="mantle-usl" group="moqui" version="2.9.9" branch="master"/>
6464

6565
<component name="AuthorizeDotNet" group="moqui" version="1.2.4" branch="master"/>
6666
<component name="mantle-edi" group="moqui" version="1.1.4" branch="master"/>
6767
<component name="mantle-paytrace" group="moqui" version="1.0.2" branch="master"/>
6868
<component name="mantle-shippo" group="moqui" version="1.2.0" branch="master"/>
6969
<component name="mantle-yotpo" group="moqui" version="1.0.1" branch="master"/>
7070

71-
<component name="mantle-braintree" group="moqui" version="" branch="master"/><!-- no releases yet -->
71+
<component name="mantle-braintree" group="moqui" version="1.9.9" branch="master"/><!-- no releases yet -->
7272
<component name="mantle-rsis" group="moqui" version="" branch="master"/><!-- no releases yet -->
7373

7474
<component name="mantle-oagis" group="moqui" version="" branch="master"/><!-- no releases yet -->
7575
<component name="mantle-ubpl" group="moqui" version="" branch="master"/><!-- no releases -->
7676

7777
<!-- Moqui Applications -->
78-
<component name="SimpleScreens" group="moqui" version="2.2.0" branch="master"/>
79-
<component name="HiveMind" group="moqui" version="1.5.0" branch="master"/>
80-
<component name="PopCommerce" group="moqui" version="2.2.0" branch="master"/>
78+
<component name="SimpleScreens" group="moqui" version="2.2.1" branch="master"/>
79+
<component name="HiveMind" group="moqui" version="1.5.1" branch="master"/>
80+
<component name="PopCommerce" group="moqui" version="2.2.1" branch="master"/>
8181
<component name="MarbleERP" group="moqui" version="1.0.0" branch="master"/>
82-
<component name="PopRestStore" group="moqui" version="1.1.0" branch="master"/>
82+
<component name="PopRestStore" group="moqui" version="1.1.1" branch="master"/>
8383
<component name="WeCreate" group="moqui" version="" branch="master"/><!-- no releases yet -->
84+
<component name="moqui-mjml" group="moqui" version="" branch="master"/><!-- no releases yet -->
8485
<!-- Moqui Web and Demo Sites -->
8586
<component name="moqui-org" group="moqui" version="" branch="master"/><!-- no releases -->
8687
<component name="moqui-demo" group="moqui" version="" branch="master"/><!-- no releases -->

‎build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,6 +1174,8 @@ File getComponent(String compName, String type, Node addons, Node myaddons, Set
11741174
File downloadComponent(String targetDirPath, String type, Node component, Node addons, Node myaddons) {
11751175
String compName = component.'@name'
11761176
String branch = component.'@branch'
1177+
// fall back to 'current' (branch-based) if release/binary requested but version is empty
1178+
if (type in ['release', 'binary'] && !component.'@version') type = 'current'
11771179

11781180
String repositoryName = (component.'@repository' ?: myaddons?.'@default-repository' ?: addons.'@default-repository' ?: 'github')
11791181
Node repository = myaddons != null ? (Node) myaddons.repository.find({ it."@name" == repositoryName }) : null

0 commit comments

Comments
 (0)