You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2015/01/11 15:09:36 UTC
[1/3] git commit: [flex-sdk] [refs/heads/release4.14.0] - update
paths to license files and fix jar file name
Repository: flex-sdk
Updated Branches:
refs/heads/release4.14.0 377f6287b -> 926b44d35
update paths to license files and fix jar file name
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/662ef7f8
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/662ef7f8
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/662ef7f8
Branch: refs/heads/release4.14.0
Commit: 662ef7f8d7e9d406c60bc18a305aa7594c60786c
Parents: 377f628
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Jan 12 01:04:54 2015 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Jan 12 01:04:54 2015 +1100
----------------------------------------------------------------------
LICENSE.bin | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/662ef7f8/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index 3702275..e64eaa8 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -76,50 +76,50 @@ CERN makes no representations about the suitability of this software for any pur
It is provided "as is" without expressed or implied warranty.
This product bundles software available under a
-BSD software license. For details, see lib/external/THAI.txt
+BSD software license. For details, see lib/external/saxon9-NOTICES/THAI.txt
This product bundles software available under a
-MIT software license. For details, see lib/external/UNICODE.txt
+MIT software license. For details, see lib/external/saxon9-NOTICES/UNICODE.txt
This product bundles software available under a
-MIT software license. For details, see lib/external/JAMESCLARK.txt
+MIT software license. For details, see lib/external/saxon9-NOTICES/JAMESCLARK.txt
------------------------------------------------------------------------------------------
lib/external/xml-apis.jar
This product bundles documents available under a
-W3C document license. For details, see lib/external/LICENSE.dom-documentation.txt
+W3C document license. For details, see lib/external/xml-apis-LICENSES/LICENSE.dom-documentation.txt
This product bundles software available under a
-W3C software license. For details, see lib/external/LICENSE.dom-software.txt
+W3C software license. For details, see lib/external/xml-apis-LICENSES/LICENSE.dom-software.txt
This product bundles SAX2 available under a Public Domain license.
-For more details see lib/external/LICENSE.sax.txt
+For more details see lib/external/xml-apis-LICENSES/LICENSE.sax.txt
------------------------------------------------------------------------------------------
lib/external/xml-apis-ext.jar
This product bundles documents available under a
-W3C document license. For details, see lib/external/LICENSE.dom-documentation.txt
+W3C document license. For details, see lib/external/xml-apis-ext-LICENSES/LICENSE.dom-documentation.txt
This product bundles software available under a
-W3C software license. For details, see lib/external/LICENSE.dom-software.txt
+W3C software license. For details, see lib/external/xml-apis-ext-LICENSES/LICENSE.dom-software.txt
------------------------------------------------------------------------------------------
-lib/external/xalanImpl.jar
+lib/external/xalan.jar
This product bundles Apache Commons BCEL available under a
-Apache Software License, Version 1.1. For details, see lib/external/BCEL.LICENSE.txt
+Apache Software License, Version 1.1. For details, see lib/external/xalan-LICENSES/BCEL.LICENSE.txt
This product bundle CUP Parser Generator available under an (old style)
-MIT license. For details, see lib/external/java_cup.LICENSE.txt
+MIT license. For details, see lib/external/xalan-LICENSES/java_cup.LICENSE.txt
This product bundles Jakarta Regexp available under a
Apache Software License, Version 1.1. For details,
-see lib/external/LICENSE.dom-software.txt
+see lib/external/xalan-LICENSES/LICENSE.dom-software.txt
------------------------------------------------------------------------------------------
[3/3] git commit: [flex-sdk] [refs/heads/release4.14.0] - removed
whitespace padding at front of lines and stray ~
Posted by jm...@apache.org.
removed whitespace padding at front of lines and stray ~
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/926b44d3
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/926b44d3
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/926b44d3
Branch: refs/heads/release4.14.0
Commit: 926b44d35d2b199ad9df6c4c20fcc17ab9bbc136
Parents: 53a7911
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Jan 12 01:09:32 2015 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Jan 12 01:09:32 2015 +1100
----------------------------------------------------------------------
NOTICE.bin | 88 ++++++++++++++++++++++++++++-----------------------------
1 file changed, 44 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/926b44d3/NOTICE.bin
----------------------------------------------------------------------
diff --git a/NOTICE.bin b/NOTICE.bin
index beb0cd3..0a673ae 100644
--- a/NOTICE.bin
+++ b/NOTICE.bin
@@ -1,49 +1,49 @@
- Portions of Apache Xerces 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.
+Portions of Apache Xerces 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.
- Portions of Apache Xerces 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.
-~
- Portions of Apache Xerces are derived from classes placed in the public domain
- by Arbortext on 10 Apr 2000. See:
- http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm
+Portions of Apache Xerces 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.
+
+Portions of Apache Xerces are derived from classes placed in the public domain
+by Arbortext on 10 Apr 2000. See:
+ http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm
- Portions of Apache Xalan were 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.
- - voluntary contributions made by Ovidiu Predescu <ov...@cup.hp.com> on
- behalf of the Apache Software Foundation that was originally developed
- at Hewlett Packard Company.
+Portions of Apache Xalan were 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.
+ - voluntary contributions made by Ovidiu Predescu <ov...@cup.hp.com> on
+ behalf of the Apache Software Foundation that was originally developed
+ at Hewlett Packard Company.
- Apache Xalan includes software developed by the following:
- - The Apache Software Foundation (see BCEL.README.txt, ant.README.txt,
- regexp.README.txt, stylebook-1.0-b3_xalan-2.README.txt,
- xercesImpl.README.txt, xml-apis.README.txt)
- - International Business Machines Corporation (see bsf.README.txt)
- - World Wide Web Consortium (see jtidy.README.txt)
- - Elliot Joel Berk and C. Scott Ananian (see JLex.README.txt)
- - Scott Hudson, Frank Flannery, C. Scott Ananian
- (see java_cup.READNE.txt, runtime.README.txt)
-
- Portions of Apache XML Commons 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
-
- Portions of SAxon9 are derived from classes placed in the
- public domain by Arbortext on 10 Apr 2000. See:
- http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm
+Apache Xalan includes software developed by the following:
+ - The Apache Software Foundation (see BCEL.README.txt, ant.README.txt,
+ regexp.README.txt, stylebook-1.0-b3_xalan-2.README.txt,
+ xercesImpl.README.txt, xml-apis.README.txt)
+ - International Business Machines Corporation (see bsf.README.txt)
+ - World Wide Web Consortium (see jtidy.README.txt)
+ - Elliot Joel Berk and C. Scott Ananian (see JLex.README.txt)
+ - Scott Hudson, Frank Flannery, C. Scott Ananian
+ (see java_cup.READNE.txt, runtime.README.txt)
+
+Portions of Apache XML Commons 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
+
+Portions of SAxon9 are derived from classes placed in the
+public domain by Arbortext on 10 Apr 2000. See:
+ http://www.arbortext.com/customer_support/updates_and_technical_notes/catalogs/docs/README.htm
[2/3] git commit: [flex-sdk] [refs/heads/release4.14.0] - Extract and
add required license files to binary release
Posted by jm...@apache.org.
Extract and add required license files to binary release
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/53a7911f
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/53a7911f
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/53a7911f
Branch: refs/heads/release4.14.0
Commit: 53a7911f369ac5c81fb0a0621f73a9c3649ec96e
Parents: 662ef7f
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Jan 12 01:06:09 2015 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Jan 12 01:06:09 2015 +1100
----------------------------------------------------------------------
modules/downloads.xml | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/53a7911f/modules/downloads.xml
----------------------------------------------------------------------
diff --git a/modules/downloads.xml b/modules/downloads.xml
index 291b110..92cf276 100644
--- a/modules/downloads.xml
+++ b/modules/downloads.xml
@@ -277,6 +277,15 @@
<include name="README.xml-apis-ext*"/>
</fileset>
</copy>
+ <unzip src="${lib.ext.dir}/xml-apis-ext.jar" dest="${lib.ext.dir}/xml-apis-ext-LICENSES">
+ <patternset>
+ <include name="license/**" />
+ </patternset>
+ </unzip>
+ <copy toDir="${lib.ext.dir}/xml-apis-ext-LICENSES/" flatten="true">
+ <fileset dir="${lib.ext.dir}/xml-apis-ext-LICENSES/license" />
+ </copy>
+ <delete dir="${lib.ext.dir}/xml-apis-ext-LICENSES/license" />
<delete dir="${download.dir}/${batik.zip.dir}"/>
</target>
@@ -514,6 +523,13 @@
<param name="destJarFile" value="${lib.ext.dir}/xalan.jar"/>
</antcall>
+ <unzip src="${lib.ext.dir}/xalan.jar" dest="${lib.ext.dir}/xalan-LICENSES">
+ <patternset>
+ <include name="*LICENSE*" />
+ <include name="*README*" />
+ </patternset>
+ </unzip>
+
<copy todir="${lib.ext.dir}">
<fileset dir="${download.dir}/xalan-j_2_6_0">
<include name="LICENSE"/>
@@ -549,7 +565,16 @@
</antcall>
<copy toDir="${lib.ext.dir}" file="${download.dir}/${xerces.dir}/xml-apis.jar" />
-
+ <unzip src="${lib.ext.dir}/xml-apis.jar" dest="${lib.ext.dir}/xml-apis-LICENSES">
+ <patternset>
+ <include name="license/**" />
+ </patternset>
+ </unzip>
+ <copy toDir="${lib.ext.dir}/xml-apis-LICENSES/" flatten="true">
+ <fileset dir="${lib.ext.dir}/xml-apis-LICENSES/license" />
+ </copy>
+ <delete dir="${lib.ext.dir}/xml-apis-LICENSES/license" />
+
<copy todir="${lib.ext.dir}">
<fileset dir="${download.dir}/${xerces.dir}">
<include name="*NOTICE*"/>