From 165a61f1618976b4f2e6543f1112558c562d975a Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Mon, 6 Mar 2023 14:38:05 -0500
Subject: [PATCH 1/2] Update and consolidate release prep step

---
 README.md        |  7 +++----
 release-prep     | 15 +++++++++++++++
 update-changelog |  5 -----
 3 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100755 release-prep
 delete mode 100755 update-changelog

diff --git a/README.md b/README.md
index 7a7db15..08af5d3 100644
--- a/README.md
+++ b/README.md
@@ -170,10 +170,9 @@ Verify, and update if needed, that the docker tag in the script and GitHub actio
 Follow these steps to publish a new GitHub release, and build and push the gem to <https://rubygems.org>.
 
 1. Bump the "VERSION" in `lib/vmpooler/version.rb` appropriately based on changes in `CHANGELOG.md` since the last release.
-2. Run `./update-gemfile-lock` to update `Gemfile.lock`.
-3. Run `./update-changelog` to update `CHANGELOG.md`.
-4. Commit and push changes to a new branch, then open a pull request against `main` and be sure to add the "maintenance" label.
-5. After the pull request is approved and merged, then navigate to Actions --> Release Gem --> run workflow --> Branch: main --> Run workflow.
+2. Run `./release-prep` to update `Gemfile.lock` and `CHANGELOG.md`.
+3. Commit and push changes to a new branch, then open a pull request against `main` and be sure to add the "maintenance" label.
+4. After the pull request is approved and merged, then navigate to Actions --> Release Gem --> run workflow --> Branch: main --> Run workflow.
 
 ## License
 
diff --git a/release-prep b/release-prep
new file mode 100755
index 0000000..63a3d6e
--- /dev/null
+++ b/release-prep
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+# The container tag should closely match what is used in `docker/Dockerfile` in vmpooler-deployment
+#
+# Update Gemfile.lock
+docker run -it --rm \
+  -v $(pwd):/app \
+  jruby:9.4.1.0-jdk11 \
+  /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends git make netbase && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
+
+# Update Changelog
+docker run -it --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \
+  githubchangeloggenerator/github-changelog-generator:1.16.2 \
+  github_changelog_generator --future-release $(grep VERSION lib/vmpooler/version.rb |rev |cut -d "'" -f2 |rev)
+
diff --git a/update-changelog b/update-changelog
deleted file mode 100755
index b14db59..0000000
--- a/update-changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-docker run -it --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \
-  githubchangeloggenerator/github-changelog-generator:1.16.2 \
-  github_changelog_generator --future-release $(grep VERSION lib/vmpooler/version.rb |rev |cut -d "'" -f2 |rev)

From c18edea9311a7e79993a3e5a70ab8f4a11f01780 Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Mon, 6 Mar 2023 14:40:07 -0500
Subject: [PATCH 2/2] 2.5.0 release prep

---
 CHANGELOG.md            | 9 +++++++--
 Gemfile.lock            | 2 +-
 lib/vmpooler/version.rb | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 781d9c6..916a9ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,16 @@
 # Changelog
 
-## [Unreleased](https://github.com/puppetlabs/vmpooler/tree/HEAD)
+## [2.5.0](https://github.com/puppetlabs/vmpooler/tree/2.5.0) (2023-03-06)
 
-[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/2.4.0...HEAD)
+[Full Changelog](https://github.com/puppetlabs/vmpooler/compare/2.4.0...2.5.0)
+
+**Implemented enhancements:**
+
+- \(RE-15161\) Use timeout builtin to TCPSocket when opening sockets. [\#555](https://github.com/puppetlabs/vmpooler/pull/555) ([isaac-hammes](https://github.com/isaac-hammes))
 
 **Merged pull requests:**
 
+- Add docs and update actions [\#550](https://github.com/puppetlabs/vmpooler/pull/550) ([yachub](https://github.com/yachub))
 - \(RE-15111\) Migrate Snyk to Mend Scanning [\#546](https://github.com/puppetlabs/vmpooler/pull/546) ([yachub](https://github.com/yachub))
 - \(RE-14811\) Remove DIO as codeowners [\#517](https://github.com/puppetlabs/vmpooler/pull/517) ([yachub](https://github.com/yachub))
 - Add Snyk action and Move to RE org [\#511](https://github.com/puppetlabs/vmpooler/pull/511) ([yachub](https://github.com/yachub))
diff --git a/Gemfile.lock b/Gemfile.lock
index 475affc..a05c75b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vmpooler (2.4.0)
+    vmpooler (2.5.0)
       concurrent-ruby (~> 1.1)
       connection_pool (~> 2.2)
       deep_merge (~> 1.2)
diff --git a/lib/vmpooler/version.rb b/lib/vmpooler/version.rb
index e07a4ef..d0b8501 100644
--- a/lib/vmpooler/version.rb
+++ b/lib/vmpooler/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vmpooler
-  VERSION = '2.4.0'
+  VERSION = '2.5.0'
 end