Update license header to Apache-1.1 - #38
Merged
Merged
Conversation
- Also modernize README.md - DiffNode.java original source: https://github.com/apache/wicket/blob/master/wicket-util/src/main/java/org/apache/wicket/util/diff/myers/DiffNode.java
Merged
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
2 participants
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 code of java-diff-utils contains code from Apache Wicket (https://github.com/apache/wicket/tree/master/wicket-util/src/main/java/org/apache/wicket/util/diff). As far as I understood, that code comes from some RCS library. The good thing is, that the code is fully Apache-1.1 license certified, because it is under the cover of the Apache Software Foundation. We tried to switch to Apache-2.0 or MIT, but parts of the code have been written by an employee of HP in Bristol. We do not think that we can contact HP legal to relicense the code. Since Apache-1.1 is also a good license, we want to move ahead with that license.
Side note: JRCS switched from LGPL-2.1 to Apache-1.1, too. See https://bitbucket.org/apalala/jrcs/src. They also have the complete diff code there: https://bitbucket.org/apalala/jrcs/src/28e3e95daf13b5d099e37e879f74944301b6590e/src/java/org/suigeneris/jrcs/diff/?at=default.
I also modernized README.md a bit.