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/06/18 11:20:32 UTC
[1/2] git commit: [flex-utilities] [refs/heads/develop] - Changed
year to be range as per http://www.apache.org/dev/licensing-howto.html#simple
Repository: flex-utilities
Updated Branches:
refs/heads/develop ce6849c3c -> 0d7044548
Changed year to be range as per http://www.apache.org/dev/licensing-howto.html#simple
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/0450e267
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/0450e267
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/0450e267
Branch: refs/heads/develop
Commit: 0450e2676a9ea3d9a33a929a59da34109b4315e7
Parents: ce6849c
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Jun 18 19:18:49 2015 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Jun 18 19:18:49 2015 +1000
----------------------------------------------------------------------
flex-installer/installer/NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/0450e267/flex-installer/installer/NOTICE
----------------------------------------------------------------------
diff --git a/flex-installer/installer/NOTICE b/flex-installer/installer/NOTICE
index 7fb7480..96d0eac 100644
--- a/flex-installer/installer/NOTICE
+++ b/flex-installer/installer/NOTICE
@@ -1,5 +1,5 @@
Apache Flex
-Copyright 2015 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/).
Re: [1/2] git commit: [flex-utilities] [refs/heads/develop] - Changed
year to be range as per http://www.apache.org/dev/licensing-howto.html#simple
Posted by Alex Harui <ah...@adobe.com>.
IMO, I don’t think you are supposed to use square brackets around the
years. I think that’s just their symbol for replaceable text.
On 6/18/15, 2:20 AM, "jmclean@apache.org" <jm...@apache.org> wrote:
>Repository: flex-utilities
>Updated Branches:
> refs/heads/develop ce6849c3c -> 0d7044548
>
>
>Changed year to be range as per
>http://www.apache.org/dev/licensing-howto.html#simple
>
>
>Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
>Commit:
>http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/0450e267
>Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/0450e267
>Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/0450e267
>
>Branch: refs/heads/develop
>Commit: 0450e2676a9ea3d9a33a929a59da34109b4315e7
>Parents: ce6849c
>Author: Justin Mclean <jm...@apache.org>
>Authored: Thu Jun 18 19:18:49 2015 +1000
>Committer: Justin Mclean <jm...@apache.org>
>Committed: Thu Jun 18 19:18:49 2015 +1000
>
>----------------------------------------------------------------------
> flex-installer/installer/NOTICE | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>----------------------------------------------------------------------
>
>
>http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/0450e267/flex-i
>nstaller/installer/NOTICE
>----------------------------------------------------------------------
>diff --git a/flex-installer/installer/NOTICE
>b/flex-installer/installer/NOTICE
>index 7fb7480..96d0eac 100644
>--- a/flex-installer/installer/NOTICE
>+++ b/flex-installer/installer/NOTICE
>@@ -1,5 +1,5 @@
> Apache Flex
>-Copyright 2015 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/).
>
Re: [2/2] git commit: [flex-utilities] [refs/heads/develop] - moved
new items to below header
Posted by Alex Harui <ah...@adobe.com>.
Justin,
The “header” says "Your use of the source code” but we are not bundling
the source code for these differences in the binary license. Or maybe it
is too early in the morning for me.
-Alex
On 6/18/15, 2:20 AM, "jmclean@apache.org" <jm...@apache.org> wrote:
>moved new items to below header
>
>
>Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
>Commit:
>http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/0d704454
>Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/0d704454
>Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/0d704454
>
>Branch: refs/heads/develop
>Commit: 0d7044548d2ba1052f8aa174717a9c675a94b519
>Parents: 0450e26
>Author: Justin Mclean <jm...@apache.org>
>Authored: Thu Jun 18 19:20:08 2015 +1000
>Committer: Justin Mclean <jm...@apache.org>
>Committed: Thu Jun 18 19:20:08 2015 +1000
>
>----------------------------------------------------------------------
> flex-installer/installer/binary_license/LICENSE | 17 +++++++----------
> 1 file changed, 7 insertions(+), 10 deletions(-)
>----------------------------------------------------------------------
>
>
>http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/0d704454/flex-i
>nstaller/installer/binary_license/LICENSE
>----------------------------------------------------------------------
>diff --git a/flex-installer/installer/binary_license/LICENSE
>b/flex-installer/installer/binary_license/LICENSE
>index 86515ea..8e1f660 100644
>--- a/flex-installer/installer/binary_license/LICENSE
>+++ b/flex-installer/installer/binary_license/LICENSE
>@@ -204,6 +204,13 @@
>
>
>--------------------------------------------------------------------------
>------
>
>+APACHE FLEX SUBCOMPONENTS:
>+
>+The Apache Flex Installer includes a number of subcomponents with
>+separate copyright notices and license terms. Your use of the source
>+code for the these subcomponents is subject to the terms and
>+conditions of the following licenses.
>+
> This product bundles ascompress, which is available under the
> MIT license. For details, see
>http://www.opensource.org/licenses/mit-license.php
>
>@@ -216,19 +223,9 @@ as3httpclientlib bundles as3corelib, which is
>available under a
> as3httpclientlib bundles as3crypto, which is available under a
> “3-clause BSD” license. For details, see deps/as3httpclientlib/.
>
>--------------------------------------------------------------------------
>-------
>-
>-APACHE FLEX SUBCOMPONENTS:
>-
>-The Apache Flex Installer includes a number of subcomponents with
>-separate copyright notices and license terms. Your use of the source
>-code for the these subcomponents is subject to the terms and
>-conditions of the following licenses.
>-
> The Open-Sans font is available under Apache License 2.0. For details
> see common/src/assets/fonts/open-sans/
>
> The NativeApplicationUpdater is available under Apache License 2.0.
> For details see installer/src/com/riaspace/
>
>-
>
Re: [2/2] git commit: [flex-utilities] [refs/heads/develop] - moved
new items to below header
Posted by Alex Harui <ah...@adobe.com>.
Justin,
The “header” says "Your use of the source code” but we are not bundling
the source code for these differences in the binary license. Or maybe it
is too early in the morning for me.
-Alex
On 6/18/15, 2:20 AM, "jmclean@apache.org" <jm...@apache.org> wrote:
>moved new items to below header
>
>
>Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
>Commit:
>http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/0d704454
>Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/0d704454
>Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/0d704454
>
>Branch: refs/heads/develop
>Commit: 0d7044548d2ba1052f8aa174717a9c675a94b519
>Parents: 0450e26
>Author: Justin Mclean <jm...@apache.org>
>Authored: Thu Jun 18 19:20:08 2015 +1000
>Committer: Justin Mclean <jm...@apache.org>
>Committed: Thu Jun 18 19:20:08 2015 +1000
>
>----------------------------------------------------------------------
> flex-installer/installer/binary_license/LICENSE | 17 +++++++----------
> 1 file changed, 7 insertions(+), 10 deletions(-)
>----------------------------------------------------------------------
>
>
>http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/0d704454/flex-i
>nstaller/installer/binary_license/LICENSE
>----------------------------------------------------------------------
>diff --git a/flex-installer/installer/binary_license/LICENSE
>b/flex-installer/installer/binary_license/LICENSE
>index 86515ea..8e1f660 100644
>--- a/flex-installer/installer/binary_license/LICENSE
>+++ b/flex-installer/installer/binary_license/LICENSE
>@@ -204,6 +204,13 @@
>
>
>--------------------------------------------------------------------------
>------
>
>+APACHE FLEX SUBCOMPONENTS:
>+
>+The Apache Flex Installer includes a number of subcomponents with
>+separate copyright notices and license terms. Your use of the source
>+code for the these subcomponents is subject to the terms and
>+conditions of the following licenses.
>+
> This product bundles ascompress, which is available under the
> MIT license. For details, see
>http://www.opensource.org/licenses/mit-license.php
>
>@@ -216,19 +223,9 @@ as3httpclientlib bundles as3corelib, which is
>available under a
> as3httpclientlib bundles as3crypto, which is available under a
> “3-clause BSD” license. For details, see deps/as3httpclientlib/.
>
>--------------------------------------------------------------------------
>-------
>-
>-APACHE FLEX SUBCOMPONENTS:
>-
>-The Apache Flex Installer includes a number of subcomponents with
>-separate copyright notices and license terms. Your use of the source
>-code for the these subcomponents is subject to the terms and
>-conditions of the following licenses.
>-
> The Open-Sans font is available under Apache License 2.0. For details
> see common/src/assets/fonts/open-sans/
>
> The NativeApplicationUpdater is available under Apache License 2.0.
> For details see installer/src/com/riaspace/
>
>-
>
[2/2] git commit: [flex-utilities] [refs/heads/develop] - moved new
items to below header
Posted by jm...@apache.org.
moved new items to below header
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/0d704454
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/0d704454
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/0d704454
Branch: refs/heads/develop
Commit: 0d7044548d2ba1052f8aa174717a9c675a94b519
Parents: 0450e26
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Jun 18 19:20:08 2015 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Jun 18 19:20:08 2015 +1000
----------------------------------------------------------------------
flex-installer/installer/binary_license/LICENSE | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/0d704454/flex-installer/installer/binary_license/LICENSE
----------------------------------------------------------------------
diff --git a/flex-installer/installer/binary_license/LICENSE b/flex-installer/installer/binary_license/LICENSE
index 86515ea..8e1f660 100644
--- a/flex-installer/installer/binary_license/LICENSE
+++ b/flex-installer/installer/binary_license/LICENSE
@@ -204,6 +204,13 @@
--------------------------------------------------------------------------------
+APACHE FLEX SUBCOMPONENTS:
+
+The Apache Flex Installer includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
This product bundles ascompress, which is available under the
MIT license. For details, see http://www.opensource.org/licenses/mit-license.php
@@ -216,19 +223,9 @@ as3httpclientlib bundles as3corelib, which is available under a
as3httpclientlib bundles as3crypto, which is available under a
“3-clause BSD” license. For details, see deps/as3httpclientlib/.
---------------------------------------------------------------------------------
-
-APACHE FLEX SUBCOMPONENTS:
-
-The Apache Flex Installer includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
The Open-Sans font is available under Apache License 2.0. For details
see common/src/assets/fonts/open-sans/
The NativeApplicationUpdater is available under Apache License 2.0.
For details see installer/src/com/riaspace/
-
Re: [1/2] git commit: [flex-utilities] [refs/heads/develop] - Changed
year to be range as per http://www.apache.org/dev/licensing-howto.html#simple
Posted by Alex Harui <ah...@adobe.com>.
IMO, I don’t think you are supposed to use square brackets around the
years. I think that’s just their symbol for replaceable text.
On 6/18/15, 2:20 AM, "jmclean@apache.org" <jm...@apache.org> wrote:
>Repository: flex-utilities
>Updated Branches:
> refs/heads/develop ce6849c3c -> 0d7044548
>
>
>Changed year to be range as per
>http://www.apache.org/dev/licensing-howto.html#simple
>
>
>Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
>Commit:
>http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/0450e267
>Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/0450e267
>Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/0450e267
>
>Branch: refs/heads/develop
>Commit: 0450e2676a9ea3d9a33a929a59da34109b4315e7
>Parents: ce6849c
>Author: Justin Mclean <jm...@apache.org>
>Authored: Thu Jun 18 19:18:49 2015 +1000
>Committer: Justin Mclean <jm...@apache.org>
>Committed: Thu Jun 18 19:18:49 2015 +1000
>
>----------------------------------------------------------------------
> flex-installer/installer/NOTICE | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>----------------------------------------------------------------------
>
>
>http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/0450e267/flex-i
>nstaller/installer/NOTICE
>----------------------------------------------------------------------
>diff --git a/flex-installer/installer/NOTICE
>b/flex-installer/installer/NOTICE
>index 7fb7480..96d0eac 100644
>--- a/flex-installer/installer/NOTICE
>+++ b/flex-installer/installer/NOTICE
>@@ -1,5 +1,5 @@
> Apache Flex
>-Copyright 2015 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/).
>