From 2105b498ec3d5f3099d1945ed402791ff20b2e58 Mon Sep 17 00:00:00 2001 From: Benjamin Dahon Date: Thu, 22 Jun 2017 19:05:57 +0200 Subject: [PATCH] Update default license (#7502) * Update default license The current value issues a warning when building: WARNING: license value 'Apache License (2.0)' is invalid. Use a license identifier from http://spdx.org/licenses or 'Nonstandard' for a nonstandard license. Did you mean 'Apache-2.0'? * Update license * Update license * Update license --- .../templates/codec-plugin/logstash-codec-example.gemspec.erb | 2 +- .../templates/filter-plugin/logstash-filter-example.gemspec.erb | 2 +- .../templates/input-plugin/logstash-input-example.gemspec.erb | 2 +- .../templates/output-plugin/logstash-output-example.gemspec.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pluginmanager/templates/codec-plugin/logstash-codec-example.gemspec.erb b/lib/pluginmanager/templates/codec-plugin/logstash-codec-example.gemspec.erb index 91e1b0600f1..bbd02dab0a1 100644 --- a/lib/pluginmanager/templates/codec-plugin/logstash-codec-example.gemspec.erb +++ b/lib/pluginmanager/templates/codec-plugin/logstash-codec-example.gemspec.erb @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = 'logstash-codec-<%= plugin_name %>' s.version = '0.1.0' - s.licenses = ['Apache License (2.0)'] + s.licenses = ['Apache-2.0'] s.summary = 'TODO: Write a short summary, because Rubygems requires one.' s.description = 'TODO: Write a longer description or delete this line.' s.homepage = 'TODO: Put your plugin''s website or public repo URL here.' diff --git a/lib/pluginmanager/templates/filter-plugin/logstash-filter-example.gemspec.erb b/lib/pluginmanager/templates/filter-plugin/logstash-filter-example.gemspec.erb index 5f910dc40fb..2c2c2ff2e61 100644 --- a/lib/pluginmanager/templates/filter-plugin/logstash-filter-example.gemspec.erb +++ b/lib/pluginmanager/templates/filter-plugin/logstash-filter-example.gemspec.erb @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = 'logstash-filter-<%= plugin_name %>' s.version = '0.1.0' - s.licenses = ['Apache License (2.0)'] + s.licenses = ['Apache-2.0'] s.summary = 'TODO: Write a short summary, because Rubygems requires one.' s.description = 'TODO: Write a longer description or delete this line.' s.homepage = 'TODO: Put your plugin''s website or public repo URL here.' diff --git a/lib/pluginmanager/templates/input-plugin/logstash-input-example.gemspec.erb b/lib/pluginmanager/templates/input-plugin/logstash-input-example.gemspec.erb index 9f8543887b2..ca14065fb25 100644 --- a/lib/pluginmanager/templates/input-plugin/logstash-input-example.gemspec.erb +++ b/lib/pluginmanager/templates/input-plugin/logstash-input-example.gemspec.erb @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = 'logstash-input-<%= plugin_name %>' s.version = '0.1.0' - s.licenses = ['Apache License (2.0)'] + s.licenses = ['Apache-2.0'] s.summary = 'TODO: Write a short summary, because Rubygems requires one.' s.description = '{TODO: Write a longer description or delete this line.' s.homepage = 'TODO: Put your plugin''s website or public repo URL here.' diff --git a/lib/pluginmanager/templates/output-plugin/logstash-output-example.gemspec.erb b/lib/pluginmanager/templates/output-plugin/logstash-output-example.gemspec.erb index db396e1ff1c..29653ebf6dd 100644 --- a/lib/pluginmanager/templates/output-plugin/logstash-output-example.gemspec.erb +++ b/lib/pluginmanager/templates/output-plugin/logstash-output-example.gemspec.erb @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = 'logstash-output-<%= plugin_name %>' s.version = '0.1.0' - s.licenses = ['Apache License (2.0)'] + s.licenses = ['Apache-2.0'] s.summary = 'TODO: Write a short summary, because Rubygems requires one.' s.description = 'TODO: Write a longer description or delete this line.' s.homepage = 'TODO: Put your plugin''s website or public repo URL here.'