Repository navigation
Conversation
The root LICENSE.txt and NOTICE.txt now describe the source distribution, and binary-includes/LICENSE.txt and NOTICE.txt describe the binary distribution and roller.war. The binary archive now ships the binary-includes files instead of the root ones, the WAR carries them as META-INF/LICENSE.txt and META-INF/NOTICE.txt, and the source archive includes binary-includes/ so a build from it still works. The source LICENSE drops entries for files that are no longer in the tree (JDOM, YUI under roller-ui/yui3, jQuery 2.1.1, jQuery UI 1.11.0 and Summernote, which now come from jars or WebJars). It adds the files that are checked in but were not listed: YUI CSS Grids and Pure in the Fauxcoly theme, jQuery 3.7.1, Bootstrap 3.4.1 with normalize.css and Font Awesome 3.2.1 in the Gaurav theme, the jQuery Mobile 1.4.2 CSS, the Octicons clipboard icon and the Silk icons. The binary LICENSE covers the same files plus all 106 jars in WEB-INF/lib, the WebJars assets and the fonts embedded in the PDF guides. Stale entries such as Spring 4.1.4, Guice 4.2.2, SLF4J 1.7.26, romtools 1.12.0, oauth-provider, Ant and Derby are replaced with what 7.0.0 actually bundles. The binary NOTICE adds the notices that bundled jars' NOTICE files require, from Spring, Guice, Jackson, Micrometer, Log4j Core, Struts, the Struts2 Bootstrap plugin and Lucene.
Dave Johnson, who wrote that code, said on dev@ that any remaining snippets aren't worth mentioning in the NOTICE file.
apache#266 replaces Gaurav's Font Awesome 3.2.1 fonts and every Silk icon with Bootstrap Icons outlines drawn inline as SVG, per the dev@ licensing thread. Both LICENSE files now name Bootstrap Icons (MIT) for those themes instead of Font Awesome (OFL) and Silk (CC BY 2.5), and both NOTICE files drop the famfamfam credit.
Contributor
|
PR-Review: no issues found. The library versions I spot-checked against master (Spring 7.0.10, Guice 7.0.0, Log4j 2.26.1) match. As the description says, merge this after #260, #261, #262, #263 and #266, and recheck the versions against the final |
… and Fauxcoly The assets pull request (apache#266) now also draws Bootstrap Icons inline in the Basic, Basic Mobile and Frontpage themes and in the blogroll macro, so the credit names those files too.
Contributor
Author
|
I rechecked the versions against
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The LICENSE and NOTICE files described Roller 5/6. They listed Spring 4.1.4, Guice 4.2.2, SLF4J 1.7.26, "romtools 1.12.0", Derby 10.11.1.1, jquery 2.1.1, jquery-ui 1.11.0, Summernote 0.8.11 and the long-gone YUI 3 directory.
binary-includes/wasn't used by any build, and the WAR had no LICENSE or NOTICE.Draft. Merge after #260, #261, #262, #263 and #266. The versions here come from a local build with all of the open dependency PRs merged. If any of them change, the versions here need to follow.
What changes:
Which files ship where.
LICENSE.txtandNOTICE.txt, and now includebinary-includes/, which a build from the source release needs.binary-includes/LICENSE.txtandNOTICE.txt.META-INF/LICENSE.txtandMETA-INF/NOTICE.txt, through awebResourcesblock inapp/pom.xml.Root
LICENSE.txt(source tree).binary-includes/LICENSE.txt(WAR and binary archives).WEB-INF/libfrom the integration build. license-maven-plugin found a license for each, and each was checked against the jar's own META-INF.binary-includes/NOTICE.txt. It adds the notices that bundled jars' own NOTICE files require:Plain ASF boilerplate is left out, as the licensing how-to allows.
mvn apache-rat:checkpasses. The WAR's META-INF files and both binary archives were byte-compared againstbinary-includes/.Decisions from dev@ (Dave Johnson):
searchhi.jsand the theme icons with no recorded source are replaced or removed by Replace icons, fonts and scripts that can't ship in the 7.0 source release #266. Their LICENSE entries and the famfamfam NOTICE credit are gone here (9636915), and Bootstrap Icons (MIT) is credited for the outlines now drawn inline in the Gaurav and Fauxcoly themes.