From 4c62ad09e765ac2995c6cd874c5b398a46886ff8 Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Wed, 11 Dec 2013 11:59:02 -0600 Subject: [PATCH 1/2] Add license to gemspec, is modified New BSD, New BSD, and MIT The dependent gems are licensed as New BSD and MIT. This gem's license omits a line from the New BSD. I'm not an attorney so I'm not sure what to call it, hence 'modified' --- rails_12factor.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rails_12factor.gemspec b/rails_12factor.gemspec index 21099aa..7d83589 100644 --- a/rails_12factor.gemspec +++ b/rails_12factor.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |gem| gem.name = "rails_12factor" gem.require_paths = ["lib"] gem.version = Rails12factor::VERSION - gem.license = 'LICENSE' + gem.licenses = ['Modified New BSD', 'New BSD', 'MIT'] gem.add_development_dependency "minitest" gem.add_development_dependency "rake" From dfcd197351b5e9f2d510ce2b8fe0b64b5b8acf9e Mon Sep 17 00:00:00 2001 From: Benjamin Fleischer Date: Wed, 21 May 2014 14:23:56 -0500 Subject: [PATCH 2/2] License as MIT --- LICENSE | 38 +++++++++++++++++++------------------- rails_12factor.gemspec | 2 +- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/LICENSE b/LICENSE index 6f2aff5..2b4068b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,21 @@ -Copyright (c) 2013, Heroku -All rights reserved. +The MIT License (MIT) -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * 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. +Copyright (c) 2013,2014 Heroku -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS 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 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. +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/rails_12factor.gemspec b/rails_12factor.gemspec index 7d83589..e8e60f2 100644 --- a/rails_12factor.gemspec +++ b/rails_12factor.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |gem| gem.name = "rails_12factor" gem.require_paths = ["lib"] gem.version = Rails12factor::VERSION - gem.licenses = ['Modified New BSD', 'New BSD', 'MIT'] + gem.licenses = ['MIT'] gem.add_development_dependency "minitest" gem.add_development_dependency "rake"