From 8f4efc1ce714a7561e44ed315120b34ec24bf34a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 1 Oct 2024 11:22:17 +0200 Subject: [PATCH] build(reuse): Move license statements closer to the fragments Signed-off-by: Joas Schilling --- .github/dependabot.yml | 2 ++ .gitignore | 3 +++ .l10nignore | 2 ++ REUSE.toml | 10 ++-------- .../Integration/features/admin-notification-v2.feature | 2 ++ tests/Integration/features/cli-notification.feature | 2 ++ .../features/delete-notifications-v1.feature | 3 +++ .../features/delete-notifications-v2.feature | 2 ++ .../features/exists-notifications-v2.feature | 2 ++ .../features/notifications-content-v1.feature | 3 +++ .../features/notifications-content-v2.feature | 2 ++ tests/Integration/features/push-registration.feature | 2 ++ tests/Integration/features/statuscodes-v1.feature | 3 +++ tests/Integration/features/statuscodes-v2.feature | 2 ++ 14 files changed, 32 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 1bcde15c5..d19a4bbfb 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: CC0-1.0 version: 2 updates: - package-ecosystem: composer diff --git a/.gitignore b/.gitignore index 6ee905f31..91dd491dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: none +# SPDX-License-Identifier: CC0-1.0 + # just sane ignores .*.sw[po] *.bak diff --git a/.l10nignore b/.l10nignore index 0844b0dde..30d9f1d41 100644 --- a/.l10nignore +++ b/.l10nignore @@ -1,2 +1,4 @@ +# SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: CC0-1.0 # compiled vue templates js/ diff --git a/REUSE.toml b/REUSE.toml index d4ad08c09..c5dc368b9 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -36,19 +36,13 @@ SPDX-FileCopyrightText = "none" SPDX-License-Identifier = "CC0-1.0" [[annotations]] -path = ["docs", ".github/issue_template.md", ".github/contributing.md", "AUTHORS.md", "README.md"] +path = [".github/issue_template.md", ".github/contributing.md"] precedence = "aggregate" SPDX-FileCopyrightText = "2016 Nextcloud GmbH and Nextcloud contributors" SPDX-License-Identifier = "CC0-1.0" [[annotations]] -path = "tests/Integration/features/**.feature" -precedence = "aggregate" -SPDX-FileCopyrightText = "2016 Nextcloud GmbH and Nextcloud contributors" -SPDX-License-Identifier = "CC0-1.0" - -[[annotations]] -path = ["package.json", "package-lock.json", "**/package.json", "**/package-lock.json", "composer.json", "composer.lock", "**/composer.json", "**/composer.lock", ".gitignore", ".l10nignore", "psalm.xml", "tests/psalm-baseline.xml", "vendor-bin/**/composer.json", "vendor-bin/**/composer.lock", ".tx/config", "**/phpunit.xml", "js/vendor.LICENSE.txt", "tsconfig.json"] +path = ["package.json", "package-lock.json", "**/package.json", "**/package-lock.json", "composer.json", "composer.lock", "**/composer.json", "**/composer.lock", "psalm.xml", "tests/psalm-baseline.xml", ".tx/config", "**/phpunit.xml", "js/vendor.LICENSE.txt"] precedence = "aggregate" SPDX-FileCopyrightText = "none" SPDX-License-Identifier = "CC0-1.0" diff --git a/tests/Integration/features/admin-notification-v2.feature b/tests/Integration/features/admin-notification-v2.feature index b109bf51c..f87cb0e97 100644 --- a/tests/Integration/features/admin-notification-v2.feature +++ b/tests/Integration/features/admin-notification-v2.feature @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: CC0-1.0 Feature: admin-notification Background: Given user "test1" exists diff --git a/tests/Integration/features/cli-notification.feature b/tests/Integration/features/cli-notification.feature index fe94a9297..8f10003e5 100644 --- a/tests/Integration/features/cli-notification.feature +++ b/tests/Integration/features/cli-notification.feature @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: CC0-1.0 Feature: cli-notification Background: Given user "test1" exists diff --git a/tests/Integration/features/delete-notifications-v1.feature b/tests/Integration/features/delete-notifications-v1.feature index 6b81b1437..231c6f441 100644 --- a/tests/Integration/features/delete-notifications-v1.feature +++ b/tests/Integration/features/delete-notifications-v1.feature @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc. +# SPDX-License-Identifier: CC0-1.0 Feature: delete-notifications Background: Given user "test1" exists diff --git a/tests/Integration/features/delete-notifications-v2.feature b/tests/Integration/features/delete-notifications-v2.feature index 649a3386c..2d23aa8ad 100644 --- a/tests/Integration/features/delete-notifications-v2.feature +++ b/tests/Integration/features/delete-notifications-v2.feature @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: CC0-1.0 Feature: delete-notifications Background: Given user "test1" exists diff --git a/tests/Integration/features/exists-notifications-v2.feature b/tests/Integration/features/exists-notifications-v2.feature index 2a821526c..2b265f652 100644 --- a/tests/Integration/features/exists-notifications-v2.feature +++ b/tests/Integration/features/exists-notifications-v2.feature @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: CC0-1.0 Feature: exists-notifications-v2 Background: Given user "test1" exists diff --git a/tests/Integration/features/notifications-content-v1.feature b/tests/Integration/features/notifications-content-v1.feature index 10994fa8d..baa9c61eb 100644 --- a/tests/Integration/features/notifications-content-v1.feature +++ b/tests/Integration/features/notifications-content-v1.feature @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-FileCopyrightText: 2016 ownCloud, Inc. +# SPDX-License-Identifier: CC0-1.0 Feature: notifications-content Background: Given user "test1" exists diff --git a/tests/Integration/features/notifications-content-v2.feature b/tests/Integration/features/notifications-content-v2.feature index b3465898e..3efe934aa 100644 --- a/tests/Integration/features/notifications-content-v2.feature +++ b/tests/Integration/features/notifications-content-v2.feature @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: CC0-1.0 Feature: notifications-content Background: Given user "test1" exists diff --git a/tests/Integration/features/push-registration.feature b/tests/Integration/features/push-registration.feature index 1bd503189..02011ef9d 100644 --- a/tests/Integration/features/push-registration.feature +++ b/tests/Integration/features/push-registration.feature @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: CC0-1.0 Feature: Push registration Background: Given user "test1" exists diff --git a/tests/Integration/features/statuscodes-v1.feature b/tests/Integration/features/statuscodes-v1.feature index 7efeaf5fd..6f683748e 100644 --- a/tests/Integration/features/statuscodes-v1.feature +++ b/tests/Integration/features/statuscodes-v1.feature @@ -1,3 +1,6 @@ +# SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc. +# SPDX-License-Identifier: CC0-1.0 Feature: statuscodes Background: Given user "test1" exists diff --git a/tests/Integration/features/statuscodes-v2.feature b/tests/Integration/features/statuscodes-v2.feature index 8fb950d7f..83fcc1f21 100644 --- a/tests/Integration/features/statuscodes-v2.feature +++ b/tests/Integration/features/statuscodes-v2.feature @@ -1,3 +1,5 @@ +# SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: CC0-1.0 Feature: statuscodes Background: Given user "test1" exists