Problem/Motivation

COPYRIGHT.txt is out of date: "All Drupal code is Copyright 2001 - 2020 by the original authors."

It also references a number of JavaScript libraries that have been removed from core.

Steps to reproduce

Proposed resolution

Update the copyright date.
Remove the JavaScript libraries that are no longer shipped with core.
Check to see if we need to include any other copyright notices.

Remaining tasks

User interface changes

API changes

Data model changes

Release notes snippet

CommentFileSizeAuthor
#21 interdiff.9.5.19-21.txt283 bytesspokje
#21 3266006-9.5-21.patch2.37 KBspokje
#19 3266006-9.5-19.patch2.35 KBspokje
#19 interdiff.9.5.14-19.txt683 bytesspokje
#18 3266006-d10-18.patch2.12 KBspokje
#18 interdiff.10.x.14-18.txt344 bytesspokje
#18 3266006-9.5-18.patch2.35 KBspokje
#18 interdiff.9.5.14-18.txt683 bytesspokje
#14 3266006-d10-14.patch2.19 KBquietone
#14 interdiff-d10.txt778 bytesquietone
#14 3266006-d9.5-14.patch2.42 KBquietone
#14 interdiff-d9.5.txt1.89 KBquietone
#12 3266006-d10.x-12.patch2.13 KBspokje
#12 3266006-d9.5-12.patch2.72 KBspokje
#9 interdiff_4-9.txt321 bytessourabhjain
#9 3266006-9.patch1.29 KBsourabhjain
#4 3266006-4.patch1.29 KBvictoria-marina

Comments

longwave created an issue. See original summary.

longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Component: other » documentation
victoria-marina’s picture

victoria-marina commented
Assigned: Unassigned » victoria-marina

I'll work on this.

victoria-marina’s picture

victoria-marina commented
Assigned: victoria-marina » Unassigned
Status: Active » Needs review
StatusFileSize
new 3266006-4.patch1.29 KB

Here is a patch. Kindly review it.

longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Status: Needs review » Reviewed & tested by the community

Thank you, this looks good to me. The JS packages you removed are no longer shipped with core, although we do ship a number of other JS packages including CKEditor. Perhaps we should just drop the individual JS copyright notices, as we aren't keeping them up to date anyway?

RTBC because the patch is an improvement on what's there, let's see what core committers think.

Status: Reviewed & tested by the community » Needs work

The last submitted patch, 4: 3266006-4.patch, failed testing. View results

xjm’s picture

xjm
she/her
Primary language English
commented
Version: 10.0.x-dev » 9.3.x-dev
Status: Needs work » Needs review
Related issues: +#3238507: Drupal 10 JavaScript dependency plan

Test failure is a known random, so restoring status.

It might be a question for the Legal Working Group, but we might need to retain copyright info for JS assets where the copyright info is not included in the vendor build asset.

There are additional JS dependencies that will be removed from D10 core, so this issue should at least have a followup right before the 10.0.x beta deadline.

That said, I don't think the deps removed in the current patch exist in D9 either. Let's check the list against core/assets/vendor in D9, and either provide a 9.3.x version of the patch or confirm that the current patch is the 9.3.x patch? Docs fixes are backportable.

longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Status: Needs review » Needs work 
+++ b/core/COPYRIGHT.txt
@@ -24,27 +24,12 @@ JavaScript
   jQuery Cookie - Copyright (c) 2014 Klaus Hartl

This is also gone from Drupal 9, replaced by js-cookie, so this can be removed.

We also have the following in core/assets/vendor that are not in the list:

backbone
ckeditor
ckeditor5
css-escape
es6-promise
jquery-joyride
js-cookie
loadjs
modernizr
normalize-css
once
picturefill
popperjs
shepherd
sortable
tabbable
underscore

Everything seems to be MIT licensed or MIT/GPL dual licensed, but I am not sure what the requirements are for attributing copyright. Most files have a comment at the top noting the authors and license, but there is no LICENSE.txt or similar shipped in most of the vendor directories.

sourabhjain’s picture

sourabhjain
Primary language English
commented
StatusFileSize
new 3266006-9.patch1.29 KB
new interdiff_4-9.txt321 bytes

Worked on the 1st suggestion which is provide by longwave.

xjm’s picture

xjm
she/her
Primary language English
commented
Status: Needs work » Needs review
Issue tags: +Needs followup

Joyride will be removed in Drupal 10, so seems unnecessary to add that one at least. :)

I am on board with committing a patch to remove everything that's already missing in both D9 and D10, and then filing a follow up to discuss what to do with the references generally.

I'm sure we had an issue something like this around Drupal 9's release as well, so we could go look for that. We should also look for any information that has already been given by the legal working group about copyrights for these, and see if this information is needed at all.

Version: 9.3.x-dev » 9.4.x-dev

Drupal 9.3.15 was released on June 1st, 2022 and is the final full bugfix release for the Drupal 9.3.x series. Drupal 9.3.x will not receive any further development aside from security fixes. Drupal 9 bug reports should be targeted for the 9.4.x-dev branch from now on, and new development or disruptive changes should be targeted for the 9.5.x-dev branch. For more information see the Drupal core minor version schedule and the Allowed changes during the Drupal core release cycle.

spokje’s picture

spokje
Primary language Dutch
commented
Version: 9.4.x-dev » 10.1.x-dev
Status: Needs review » Needs work
Issue tags: -Needs followup
StatusFileSize
new 3266006-d9.5-12.patch2.72 KB
new 3266006-d10.x-12.patch2.13 KB

Let's get this started (again) with all the libraries that are currently in core/assets/vendor.
Added copyright info where I could find it.

spokje’s picture

spokje
Primary language Dutch
commented
Status: Needs work » Needs review
quietone’s picture

quietone commented
StatusFileSize
new interdiff-d9.5.txt1.89 KB
new 3266006-d9.5-14.patch2.42 KB
new interdiff-d10.txt778 bytes
new 3266006-d10-14.patch2.19 KB

I tried to fill in the gaps on this. Thanks to @Spokje for the support.

quietone’s picture

quietone commented
Issue tags: +Drupal 10 stable release blocker

Adding tag because the copyright information should be up to date.

spokje’s picture

spokje
Primary language Dutch
commented

Nice sleuthing there @quietone.

2 remarks, but do with them what you want, since I'm certainly not a copyright lawyer.
(Remarks are for both the 9.5 and 10.x version BTW)

+ Underscore = Copyright (c) 2009-2022 Jeremy Ashkenas, Julian Gonggrijp, and DocumentCloud and Investigative Reporters & Editors
Unsure if we want to add an end year, even if it's in the original copyright notice of the source itself.
There are other libraries in COPYRIGHT.txt that have an end year in their source, but these were never added to this file.

+ Once - Copyright (c) 2012-2022 Isaac Z. Schlueter and Contributors
I think we're not using that once, but rather a Drupal maintained one?
Maybe ask the front-end experts?

longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Status: Needs review » Needs work

Agree with @Spokje: let's be consistent on the end years, and Once is a Drupal-owned library (therefore not sure if we need to explicitly include it here, given the copyright message at the very top?)

spokje’s picture

spokje
Primary language Dutch
commented
Status: Needs work » Needs review
StatusFileSize
new interdiff.9.5.14-18.txt683 bytes
new 3266006-9.5-18.patch2.35 KB
new interdiff.10.x.14-18.txt344 bytes
new 3266006-d10-18.patch2.12 KB

So the above will land us here, which is in the attached patches.

The only (c) MIA is for jQuery joyride in 9.5.x

spokje’s picture

spokje
Primary language Dutch
commented
StatusFileSize
new interdiff.9.5.14-19.txt683 bytes
new 3266006-9.5-19.patch2.35 KB
longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Status: Needs review » Needs work

Looks like jQuery Joyride should be:

jQuery Joyride - Copyright (c) 2013 ZURB

https://github.com/zurb/joyride/blob/v2.1/jquery.joyride-2.1.js#L4

spokje’s picture

spokje
Primary language Dutch
commented
Status: Needs work » Needs review
StatusFileSize
new 3266006-9.5-21.patch2.37 KB
new interdiff.9.5.19-21.txt283 bytes
longwave’s picture

longwave
he/him
Primary language English
Location UK
commented
Status: Needs review » Reviewed & tested by the community

This all looks correct to me now.

For committers: #21 is for 9.5.x and #18 is for 10.x.

catch’s picture

catch
he/him
Primary language English
commented
Version: 10.1.x-dev » 9.5.x-dev
Status: Reviewed & tested by the community » Fixed

Feels like we might be able to drop some of this due to #2258313: Add license information to aggregated assets but for now let's update it. Committed/pushed the respective patches to 10.1/10.0/9.5, thanks!

  • catch committed 66e42cf on 10.0.x 
    Issue #3266006 by Spokje, quietone, sourabhjain, victoria-marina,...
  • catch committed 6e61617 on 10.1.x
    Issue #3266006 by Spokje, quietone, sourabhjain, victoria-marina,...
  • catch committed eb94ef5 on 9.5.x
    Issue #3266006 by Spokje, quietone, sourabhjain, victoria-marina,...

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.