Hi Jalud and other Derbies, Regarding the adding of the ASF license I propose the following, in order to move forward. I've tried to take care to reflect all parties involved, including myself ;), and this is what I came up with. (comments, suggestions welcome)
------------------------------------------------------------ a) Replace the IBM license information (as propopsed by Jalud) of the (.java) files with the following, but keep a modified the IBM copyright line, per http://www.apache.org/licenses/LICENSE-2.0.txt: Copyright [yyyy] IBM Corp. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. Daniel John Debrunner wrote: > Does the corporate CLA that Derby was contributed under need to be > checked to ensure the copyrights can be changed from IBM to ASF? Jalud Abdulmenan wrote: > My non-authoritative opinion is that if a project is licensed under the > ASF license then the source files should have the ASF copyright. > However, I do not know if this is inline or not with the corporate CLA > that Derby was contributed under. I've gotten signals within IBM that IBM still retains the copyright and that the copyright notices should reflect that. Which there are provisions for (http://www.apache.org/licenses/LICENSE-2.0.html#apply). ------------------------------------------------------------ b) Add ASF copyright notice to files modified under Derby license. I.e., ADD the following when there is a community contribution to a file. Copyright 2004 The Apache Software Foundation. In 2005 use either of: Copyright 2005 The Apache Software Foundation. Copyright 2004, 2005 The Apache Software Foundation. Leave the IBM notices intact. One could easily write (perl) scripts that adds/updates these notices (using information from "svn log ..."). I've done so previously for perforce. ------------------------------------------------------------ c) The [yyyy] in the Copyright should be the years that is contained in the original files as donated to ASF, using the format "YYYY" or "CCCC, YYYY" when applicable. Let me explain where these years come from, since I did a scripted update of all of them a few months ago. I traced back in our source code repository from when the file was first created (CCCC). YYYY was set to the year the file was last "move"/changed package name, or accumulated at least 5% (of the lines) had been modified. Daniel John Debrunner wrote: > Any reason you chose a fixed copyright date (2001-2004) rather than the > valid copyright date each file had on the handover, e.g. 1997-2004? Jalud Abdulmenan wrote: > I took the date from some of the files that I was going over. > I was a little bit hesitant even for 2001-2004. I prefer just 2004 since > that is the year derby came under the ASF license. Apache says in: http://www.apache.org/dev/apply-license.html : > Do not worry about consistency in the first year -- it is > not supposed to be uniform and should never be dated prior > to the year of first creation. As I understand it, if there are no other copyright than the Apache (would IBM's ever be removed), then Apache considered it important that the first year mentioned reflects the creation of the file. Otherwise, it seems that the years should reflect when it was first publicized by ASF. Apache says on http://www.apache.org/dev/apply-license.html: > ... years given start with the first publication year of the file > contents (the authored expression) ... ------------------------------------------------------------ And to comply with http://www.apache.org/dev/apply-license.html : d) Copy http://www.apache.org/licenses/LICENSE-2.0.txt into /LICENSE e) Create a file /NOTICE containing: --- This product includes software developed by The Apache Software Foundation (http://www.apache.org/). This software consists of voluntary contributions made by many individuals on behalf of the Apache Software Foundation, and was originally based on Cloudscape software, copyright International Business Machines Inc., http://www.ibm.com . --- ( inspired from public record IBM donations http://www.apache.org/foundation/records/ ) ------------------------------------------------------------ f) I further suggest that the updates not be submitted as patches, but instead that a (perl?) script is given that is tested, and can be run by a committer. I'm aware that Apache says: >For Apache software, we strongly recommend checking the diffs of each >file and commit only one directory at a time (bottom-up) so that the >changes can be verified without overwhelming reviewers. But with 1298 .java-files, I think even a 123 directories with a patch each is really pushing it. I suggest the script that performs the updates on a directory and its subdirectories, that it only touches files that are actually changed, so that it can be re-run at any time, only affecting files that need change. Having a script also allows any future changes to be readily applied. Jalud Abdulmenan wrote: > I will submit a modified patch when a consensus is reached on these two > questions. ------------------------------------------------------------ g) I'm still trying to get a copy of the IBM Corporate CLA to read, since it may be easier to comply with it then, and might simplify some issues. Maybe somebody at Apache has an available copy? --- I'm currently working for IBM: 2 years DB2 Everyplace; Now 2 years Cloudscape; Before that I did research on databases - Scalable Distributed Data Structures: 3 years in Amsterdam (CWI); 3 years at Link��ping University, Sweden. /Jonas
