From 5fe915900fe06a77fe01c626f4a3b952524c1fc4 Mon Sep 17 00:00:00 2001 From: "R.I.Pienaar" Date: Wed, 27 Nov 2019 10:25:34 +0100 Subject: [PATCH] (misc) Release 0.17.1 --- CHANGELOG.md | 2 ++ Rakefile | 3 ++- lib/mcollective/agent/bolt_tasks.ddl | 2 +- lib/mcollective/agent/bolt_tasks.json | 2 +- lib/mcollective/agent/choria_util.ddl | 2 +- lib/mcollective/agent/choria_util.json | 2 +- lib/mcollective/agent/rpcutil.ddl | 2 +- lib/mcollective/agent/rpcutil.json | 2 +- lib/mcollective/connector/nats.ddl | 2 +- lib/mcollective/data/bolt_task_data.ddl | 2 +- lib/mcollective/discovery/choria.ddl | 2 +- lib/mcollective/util/choria.rb | 2 +- lib/mcollective/validator/bolt_task_name_validator.ddl | 2 +- module/choria/data/puppet_aio/6.yaml | 2 +- module/choria/metadata.json | 2 +- module/tasks/metadata.json | 4 ++-- 16 files changed, 19 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2310076..a3be550 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ |Date |Issue |Description | |----------|------|---------------------------------------------------------------------------------------------------------| +|2019/11/27| |Release 0.17.1 | +|2019/11/27| |Update `choria-mcorpc-support` dependency | |2019/11/26| |Release 0.17.0 | |2019/11/21|607 |Support using Synadia NATS NGS as a broker for Choria | |2019/11/01|591 |Support both Puppet 5 and 6 paths for the task helper | diff --git a/Rakefile b/Rakefile index 36ce89d..708304a 100644 --- a/Rakefile +++ b/Rakefile @@ -53,6 +53,8 @@ task :prep_version do end end + Rake::Task[:update_ddl].execute + sh "git add CHANGELOG.md lib module" sh "git commit -e -m '(misc) Release %s'" % ENV["CHORIA_VERSION"] end @@ -94,7 +96,6 @@ task :release do Rake::Task[:spec].execute Rake::Task[:rubocop].execute Rake::Task[:prep_version].execute if ENV["CHORIA_VERSION"] - Rake::Task[:update_ddl].execute ["choria", "tasks"].each do |mod| puts "=" * 20 diff --git a/lib/mcollective/agent/bolt_tasks.ddl b/lib/mcollective/agent/bolt_tasks.ddl index 08afce6..67f8d28 100644 --- a/lib/mcollective/agent/bolt_tasks.ddl +++ b/lib/mcollective/agent/bolt_tasks.ddl @@ -2,7 +2,7 @@ metadata :name => "bolt_tasks", :description => "Downloads and runs Puppet Tasks", :author => "R.I.Pienaar ", :license => "Apache-2.0", - :version => "0.17.0", + :version => "0.17.1", :url => "https://choria.io", :timeout => 60 diff --git a/lib/mcollective/agent/bolt_tasks.json b/lib/mcollective/agent/bolt_tasks.json index 86c7af9..dbd5d18 100644 --- a/lib/mcollective/agent/bolt_tasks.json +++ b/lib/mcollective/agent/bolt_tasks.json @@ -5,7 +5,7 @@ "description": "Downloads and runs Puppet Tasks", "author": "R.I.Pienaar ", "license": "Apache-2.0", - "version": "0.17.0", + "version": "0.17.1", "url": "https://choria.io", "timeout": 60 }, diff --git a/lib/mcollective/agent/choria_util.ddl b/lib/mcollective/agent/choria_util.ddl index 62db7f6..b6e73d5 100644 --- a/lib/mcollective/agent/choria_util.ddl +++ b/lib/mcollective/agent/choria_util.ddl @@ -2,7 +2,7 @@ metadata :name => "choria_util", :description => "Choria Utilities", :author => "R.I.Pienaar ", :license => "Apache-2.0", - :version => "0.17.0", + :version => "0.17.1", :url => "https://choria.io", :timeout => 20 diff --git a/lib/mcollective/agent/choria_util.json b/lib/mcollective/agent/choria_util.json index 252b6e2..f82919c 100644 --- a/lib/mcollective/agent/choria_util.json +++ b/lib/mcollective/agent/choria_util.json @@ -5,7 +5,7 @@ "description": "Choria Utilities", "author": "R.I.Pienaar ", "license": "Apache-2.0", - "version": "0.17.0", + "version": "0.17.1", "url": "https://choria.io", "timeout": 20 }, diff --git a/lib/mcollective/agent/rpcutil.ddl b/lib/mcollective/agent/rpcutil.ddl index a9ce9ee..cb7b3ee 100644 --- a/lib/mcollective/agent/rpcutil.ddl +++ b/lib/mcollective/agent/rpcutil.ddl @@ -2,7 +2,7 @@ metadata :name => "rpcutil", :description => "General helpful actions that expose stats and internals to SimpleRPC clients", :author => "R.I.Pienaar ", :license => "Apache License, Version 2.0", - :version => "0.17.0", + :version => "0.17.1", :url => "https://docs.puppetlabs.com/mcollective/", :timeout => 10 diff --git a/lib/mcollective/agent/rpcutil.json b/lib/mcollective/agent/rpcutil.json index 0ab1fbf..91b93c5 100644 --- a/lib/mcollective/agent/rpcutil.json +++ b/lib/mcollective/agent/rpcutil.json @@ -5,7 +5,7 @@ "description": "General helpful actions that expose stats and internals to SimpleRPC clients", "author": "R.I.Pienaar ", "license": "Apache License, Version 2.0", - "version": "0.17.0", + "version": "0.17.1", "url": "https://docs.puppetlabs.com/mcollective/", "timeout": 10 }, diff --git a/lib/mcollective/connector/nats.ddl b/lib/mcollective/connector/nats.ddl index 14090bd..b411ca6 100644 --- a/lib/mcollective/connector/nats.ddl +++ b/lib/mcollective/connector/nats.ddl @@ -2,7 +2,7 @@ metadata :name => "nats", :description => "Connector plugin for NATS.io middleware", :author => "R.I.Pienaar ", :license => "Apache-2.0", - :version => "0.17.0", + :version => "0.17.1", :url => "https://github.com/choria-io", :timeout => 60 diff --git a/lib/mcollective/data/bolt_task_data.ddl b/lib/mcollective/data/bolt_task_data.ddl index d017efb..b532d81 100644 --- a/lib/mcollective/data/bolt_task_data.ddl +++ b/lib/mcollective/data/bolt_task_data.ddl @@ -2,7 +2,7 @@ metadata :name => "bolt_task", :description => "Information about past Bolt Task", :author => "R.I.Pienaar ", :license => "Apache-2.0", - :version => "0.17.0", + :version => "0.17.1", :url => "https://choria.io", :timeout => 1 diff --git a/lib/mcollective/discovery/choria.ddl b/lib/mcollective/discovery/choria.ddl index 3d7e7aa..6770ad4 100644 --- a/lib/mcollective/discovery/choria.ddl +++ b/lib/mcollective/discovery/choria.ddl @@ -2,7 +2,7 @@ metadata :name => "choria", :description => "PuppetDB based discovery for the Choria plugin suite", :author => "R.I.Pienaar ", :license => "Apache-2.0", - :version => "0.17.0", + :version => "0.17.1", :url => "https://github.com/choria-io", :timeout => 0 diff --git a/lib/mcollective/util/choria.rb b/lib/mcollective/util/choria.rb index 8504ac6..ab9f3c5 100644 --- a/lib/mcollective/util/choria.rb +++ b/lib/mcollective/util/choria.rb @@ -8,7 +8,7 @@ class UserError < StandardError; end class Abort < StandardError; end unless defined?(Choria::VERSION) # rubocop:disable Style/IfUnlessModifier - VERSION = "0.17.0".freeze + VERSION = "0.17.1".freeze end attr_writer :ca diff --git a/lib/mcollective/validator/bolt_task_name_validator.ddl b/lib/mcollective/validator/bolt_task_name_validator.ddl index 86b48b4..095ef8c 100644 --- a/lib/mcollective/validator/bolt_task_name_validator.ddl +++ b/lib/mcollective/validator/bolt_task_name_validator.ddl @@ -2,6 +2,6 @@ metadata :name => "bolt_task_name", :description => "Validates that a string matches Bolt Task Name", :author => "R.I.Pienaar ", :license => "Apache-2.0", - :version => "0.17.0", + :version => "0.17.1", :url => "https://choria.io", :timeout => 1 diff --git a/module/choria/data/puppet_aio/6.yaml b/module/choria/data/puppet_aio/6.yaml index 8d13565..bfe39a7 100644 --- a/module/choria/data/puppet_aio/6.yaml +++ b/module/choria/data/puppet_aio/6.yaml @@ -1,5 +1,5 @@ mcollective_choria::gem_dependencies: - "choria-mcorpc-support": "2.20.7" + "choria-mcorpc-support": "2.20.8" mcollective_choria::config: security.serializer: "json" diff --git a/module/choria/metadata.json b/module/choria/metadata.json index b2f97fe..5ecf838 100644 --- a/module/choria/metadata.json +++ b/module/choria/metadata.json @@ -1,6 +1,6 @@ { "name": "choria-mcollective_choria", - "version": "0.17.0", + "version": "0.17.1", "author": "R.I.Pienaar ", "summary": "A suite of MCollective Plugins for AIO Puppet", "license": "Apache-2.0", diff --git a/module/tasks/metadata.json b/module/tasks/metadata.json index bc34e9c..1bc4b83 100644 --- a/module/tasks/metadata.json +++ b/module/tasks/metadata.json @@ -1,6 +1,6 @@ { "name": "choria-mcollective_agent_bolt_tasks", - "version": "0.17.0", + "version": "0.17.1", "author": "R.I.Pienaar ", "summary": "Puppet Tasks integration for Choria", "license": "Apache-2.0", @@ -9,7 +9,7 @@ "issues_url": "https://github.com/choria-io/mcollective-choria/issues", "dependencies": [ { "name": "choria/mcollective","version_requirement":">= 0.9.0 < 2.0.0"}, - { "name": "choria/mcollective_choria","version_requirement":"0.17.0"} + { "name": "choria/mcollective_choria","version_requirement":"0.17.1"} ], "requirements": [ {