need to call our version different from ADOdb ones, just no v-prefix is not enough

This commit is contained in:
ralf 2024-09-08 16:56:19 +02:00
parent b55c7aa90a
commit 9c841fe2a8
2 changed files with 9 additions and 9 deletions

View File

@ -79,7 +79,7 @@
"bower-asset/jquery": "^1.12.4", "bower-asset/jquery": "^1.12.4",
"defuse/php-encryption": "^2.4", "defuse/php-encryption": "^2.4",
"egroupware/activesync": "self.version", "egroupware/activesync": "self.version",
"egroupware/adodb-php": "^5.22.7", "egroupware/adodb-php": "^5.22.7.1",
"egroupware/bookmarks": "self.version", "egroupware/bookmarks": "self.version",
"egroupware/collabora": "self.version", "egroupware/collabora": "self.version",
"egroupware/compress": "^2.3.0", "egroupware/compress": "^2.3.0",

16
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "4a3b52762bd5073ae132b5d2aee74b30", "content-hash": "7761c13b4a34ffe5aba0b720102ea4f8",
"packages": [ "packages": [
{ {
"name": "adldap2/adldap2", "name": "adldap2/adldap2",
@ -879,23 +879,23 @@
}, },
{ {
"name": "egroupware/adodb-php", "name": "egroupware/adodb-php",
"version": "v5.22.7", "version": "5.22.7.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/EGroupware/ADOdb.git", "url": "https://github.com/EGroupware/ADOdb.git",
"reference": "e7150539d5707ae556172532e2b25ac4e88cb2a6" "reference": "5b4848ff23ae949b507a47527b54bab52f739c95"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/EGroupware/ADOdb/zipball/e7150539d5707ae556172532e2b25ac4e88cb2a6", "url": "https://api.github.com/repos/EGroupware/ADOdb/zipball/5b4848ff23ae949b507a47527b54bab52f739c95",
"reference": "e7150539d5707ae556172532e2b25ac4e88cb2a6", "reference": "5b4848ff23ae949b507a47527b54bab52f739c95",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.0 || ^8.0" "php": "^7.4 || ^8.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^8.5" "phpunit/phpunit": "^9.5"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -936,7 +936,7 @@
"issues": "https://github.com/ADOdb/ADOdb/issues", "issues": "https://github.com/ADOdb/ADOdb/issues",
"source": "https://github.com/ADOdb/ADOdb" "source": "https://github.com/ADOdb/ADOdb"
}, },
"time": "2023-11-04T22:25:49+00:00" "time": "2024-09-08T14:39:14+00:00"
}, },
{ {
"name": "egroupware/bookmarks", "name": "egroupware/bookmarks",