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/04 12:32:51 UTC
[01/15] git commit: [flex-sdk] [refs/heads/develop] - Updated year
and made first part consistent with
http://www.apache.org/dev/licensing-howto.html#simple
Repository: flex-sdk
Updated Branches:
refs/heads/develop 726dc3ed3 -> 078fb9577
Updated year and made first part consistent with http://www.apache.org/dev/licensing-howto.html#simple
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/87f681ab
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/87f681ab
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/87f681ab
Branch: refs/heads/develop
Commit: 87f681ab06ab7dfc4fec98d4390a11a14aca506e
Parents: 726dc3e
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 16:28:50 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:30 2015 +0100
----------------------------------------------------------------------
NOTICE | 6 +++---
NOTICE.asc | 6 +++---
NOTICE.base | 6 +++---
NOTICE.pb | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/87f681ab/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index a7b0456..9b945b6 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,8 +1,8 @@
Apache Flex
-Copyright 2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
-This product includes software developed at The Apache Software Foundation
-(http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
The Initial Developer of the Original Code, known as Adobe Flex, is Adobe
Systems Incorporated (http://www.adobe.com/).
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/87f681ab/NOTICE.asc
----------------------------------------------------------------------
diff --git a/NOTICE.asc b/NOTICE.asc
index a71af44..de97bec 100644
--- a/NOTICE.asc
+++ b/NOTICE.asc
@@ -1,8 +1,8 @@
Apache Flex
-Copyright 2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
-This product includes software developed at The Apache Software Foundation
-(http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
The Initial Developer of the Original Code, known as Adobe Flex, is Adobe
Systems Incorporated (http://www.adobe.com/).
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/87f681ab/NOTICE.base
----------------------------------------------------------------------
diff --git a/NOTICE.base b/NOTICE.base
index fc8b862..8b91f51 100644
--- a/NOTICE.base
+++ b/NOTICE.base
@@ -1,8 +1,8 @@
Apache Flex
-Copyright 2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
-This product includes software developed at The Apache Software Foundation
-(http://www.apache.org/).
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
The Initial Developer of the Original Code, known as Adobe Flex, is Adobe
Systems Incorporated (http://www.adobe.com/).
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/87f681ab/NOTICE.pb
----------------------------------------------------------------------
diff --git a/NOTICE.pb b/NOTICE.pb
index bbf5c9a..5aa2900 100644
--- a/NOTICE.pb
+++ b/NOTICE.pb
@@ -1,5 +1,5 @@
Apache Flex
-Copyright 2014 The Apache Software Foundation
+Copyright 2012-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[04/15] git commit: [flex-sdk] [refs/heads/develop] - fix license
section for lib-apis-ext
Posted by er...@apache.org.
fix license section for lib-apis-ext
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/152fd4c0
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/152fd4c0
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/152fd4c0
Branch: refs/heads/develop
Commit: 152fd4c0d4f279d0b4fd0b4721bfdf0ba2de7b28
Parents: 3aa80c8
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 17:18:58 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:32 2015 +0100
----------------------------------------------------------------------
LICENSE.bin | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/152fd4c0/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index a3b9858..ae4b0f2 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -80,8 +80,10 @@ lib/external/xercesImpl.jar (Xerces-J-bin.2.9.1.zip)
lib/external/xml-apis-ext.jar (batik-1.7-src.tar.gz)
- Apache License Version 2.0, January 2004
-
- See the Apache License, Version 2.0 at the top of this file.
+This product bundles documents available under a
+W3C document license. For details, see lib/external/LICENSE.dom-documentation.txt
+
+This product bundles software available under a
+W3C software license. For details, see lib/external/LICENSE.dom-software.txt
------------------------------------------------------------------------------------------
[09/15] git commit: [flex-sdk] [refs/heads/develop] - update licenses
for xalan
Posted by er...@apache.org.
update licenses for xalan
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/19892ace
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/19892ace
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/19892ace
Branch: refs/heads/develop
Commit: 19892ace0d5a3de86b5eab64057bc5eee78f144a
Parents: bf0454c
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 17:52:42 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:34 2015 +0100
----------------------------------------------------------------------
LICENSE.bin | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/19892ace/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index 54d3cce..fe85dee 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -91,3 +91,16 @@ This product bundles software available under a
W3C software license. For details, see lib/external/LICENSE.dom-software.txt
------------------------------------------------------------------------------------------
+
+lib/external/xalanImpl.jar
+
+This product bundles Apache Commons BCEL available under a
+Apache Software License, Version 1.1. For details, see lib/external/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
+
+This product bundles jakarta regexp available under a
+Apache Software License, Version 1.1. For details, see lib/external/LICENSE.dom-software.txt
+
+------------------------------------------------------------------------------------------
[03/15] git commit: [flex-sdk] [refs/heads/develop] - removed
unneeded lines for Xerces as per
http://www.apache.org/dev/licensing-howto.html#bundle-asf-product. Minor
format change as well.
Posted by er...@apache.org.
removed unneeded lines for Xerces as per http://www.apache.org/dev/licensing-howto.html#bundle-asf-product. Minor format change as well.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/9890ed55
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/9890ed55
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/9890ed55
Branch: refs/heads/develop
Commit: 9890ed55d73604309c6df59bb790786a0a10c5d6
Parents: 87f681a
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 16:41:10 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:31 2015 +0100
----------------------------------------------------------------------
NOTICE | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/9890ed55/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 9b945b6..a78d131 100644
--- a/NOTICE
+++ b/NOTICE
@@ -29,14 +29,12 @@ The Batik SVG toolkit source includes images from the Tango Desktop Project
The Batik SVG toolkit source includes images from the Pasodoble Icon Theme
(http://www.jesusda.com/projects/pasodoble).
-The Xerces Patch includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
Portions of 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.
+ 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.
[05/15] git commit: [flex-sdk] [refs/heads/develop] - Removed xalan
as per http://www.apache.org/dev/licensing-howto.html#alv2-dep
Posted by er...@apache.org.
Removed xalan as per http://www.apache.org/dev/licensing-howto.html#alv2-dep
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/3aa80c80
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/3aa80c80
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/3aa80c80
Branch: refs/heads/develop
Commit: 3aa80c80fa87006b2e1eac873aa2148f93a6bd46
Parents: 5fd2c59
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 16:55:12 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:32 2015 +0100
----------------------------------------------------------------------
LICENSE.bin | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3aa80c80/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index 1d1f150..a3b9858 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -78,15 +78,6 @@ lib/external/xercesImpl.jar (Xerces-J-bin.2.9.1.zip)
------------------------------------------------------------------------------------------
-lib/external/xalan.jar (xalan-j_2_6_0-bin.tar.gz)
-
- Apache License Version 2.0, January 2004
-
- See notice file at lib/external/xalan-NOTICE
- See the Apache License, Version 2.0 at the top of this file.
-
-------------------------------------------------------------------------------------------
-
lib/external/xml-apis-ext.jar (batik-1.7-src.tar.gz)
Apache License Version 2.0, January 2004
[06/15] git commit: [flex-sdk] [refs/heads/develop] - Removed Xerces
as per http://www.apache.org/dev/licensing-howto.html#alv2-dep
Posted by er...@apache.org.
Removed Xerces as per http://www.apache.org/dev/licensing-howto.html#alv2-dep
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/bf0454cd
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/bf0454cd
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/bf0454cd
Branch: refs/heads/develop
Commit: bf0454cd6bea586b56e9bde901249980dc8da73f
Parents: 819b547
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 17:34:47 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:33 2015 +0100
----------------------------------------------------------------------
LICENSE.bin | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/bf0454cd/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index a01d17c..54d3cce 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -69,15 +69,6 @@ module. All Rights Reserved.
------------------------------------------------------------------------------------------
-lib/external/xercesImpl.jar (Xerces-J-bin.2.9.1.zip)
-
- Apache License Version 2.0, January 2004
-
- See notice files at lib/external/xerces-NOTICES
- See license files at lib/external/xerces-LICENSE
-
-------------------------------------------------------------------------------------------
-
lib/external/xml-apis.jar
This product bundles documents available under a
[10/15] git commit: [flex-sdk] [refs/heads/develop] - Fixed Xalan
notice by removing unneeded lines as per
http://www.apache.org/dev/licensing-howto.html#bundle-asf-product
Posted by er...@apache.org.
Fixed Xalan notice by removing unneeded lines as per http://www.apache.org/dev/licensing-howto.html#bundle-asf-product
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/3cc3c805
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/3cc3c805
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/3cc3c805
Branch: refs/heads/develop
Commit: 3cc3c805179329baf1f145af2caab9106d762075
Parents: 55db76b
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 17:58:40 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:35 2015 +0100
----------------------------------------------------------------------
NOTICE.bin | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/3cc3c805/NOTICE.bin
----------------------------------------------------------------------
diff --git a/NOTICE.bin b/NOTICE.bin
index 72697b0..87f07ee 100644
--- a/NOTICE.bin
+++ b/NOTICE.bin
@@ -1,12 +1,5 @@
- =========================================================================
- == NOTICE file corresponding to section 4(d) of the Apache License, ==
- == Version 2.0, in this case for the Apache Xalan distribution. ==
- =========================================================================
-
- This product includes software developed by
- The Apache Software Foundation (http://www.apache.org/).
- Portions of this software was originally based on the following:
+ Portions of 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.,
[11/15] git commit: [flex-sdk] [refs/heads/develop] - remove unneeded
lines for Xerces. Made spacing match in Xalan
Posted by er...@apache.org.
remove unneeded lines for Xerces. Made spacing match in Xalan
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/29275500
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/29275500
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/29275500
Branch: refs/heads/develop
Commit: 2927550065ddf689e099b2b77911e3cf662fa516
Parents: 3cc3c80
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 18:08:43 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:35 2015 +0100
----------------------------------------------------------------------
NOTICE.bin | 27 +++++----------------------
1 file changed, 5 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/29275500/NOTICE.bin
----------------------------------------------------------------------
diff --git a/NOTICE.bin b/NOTICE.bin
index 87f07ee..64e650d 100644
--- a/NOTICE.bin
+++ b/NOTICE.bin
@@ -9,34 +9,17 @@
behalf of the Apache Software Foundation that was originally developed
at Hewlett Packard Company.
- This product includes software developed by the following:
-
+ 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)
-
+ 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)
-
+ - 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)
- =========================================================================
- == NOTICE file corresponding to section 4(d) of the Apache License, ==
- == Version 2.0, in this case for the Apache Xerces distribution. ==
- =========================================================================
-
-
- Apache Xerces Java
- Copyright 1999-2007 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:
+ Portions of 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
[12/15] git commit: [flex-sdk] [refs/heads/develop] - Fixed Xerces
notices
Posted by er...@apache.org.
Fixed Xerces notices
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/73cfb686
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/73cfb686
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/73cfb686
Branch: refs/heads/develop
Commit: 73cfb686de99114e2b926dc8667ce14b73e5670f
Parents: 2927550
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 18:14:40 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:36 2015 +0100
----------------------------------------------------------------------
NOTICE.bin | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/73cfb686/NOTICE.bin
----------------------------------------------------------------------
diff --git a/NOTICE.bin b/NOTICE.bin
index 64e650d..701652a 100644
--- a/NOTICE.bin
+++ b/NOTICE.bin
@@ -25,15 +25,19 @@
- 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 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 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
-Apache XML Commons Resolver
-Copyright 2006 The Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation http://www.apache.org/
-Portions of this code 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
[14/15] git commit: [flex-sdk] [refs/heads/develop] - swapped order
of Xerces and Xalan so it flows better from the base NOTICE
Posted by er...@apache.org.
swapped order of Xerces and Xalan so it flows better from the base NOTICE
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/81ab0b83
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/81ab0b83
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/81ab0b83
Branch: refs/heads/develop
Commit: 81ab0b83d7c554595e356354af876dab01485881
Parents: b4cf8b8
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 18:33:34 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:37 2015 +0100
----------------------------------------------------------------------
NOTICE.bin | 43 ++++++++++++++++++++-----------------------
1 file changed, 20 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/81ab0b83/NOTICE.bin
----------------------------------------------------------------------
diff --git a/NOTICE.bin b/NOTICE.bin
index e686483..cdf499e 100644
--- a/NOTICE.bin
+++ b/NOTICE.bin
@@ -1,4 +1,23 @@
+ 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 Xalan were originally based on the following:
- software copyright (c) 1999-2002, Lotus Development Corporation.,
http://www.lotus.com.
@@ -18,31 +37,9 @@
- 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 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 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
-
-
-
[15/15] git commit: [flex-sdk] [refs/heads/develop] - change to be
consistent style as per
http://www.apache.org/dev/licensing-howto.html#permissive-deps
Posted by er...@apache.org.
change to be consistent style as per http://www.apache.org/dev/licensing-howto.html#permissive-deps
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/078fb957
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/078fb957
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/078fb957
Branch: refs/heads/develop
Commit: 078fb9577a9dab00a9001d2b0b2fa2c18cf2b472
Parents: 81ab0b8
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 18:38:42 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:37 2015 +0100
----------------------------------------------------------------------
LICENSE.bin | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/078fb957/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index eaa301a..240e8f9 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -4,17 +4,17 @@ Below are the licenses for components included in the binary distribution.
lib/external/commons-collection.jar (commons-collections-3.0.tar.gz)
- The Apache Software License, Version 1.1
-
- See license file at lib/external/commons-collections-LICENSE.txt
+This product bundles Apache Commons Collections available under a
+Apache Software License, Version 1.1. For details,
+see lib/external/commons-collections-LICENSE.txt
------------------------------------------------------------------------------------------
lib/external/commons-discovery.jar (commons-discovery-0.2.tar.gz)
- The Apache Software License, Version 1.1
-
- See license file at lib/external/commons-discovery-LICENSE
+This product bundles Apache Commons Discovery available under a
+Apache Software License, Version 1.1. For details,
+see lib/external/commons-collections-LICENSE.txt
------------------------------------------------------------------------------------------
@@ -100,7 +100,8 @@ Apache Software License, Version 1.1. For details, see lib/external/BCEL.LICENSE
This product bundle CUP Parser Generator available under an (old style)
MIT license. For details, see lib/external/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
+This product bundles Jakarta egexp available under a
+Apache Software License, Version 1.1. For details,
+see lib/external/LICENSE.dom-software.txt
------------------------------------------------------------------------------------------
[13/15] git commit: [flex-sdk] [refs/heads/develop] - Added Apache
XML Commons and add Apache to Apache projects
Posted by er...@apache.org.
Added Apache XML Commons and add Apache to Apache projects
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b4cf8b89
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b4cf8b89
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b4cf8b89
Branch: refs/heads/develop
Commit: b4cf8b89a838a10c06c124e2f5a86cef025eebe0
Parents: 73cfb68
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 18:18:17 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:36 2015 +0100
----------------------------------------------------------------------
NOTICE.bin | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b4cf8b89/NOTICE.bin
----------------------------------------------------------------------
diff --git a/NOTICE.bin b/NOTICE.bin
index 701652a..e686483 100644
--- a/NOTICE.bin
+++ b/NOTICE.bin
@@ -1,5 +1,5 @@
- Portions of Xalan were originally based on the following:
+ 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.,
@@ -9,7 +9,7 @@
behalf of the Apache Software Foundation that was originally developed
at Hewlett Packard Company.
- Xalan includes software developed by the following:
+ 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)
@@ -19,14 +19,14 @@
- Scott Hudson, Frank Flannery, C. Scott Ananian
(see java_cup.READNE.txt, runtime.README.txt)
- Portions of Xerces were originally based on the following:
+ 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 Xerces was originally based on the following:
+ 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.,
@@ -34,9 +34,14 @@
- software copyright (c) 2003, IBM Corporation.,
http://www.ibm.com.
~
- Portions of Xerces are derived from classes placed in the public domain
+ 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 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
[02/15] git commit: [flex-sdk] [refs/heads/develop] - Removed
commons-logging.jar as per
http://www.apache.org/dev/licensing-howto.html#alv2-dep
Posted by er...@apache.org.
Removed commons-logging.jar as per http://www.apache.org/dev/licensing-howto.html#alv2-dep
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/5fd2c593
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/5fd2c593
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/5fd2c593
Branch: refs/heads/develop
Commit: 5fd2c59398df7d2c4f56aa88ce382c8af860a63f
Parents: 9890ed5
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 16:50:02 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:31 2015 +0100
----------------------------------------------------------------------
LICENSE.bin | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/5fd2c593/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index 8788084..1d1f150 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -18,14 +18,6 @@ lib/external/commons-discovery.jar (commons-discovery-0.2.tar.gz)
------------------------------------------------------------------------------------------
-lib/external/commons-logging.jar (commons-logging-1.0.4.tar.gz)
-
- Apache License Version 2.0, January 2004
-
- See the Apache License, Version 2.0 at the top of this file.
-
-------------------------------------------------------------------------------------------
-
lib/external/java-cc.jar (javacc-5.0.tar.gz)
Copyright (c) 2006, Sun Microsystems, Inc.
[08/15] git commit: [flex-sdk] [refs/heads/develop] - fix caps
Posted by er...@apache.org.
fix caps
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/55db76bf
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/55db76bf
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/55db76bf
Branch: refs/heads/develop
Commit: 55db76bf518c8fec4456edfbc961dfba794ae222
Parents: 19892ac
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 17:56:32 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:34 2015 +0100
----------------------------------------------------------------------
LICENSE.bin | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/55db76bf/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index fe85dee..eaa301a 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -100,7 +100,7 @@ Apache Software License, Version 1.1. For details, see lib/external/BCEL.LICENSE
This product bundle CUP Parser Generator available under an (old style)
MIT license. For details, see lib/external/java_cup.LICENSE.txt
-This product bundles jakarta regexp available under a
+This product bundles Jakarta Regexp available under a
Apache Software License, Version 1.1. For details, see lib/external/LICENSE.dom-software.txt
------------------------------------------------------------------------------------------
[07/15] git commit: [flex-sdk] [refs/heads/develop] - added correct
licensing for xml-apis.jar
Posted by er...@apache.org.
added correct licensing for xml-apis.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/819b5479
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/819b5479
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/819b5479
Branch: refs/heads/develop
Commit: 819b5479c2e775c751e32c8b21e4f3d56b22e6e3
Parents: 152fd4c
Author: Justin Mclean <jm...@apache.org>
Authored: Sun Jan 4 17:32:56 2015 +1100
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Sun Jan 4 12:32:33 2015 +0100
----------------------------------------------------------------------
LICENSE.bin | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/819b5479/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index ae4b0f2..a01d17c 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -78,7 +78,20 @@ lib/external/xercesImpl.jar (Xerces-J-bin.2.9.1.zip)
------------------------------------------------------------------------------------------
-lib/external/xml-apis-ext.jar (batik-1.7-src.tar.gz)
+lib/external/xml-apis.jar
+
+This product bundles documents available under a
+W3C document license. For details, see lib/external/LICENSE.dom-documentation.txt
+
+This product bundles software available under a
+W3C software license. For details, see lib/external/LICENSE.dom-software.txt
+
+This produce bundles SAX2 available under a Public Domain license.
+For more details see lib/external/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