Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: re-add licenses by SPDX identifier, mark shorthand aliases as deprecated #1560

Merged
merged 8 commits into from
Jan 24, 2025

Conversation

edward-ly
Copy link
Collaborator

Resolves #1274.

Adds the SPDX identifiers for the currently supported licenses as valid enum values for the <licence> tag. Automatically converts apache, mit, and mpl to Apache-2.0, MIT, and MPL-2.0, respectively, when importing or creating a new app release. agpl and gpl3 are left alone for now as they are implicitly assumed to map to AGPL-3.0 and GPL-3.0, but those identifiers are also deprecated themselves.

Feel free to correct me if I'm wrong, but that was my interpretation based on the discussion so far.

Tasks for the app store admin (who I believe is @Altahrim?) after merging:

  • rebuild app store documentation
  • add the following rows to the Licenses table:
id name
AGPL-3.0-only GNU Affero General Public License v3.0 only
AGPL-3.0-or-later GNU Affero General Public License v3.0 or later
Apache-2.0 Apache License 2.0
GPL-3.0-only GNU General Public License v3.0 only
GPL-3.0-or-later GNU General Public License v3.0 or later
MIT MIT License
MPL-2.0 Mozilla Public License 2.0

@edward-ly edward-ly requested review from AndyScherzinger, bigcat88 and oleksandr-nc and removed request for bigcat88 January 7, 2025 23:27
@AndyScherzinger
Copy link
Member

Besides my comments this looks good to me, yet this can only be merged after the same PR has been merged on server v31.0.0, to ensure v31.0.0 (and later) won't break.

@oleksandr-nc
Copy link
Collaborator

oleksandr-nc commented Jan 8, 2025

Tasks for the app store admin (who I believe is @Altahrim?) after merging:

This will probably be done by me.

CI is expected to fail, it is broken due to invalid translations.

I have informed @nickvergessen about this situation, for now I will temporarily remove the translations from the repository (but they will be returned by the bot again soon)

Edited: CI should be fixed now, thanks to Joas!
nextcloud/docker-ci#702

docs/developer.rst Outdated Show resolved Hide resolved
AndyScherzinger added a commit to nextcloud/server that referenced this pull request Jan 8, 2025
…ecated.

matching the app store change at nextcloud/appstore#1560

Signed-off-by: Andy Scherzinger <[email protected]>
@edward-ly
Copy link
Collaborator Author

Andy's suggestions have now been applied. By the way, with the new license IDs, I've been thinking maybe we need to change the way the license is displayed in the server as well (e.g. here), but I'll leave it up to you whether anything needs to be done about it or not.

@AndyScherzinger
Copy link
Member

I've been thinking maybe we need to change the way the license is displayed in the server as well (e.g. here), but I'll leave it up to you whether anything needs to be done about it or not

I had a similar thought if we should just drop the "-licensed" in the rendering

Copy link
Collaborator

@oleksandr-nc oleksandr-nc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me

@AndyScherzinger
Copy link
Member

👍

@provokateurin
Copy link
Member

Btw can someone script PRs to update the license identifiers of all apps built by the company? If they were built after the OC split then we can safely assume that AGPL-3.0-or-later is meant. Alternatively if no direct change is possible due to ambiguity it would be nice to open an issue in each repo to warn about this.

@edward-ly edward-ly enabled auto-merge January 24, 2025 16:41
@edward-ly edward-ly merged commit 93686e7 into master Jan 24, 2025
9 checks passed
@edward-ly edward-ly deleted the feat/spdx-licenses branch January 24, 2025 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

More detailed licensing information
4 participants