Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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('.')
Expand Down
32 changes: 16 additions & 16 deletions History.txt
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions Mavenfile
Original file line number Diff line number Diff line change
Expand Up @@ -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',
)
Expand Down
3 changes: 2 additions & 1 deletion README.rdoc
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion lib/warbler/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
#++

module Warbler
VERSION = "2.0.5"
VERSION = "2.1.0"
end
Binary file modified lib/warbler_jar.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions warbler.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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