From a4683ff6f536e3679a6a259999d536874a02e7f3 Mon Sep 17 00:00:00 2001 From: Richard Louapre Date: Mon, 13 Aug 2018 06:42:35 -0400 Subject: [PATCH 1/2] Latest versions of warbler does not require JRuby --- deploy/lib/server_config.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/lib/server_config.rb b/deploy/lib/server_config.rb index 364b473c..ddbbe064 100644 --- a/deploy/lib/server_config.rb +++ b/deploy/lib/server_config.rb @@ -199,7 +199,6 @@ def ServerConfig.strip_path(path) end def self.jar - raise HelpException.new("jar", "You must be using JRuby to create a jar") unless RUBY_PLATFORM == "java" begin # ensure warbler gem is installed gem 'warbler' From 6a45f08b635909ce2250e3777663c8613c6a258a Mon Sep 17 00:00:00 2001 From: Richard Louapre Date: Mon, 13 Aug 2018 06:44:01 -0400 Subject: [PATCH 2/2] When running embedded JRuby change is_jar implementation - Old implementation did not work anymore with JRuby 9 --- deploy/lib/util.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/lib/util.rb b/deploy/lib/util.rb index 6aa73a87..4e6f2cf2 100644 --- a/deploy/lib/util.rb +++ b/deploy/lib/util.rb @@ -88,7 +88,7 @@ def path_separator end def is_jar? - __FILE__.match(/.*\.jar.*/) != nil + RUBY_PLATFORM == "java" end def copy_file(src, target)