geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aba...@apache.org
Subject [1/6] incubator-geode git commit: GEODE-904 Adds notice to end of CDDL, changes CDDL name and link
Date Fri, 08 Apr 2016 19:55:03 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop a77398877 -> df3d10fad


GEODE-904 Adds notice to end of CDDL, changes CDDL name and link

These dependencies are under a “CDDL 1.0.1,” which adds a notice to the
end. I’ve included that here.

I also removed the redundant “License” from “CDDL License” and changed
the license link to point to a version with the notice.

This closes #126


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/df3d10fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/df3d10fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/df3d10fa

Branch: refs/heads/develop
Commit: df3d10fad6fc92b1d811ed83af9720f09102812e
Parents: dc8a344
Author: Joey McAllister <jmcallister@pivotal.io>
Authored: Fri Apr 8 12:15:09 2016 -0700
Committer: Anthony Baker <abaker@apache.org>
Committed: Fri Apr 8 12:54:26 2016 -0700

----------------------------------------------------------------------
 geode-assembly/src/main/dist/LICENSE | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/df3d10fa/geode-assembly/src/main/dist/LICENSE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index dbb3780..5ea39ca 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -263,10 +263,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 ---------------------------------------------------------------------------
-The CDDL License (https://opensource.org/licenses/CDDL-1.0)
+The CDDL (https://glassfish.java.net/public/CDDLv1.0.html)
 ---------------------------------------------------------------------------
 
-Apache Geode bundles the following file under the CDDL license:
+Apache Geode bundles the following file under the Common Development and
+Distribution License:
 
   - javax.activation v1.1.1
     (http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp),
@@ -583,6 +584,15 @@ Apache Geode bundles the following file under the CDDL license:
   on an equitable basis. Nothing herein is intended or shall be deemed to
   constitute any admission of liability.
 
+NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
+LICENSE (CDDL)
+
+The code released under the CDDL shall be governed by the laws of the State
+of California (excluding conflict-of-law provisions). Any litigation
+relating to this License shall be subject to the jurisdiction of the
+Federal Courts of the Northern District of California and the state courts
+of the State of California, with venue lying in Santa Clara County,
+California.
 
 ---------------------------------------------------------------------------
 The ISC License (http://opensource.org/licenses/ISC)


Mime
View raw message