In message <[email protected]>, Mark
Hindess writes:
> 
> In message <[email protected]>, Mark Hindess
> > writes:
> >
> > Committed in r781482.  There were no code changes so this update
> > doesn't impact any existing testing.
>
> Just to clarify, we still need to fix the content of (at least) the
> top-level federation build NOTICE file for M10.

Based on the discussion on this list, my reading of the thread at:

  http://markmail.org/thread/shzezyoalnydbflq

and some reading of other NOTICE files, I think we just need something like
the attached patch for M10.

Can I have committer approval and/or comments please?  My intention would be 
to apply the patch twice (to the top-level and classlib NOTICE files).

Regards,
 Mark.

Index: NOTICE
===================================================================
--- NOTICE	(revision 781482)
+++ NOTICE	(working copy)
@@ -12,3 +12,42 @@
          (C) Copyright 2005 Intel Corporation
          (C) Copyright 2005-2006 Intel Corporation
          (C) Copyright 2006 Intel Corporation
+
+===============================================================================
+
+Portions of Apache Harmony's Class Library TEXT module contain JavaDoc
+derived from the ICU project.
+
+ICU4J license - ICU4J 1.8.1 and later
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1995-2008 International Business Machines Corporation and others 
+
+All rights reserved. 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so,
+provided that the above copyright notice(s) and this permission notice appear
+in all copies of the Software and that both the above copyright notice(s) and
+this permission notice appear in supporting documentation. 
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION 
+WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale, use
+or other dealings in this Software without prior written authorization
+of the copyright holder.
+
+===============================================================================

Reply via email to