Merge pull request #1338 from puppetlabs/release-prep

Release prep v3.1.0
puppetlabs · Apr 11, 2024 · 5c9733b · 5c9733b
2 parents fe0f662 + 5bf37a8
commit 5c9733b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,21 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
 
-## [v3.0.1](https://github.com/puppetlabs/pdk/tree/v3.0.1) - 2023-12-07
+## [v3.1.0](https://github.com/puppetlabs/pdk/tree/v3.1.0) - 2024-04-11
+
+[Full Changelog](https://github.com/puppetlabs/pdk/compare/v3.0.1...v3.1.0)
+
+### Added
+
+- Allow `pdk convert` and `pdk update` to work in a ControlRepo context [#1310](https://github.com/puppetlabs/pdk/pull/1310) ([garrettrowell](https://github.com/garrettrowell))
+- Support executable templates [#1289](https://github.com/puppetlabs/pdk/pull/1289) ([nabertrand](https://github.com/nabertrand))
+
+### Fixed
+
+- (CAT-1796) Fix missing locale gem [#1337](https://github.com/puppetlabs/pdk/pull/1337) ([LukasAud](https://github.com/LukasAud))
+- (CAT-1703) Convert concurrent-ruby from a pin to a pessimistic constraint [#1312](https://github.com/puppetlabs/pdk/pull/1312) ([david22swan](https://github.com/david22swan))
+
+## [v3.0.1](https://github.com/puppetlabs/pdk/tree/v3.0.1) - 2023-12-13
 
 [Full Changelog](https://github.com/puppetlabs/pdk/compare/v3.0.0...v3.0.1)
 

diff --git a/docs/release_notes_pdk.md b/docs/release_notes_pdk.md
@@ -2,6 +2,21 @@
 
 New features, enhancements, and resolved issues for PDK.
 
+## PDK 3.1.0
+
+### New features and enhancements
+
+* Executable templates are now supported
+* `pdk convert` and `pdk update`can now work in a ControlRepo context
+
+### Template Changes
+
+* The templates have been updated to allow Rubocop rules to be overriden.
+* CFPropertyList has been added as a pinned dependency on Windows.
+* Our Rubocop pin has been increased to `1.50.0`.
+* The codecov gem has been removed.
+* The archived ruby vscode extension has been replaced.
+
 ## PDK 3.0.1
 
 ### New features and enhancements

diff --git a/lib/pdk/version.rb b/lib/pdk/version.rb
@@ -1,4 +1,4 @@
 module PDK
-  VERSION = '3.0.1'.freeze
-  TEMPLATE_REF = '3.0.1.3'.freeze
+  VERSION = '3.1.0'.freeze
+  TEMPLATE_REF = '3.1.0'.freeze
 end