Skip to content

Commit

Permalink
Change license identifier to BSD-2-Clause and make composer.json file…
Browse files Browse the repository at this point in the history
… compliant with recent composer.
  • Loading branch information
ralflang committed Jan 12, 2024
1 parent dc49cf2 commit c62b807
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .horde.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ state:
release: alpha
api: alpha
license:
identifier: BSD
identifier: BSD-2-Clause
uri: http://www.horde.org/licenses/bsd
dependencies:
required:
php: ^7
php: ^7 || ^8
composer:
horde/horde: ^6
optional:
Expand Down
25 changes: 13 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,24 @@
{
"minimum-stability": "dev",
"name": "horde/vilma",
"description": "Domain and user administration application",
"type": "horde-application",
"homepage": "https://www.horde.org",
"license": "BSD",
"license": "BSD-2-Clause",
"authors": [
{
"name": "Jan Schneider",
"email": "[email protected]",
"role": "lead"
}
],
"time": "2021-03-15",
"repositories": [
{
"type": "composer",
"url": "https://horde-satis.maintaina.com/"
}
],
"time": "2024-01-12",
"repositories": [],
"require": {
"horde/horde-installer-plugin": "dev-FRAMEWORK_6_0 || '*'",
"php": "^7",
"horde/horde-installer-plugin": "dev-FRAMEWORK_6_0 || ^2",
"php": "^7 || ^8",
"horde/horde": "^6 || dev-FRAMEWORK_6_0"
},
"require-dev": {},
"suggest": {
"horde/test": "^3 || dev-FRAMEWORK_6_0"
},
Expand All @@ -32,7 +27,13 @@
"Vilma": "lib/"
}
},
"autoload-dev": {},
"bin": [
"bin/vilma-create-mailboxes"
]
],
"config": {
"allow-plugins": {
"horde/horde-installer-plugin": true
}
}
}
5 changes: 3 additions & 2 deletions doc/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
license:
identifier: BSD
uri: http://www.horde.org/licenses/bsd
notes: |+
notes: |
[rla] Change license identifier from 'BSD' to BSD-2-Clause to make SPDX compatible and to align with the actually shipped license file.
|+
1.0.0alpha1:
api: 1.0.0
state:
Expand Down

0 comments on commit c62b807

Please sign in to comment.