Merge pull request #45429 from nextcloud/chore/noid/spdx-batch3

Add SPDX header - Batch 3
nextcloud · May 22, 2024 · 02dc1bc · 02dc1bc
2 parents 2f8176f + 0b20dd6
commit 02dc1bc
Show file tree

Hide file tree

Showing 34 changed files with 157 additions and 21 deletions.
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -7,7 +7,55 @@ Files: lib/l10n/*.js lib/l10n/*.json core/l10n/*.js core/l10n/*.json apps/admin_
 Copyright: 2016 ownCloud, Inc., 2016-2024 Nextcloud translators
 License: AGPL-3.0-only OR AGPL-3.0-or-later
 
-Files: core/img/favicon*.* core/img/logo/logo*.*
+Files: tests/data/block-aligned-plus-one.txt tests/data/block-aligned.txt tests/data/data.tar.gz tests/data/data.zip tests/data/desktopapp.png tests/data/desktopapp.svg tests/data/certificates/badCertificate.crt tests/data/certificates/expiredCertificate.crt tests/data/certificates/goodCertificate.crt tests/data/integritycheck/app/AnotherFile.txt tests/data/integritycheck/app/subfolder/file.txt tests/data/integritycheck/appWithInvalidData/AnotherFile.txt tests/data/integritycheck/appWithInvalidData/UnecessaryFile
+Copyright: 2015 ownCloud, Inc.
+License: AGPL-3.0-only
+
+Files: tests/data/integritycheck/htaccessUnmodified/.htaccess tests/data/integritycheck/htaccessUnmodified/subfolder/.htaccess tests/data/integritycheck/htaccessWithInvalidModifiedContent/.htaccess tests/data/integritycheck/htaccessWithValidModifiedContent/subfolder/.htaccess
+Copyright: 2016 ownCloud, Inc.
+License: AGPL-3.0-only
+
+Files: tests/data/l10n/cs.json tests/data/l10n/de.json tests/data/l10n/ru.json
+Copyright: 2015 ownCloud, Inc., 2021 Nextcloud GmbH and Nextcloud contributors
+License: AGPL-3.0-only
+
+Files: tests/data/lorem.txt
+Copyright: 2012 ownCloud, Inc.
+License: AGPL-3.0-only
+
+Files: tests/data/testavatar.png tests/data/testimage.gif tests/data/testimage.jpg tests/data/testimage.png
+Copyright: 2013 ownCloud, Inc.
+License: AGPL-3.0-only
+
+Files: tests/data/lorem-big.txt tests/data/strängé*filename*(duplicate*#2).txt tests/data/strõngÚ*filename*(duplicate*#2).txt
+Copyright: 2014 ownCloud, Inc.
+License: AGPL-3.0-only
+
+Files: tests/data/testimagelarge.svg
+Copyright: 2015 ownCloud, Inc., 2016 Nextcloud GmbH and Nextcloud contributors
+License: AGPL-3.0-only
+
+Files: tests/data/setUploadLimit/htaccess tests/data/setUploadLimit/user.ini
+Copyright: 2015 ownCloud, Inc., 2018 Nextcloud GmbH and Nextcloud contributors
+License: AGPL-3.0-only
+
+Files: tests/data/testimage-wide.png tests/data/testimage.eps tests/data/testimage.mp3 tests/data/testimage.mp4 tests/data/testimage.odt
+Copyright: 2015 ownCloud, Inc.
+License: AGPL-3.0-only
+
+Files: tests/data/testapp.zip tests/data/testapp2.zip tests/docker/mariadb/oc.cnf
+Copyright: 2016 ownCloud, Inc.
+License: AGPL-3.0-only
+
+Files: tests/docker/mysqlmb4/mb4.cnf
+Copyright: 2016 ownCloud, Inc., 2017 Nextcloud GmbH and Nextcloud contributors
+License: AGPL-3.0-only
+
+Files: tests/data/integritycheck/htaccessWithValidModifiedContent/.htaccess
+Copyright: 2016 ownCloud, Inc., 2019 Nextcloud GmbH and Nextcloud contributors
+License: AGPL-3.0-only
+
+Files: core/img/favicon*.* core/img/logo/logo*.* tests/data/testimage.webp
 Copyright: 2016-2024 Nextcloud GmbH
 License: LicenseRef-NextcloudTrademarks
 
@@ -27,23 +75,31 @@ Files: core/js/mimetypelist.js core/js/core.json themes/example/core/img
 Copyright: 2016 ownCloud, Inc., 2016-2024 Nextcloud GmbH and Nextcloud contributors
 License: AGPL-3.0-only
 
-Files: core/js/merged-template-prepend.json
-Copyright: Inc., 2017 Nextcloud GmbH and Nextcloud contributors
+Files: tests/data/testapp.0.8.tar.gz tests/data/testapp.tar.gz tests/data/testapp1.tar.gz
+Copyright: 2016 Nextcloud GmbH and Nextcloud contributors
 License: AGPL-3.0-or-later
 
-Files: core/src/systemtags/templates/result.handlebars core/src/systemtags/templates/result_form.handlebars core/src/systemtags/templates/selection.handlebars
+Files: core/js/merged-template-prepend.json tests/data/certificates/goodCertificate.crt tests/data/emails/new-account-email-custom-text-alternative.txt tests/data/emails/new-account-email-custom.html tests/data/emails/new-account-email-custom.txt tests/data/emails/new-account-email-single-button.html tests/data/emails/new-account-email-single-button.txt tests/data/emails/new-account-email.html tests/data/emails/new-account-email.txt
+Copyright: 2017 Nextcloud GmbH and Nextcloud contributors
+License: AGPL-3.0-or-later
+
+Files: core/src/systemtags/templates/result.handlebars core/src/systemtags/templates/result_form.handlebars core/src/systemtags/templates/selection.handlebars tests/data/testimage.heic
 Copyright: 2018 Nextcloud GmbH and Nextcloud contributors
 License: AGPL-3.0-or-later
 
-Files: core/src/jquery/contactsmenu/jquery_entry.handlebars tests/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js
+Files: core/src/jquery/contactsmenu/jquery_entry.handlebars tests/data/integritycheck/mimetypeListModified/core/js/mimetypelist.js tests/data/integritycheck/mimetypeListModified/core/signature.json tests/data/guest_avatar_einstein_32.png tests/data/guest_avatar_einstein_32.svg tests/data/test.pdf
 Copyright: 2019 Nextcloud GmbH and Nextcloud contributors
 License: AGPL-3.0-or-later
 
-Files: build/stubs/ftp.php
+Files: tests/data/testimage-badheader.jpg
+Copyright: 2021 Nextcloud GmbH and Nextcloud contributors
+License: AGPL-3.0-or-later
+
+Files: build/stubs/ftp.php tests/data/integritycheck/mimetypeListModified/coresignature.json
 Copyright: 2022 Nextcloud GmbH and Nextcloud contributors
 License: AGPL-3.0-or-later
 
-Files: build/stubs/app_api.php build/stubs/SensitiveParameter.phpstub build/stubs/psr_container.php
+Files: build/stubs/app_api.php build/stubs/SensitiveParameter.phpstub build/stubs/psr_container.php tests/data/testimage-large.jpg
 Copyright: 2023 Nextcloud GmbH and Nextcloud contributors
 License: AGPL-3.0-or-later
 

diff --git a/COPYING-README b/COPYING-README
@@ -18,4 +18,4 @@ Licensing of components:
 All unmodified files from these and other sources retain their original copyright
 and license notices: see the relevant individual files.
 
-Attribution information for Nextcloud is contained in the `AUTHORS.md` file.
+Attribution information for Nextcloud is contained in the `AUTHORS` file.
diff --git a/tests/data/app/description-multi-lang.xml b/tests/data/app/description-multi-lang.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0"?>
+<!--
+ - SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <info>
 	<id>files_encryption</id>
 	<name>Server-side Encryption</name>

diff --git a/tests/data/app/description-single-lang.xml b/tests/data/app/description-single-lang.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0"?>
+<!--
+ - SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <info>
 	<id>files_encryption</id>
 	<name>Server-side Encryption</name>

diff --git a/tests/data/app/expected-info.json.license b/tests/data/app/expected-info.json.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+SPDX-License-Identifier: AGPL-3.0-only
diff --git a/tests/data/app/invalid-info.xml b/tests/data/app/invalid-info.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0"?>
+<!--
+ - SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ - SPDX-FileCopyrightText: 2014 ownCloud, Inc.
+ - SPDX-License-Identifier: AGPL-3.0-only
+-->
 <info
 	<id>files_encryption</id>
 	<name>Server-side Encryption</name>

diff --git a/tests/data/app/navigation-one-item.json.license b/tests/data/app/navigation-one-item.json.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/data/app/navigation-one-item.xml b/tests/data/app/navigation-one-item.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0"?>
+<!--
+ - SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
 	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
 	<id>activity</id>

diff --git a/tests/data/app/navigation-two-items.json.license b/tests/data/app/navigation-two-items.json.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/data/app/navigation-two-items.xml b/tests/data/app/navigation-two-items.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0"?>
+<!--
+ - SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
+ - SPDX-License-Identifier: AGPL-3.0-or-later
+-->
 <info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance"
 	  xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
 	<id>activity</id>

diff --git a/tests/data/app/valid-info.xml b/tests/data/app/valid-info.xml
@@ -1,4 +1,9 @@
 <?xml version="1.0"?>
+<!--
+ - SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+ - SPDX-FileCopyrightText: 2014 ownCloud, Inc.
+ - SPDX-License-Identifier: AGPL-3.0-only
+-->
 <info>
 	<id>files_encryption</id>
 	<name>Server-side Encryption</name>

diff --git a/tests/data/integritycheck/SomeApp.crt.license b/tests/data/integritycheck/SomeApp.crt.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2015 ownCloud, Inc.
+SPDX-License-Identifier: AGPL-3.0-only
diff --git a/tests/data/integritycheck/SomeApp.key.license b/tests/data/integritycheck/SomeApp.key.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2015 ownCloud, Inc.
+SPDX-License-Identifier: AGPL-3.0-only
diff --git a/tests/data/integritycheck/core.crt.license b/tests/data/integritycheck/core.crt.license
@@ -0,0 +1,3 @@
+SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+SPDX-License-Identifier: AGPL-3.0-only
diff --git a/tests/data/integritycheck/core.key.license b/tests/data/integritycheck/core.key.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2015 ownCloud, Inc.
+SPDX-License-Identifier: AGPL-3.0-only
diff --git a/tests/data/integritycheck/root.crt.license b/tests/data/integritycheck/root.crt.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2015 ownCloud, Inc.
+SPDX-License-Identifier: AGPL-3.0-only
diff --git a/tests/data/integritycheck/root.key.license b/tests/data/integritycheck/root.key.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2015 ownCloud, Inc.
+SPDX-License-Identifier: AGPL-3.0-only
diff --git a/tests/data/svg/files-app-red.svg b/tests/data/svg/files-app-red.svg
diff --git a/tests/data/svg/mixed-red.svg b/tests/data/svg/mixed-red.svg
diff --git a/tests/data/svg/mixed-source.svg b/tests/data/svg/mixed-source.svg
diff --git a/tests/data/svg/rect-black.svg b/tests/data/svg/rect-black.svg
diff --git a/tests/data/svg/rect-red.svg b/tests/data/svg/rect-red.svg
diff --git a/tests/data/svg/settings-admin-red.svg b/tests/data/svg/settings-admin-red.svg
diff --git a/tests/data/testimage.webp b/tests/data/testimage.webp
diff --git a/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php b/tests/lib/IntegrityCheck/Iterator/ExcludeFileByNameFilterIteratorTest.php
@@ -1,8 +1,9 @@
 <?php
 /**
+ * SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2015 ownCloud, Inc.
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 namespace Test\IntegrityCheck\Iterator;
 
 use OC\IntegrityCheck\Iterator\ExcludeFileByNameFilterIterator;

diff --git a/tests/lib/TaskProcessing/TaskProcessingTest.php b/tests/lib/TaskProcessing/TaskProcessingTest.php
@@ -1,11 +1,8 @@
 <?php
 /**
- * Copyright (c) 2024 Marcel Klehr <[email protected]>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
 namespace Test\TextProcessing;
 
 use OC\AppFramework\Bootstrap\Coordinator;

diff --git a/tests/lib/Template/data/combine.json.license b/tests/lib/Template/data/combine.json.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
+SPDX-License-Identifier: AGPL-3.0-or-later
diff --git a/tests/objectstore/start-swift-ceph.sh b/tests/objectstore/start-swift-ceph.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
-# ownCloud
+# SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+# SPDX-License-Identifier: AGPL-3.0-only
 #
 # This script start a docker container to test the files_external tests
 # against. It will also change the files_external config to use the docker
@@ -10,7 +11,6 @@
 #
 # @author Morris Jobke
 # @author Robin McCorkell
-# @copyright 2015 ownCloud
 
 if ! command -v docker >/dev/null 2>&1; then
     echo "No docker executable found - skipped docker setup"

diff --git a/tests/objectstore/stop-swift-ceph.sh b/tests/objectstore/stop-swift-ceph.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
-# ownCloud
+# SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+# SPDX-License-Identifier: AGPL-3.0-only
 #
 # This script stops the docker container the files_external tests were run
 # against. It will also revert the config changes done in start step.

diff --git a/tests/objectstore/wait-for-connection b/tests/objectstore/wait-for-connection
@@ -1,6 +1,9 @@
 #!/usr/bin/php
 <?php
-
+/**
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
 $timeout = 60;
 
 switch ($argc) {

diff --git a/tests/travis/before_install.sh b/tests/travis/before_install.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
-# ownCloud
+# SPDX-FileCopyrightText: 2015 ownCloud, Inc.
+# SPDX-License-Identifier: AGPL-3.0-only
 #
 # @author Thomas Müller
 # @copyright 2014 Thomas Müller [email protected]

diff --git a/tests/travis/changed_app.sh b/tests/travis/changed_app.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 #
-# ownCloud
+# SPDX-FileCopyrightText: 2015 ownCloud, Inc.
+# SPDX-License-Identifier: AGPL-3.0-only
 #
 # @author Joas Schilling
 # @author Thomas Müller

diff --git a/tests/travis/custom.ini b/tests/travis/custom.ini
@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2015 ownCloud, Inc.
+# SPDX-License-Identifier: AGPL-3.0-only
 always_populate_raw_post_data = -1
 mbstring.func_overload = 0
 default_charset = 'UTF-8'

diff --git a/tests/travis/install.sh b/tests/travis/install.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 #
-# ownCloud
+# SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+# SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+# SPDX-License-Identifier: AGPL-3.0-only
 #
 # @author Thomas Müller
 # @copyright 2014 Thomas Müller [email protected]