warbler 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e84423e4b45c6f8e15ac24cc272c47f604945ad
-  data.tar.gz: 6e1b644958d7cbcef7a32fbc25d41bdd5ca69cbb
+  metadata.gz: cb40a71550c20f3d1a8a2b61e5d6b356e6853eaf
+  data.tar.gz: 0d51049692b90eb8eb4a2214f4f734c4e1bfdb19
 SHA512:
-  metadata.gz: e802caec8da9d81f104c0c48d8e55b63b84e83e39fc5b8d6d8aebe9f854800013912c07cd06df20d5b026ad2ad0506fa9005a42f59bd47e3516ba90dbecee328
-  data.tar.gz: da33014f8856ff463022601a82e1303ddb45e3ab6ee1876d2d41c3f379c766bd0c4231cda69eecbe36bad38ad2e87061af5c1a28468bc73a3e9dcbd7229ae8fa
+  metadata.gz: d11c58088617a6b83e57bbc4f6e8552c863c8809a4d7af27c04dd63a0ef442776d69c2a2cd40319edd30b3cb8eef95ef0c3e1e19983f4febe553cd1ba5a77fe9
+  data.tar.gz: cfaf87a6bf456bc5ee683f0be468bfeb3bb7fe3a9f3f3c1a794ad0bbda77cfd3d814b66724fcaeb8fb236613cd703b66926cd047c36daa360ac22fd6fbe2bf25

data/Mavenfile

@@ -5,13 +5,14 @@
 gemspec( :jar => 'warbler_jar.jar',
          :source => 'ext' )
 
-# just dump the POM as pom.xml as read-only file
-properties( 'jruby.plugins.version' => '1.1.3' )
+properties( 'jruby.plugins.version' => '1.1.5',
+            'jruby.version' => '9.1.2.0',
+            'jetty.version' => '9.2.10.v20150310' )
 
 # dependencies needed for compilation
 scope :provided do
-  jar 'org.jruby:jruby', '1.7.8'
-  jar 'org.eclipse.jetty:jetty-webapp', '9.2.10.v20150310'
+  jar 'org.jruby:jruby', '${jruby.version}'
+  jar 'org.eclipse.jetty:jetty-webapp', '${jetty.version}'
 end
 
 plugin :compiler, '3.1', :source => '1.5', :target => '1.5'
@@ -19,6 +20,13 @@ plugin :compiler, '3.1', :source => '1.5', :target => '1.5'
 plugin :invoker, '1.8' do
   execute_goals( :install, :run,
                  :id => 'integration-test',
+                 :properties => { 'warbler.version' => '${project.version}',
+                                  'jruby.version' => '${jruby.version}',
+                                  'jetty.version' => '${jetty.version}',
+                                  'bundler.version' => '1.12.3',
+                                  'jruby.plugins.version' => '${jruby.plugins.version}' },
+
+                 :goals => ['verify'],
                  :projectsDirectory => 'integration',
                  :streamLogs => true )
 end

data/Rakefile

@@ -34,7 +34,9 @@ task :default => :spec
 # use Mavenfile to define :jar task
 require 'maven/ruby/maven'
 mvn = Maven::Ruby::Maven.new
-mvn.inherit_jruby_version
+if defined?(JRUBY_VERISON) && ! (JRUBY_VERSION =~ /^9.0/)
+  mvn.inherit_jruby_version
+end
 
 desc 'compile java sources and build jar'
 task :jar do

data/lib/warbler/templates/bundler.erb

@@ -2,3 +2,18 @@ ENV['BUNDLE_WITHOUT'] = '<%= config.bundle_without.join(':') %>'
 <% if config.bundler[:frozen] -%>
 ENV['BUNDLE_FROZEN'] = '1'
 <% end -%>
+
+module Bundler
+  module Patch
+    def clean_load_path
+      # nothing to be done for embedded JRuby
+    end
+  end
+  module SharedHelpers
+    def included(bundler)
+      bundler.send :include, Patch
+    end
+  end
+end
+
+require 'bundler/shared_helpers'

data/lib/warbler/traits/war.rb

@@ -234,7 +234,7 @@ module Warbler
         end
 
         def servlet_context_listeners
-          @cservlet_ontext_listeners ||= [ servlet_context_listener ]
+          @servlet_context_listeners ||= [ servlet_context_listener ]
         end
 
         def servlet_context_params(escape = true)

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

metadata

@@ -1,45 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Nick Sieger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
-  type: :runtime
+  name: rake
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.1.0
 - !ruby/object:Gem::Dependency
-  name: jruby-jars
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 9.0.0.0
-  type: :runtime
+  name: jruby-jars
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 9.0.0.0
 - !ruby/object:Gem::Dependency
-  name: jruby-rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -48,8 +47,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :runtime
+  name: jruby-rack
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +59,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -68,8 +67,9 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.4'
-  type: :runtime
+  name: rubyzip
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -79,28 +79,28 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: jbundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-  type: :development
+  name: jbundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.10'
-  type: :development
+  name: rspec
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -168,7 +168,7 @@ homepage: https://github.com/jruby/warbler
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -188,10 +188,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.6
+signing_key:
 specification_version: 4
 summary: Warbler chirpily constructs .war files of your Rails applications.
 test_files: []
-has_rdoc: