Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1815E200CA7 for ; Wed, 14 Jun 2017 17:56:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 16D7F160BDB; Wed, 14 Jun 2017 15:56:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 37343160BC0 for ; Wed, 14 Jun 2017 17:56:22 +0200 (CEST) Received: (qmail 82718 invoked by uid 500); 14 Jun 2017 15:56:20 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 82709 invoked by uid 99); 14 Jun 2017 15:56:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Jun 2017 15:56:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7FD71E04AA; Wed, 14 Jun 2017 15:56:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: abaker@apache.org To: commits@geode.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: geode git commit: Update LICENSE after review Date: Wed, 14 Jun 2017 15:56:20 +0000 (UTC) archived-at: Wed, 14 Jun 2017 15:56:23 -0000 Repository: geode Updated Branches: refs/heads/release/1.2.0 2cee6f391 -> 24192d4fb Update LICENSE after review Add explicit dependencies on jackson-annotations and slf4j-api to ensure that we are using a single version in all modules. Clean up javascript references in LICENSE. Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/24192d4f Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/24192d4f Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/24192d4f Branch: refs/heads/release/1.2.0 Commit: 24192d4fbc8739d0f4dae2b4de5c8fd00b82ad32 Parents: 2cee6f3 Author: Anthony Baker Authored: Wed Jun 14 08:39:53 2017 -0700 Committer: Anthony Baker Committed: Wed Jun 14 08:39:53 2017 -0700 ---------------------------------------------------------------------- LICENSE | 38 +++---------------------------- geode-assembly/src/main/dist/LICENSE | 22 ++++++++++-------- geode-core/build.gradle | 1 + geode-pulse/build.gradle | 4 ++++ 4 files changed, 20 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/24192d4f/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index e5f1557..0dc431d 100644 --- a/LICENSE +++ b/LICENSE @@ -219,8 +219,6 @@ Apache Geode bundles the following files under the BSD 3-Clause License: - ANSIBuffer (http://jline.sourceforge.net/apidocs/jline/ANSIBuffer.html), Copyright (c) 2002-2007 Marc Prud'hommeaux. - - highlight.js v7.3 (https://highlightjs.org), Copyright (c) 2006, Ivan - Sagalaev - jQuery Sparklines v2.0 (http://omnipotent.net/jquery.sparkline/), Copyright (c) 2012 Splunk Inc. - Protocol Buffers (https://github.com/google/protobuf), Copyright (c) 2014 @@ -254,40 +252,17 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --------------------------------------------------------------------------- -The ISC License (http://opensource.org/licenses/ISC) ---------------------------------------------------------------------------- - -Apache Geode bundles the following file under the ISC license: - - - Shred (https://github.com/pandastrike/shred), Copyright (c) 2012-2015 - Panda Strike, LLC and Dan Yoder - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR -IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - ---------------------------------------------------------------------------- The MIT License (http://opensource.org/licenses/mit-license.html) --------------------------------------------------------------------------- Apache Geode bundles the following files under the MIT license: - - Backbone.js v0.9.2 (http://backbonejs.org), Copyright (c) 2010-2012 - Jeremy Ashkenas, DocumentCloud Inc. - - JavaScript InfoVis Toolkit v2.0.1 (http://philogb.github.io/jit/), + - HTML5 Shiv vpre3.5 (https://github.com/aFarkas/html5shiv), Copyright + (c) 2014 Alexander Farkas (aFarkas) + - JavaScript InfoVis Toolkit v2.0.1 (http://philogb.github.io/jit/), Copyright (c) 2011 Sencha Inc. - jQuery JavaScript Library v1.7.2 (https://jquery.com), Copyright (c) jQuery Foundation and other contributors, http://jquery.org - - jQuery BBQ v1.2.1 (http://benalman.com/projects/jquery-bbq-plugin/), - Copyright (c) 2010, "Cowboy" Ben Alman - jQuery.i18n.properties v1.0.x (https://github.com/jquery-i18n-properties/jquery-i18n-properties), Copyright (c) 2011 Nuno Miguel Correia Serra Fernandes @@ -298,8 +273,6 @@ Apache Geode bundles the following files under the MIT license: Brandon Aaron - jQuery Placeholder (http://webcloud.se), Copyright (c) 2010 Daniel Stocks - - jQuery-slideto (https://github.com/Sleavely/jQuery-slideto), Copyright - (c) 2015 Joakim Hedlund - jQuery UI MultiSelect Widget v1.14pre (http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/), Copyright (c) 2011 Eric Hynds @@ -311,8 +284,6 @@ Apache Geode bundles the following files under the MIT license: Copyright (c) 2012 Scott Jehl - MooTools (http://mootools.net), Copyright (c) 2006-2015 Valerio Proietti, - - Normalize.css v2.1.0 (https://necolas.github.io/normalize.css/), - Copyright (c) Nicolas Gallagher and Jonathan Neal - Sizzle.js (http://sizzlejs.com/), Copyright (c) 2011, The Dojo Foundation - Split.js (https://github.com/nathancahill/Split.js), Copyright (c) 2015 Nathan Cahill @@ -321,8 +292,6 @@ Apache Geode bundles the following files under the MIT license: contributors - Timeago v1.3.0 (http://timeago.yarp.com), Copyright (c) 2008-2015 Ryan McGeary - - Underscore (http://underscorejs.org), Copyright (c) 2009-2016 Jeremy - Ashkenas, DocumentCloud, and Investigative Reporters & Editors - zTree v3.5.02 (http://zTree.me/), Copyright (c) 2010 Hunter.z Permission is hereby granted, free of charge, to any person obtaining a copy @@ -408,5 +377,4 @@ domain: - CompactConcurrentHashSet2, derived from JSR-166 ConcurrentHashMap v1.43 (http://gee.cs.oswego.edu/dl/concurrency-interest). - - Reset CSS (http://meyerweb.com/eric/tools/css/reset/) - tooltip.js v1.2.6 (https://github.com/jquerytools/jquerytools) http://git-wip-us.apache.org/repos/asf/geode/blob/24192d4f/geode-assembly/src/main/dist/LICENSE ---------------------------------------------------------------------- diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE index 2f2de95..cd7e02e 100644 --- a/geode-assembly/src/main/dist/LICENSE +++ b/geode-assembly/src/main/dist/LICENSE @@ -225,14 +225,14 @@ Apache Geode bundles the following files under the BSD 3-Clause License: Marc Prud'hommeaux - jQuery Sparklines v2.0 (http://omnipotent.net/jquery.sparkline/), Copyright (c) 2012 Splunk Inc. - - Paranamer v2.3 (http://github.com/paul-hammant/paranamer), Copyright + - Paranamer v2.8 (http://github.com/paul-hammant/paranamer), Copyright (c) 2006 Paul Hammant and Thoughtworks Inc. - Protocol Buffers (https://github.com/google/protobuf), Copyright (c) 2014 Google Inc. - - scala-library v2.10.0 (http://www.scala-lang.org), Copyright (c) + - scala-library v2.10.6 (http://www.scala-lang.org), Copyright (c) 2002-2016 EPFL, Copyright (c) 2011-2016 Lightbend, Inc. (formerly Typesafe, Inc.) - - scala-reflect v2.10.0 (http://www.scala-lang.org), Copyright (c) + - scala-reflect v2.10.6 (http://www.scala-lang.org), Copyright (c) 2002-2016 EPFL, Copyright (c) 2011-2016 Lightbend, Inc. (formerly Typesafe, Inc.) @@ -270,7 +270,7 @@ The CDDL (https://glassfish.java.net/public/CDDLv1.0.html) Apache Geode bundles the following file under the Common Development and Distribution License: - - javax.activation v1.1.1 + - javax.activation v1.1 (http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp), - javax.mail v1.4.7 (http://www.oracle.com/) - javax.resource v 1.7 (https://glassfish.java.net/) @@ -601,9 +601,13 @@ The MIT License (http://opensource.org/licenses/mit-license.html) Apache Geode bundles the following files under the MIT license: + - FastClasspathScanner v2.0.11 (https://github.com/lukehutch/fast-classpath-scanner), + Copyright (c) 2015 Luke Hutchison + - HTML5 Shiv vpre3.5 (https://github.com/aFarkas/html5shiv), Copyright + (c) 2014 Alexander Farkas (aFarkas) - 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) + - JOpt Simple v5.0.3 (http://pholser.github.io/jopt-simple/), Copyright (c) 2004-2015 Paul R. Holser, Jr. - jQuery JavaScript Library v1.7.2 (https://jquery.com), Copyright (c) jQuery Foundation and other contributors, http://jquery.org @@ -626,12 +630,10 @@ Apache Geode bundles the following files under the MIT license: Kelvin Luck - matchMedia() polyfill (https://github.com/paulirish/matchMedia.js), Copyright (c) 2012 Scott Jehl - - MooTools (http://mootools.net), Copyright (c) 2006-2015 Valerio + - MooTools (http://mootools.net), Copyright (c) 2006-2015 Valerio Proietti, - - Normalize.css v2.1.0 (https://necolas.github.io/normalize.css/), - Copyright (c) Nicolas Gallagher and Jonathan Neal - - SLF4J API v1.7.21 (http://www.slf4j.org), Copyright (c) 2004-2013 QOS.ch - - sizzle.js (http://sizzlejs.com/), Copyright (c) 2011, The Dojo Foundation + - SLF4J API v1.7.23 (http://www.slf4j.org), Copyright (c) 2004-2013 QOS.ch + - Sizzle.js (http://sizzlejs.com/), Copyright (c) 2011, The Dojo Foundation - Split.js (https://github.com/nathancahill/Split.js), Copyright (c) 2015 Nathan Cahill - TableDnD v0.5 (https://github.com/isocra/TableDnD), Copyright (c) 2012 http://git-wip-us.apache.org/repos/asf/geode/blob/24192d4f/geode-core/build.gradle ---------------------------------------------------------------------- diff --git a/geode-core/build.gradle b/geode-core/build.gradle index 0297146..a92f27e 100755 --- a/geode-core/build.gradle +++ b/geode-core/build.gradle @@ -37,6 +37,7 @@ dependencies { compile 'com.github.stephenc.findbugs:findbugs-annotations:' + project.'stephenc-findbugs.version' compile 'org.jgroups:jgroups:' + project.'jgroups.version' compile 'antlr:antlr:' + project.'antlr.version' + compile 'com.fasterxml.jackson.core:jackson-annotations:' + project.'jackson.version' compile 'com.fasterxml.jackson.core:jackson-databind:' + project.'jackson.version' compile 'commons-io:commons-io:' + project.'commons-io.version' compile 'commons-lang:commons-lang:' + project.'commons-lang.version' http://git-wip-us.apache.org/repos/asf/geode/blob/24192d4f/geode-pulse/build.gradle ---------------------------------------------------------------------- diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle index fdc9fbc..5ae9ffa 100755 --- a/geode-pulse/build.gradle +++ b/geode-pulse/build.gradle @@ -39,6 +39,10 @@ dependencies { compile 'commons-lang:commons-lang:' + project.'commons-lang.version' compile 'org.springframework.ldap:spring-ldap-core:' + project.'spring-ldap-core.version' runtime 'org.springframework:spring-expression:' + project.'springframework.version' + + // added only to ensure common version with other geode modules + runtime 'org.slf4j:slf4j-log4j12:' + project.'slf4j-api.version' + compile ('org.springframework.security:spring-security-config:' + project.'spring-security.version') { exclude module: 'aopalliance' exclude module: 'spring-expression'