Hey Koji That's also fine for me .. if we do so, then we should consider doing the same for highlight.js - where we also include the License-Information into the File itself?
Stefan On Sunday, May 20, 2012 at 4:51 PM, Koji Sekiguchi wrote: > Hi Stefan, > > I think we'd be better off moving the copyright notice to NOTICE.txt, because > if > we upgrade d3.js in the future, we prefer to forget about including it the > upgraded > d3.js. How about: > > $ svn diff > Index: solr/NOTICE.txt > =================================================================== > --- solr/NOTICE.txt (revision 1340591) > +++ solr/NOTICE.txt (working copy) > @@ -16,6 +16,9 @@ > This product includes the JQuery JavaScript library created by John Resig. > Copyright (c) 2010 John Resig, http://jquery.com/ > > +This product includes the D3.js JavaScript library created by Michael > Bostock. > +Copyright (c) 2012, Michael Bostock, https://github.com/mbostock/d3 > + > stax-utils library: https://stax-utils.dev.java.net/ > Copyright (c) 2004, Christian Niles, unit12.net (http://unit12.net) > Copyright (c) 2004, Sun Microsystems, Inc. > > > (12/05/20 19:32), [email protected] (mailto:[email protected]) wrote: > > Author: steffkes > > Date: Sun May 20 10:32:38 2012 > > New Revision: 1340665 > > > > URL: http://svn.apache.org/viewvc?rev=1340665&view=rev > > Log: > > SOLR-3238: Add License for d3 > > > > Modified: > > lucene/dev/trunk/solr/webapp/web/js/lib/d3.js > > > > Modified: lucene/dev/trunk/solr/webapp/web/js/lib/d3.js > > URL: > > http://svn.apache.org/viewvc/lucene/dev/trunk/solr/webapp/web/js/lib/d3.js?rev=1340665&r1=1340664&r2=1340665&view=diff > > ============================================================================== > > --- lucene/dev/trunk/solr/webapp/web/js/lib/d3.js (original) > > +++ lucene/dev/trunk/solr/webapp/web/js/lib/d3.js Sun May 20 10:32:38 2012 > > @@ -1,3 +1,34 @@ > > +/* > > + > > +Copyright (c) 2012, Michael Bostock > > +All rights reserved. > > + > > +Redistribution and use in source and binary forms, with or without > > +modification, are permitted provided that the following conditions are met: > > + > > +* Redistributions of source code must retain the above copyright notice, > > this > > + list of conditions and the following disclaimer. > > + > > +* Redistributions in binary form must reproduce the above copyright notice, > > + this list of conditions and the following disclaimer in the documentation > > + and/or other materials provided with the distribution. > > + > > +* The name Michael Bostock may not be used to endorse or promote products > > + derived from this software without specific prior written permission. > > + > > +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" > > +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > > +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > > ARE > > +DISCLAIMED. IN NO EVENT SHALL MICHAEL BOSTOCK BE LIABLE FOR ANY DIRECT, > > +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > (INCLUDING, > > +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF > > USE, > > +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY > > THEORY > > +OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING > > +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > > SOFTWARE, > > +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > + > > +*/ > > + > > (function(){if (!Date.now) Date.now = function() { > > return +new Date; > > }; > > > > > -- > Query Log Visualizer for Apache Solr > http://soleami.com/ > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > (mailto:[email protected]) > For additional commands, e-mail: [email protected] > (mailto:[email protected]) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
