From f95c2a228c8549c40214663e73a9a92c5452284d Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Wed, 14 Sep 2016 13:56:10 -0700 Subject: [PATCH 1/2] Use correct SPDX ID for license in gemspec Previously we were using "BSD-3", but the correct SPDX ID is "BSD-3-CLAUSE". This fixes a warning rubygems emits when building gems. http://spdx.org/licenses/ http://spdx.org/licenses/BSD-3-Clause.html --- api/solidus_api.gemspec | 1 + backend/solidus_backend.gemspec | 1 + core/solidus_core.gemspec | 2 +- frontend/solidus_frontend.gemspec | 1 + sample/solidus_sample.gemspec | 2 +- solidus.gemspec | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/api/solidus_api.gemspec b/api/solidus_api.gemspec index 68361c7b7fb..56954e623ec 100644 --- a/api/solidus_api.gemspec +++ b/api/solidus_api.gemspec @@ -5,6 +5,7 @@ Gem::Specification.new do |gem| gem.author = 'Solidus Team' gem.email = 'contact@solidus.io' gem.homepage = 'http://solidus.io/' + gem.license = 'BSD-3-Clause' gem.summary = 'REST API for the Solidus e-commerce framework.' gem.description = gem.summary diff --git a/backend/solidus_backend.gemspec b/backend/solidus_backend.gemspec index c701d5f0bbe..959f5be941c 100644 --- a/backend/solidus_backend.gemspec +++ b/backend/solidus_backend.gemspec @@ -12,6 +12,7 @@ Gem::Specification.new do |s| s.author = 'Solidus Team' s.email = 'contact@solidus.io' s.homepage = 'http://solidus.io' + s.license = 'BSD-3-Clause' s.rubyforge_project = 'solidus_backend' s.files = `git ls-files`.split("\n") diff --git a/core/solidus_core.gemspec b/core/solidus_core.gemspec index 59e2ee66a4b..549906bec9e 100644 --- a/core/solidus_core.gemspec +++ b/core/solidus_core.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |s| s.author = 'Solidus Team' s.email = 'contact@solidus.io' s.homepage = 'http://solidus.io' - s.license = 'BSD-3' + s.license = 'BSD-3-Clause' s.files = `git ls-files`.split("\n") s.require_path = 'lib' diff --git a/frontend/solidus_frontend.gemspec b/frontend/solidus_frontend.gemspec index 8f8bf2a0366..22cb6447e90 100644 --- a/frontend/solidus_frontend.gemspec +++ b/frontend/solidus_frontend.gemspec @@ -12,6 +12,7 @@ Gem::Specification.new do |s| s.author = 'Solidus Team' s.email = 'contact@solidus.io' s.homepage = 'http://solidus.io/' + s.license = 'BSD-3-Clause' s.rubyforge_project = 'solidus_frontend' s.files = `git ls-files`.split("\n") diff --git a/sample/solidus_sample.gemspec b/sample/solidus_sample.gemspec index 4e6838733e9..35d2ae215c4 100644 --- a/sample/solidus_sample.gemspec +++ b/sample/solidus_sample.gemspec @@ -12,7 +12,7 @@ Gem::Specification.new do |s| s.author = 'Solidus Team' s.email = 'contact@solidus.io' s.homepage = 'http://solidus.io/' - s.license = 'BSD-3' + s.license = 'BSD-3-Clause' s.files = `git ls-files`.split("\n") s.require_path = 'lib' diff --git a/solidus.gemspec b/solidus.gemspec index 095dcf0896e..ab4ea3909aa 100644 --- a/solidus.gemspec +++ b/solidus.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.author = 'Solidus Team' s.email = 'contact@solidus.io' s.homepage = 'http://solidus.io' - s.license = 'BSD-3' + s.license = 'BSD-3-Clause' s.add_dependency 'solidus_core', s.version s.add_dependency 'solidus_api', s.version From 96bbb0c1b49a23c73e246e71c6bcc6337e5f1828 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Wed, 14 Sep 2016 14:02:57 -0700 Subject: [PATCH 2/2] Remove rubyforge_project from gemspec This option is deprecated and rubyforge is no more. --- backend/solidus_backend.gemspec | 1 - frontend/solidus_frontend.gemspec | 1 - 2 files changed, 2 deletions(-) diff --git a/backend/solidus_backend.gemspec b/backend/solidus_backend.gemspec index 959f5be941c..ad8d4854190 100644 --- a/backend/solidus_backend.gemspec +++ b/backend/solidus_backend.gemspec @@ -13,7 +13,6 @@ Gem::Specification.new do |s| s.email = 'contact@solidus.io' s.homepage = 'http://solidus.io' s.license = 'BSD-3-Clause' - s.rubyforge_project = 'solidus_backend' s.files = `git ls-files`.split("\n") s.require_path = 'lib' diff --git a/frontend/solidus_frontend.gemspec b/frontend/solidus_frontend.gemspec index 22cb6447e90..23cceb98124 100644 --- a/frontend/solidus_frontend.gemspec +++ b/frontend/solidus_frontend.gemspec @@ -13,7 +13,6 @@ Gem::Specification.new do |s| s.email = 'contact@solidus.io' s.homepage = 'http://solidus.io/' s.license = 'BSD-3-Clause' - s.rubyforge_project = 'solidus_frontend' s.files = `git ls-files`.split("\n") s.require_path = 'lib'