diff --git a/Gemfile b/Gemfile
index ad859877..b1dfd37a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ gem 'maven-tools', '1.2.3'
 
 
 group :development, :test do
-  gem 'rdoc', ['>= 3.10', '< 4.3'], :require => nil
+  gem 'rdoc', ['>= 3.10', '< 7'], :require => nil
 
   # force jruby-jars to use current JRuby version for testing
   gem 'jruby-jars', '~> ' + JRUBY_VERSION.split('.')[0..1].join('.')
diff --git a/History.txt b/History.txt
index 81d0c720..8dc0b44f 100644
--- a/History.txt
+++ b/History.txt
@@ -1,21 +1,21 @@
 == Unreleased
 
-- #429 maintenance Properly require ruby >= 2.1
-- #439 Include gem_build_complete_path in jar
-- #440 Don't overwrite user-specified `webserver.properties` file
-- #450 Update `warble.rb` documentation
-- #466 Update default Maven URL
-- #491 Relax version requirement for rubyzip
-- #497 CI: Migrate to Github Actions
-- #499 Drop jruby 9.1 support
-- #500 test: Configure a git default branch name, silences warning
-- #501 CI: Also test against java 15
-- #502 Update vendored dummy repos to our support matrix
-- #503 Drop support for old rake versions
-- #504 Migrate the spec suite to use RSpec 3
-- #505 Drop rake 12 support
-- #513 Fix helper class used for `config.webxml` values
-- #514 CI: Install a RubyGems 3.2.x for jruby-head, and ensure a Bundler 1.17.3 is available and used
+== 2.1.0
+
+Requires JRuby >= 9.4 due to needing Ruby 3.0+ compatibility.
+
+- #439: Include gem_build_complete_path in jar for RubyGems 2.5+ extension support
+- #440: Don't overwrite user-specified `webserver.properties` file
+- #513, #521: Fix issues with openstruct used for `config.webxml` values on JRuby 9.3+
+- #527: Fix war file path as argument for Jetty runner on Jetty 9.4.32+
+- #538: Put public folders inside public for executable war
+- #552, #553: Use URI.open instead of open
+- #557: Replace File.exists? with File.exist? for Ruby 3.2.0+ compatibility
+- #559, 575: Fixes to update Warbler to modern libs and JRuby, removing old Bundler 1.x hacks
+- #562: Fix problems with spaces in path names under windows
+- #571: Use newer keyword argument rubyzip 3.0 API (drops support for JRuby 9.3)
+- #575: Fix Gem path issues on JRuby 9.4.x
+- #574: Bump default Jetty version for executables to 9.4.58.v20250814
 
 == 2.0.5
 
diff --git a/Mavenfile b/Mavenfile
index 0ec82c09..c2d98cf2 100644
--- a/Mavenfile
+++ b/Mavenfile
@@ -18,6 +18,7 @@ end
 
 properties(
   'project.build.sourceEncoding' => 'UTF-8',
+  'mavengem.wagon.version' => '2.0.2',
   'jruby.plugins.version' => '3.0.6',
   'jetty.version' => '9.4.58.v20250814',
 )
diff --git a/README.rdoc b/README.rdoc
index 7df83145..159ae52c 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -1,4 +1,5 @@
-= Warbler {rdoc-image:https://badge.fury.io/rb/warbler.svg}[http://badge.fury.io/rb/warbler] {rdoc-image:https://github.com/jruby/warbler/actions/workflows/ci.yml/badge.svg}[https://github.com/jruby/warbler/actions/workflows/ci.yml]
+= Warbler
+{rdoc-image:https://badge.fury.io/rb/warbler.svg}[http://badge.fury.io/rb/warbler] {rdoc-image:https://github.com/jruby/warbler/actions/workflows/ci.yml/badge.svg}[https://github.com/jruby/warbler/actions/workflows/ci.yml]
 
 Warbler is a gem to make a Java jar or war file out of any Ruby, Rails or Rack
 application. Warbler provides a minimal, flexible, Ruby-like way to bundle up
diff --git a/integration/pom.xml b/integration/pom.xml
index 2449f5d0..3acd21aa 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -14,7 +14,7 @@
     <gem.path>${basedir}/../../pkg/rubygems</gem.path>
 
     <!-- Default versions, overridden from parent when running tests acros env -->
-    <warbler.version>2.0.5</warbler.version>
+    <warbler.version>2.1.0</warbler.version>
     <jruby.version>9.4.14.0</jruby.version>
     <bundler.version>2.6.3</bundler.version>
     <jetty.version>9.4.58.v20250814</jetty.version>
diff --git a/lib/warbler/version.rb b/lib/warbler/version.rb
index 8b91f860..ff3ace06 100644
--- a/lib/warbler/version.rb
+++ b/lib/warbler/version.rb
@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "2.0.5"
+  VERSION = "2.1.0"
 end
diff --git a/lib/warbler_jar.jar b/lib/warbler_jar.jar
index c1110d2c..028c1c96 100644
Binary files a/lib/warbler_jar.jar and b/lib/warbler_jar.jar differ
diff --git a/warbler.gemspec b/warbler.gemspec
index 06dd50fc..dd0f55c2 100644
--- a/warbler.gemspec
+++ b/warbler.gemspec
@@ -31,9 +31,9 @@ bundle up all of your application files for deployment to a Java environment.}
   gem.add_runtime_dependency 'rake', ['~> 13.0', '>= 13.0.3']
   gem.add_runtime_dependency 'rexml', '~> 3.0'
   gem.add_runtime_dependency 'jruby-jars', ['>= 9.4', '< 10.1']
-  gem.add_runtime_dependency 'jruby-rack', ['>= 1.1.1', '< 1.3']
+  gem.add_runtime_dependency 'jruby-rack', ['>= 1.2.3', '< 1.3']
   gem.add_runtime_dependency 'rubyzip', '>= 3.0.0'
-  gem.add_runtime_dependency 'ostruct', '0.6.2'
+  gem.add_runtime_dependency 'ostruct', '~> 0.6.2'
   gem.add_development_dependency 'jbundler', '0.9.5'
   gem.add_development_dependency 'rspec', '~> 3.0'
 end