flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [03/12] git commit: [flex-sdk] [refs/heads/release4.14.0] - custom NOTICE for XercesPatch jar
Date Fri, 02 Jan 2015 18:36:37 GMT
custom NOTICE for XercesPatch jar


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b5f9fdd9
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b5f9fdd9
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b5f9fdd9

Branch: refs/heads/release4.14.0
Commit: b5f9fdd9acc9d53330af172dbb5babdf4ddb069d
Parents: 7048b5f
Author: Alex Harui <aharui@apache.org>
Authored: Sun Dec 28 07:49:11 2014 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Jan 2 10:33:22 2015 -0800

----------------------------------------------------------------------
 modules/thirdparty/xerces-patch/build.xml       |  5 +++--
 .../xerces-patch/src/java/META-INF/NOTICE       | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b5f9fdd9/modules/thirdparty/xerces-patch/build.xml
----------------------------------------------------------------------
diff --git a/modules/thirdparty/xerces-patch/build.xml b/modules/thirdparty/xerces-patch/build.xml
index b2e73f1..79b99d7 100644
--- a/modules/thirdparty/xerces-patch/build.xml
+++ b/modules/thirdparty/xerces-patch/build.xml
@@ -62,8 +62,9 @@
 
     <target name="jar" depends="compile" description="compile and create xercesPatch.jar">
         <mkdir dir="${module.classes}/META-INF"/>
-        <copy file="../../../LICENSE" todir="${module.classes}/META-INF"/>
-        <copy file="../../../NOTICE" todir="${module.classes}/META-INF"/>
+        <copy file="../../../LICENSE.base" tofile="${module.classes}/META-INF/LICENSE"/>
+        <!--use copy of xerces NOTICE stored in our repo -->
+        <!--<copy file="../../../NOTICE" todir="${module.classes}/META-INF"/>-->
 
 		<echo message="Building lib/xercesPatch.jar"/>
         <jar file="${lib.ext.dir}/xercesPatch.jar" basedir="${module.classes}" includes="**/*">

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b5f9fdd9/modules/thirdparty/xerces-patch/src/java/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/modules/thirdparty/xerces-patch/src/java/META-INF/NOTICE b/modules/thirdparty/xerces-patch/src/java/META-INF/NOTICE
new file mode 100644
index 0000000..14313e3
--- /dev/null
+++ b/modules/thirdparty/xerces-patch/src/java/META-INF/NOTICE
@@ -0,0 +1,20 @@
+   =========================================================================
+   ==  NOTICE file corresponding to section 4(d) of the Apache License,   ==
+   ==  Version 2.0, in this case for the Apache Flex Xerces Patch distribution. ==
+   =========================================================================
+
+   Apache Flex Xerces Patch
+   Copyright 2014 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.
+     - voluntary contributions made by Paul Eng on behalf of the 
+       Apache Software Foundation that were originally developed at iClick, Inc.,
+       software copyright (c) 1999.
+
+   Changes to Xerces sources in this product were developed by Adobe Systems Inc.
+


Mime
View raw message