You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/04/08 18:26:41 UTC
[23/36] incubator-geode git commit: GEODE-902: Update LICENSE /
NOTICE for MX4JModelMBean.java
GEODE-902: Update LICENSE / NOTICE for MX4JModelMBean.java
Added a pointer to the MX4J license and an entry in the NOTICE
file for both the source and binary distributions. This update
is an interim change as we are reworking the files for the M2
release.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/39722f34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/39722f34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/39722f34
Branch: refs/heads/feature/GEODE-17-2
Commit: 39722f345047032f3515ed3e5128f736d53dd9d8
Parents: 893ea11
Author: Anthony Baker <ab...@apache.org>
Authored: Wed Apr 6 11:02:04 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Wed Apr 6 11:58:09 2016 -0700
----------------------------------------------------------------------
LICENSE | 6 ++++++
NOTICE | 3 +++
geode-assembly/src/main/dist/LICENSE | 8 +++++++-
geode-assembly/src/main/dist/NOTICE | 3 +++
4 files changed, 19 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/39722f34/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 31f4473..dc7a5a7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -365,3 +365,9 @@ split.js (https://github.com/nathancahill/Split.js)
---------------------------------------------------------------------------
This product bundles split.js which is available under an MIT license.
For details see http://www.opensource.org/licenses/mit-license.php.
+
+---------------------------------------------------------------------------
+MX4J (http://mx4j.sourceforge.net)
+---------------------------------------------------------------------------
+This product bundles MX4JModelMBean.java which is available under the MX4J license.
+For details see http://mx4j.sourceforge.net/docs/ch01s06.html.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/39722f34/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 5396eaa..8e7485f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -28,3 +28,6 @@ Copyright 2015 Apache Software Foundation
spring-petclinic (https://github.com/spring-projects/spring-petclinic)
Copyright 2002-2013
+
+This product includes software developed by the MX4J
+project (http://mx4j.sourceforge.net).
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/39722f34/geode-assembly/src/main/dist/LICENSE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index 2f1374b..6fbbab0 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -431,4 +431,10 @@ For details see http://opensource.org/licenses/BSD-3-Clause.
split.js (https://github.com/nathancahill/Split.js)
---------------------------------------------------------------------------
This product bundles split.js which is available under an MIT license.
-For details see http://www.opensource.org/licenses/mit-license.php.
\ No newline at end of file
+For details see http://www.opensource.org/licenses/mit-license.php.
+
+---------------------------------------------------------------------------
+MX4J (http://mx4j.sourceforge.net)
+---------------------------------------------------------------------------
+This product bundles MX4JModelMBean.java which is available under the MX4J license.
+For details see http://mx4j.sourceforge.net/docs/ch01s06.html.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/39722f34/geode-assembly/src/main/dist/NOTICE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/NOTICE b/geode-assembly/src/main/dist/NOTICE
index b429715..ec14cda 100644
--- a/geode-assembly/src/main/dist/NOTICE
+++ b/geode-assembly/src/main/dist/NOTICE
@@ -465,3 +465,6 @@ subcomponent's license, as noted in the license.txt file.
not be used to endorse or promote products derived from this
software without prior written permission. For written permission,
please contact enquiries@springsource.com.
+
+This product includes software developed by the MX4J
+project (http://mx4j.sourceforge.net).