You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2015/01/03 10:02:25 UTC
[02/13] git commit: [flex-sdk] [refs/heads/develop] - custom NOTICE
for XercesPatch jar
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/be2e7dfc
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/be2e7dfc
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/be2e7dfc
Branch: refs/heads/develop
Commit: be2e7dfcba987074e64fa1ab0947019c260aa688
Parents: e054e39
Author: Alex Harui <ah...@apache.org>
Authored: Sun Dec 28 07:49:11 2014 -0800
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sat Jan 3 10:02:06 2015 +0100
----------------------------------------------------------------------
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/be2e7dfc/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/be2e7dfc/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.
+