gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-08 20:46:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2025-02-06 16:37:43 +01:00
commit c620ec8f15
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build.xml
View File

@ -16,7 +16,7 @@
<propertyregex property="shortversion" subject="${version} kk" pattern="([56])\.([0-9]).*" replace="seeddms$1$2x" override="true"/> <propertyregex property="shortversion" subject="${version} kk" pattern="([56])\.([0-9]).*" replace="seeddms$1$2x" override="true"/>
<property name="majorversion" value="${version}" /> <property name="majorversion" value="${version}" />
<propertyregex property="majorversion" subject="${version}" pattern="([56])\..*" replace="$1" override="true"/> <propertyregex property="majorversion" subject="${version}" pattern="([56])\..*" replace="$1" override="true"/>
<property name="composer_version" value="2.2.22" /> <property name="composer_version" value="2.8.5" />
<property name="composer_extra_params" value="" /> <property name="composer_extra_params" value="" />
<property name="composer_env" value="" /> <property name="composer_env" value="" />
<property name="mink_driver" value="chrome" /> <property name="mink_driver" value="chrome" />
@ -73,8 +73,13 @@
<then> <then>
<httpget url="https://getcomposer.org/composer-2.phar" sslVerifyPeer="false" dir="${srcdir}" filename="composer.phar" /> <httpget url="https://getcomposer.org/composer-2.phar" sslVerifyPeer="false" dir="${srcdir}" filename="composer.phar" />
</then> </then>
<else> <else>
<httpget url="https://getcomposer.org/download/${composer_version}/composer.phar" sslVerifyPeer="false" dir="${srcdir}" /> <if>
<not><available file="composer.phar" /></not>
<then>
<httpget url="https://getcomposer.org/download/${composer_version}/composer.phar" sslVerifyPeer="false" dir="${srcdir}" />
</then>
</if>
</else> </else>
</if> </if>
<echo message="Installing dependencies..." /> <echo message="Installing dependencies..." />

5
composer-dist.json
View File

@ -6,20 +6,21 @@
}, },
"require": { "require": {
"robthree/twofactorauth": "^1.5", "robthree/twofactorauth": "^1.5",
"sabre/dav": "^4.",
"sabre/xml": "*",
"slim/slim": "^4.0", "slim/slim": "^4.0",
"guzzlehttp/psr7": "*", "guzzlehttp/psr7": "*",
"erusev/parsedown": "*", "erusev/parsedown": "*",
"erusev/parsedown-extra": "*", "erusev/parsedown-extra": "*",
"mibe/feedwriter": "^1.1", "mibe/feedwriter": "^1.1",
"phpoffice/phpspreadsheet": "*", "phpoffice/phpspreadsheet": "*",
"sabre/xml": "*",
"sabre/dav": "^4.",
"pear/log": "*", "pear/log": "*",
"pear/mail": "*", "pear/mail": "*",
"pear/mail_mime": "*", "pear/mail_mime": "*",
"pear/net_smtp": "*", "pear/net_smtp": "*",
"pear/auth_sasl": "*", "pear/auth_sasl": "*",
"pear/db": "*", "pear/db": "*",
"dragonmantank/cron-expression": "^3.1",
"alecrabbit/php-console-colour": "*", "alecrabbit/php-console-colour": "*",
"dragonmantank/cron-expression": "^3", "dragonmantank/cron-expression": "^3",
"zf1/zend-search-lucene": "*", "zf1/zend-search-lucene": "*",