Skip to content
This repository was archived by the owner on Nov 12, 2019. It is now read-only.

Commit d5ef624

Browse files
committed
Refine license discussion in README.md
1 parent 90c62c8 commit d5ef624

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

README.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,20 @@ This library implements Myers' diff algorithm, but it is modular so it is easy t
8585
## License
8686

8787
This work is licensed under The Apache Software License, Version 1.1.
88+
8889
Reason: The code contains work of HP, which contributed it under Apache-1.1.
8990
[[Example code](https://github.com/apache/wicket/blob/master/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java)).
9091
It was easier to change the license to Apache-1.1 than to contact HP Legal for a code created in 2003 at HP Bristol.
92+
93+
I had a discussion with [Juancarlo](https://bitbucket.org/apalala/) and Brian McBride.
94+
Brian worked for HPLabs in Bristol (UK) at that time. His authorship appears in three files:
95+
96+
- https://github.com/apache/wicket/blob/master/wicket-util/src/main/java/org/apache/wicket/util/diff/DiffAlgorithm.java
97+
- https://github.com/apache/wicket/blob/master/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
98+
- https://github.com/apache/wicket/blob/master/wicket-util/src/main/java/org/apache/wicket/util/diff/Delta.java
99+
100+
All other files at JRCS are (according to Juancarlo) 100% authored by Juancarlo in a cleanroom way.
101+
102+
Since Brian pointed me to HP and I do not want to fight with HP, I agreed with Juancarlo to change the license of the JRCS files to Apache-1.1.
103+
104+
The alternative is to find out which code was written by Brian and to replace this code by some other clean room developed code.

0 commit comments

Comments
 (0)