db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1023985 - in /db/derby/code/trunk: ./ tools/ant/properties/ tools/release/notices/
Date Mon, 18 Oct 2010 20:24:48 GMT
Author: rhillegas
Date: Mon Oct 18 20:24:47 2010
New Revision: 1023985

URL: http://svn.apache.org/viewvc?rev=1023985&view=rev
Log:
DERBY-2573: Add machinery to update the NOTICE file with the current copyright year when we
build a release.

Added:
    db/derby/code/trunk/tools/release/notices/
    db/derby/code/trunk/tools/release/notices/felix.txt   (with props)
    db/derby/code/trunk/tools/release/notices/initialgrant.txt   (with props)
    db/derby/code/trunk/tools/release/notices/jdbcstubs.txt   (with props)
    db/derby/code/trunk/tools/release/notices/nisttestgrant.txt   (with props)
    db/derby/code/trunk/tools/release/notices/preamble.txt   (with props)
    db/derby/code/trunk/tools/release/notices/separator.txt   (with props)
    db/derby/code/trunk/tools/release/notices/xalan.txt   (with props)
Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/tools/ant/properties/dirs.properties

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1023985&r1=1023984&r2=1023985&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Mon Oct 18 20:24:47 2010
@@ -1932,6 +1932,45 @@
 
    </target>
 
+   <!-- Build the NOTICE file and check it in -->
+   <target name="buildnotice">
+
+     <property file="${properties.dir}/release.properties"/>
+     <property name="noticefile" value="${basedir}/NOTICE"/>
+
+     <!-- plug in the current copyright year -->
+     <copy overwrite="true" file="${derby.notice.src.dir}/preamble.txt" tofile="${noticefile}">
+       <filterset>
+         <filter token="COPYRIGHT_YEAR" value="${copyright.year}"/>
+       </filterset>
+     </copy>
+
+     <antcall target="appendnotice"><param name="sourcefile" value="initialgrant.txt"/></antcall>
+     <antcall target="appendnotice"><param name="sourcefile" value="nisttestgrant.txt"/></antcall>
+     <antcall target="appendnotice"><param name="sourcefile" value="jdbcstubs.txt"/></antcall>
+     <antcall target="appendnotice"><param name="sourcefile" value="felix.txt"/></antcall>
+     <antcall target="appendnotice"><param name="sourcefile" value="xalan.txt"/></antcall>
+     
+      <antcall target="checkinfile">
+         <param name="checkinComment" value="Check in NOTICE as part of building a release."/>
+         <param name="fileName" value="${noticefile}"/>
+      </antcall>
+
+   </target>
+
+   <!--
+       Append a file to the notice file
+
+       Args:
+           noticefile   Destination NOTICE file
+           sourcefile  Source file to append.
+   -->
+   <target name="appendnotice">
+     <concat destfile="${noticefile}" append="true">
+        <filelist files="${derby.notice.src.dir}/separator.txt,${derby.notice.src.dir}/${sourcefile}"/>
+     </concat>
+   </target>
+
    <!--
        Checkin in-flight edits
 
@@ -2602,6 +2641,9 @@ you should not have to do this.
            <param name="bumpID" value="false"/>
         </antcall>
 
+        <!-- update the NOTICE file with the current copyright year and check NOTICE in
-->
+        <antcall target="buildnotice"/>
+
         <!-- copy the generated sqlstate tables to the docs client and check it in -->
         <antcall target="copyerrordocs"/>
 

Modified: db/derby/code/trunk/tools/ant/properties/dirs.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/dirs.properties?rev=1023985&r1=1023984&r2=1023985&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/dirs.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/dirs.properties Mon Oct 18 20:24:47 2010
@@ -81,6 +81,7 @@ derby.demo.src.dir=${derbysrc.dir}/demo
 derby.testing.src.dir=${derbysrc.dir}/testing
 derby.storeless.src.dir=${derbysrc.dir}/storeless
 derby.metadata.src.dir=${derby.engine.src.dir}/org/apache/derby/impl/jdbc
+derby.notice.src.dir=${basedir}/tools/release/notices
 
 derby.engine.dir=${derby.engine.src.dir}/${derby.dir}
 derby.drda.dir=${derby.drda.src.dir}/${derby.dir}

Added: db/derby/code/trunk/tools/release/notices/felix.txt
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/notices/felix.txt?rev=1023985&view=auto
==============================================================================
--- db/derby/code/trunk/tools/release/notices/felix.txt (added)
+++ db/derby/code/trunk/tools/release/notices/felix.txt Mon Oct 18 20:24:47 2010
@@ -0,0 +1,35 @@
+
+The Derby build relies on source files supplied by the Apache Felix
+project. The following notice covers the Felix files:
+
+  Apache Felix Main
+  Copyright 2008 The Apache Software Foundation
+
+
+  I. Included Software
+
+  This product includes software developed at
+  The Apache Software Foundation (http://www.apache.org/).
+  Licensed under the Apache License 2.0.
+
+  This product includes software developed at
+  The OSGi Alliance (http://www.osgi.org/).
+  Copyright (c) OSGi Alliance (2000, 2007).
+  Licensed under the Apache License 2.0.
+
+  This product includes software from http://kxml.sourceforge.net.
+  Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
+  Licensed under BSD License.
+
+  II. Used Software
+
+  This product uses software developed at
+  The OSGi Alliance (http://www.osgi.org/).
+  Copyright (c) OSGi Alliance (2000, 2007).
+  Licensed under the Apache License 2.0.
+
+
+  III. License Summary
+  - Apache License 2.0
+  - BSD License
+

Propchange: db/derby/code/trunk/tools/release/notices/felix.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/release/notices/initialgrant.txt
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/notices/initialgrant.txt?rev=1023985&view=auto
==============================================================================
--- db/derby/code/trunk/tools/release/notices/initialgrant.txt (added)
+++ db/derby/code/trunk/tools/release/notices/initialgrant.txt Mon Oct 18 20:24:47 2010
@@ -0,0 +1,13 @@
+Portions of Derby were originally developed by
+International Business Machines Corporation and are
+licensed to the Apache Software Foundation under the
+"Software Grant and Corporate Contribution License Agreement",
+informally known as the "Derby CLA".
+The following copyright notice(s) were affixed to portions of the code
+with which this file is now or was at one time distributed
+and are placed here unaltered.
+
+(C) Copyright 1997,2004 International Business Machines Corporation.  All rights reserved.
+
+(C) Copyright IBM Corp. 2003. 
+

Propchange: db/derby/code/trunk/tools/release/notices/initialgrant.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/release/notices/jdbcstubs.txt
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/notices/jdbcstubs.txt?rev=1023985&view=auto
==============================================================================
--- db/derby/code/trunk/tools/release/notices/jdbcstubs.txt (added)
+++ db/derby/code/trunk/tools/release/notices/jdbcstubs.txt Mon Oct 18 20:24:47 2010
@@ -0,0 +1,11 @@
+
+The JDBC apis for small devices and JDBC3 (under java/stubs/jsr169 and
+java/stubs/jdbc3) were produced by trimming sources supplied by the
+Apache Harmony project. In addition, the Harmony SerialBlob and
+SerialClob implementations are used. The following notice covers the Harmony sources:
+
+Portions of Harmony were originally developed by
+Intel Corporation and are licensed to the Apache Software
+Foundation under the "Software Grant and Corporate Contribution
+License Agreement", informally known as the "Intel Harmony CLA".
+

Propchange: db/derby/code/trunk/tools/release/notices/jdbcstubs.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/release/notices/nisttestgrant.txt
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/notices/nisttestgrant.txt?rev=1023985&view=auto
==============================================================================
--- db/derby/code/trunk/tools/release/notices/nisttestgrant.txt (added)
+++ db/derby/code/trunk/tools/release/notices/nisttestgrant.txt Mon Oct 18 20:24:47 2010
@@ -0,0 +1,9 @@
+
+The portion of the functionTests under 'nist' was originally 
+developed by the National Institute of Standards and Technology (NIST), 
+an agency of the United States Department of Commerce, and adapted by
+International Business Machines Corporation in accordance with the NIST
+Software Acknowledgment and Redistribution document at
+http://www.itl.nist.gov/div897/ctg/sql_form.htm
+
+

Propchange: db/derby/code/trunk/tools/release/notices/nisttestgrant.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/release/notices/preamble.txt
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/notices/preamble.txt?rev=1023985&view=auto
==============================================================================
--- db/derby/code/trunk/tools/release/notices/preamble.txt (added)
+++ db/derby/code/trunk/tools/release/notices/preamble.txt Mon Oct 18 20:24:47 2010
@@ -0,0 +1,15 @@
+=========================================================================
+==  NOTICE file corresponding to section 4(d) of the Apache License,
+==  Version 2.0, in this case for the Apache Derby distribution.
+==
+==  DO NOT EDIT THIS FILE DIRECTLY. IT IS GENERATED
+==  BY THE buildnotice TARGET IN THE TOP LEVEL build.xml FILE.
+==
+=========================================================================
+
+Apache Derby
+Copyright 2004-@COPYRIGHT_YEAR@ The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: db/derby/code/trunk/tools/release/notices/preamble.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/release/notices/separator.txt
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/notices/separator.txt?rev=1023985&view=auto
==============================================================================
--- db/derby/code/trunk/tools/release/notices/separator.txt (added)
+++ db/derby/code/trunk/tools/release/notices/separator.txt Mon Oct 18 20:24:47 2010
@@ -0,0 +1,3 @@
+
+=========================================================================
+

Propchange: db/derby/code/trunk/tools/release/notices/separator.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: db/derby/code/trunk/tools/release/notices/xalan.txt
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/notices/xalan.txt?rev=1023985&view=auto
==============================================================================
--- db/derby/code/trunk/tools/release/notices/xalan.txt (added)
+++ db/derby/code/trunk/tools/release/notices/xalan.txt Mon Oct 18 20:24:47 2010
@@ -0,0 +1,84 @@
+
+The Derby build relies on jar files supplied by the Apache Xalan
+project. The following notice covers the Xalan jar files:
+
+   =========================================================================
+   ==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+   ==  Version 2.0, in this case for the Apache Xalan Java distribution.  ==
+   =========================================================================
+
+   Apache Xalan (Xalan XSLT processor)
+   Copyright 1999-2006 The Apache Software Foundation
+
+   Apache Xalan (Xalan serializer)
+   Copyright 1999-2006 The Apache Software Foundation
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+
+   =========================================================================
+   Portions of this software was originally based on the following:
+     - software copyright (c) 1999-2002, Lotus Development Corporation.,
+       http://www.lotus.com.
+     - software copyright (c) 2001-2002, Sun Microsystems.,
+       http://www.sun.com.
+     - software copyright (c) 2003, IBM Corporation., 
+       http://www.ibm.com.
+       
+   =========================================================================
+   The binary distribution package (ie. jars, samples and documentation) of
+   this product includes software developed by the following:
+       
+     - The Apache Software Foundation 
+         - Xerces Java - see LICENSE.txt 
+         - JAXP 1.3 APIs - see LICENSE.txt
+         - Bytecode Engineering Library - see LICENSE.txt
+         - Regular Expression - see LICENSE.txt
+       
+     - Scott Hudson, Frank Flannery, C. Scott Ananian 
+         - CUP Parser Generator runtime (javacup\runtime) - see LICENSE.txt 
+ 
+   ========================================================================= 
+   The source distribution package (ie. all source and tools required to build
+   Xalan Java) of this product includes software developed by the following:
+       
+     - The Apache Software Foundation
+         - Xerces Java - see LICENSE.txt 
+         - JAXP 1.3 APIs - see LICENSE.txt
+         - Bytecode Engineering Library - see LICENSE.txt
+         - Regular Expression - see LICENSE.txt
+         - Ant - see LICENSE.txt
+         - Stylebook doc tool - see LICENSE.txt    
+       
+     - Elliot Joel Berk and C. Scott Ananian 
+         - Lexical Analyzer Generator (JLex) - see LICENSE.txt
+
+   =========================================================================       
+   Apache Xerces Java
+   Copyright 1999-2006 The Apache Software Foundation
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Portions of Apache Xerces Java in xercesImpl.jar and xml-apis.jar
+   were originally based on the following:
+     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+     - voluntary contributions made by Paul Eng on behalf of the 
+       Apache Software Foundation that were originally developed at iClick, Inc.,
+       software copyright (c) 1999.    
+
+   =========================================================================   
+   Apache xml-commons xml-apis (redistribution of xml-apis.jar)
+
+   Apache XML Commons
+   Copyright 2001-2003,2006 The Apache Software Foundation.
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Portions of this software were originally based on the following:
+     - software copyright (c) 1999, IBM Corporation., http://www.ibm.com.
+     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
+     - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
+

Propchange: db/derby/code/trunk/tools/release/notices/xalan.txt
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message