You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2016/04/21 20:52:50 UTC
[1/4] incubator-geode git commit: GEODE-1265: Add Droid fonts to
LICENSE
Repository: incubator-geode
Updated Branches:
refs/heads/develop 7e1656b08 -> f810d62d0
GEODE-1265: Add Droid fonts to LICENSE
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f810d62d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f810d62d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f810d62d
Branch: refs/heads/develop
Commit: f810d62d0695c95ff56d32855eb2c80a7098213f
Parents: 14d0cf5
Author: Anthony Baker <ab...@apache.org>
Authored: Wed Apr 20 15:37:35 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Apr 21 11:52:23 2016 -0700
----------------------------------------------------------------------
LICENSE | 3 +++
geode-assembly/src/main/dist/LICENSE | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f810d62d/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 3413a7c..f067970 100644
--- a/LICENSE
+++ b/LICENSE
@@ -208,6 +208,9 @@ Apache Geode includes a number of components and libraries with separate
copyright notices and license terms. Your use of those components are
subject to the terms and conditions of the following licenses.
+Apache Geode bundles the Droid fonts (http://www.droidfonts.com) under
+the Apache License v2.0.
+
---------------------------------------------------------------------------
The BSD 3-Clause License (http://opensource.org/licenses/BSD-3-Clause)
---------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f810d62d/geode-assembly/src/main/dist/LICENSE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index 3ed1e9a..9c2580a 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -208,6 +208,9 @@ Apache Geode includes a number of components and libraries with separate
copyright notices and license terms. Your use of those components are
subject to the terms and conditions of the following licenses.
+Apache Geode bundles the Droid fonts (http://www.droidfonts.com) under
+the Apache License v2.0.
+
---------------------------------------------------------------------------
The BSD 3-Clause License (http://opensource.org/licenses/BSD-3-Clause)
---------------------------------------------------------------------------
[3/4] incubator-geode git commit: GEODE-1264: Add MX4J to LICENSE
Posted by ab...@apache.org.
GEODE-1264: Add MX4J to LICENSE
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/14d0cf50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/14d0cf50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/14d0cf50
Branch: refs/heads/develop
Commit: 14d0cf50ab8cebf6748f82e0c54709aac5dc5770
Parents: bc24aef
Author: Anthony Baker <ab...@apache.org>
Authored: Wed Apr 20 15:31:53 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Apr 21 11:52:23 2016 -0700
----------------------------------------------------------------------
LICENSE | 55 +++++++++++++++++++++++++++++++
geode-assembly/src/main/dist/LICENSE | 3 +-
2 files changed, 57 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/14d0cf50/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 970a2ff..3413a7c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -389,6 +389,61 @@ DEALINGS IN THE SOFTWARE.
---------------------------------------------------------------------------
+The MX4J License (http://mx4j.sourceforge.net/docs/ch01s06.html)
+---------------------------------------------------------------------------
+
+Apache Geode bundles the following files under the MX4J License:
+
+ - MX4JModelMBean.java (http://mx4j.sourceforge.net)
+
+Version 1.0
+
+Copyright (c) 2001-2004 by the MX4J contributors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+3. The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgment:
+ "This product includes software developed by the
+ MX4J project (http://mx4j.sourceforge.net)."
+ Alternately, this acknowledgment may appear in the software itself,
+ if and wherever such third-party acknowledgments normally appear.
+
+4. The name "MX4J" must not be used to endorse or promote
+ products derived from this software without prior written
+ permission.
+ For written permission, please contact
+ biorn_steedom [at] users [dot] sourceforge [dot] net
+
+5. Products derived from this software may not be called "MX4J",
+ nor may "MX4J" appear in their name, without prior written
+ permission of Simone Bordet.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE MX4J CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+
+---------------------------------------------------------------------------
Public Domain
---------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/14d0cf50/geode-assembly/src/main/dist/LICENSE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index 9c906dd..3ed1e9a 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -736,8 +736,9 @@ DEALINGS IN THE SOFTWARE.
The MX4J License (http://mx4j.sourceforge.net/docs/ch01s06.html)
---------------------------------------------------------------------------
-Apache Geode bundles the following file under the MIT license:
+Apache Geode bundles the following file under the MX4J license:
+ - MX4JModelMBean.java (http://mx4j.sourceforge.net)
- MX4J v3.0.1 (http://mx4j.sourceforge.net), Copyright (c) MX4J
Version 1.0
[4/4] incubator-geode git commit: GEODE-1267: Update NOTICE
references to Spring dependencies
Posted by ab...@apache.org.
GEODE-1267: Update NOTICE references to Spring dependencies
Improved NOTICE text referencing Spring libraries for LDAP, Shell,
and HATEOS.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/90234293
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/90234293
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/90234293
Branch: refs/heads/develop
Commit: 9023429386d690f315a28c5e6df12f18a50b0787
Parents: 7e1656b
Author: Anthony Baker <ab...@apache.org>
Authored: Wed Apr 20 15:00:25 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Apr 21 11:52:23 2016 -0700
----------------------------------------------------------------------
geode-assembly/src/main/dist/NOTICE | 36 +++-------------------
geode-pulse/src/main/webapp/META-INF/NOTICE | 18 ++---------
geode-web-api/src/main/webapp/META-INF/NOTICE | 12 +-------
3 files changed, 7 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90234293/geode-assembly/src/main/dist/NOTICE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/NOTICE b/geode-assembly/src/main/dist/NOTICE
index f054cf5..4556826 100644
--- a/geode-assembly/src/main/dist/NOTICE
+++ b/geode-assembly/src/main/dist/NOTICE
@@ -302,41 +302,13 @@ Copyright (c) [2012-2014] Pivotal Software, Inc.
Spring LDAP Core 1.3.2
- ======================================================================
- == NOTICE file corresponding to section 4 d of the Apache License, ==
- == Version 2.0, for the Spring LDAP distribution. ==
- ======================================================================
-
- This product includes software developed by
- the Apache Software Foundation (http://www.apache.org).
-
- The end-user documentation included with a redistribution, if any,
- must include the following acknowledgement:
-
- "This product includes software developed by the Spring LDAP
- Project (http://www.springframework.org/ldap)."
-
- Alternately, this acknowledgement may appear in the software itself,
- if and wherever such third-party acknowledgements normally appear.
+ This product includes software developed by the Spring LDAP
+ Project (http://www.springframework.org/ldap).
Spring Shell 1.1.0
- ======================================================================
- == NOTICE file corresponding to section 4 d of the Apache License, ==
- == Version 2.0, for the Spring Framework distribution. ==
- ======================================================================
-
- This product includes software developed by
- the Apache Software Foundation (http://www.apache.org).
-
- The end-user documentation included with a redistribution, if any,
- must include the following acknowledgement:
-
- "This product includes software developed by the Spring Framework
- Project (http://www.springframework.org)."
-
- Alternately, this acknowledgement may appear in the software itself,
- if and wherever such third-party acknowledgements normally appear.
+ This product includes software developed by the Spring Framework
+ Project (http://www.springframework.org).
The names "Spring", "Spring Framework", and "Spring Shell" must
not be used to endorse or promote products derived from this
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90234293/geode-pulse/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/META-INF/NOTICE b/geode-pulse/src/main/webapp/META-INF/NOTICE
index 25a229d..763788e 100644
--- a/geode-pulse/src/main/webapp/META-INF/NOTICE
+++ b/geode-pulse/src/main/webapp/META-INF/NOTICE
@@ -72,19 +72,5 @@ Copyright (c) 2002-2015 Pivotal, Inc.
Spring LDAP Core 1.3.2.RELEASE
- ======================================================================
- == NOTICE file corresponding to section 4 d of the Apache License, ==
- == Version 2.0, for the Spring LDAP distribution. ==
- ======================================================================
-
- This product includes software developed by
- the Apache Software Foundation (http://www.apache.org).
-
- The end-user documentation included with a redistribution, if any,
- must include the following acknowledgement:
-
- "This product includes software developed by the Spring LDAP
- Project (http://www.springframework.org/ldap)."
-
- Alternately, this acknowledgement may appear in the software itself,
- if and wherever such third-party acknowledgements normally appear.
+ This product includes software developed by the Spring LDAP
+ Project (http://www.springframework.org/ldap).
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90234293/geode-web-api/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/META-INF/NOTICE b/geode-web-api/src/main/webapp/META-INF/NOTICE
index b62c5dc..7cd12aa 100644
--- a/geode-web-api/src/main/webapp/META-INF/NOTICE
+++ b/geode-web-api/src/main/webapp/META-INF/NOTICE
@@ -76,14 +76,4 @@ Copyright (c) [2012-2014] Pivotal Software, Inc.
This product may include 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 subcomponent's license, as noted in the LICENSE file.Spring Framework 4.2.4.RELEASE
- Copyright (c) 2002-2015 Pivotal, Inc.
-
- This product is licensed to you under the Apache License, Version 2.0
- (the "License"). You may not use this product except in compliance with
- the License.
-
- This product may include a number of subcomponents with separate
- copyright notices and license terms. Your use of the source code for
- these subcomponents is subject to the terms and conditions of the
- subcomponent's license, as noted in the license.txt file.
+ conditions of the subcomponent's license, as noted in the LICENSE file.
[2/4] incubator-geode git commit: GEODE-1263: Add jit.js to LICENSE
Posted by ab...@apache.org.
GEODE-1263: Add jit.js to LICENSE
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bc24aefa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bc24aefa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bc24aefa
Branch: refs/heads/develop
Commit: bc24aefa96502e7b6de83c2caaec626432e7f8e0
Parents: 9023429
Author: Anthony Baker <ab...@apache.org>
Authored: Wed Apr 20 15:16:39 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Apr 21 11:52:23 2016 -0700
----------------------------------------------------------------------
LICENSE | 2 ++
geode-assembly/src/main/dist/LICENSE | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bc24aefa/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index e1fc3cb..970a2ff 100644
--- a/LICENSE
+++ b/LICENSE
@@ -322,6 +322,8 @@ Apache Geode bundles the following files under the MIT license:
(c) 2014 Alexander Farkas (aFarkas)
- iCheck v0.8 (http://icheck.fronteed.com/), Copyright (c) 2013 Damir
Foy, http://damirfoy.com
+ - JavaScript InfoVis Toolkit v2.0.1 (http://philogb.github.io/jit/),
+ Copyright (c) 2011 Sencha Inc.
- JOpt Simple (http://pholser.github.io/jopt-simple/), Copyright (c)
2004-2015 Paul R. Holser, Jr.
- jQuery JavaScript Library v.1.7.2 (https://jquery.com), Copyright (c)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bc24aefa/geode-assembly/src/main/dist/LICENSE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index 5ea39ca..9c906dd 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -666,6 +666,8 @@ Apache Geode bundles the following files under the MIT license:
(c) 2014 Alexander Farkas (aFarkas)
- iCheck v0.8 (http://icheck.fronteed.com/), Copyright (c) 2013 Damir
Foy, http://damirfoy.com
+ - JavaScript InfoVis Toolkit v2.0.1 (http://philogb.github.io/jit/),
+ Copyright (c) 2011 Sencha Inc.
- JOpt Simple (http://pholser.github.io/jopt-simple/), Copyright (c)
2004-2015 Paul R. Holser, Jr.
- jQuery JavaScript Library v.1.7.2 (https://jquery.com), Copyright (c)