Repository: incubator-geode Updated Branches: refs/heads/develop 1d9a4ed62 -> ee0666a3c
GEODE-2014: Upgrade Swagger libraries * Updated gradle exclusions to remove items no longer used. * Updated distribution LICENSE file * Corrected LICENSE file as jquery-ui is still used in pulse, updated version * Updated rat configuration. * This closes #271 (cherry picked from commit a6018ab) Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ee0666a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ee0666a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ee0666a3 Branch: refs/heads/develop Commit: ee0666a3ca5a8807648eb44f0c844c8aefde01fe Parents: 1d9a4ed Author: Kevin Duling <kdul...@pivotal.io> Authored: Tue Oct 25 15:52:56 2016 -0700 Committer: Jinmei Liao <jil...@pivotal.io> Committed: Wed Oct 26 09:30:04 2016 -0700 ---------------------------------------------------------------------- LICENSE | 5 +-- geode-assembly/src/main/dist/LICENSE | 40 ++-------------------- geode-web-api/src/main/webapp/docs/index.html | 13 +++++++ gradle/rat.gradle | 19 ---------- 4 files changed, 16 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ee0666a3/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 3f777c7..231239b 100644 --- a/LICENSE +++ b/LICENSE @@ -346,11 +346,8 @@ Apache Geode bundles the following files under the MIT license: - jQuery UI MultiSelect Widget v1.14pre (http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/), Copyright (c) 2011 Eric Hynds - - jQuery UI v1.8.18 (http://jqueryui.com/about), Copyright (c) jQuery + - jQuery UI v1.10.2 (http://jqueryui.com/about), Copyright (c) jQuery Foundation and other contributors, http://jquery.org - - jQuery Wiggle (https://github.com/wilhelm-murdoch/jQuery-Wiggle), - Copyright (c) 2011 Wilhelm Murdoch <wilhelm.murd...@gmail.com>, - TheDrunkenEpic <http://www.thedrunkenepic.com> - jScrollPane (http://jscrollpane.kelvinluck.com/), Copyright (c) 2010 Kelvin Luck - matchMedia() polyfill (https://github.com/paulirish/matchMedia.js), http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ee0666a3/geode-assembly/src/main/dist/LICENSE ---------------------------------------------------------------------- diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE index 04ce74c..92e95b3 100644 --- a/geode-assembly/src/main/dist/LICENSE +++ b/geode-assembly/src/main/dist/LICENSE @@ -221,8 +221,6 @@ Apache Geode bundles the following files under the BSD 3-Clause License: Copyright (c) 2002-2007 Marc Prud'hommeaux. - Antlr v2.7.7 (http://www.antlr.org), Copyright (c) 2012 Terrence Parr and Sam Harwell - - highlight.js v7.3 (https://highlightjs.org), Copyright (c) 2006, Ivan - Sagalaev - JLine v2.12 (http://jline.sourceforge.net), Copyright (c) 2002-2006, Marc Prud'hommeaux <m...@cornell.edu> - jQuery Sparklines v2.0 (http://omnipotent.net/jquery.sparkline/), @@ -597,26 +595,6 @@ 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) ---------------------------------------------------------------------------- - -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 <d...@pandastrike.com> - -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 JSON License (http://www.json.org/license.html) @@ -653,16 +631,12 @@ 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. - Bootflat v1.0.1 (http://bootflat.github.io/), Copyright (c) 2014 bootflat - Bootstrap v3.0.0 (http://getbootstrap.com/), Copyright (c) 2011-2016 Twitter, Inc. - Font Awesome v4.0.3 (code files) (http://fontawesome.io), Copyright (c) Dave Gandy - - Handlebars v1.0.0 (http://handlebarsjs.com), Copyright (c) 2011, Yehuda - Katz - HeadJS v0.96 (http://headjs.com/), Copyright (c) 2013 Tero Piirainen (tipiirai) - HTML5 Shiv v3.6.2pre (https://github.com/aFarkas/html5shiv), Copyright @@ -673,10 +647,8 @@ Apache Geode bundles the following files under the MIT license: Copyright (c) 2011 Sencha Inc. - JOpt Simple (http://pholser.github.io/jopt-simple/), Copyright (c) 2004-2015 Paul R. Holser, Jr. - - jQuery JavaScript Library v1.7.2, v1.8.0 (https://jquery.com), Copyright (c) + - 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 @@ -687,16 +659,11 @@ 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 - - jQuery UI v1.8.18 (http://jqueryui.com/about), Copyright (c) jQuery + - jQuery UI v1.10.2 (http://jqueryui.com/about), Copyright (c) jQuery Foundation and other contributors, http://jquery.org - - jQuery Wiggle (https://github.com/wilhelm-murdoch/jQuery-Wiggle), - Copyright (c) 2011 Wilhelm Murdoch <wilhelm.murd...@gmail.com>, - TheDrunkenEpic <http://www.thedrunkenepic.com> - jScrollPane (http://jscrollpane.kelvinluck.com/), Copyright (c) 2010 Kelvin Luck - matchMedia() polyfill (https://github.com/paulirish/matchMedia.js), @@ -716,8 +683,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 @@ -803,7 +768,6 @@ domain: - AOP Alliance v1.0 (http://aopalliance.sourceforge.net) - 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/incubator-geode/blob/ee0666a3/geode-web-api/src/main/webapp/docs/index.html ---------------------------------------------------------------------- diff --git a/geode-web-api/src/main/webapp/docs/index.html b/geode-web-api/src/main/webapp/docs/index.html index 021fbc2..99089b4 100644 --- a/geode-web-api/src/main/webapp/docs/index.html +++ b/geode-web-api/src/main/webapp/docs/index.html @@ -1 +1,14 @@ +<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license +agreements. See the NOTICE file distributed with this work for additional information regarding +copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance with the License. You may obtain a +copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under the License +is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express +or implied. See the License for the specific language governing permissions and limitations under +the License. --> + <meta http-equiv="refresh" content="0; URL='/geode/swagger-ui.html'"/> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ee0666a3/gradle/rat.gradle ---------------------------------------------------------------------- diff --git a/gradle/rat.gradle b/gradle/rat.gradle index 990ff63..e9fc70f 100644 --- a/gradle/rat.gradle +++ b/gradle/rat.gradle @@ -154,7 +154,6 @@ rat { // --- Other Licenses --- // Public Domain http://meyerweb.com/eric/tools/css/reset/ - 'geode-web-api/src/main/webapp/docs/css/reset.css', 'geode-pulse/src/main/webapp/scripts/lib/tooltip.js', // JSON License - permissive, used for Good, not Evil @@ -178,12 +177,6 @@ rat { 'geode-json/src/main/java/org/json/XMLTokener.java', // MIT License - 'geode-web-api/src/main/webapp/docs/lib/backbone-min.js', - 'geode-web-api/src/main/webapp/docs/lib/jquery-1.8.0.min.js', - 'geode-web-api/src/main/webapp/docs/lib/jquery.ba-bbq.min.js', - 'geode-web-api/src/main/webapp/docs/lib/jquery.slideto.min.js', - 'geode-web-api/src/main/webapp/docs/lib/jquery.wiggle.min.js', - 'geode-web-api/src/main/webapp/docs/lib/underscore-min.js', 'geode-site/src/jbake/**', 'geode-pulse/src/main/webapp/scripts/lib/jquery.jqGrid.src.js', 'geode-pulse/src/main/webapp/scripts/lib/grid.locale-en.js', @@ -209,23 +202,11 @@ rat { 'geode-pulse/src/main/webapp/css/jquery.ztreestyle.css', 'geode-pulse/src/main/webapp/css/jquery-ui.css', - // MIT or ISC - 'geode-web-api/src/main/webapp/docs/lib/shred.bundle.js', - 'geode-web-api/src/main/webapp/docs/lib/shred/content.js', - // BSD License - 'geode-web-api/src/main/webapp/docs/lib/highlight.7.3.pack.js', 'geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIBuffer.java', 'geode-pulse/src/main/webapp/scripts/lib/jquery.sparkline.js', // Apache License - 'geode-web-api/src/main/webapp/docs/o2c.html', - 'geode-web-api/src/main/webapp/docs/index.html', - 'geode-web-api/src/main/webapp/docs/lib/swagger-oauth.js', - 'geode-web-api/src/main/webapp/docs/lib/swagger.js', - 'geode-web-api/src/main/webapp/docs/css/screen.css', - 'geode-web-api/src/main/webapp/docs/swagger-ui.js', - 'geode-web-api/src/main/webapp/docs/swagger-ui.min.js', 'geode-pulse/src/main/webapp/scripts/multiselect/prettify.js', // MX4J License