From 6c219f5192b11c009dd6f3d11367355572e44b11 Mon Sep 17 00:00:00 2001 From: Peter Amiri Date: Mon, 11 May 2026 18:21:36 -0700 Subject: [PATCH] chore: expand NOTICE attribution and bundle it in base artifact (#2573) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apache License 2.0 §4(d) requires NOTICE attribution to propagate to derivative works. PR #2594 added an initial NOTICE focused on the cli/LICENSE MIT→Apache reconciliation; this change extends the same file with the broader contributor attribution called for in #2573 — original CFWheels authors (Per Djurner et al.), the named long-running contributors, and a pointer to git log for the full list — while preserving the Tom King / wheels-cli MIT relicensing section as a dedicated subsection. Also updates tools/build/scripts/prepare-base.sh to bundle NOTICE alongside LICENSE in the base template build artifact, so the ForgeBox-published scaffold (and anything redistributing it) carries the attribution forward. Footer of NOTICE references LICENSE rather than restating the full Apache 2.0 boilerplate, matching the ASF canonical template convention (NOTICE is for attribution; license terms live in LICENSE). LICENSE itself is intentionally not modified; keeping the verbatim Apache 2.0 text intact preserves the fingerprint that license-detection tooling (FOSSA, ScanCode, GitHub linguist) relies on. Closes #2573. Signed-off-by: Peter Amiri Co-Authored-By: Claude Opus 4.7 (1M context) --- NOTICE | 24 +++++++++++++++++++++--- tools/build/scripts/prepare-base.sh | 3 ++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/NOTICE b/NOTICE index 9065142155..ef78081445 100644 --- a/NOTICE +++ b/NOTICE @@ -1,8 +1,23 @@ Wheels Framework -================ +Copyright 2006-2026 The Wheels Framework Authors -This product is licensed under the Apache License, Version 2.0 -(see LICENSE in the repository root). +This product includes software developed by: + + - Per Djurner and the original CFWheels contributors (2006-) + https://github.com/cfwheels/cfwheels + + - Andy Bellenie, Tony Petruzzi, Chris Peters, and the broader + CFWheels community of contributors and maintainers + + - Tom King and contributors to the original Wheels CLI (2016-) + (see "Wheels CLI MIT relicensing" below) + +For the full list of contributors, see the project's Git history: + git log --format='%aN <%aE>' | sort -u + +------------------------------------------------------------------ + +Wheels CLI MIT relicensing Portions of the cli/ directory derive from wheels-cli, originally released as a standalone CommandBox module by Tom King under the @@ -15,3 +30,6 @@ relicensed under the Apache License, Version 2.0. The original MIT copyright notice is retained here in accordance with the MIT License's notice-retention clause and Apache License 2.0, Section 4(c). + +This product is licensed under the Apache License, Version 2.0 +(see LICENSE). diff --git a/tools/build/scripts/prepare-base.sh b/tools/build/scripts/prepare-base.sh index bc06cfd8af..1c4b2252b8 100755 --- a/tools/build/scripts/prepare-base.sh +++ b/tools/build/scripts/prepare-base.sh @@ -45,8 +45,9 @@ cp CLAUDE.md "${BUILD_DIR}/" cp -r .claude "${BUILD_DIR}/" cp -r .opencode "${BUILD_DIR}/" 2>/dev/null || true -# Copy Apache License how are you? +# Apache 2.0 §4(d) requires NOTICE to propagate to derivatives. cp LICENSE "${BUILD_DIR}/" +cp NOTICE "${BUILD_DIR}/" # Copy VS Code snippets echo "Copying VS Code snippets..."