Repository navigation
fix(license): list zmij in fory-json jar LICENSE; per-module Scala NOTICE - #4130
Merged
Merged
Conversation
…TICE - fory-json ships FloatingDecimal (adapted from zmij, MIT) and META-INF/licenses/LICENSE-zmij.txt, but its META-INF/LICENSE had no MIT section. Add the zmij entry. - fory-scala and fory-json-scala jars shipped the root source NOTICE, which lists Spark, Commons IO, Commons Lang, dataclasses and gRPC, none of which these jars contain. Give each module its own NOTICE, matching the per-module LICENSE files. Fixes apache#4129 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
Why?
Two convenience-binary licensing problems found in the 1.7.7-rc1 Nexus staging jars. See #4129 for the full analysis.
What does this PR do?
fory-json jar LICENSE.
FloatingDecimalis adapted from zmij (MIT). The jar already shipsMETA-INF/licenses/LICENSE-zmij.txt, butjava/fory-json/src/main/resources/META-INF/LICENSE(which becomes the jar'sMETA-INF/LICENSE) had no MIT section. This PR adds the zmij entry, in the same format the fory-core jar LICENSE uses for Kryo.Scala jar NOTICE.
scala/build.sbtsetapacheSonatypeNoticeFileto the root source NOTICE for every module, so thefory-scalaandfory-json-scalajars listed Spark, Commons IO, Commons Lang, dataclasses and gRPC, none of which they contain. This PR:scala/fory-scala/NOTICEandscala/fory-json-scala/NOTICE, matching the per-module LICENSE files that are already there;apacheSonatypeNoticeFileat its own NOTICE.fory-json-scala's only third-party-derived code is based on jackson-module-scala, which has no NOTICE file, so the plain Apache Fory notice is correct for both modules. The unpublished root aggregate project keeps its own setting.Verification:
fory-json-1.7.7.jarMETA-INF/LICENSEis byte-identical to the resource atv1.7.7-rc1;fory-scala_3-1.7.7.jarMETA-INF/NOTICEis byte-identical to the rootNOTICE.sbt "show fory-scala/apacheSonatypeNoticeFile" "show fory-json-scala/apacheSonatypeNoticeFile"resolves to the new per-module files.sbt fory-scala/Compile/packageBin fory-json-scala/Compile/packageBin fory-scala/Compile/packageSrcsucceeds, and the built jars contain the new module NOTICE.Related issues
Does this PR introduce any user-facing change?
🤖 Generated with Claude Code