warbler 2.0.3 → 2.0.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2e84423e4b45c6f8e15ac24cc272c47f604945ad
4
- data.tar.gz: 6e1b644958d7cbcef7a32fbc25d41bdd5ca69cbb
3
+ metadata.gz: cb40a71550c20f3d1a8a2b61e5d6b356e6853eaf
4
+ data.tar.gz: 0d51049692b90eb8eb4a2214f4f734c4e1bfdb19
5
5
  SHA512:
6
- metadata.gz: e802caec8da9d81f104c0c48d8e55b63b84e83e39fc5b8d6d8aebe9f854800013912c07cd06df20d5b026ad2ad0506fa9005a42f59bd47e3516ba90dbecee328
7
- data.tar.gz: da33014f8856ff463022601a82e1303ddb45e3ab6ee1876d2d41c3f379c766bd0c4231cda69eecbe36bad38ad2e87061af5c1a28468bc73a3e9dcbd7229ae8fa
6
+ metadata.gz: d11c58088617a6b83e57bbc4f6e8552c863c8809a4d7af27c04dd63a0ef442776d69c2a2cd40319edd30b3cb8eef95ef0c3e1e19983f4febe553cd1ba5a77fe9
7
+ data.tar.gz: cfaf87a6bf456bc5ee683f0be468bfeb3bb7fe3a9f3f3c1a794ad0bbda77cfd3d814b66724fcaeb8fb236613cd703b66926cd047c36daa360ac22fd6fbe2bf25
data/Mavenfile CHANGED
@@ -5,13 +5,14 @@
5
5
  gemspec( :jar => 'warbler_jar.jar',
6
6
  :source => 'ext' )
7
7
 
8
- # just dump the POM as pom.xml as read-only file
9
- properties( 'jruby.plugins.version' => '1.1.3' )
8
+ properties( 'jruby.plugins.version' => '1.1.5',
9
+ 'jruby.version' => '9.1.2.0',
10
+ 'jetty.version' => '9.2.10.v20150310' )
10
11
 
11
12
  # dependencies needed for compilation
12
13
  scope :provided do
13
- jar 'org.jruby:jruby', '1.7.8'
14
- jar 'org.eclipse.jetty:jetty-webapp', '9.2.10.v20150310'
14
+ jar 'org.jruby:jruby', '${jruby.version}'
15
+ jar 'org.eclipse.jetty:jetty-webapp', '${jetty.version}'
15
16
  end
16
17
 
17
18
  plugin :compiler, '3.1', :source => '1.5', :target => '1.5'
@@ -19,6 +20,13 @@ plugin :compiler, '3.1', :source => '1.5', :target => '1.5'
19
20
  plugin :invoker, '1.8' do
20
21
  execute_goals( :install, :run,
21
22
  :id => 'integration-test',
23
+ :properties => { 'warbler.version' => '${project.version}',
24
+ 'jruby.version' => '${jruby.version}',
25
+ 'jetty.version' => '${jetty.version}',
26
+ 'bundler.version' => '1.12.3',
27
+ 'jruby.plugins.version' => '${jruby.plugins.version}' },
28
+
29
+ :goals => ['verify'],
22
30
  :projectsDirectory => 'integration',
23
31
  :streamLogs => true )
24
32
  end
data/Rakefile CHANGED
@@ -34,7 +34,9 @@ task :default => :spec
34
34
  # use Mavenfile to define :jar task
35
35
  require 'maven/ruby/maven'
36
36
  mvn = Maven::Ruby::Maven.new
37
- mvn.inherit_jruby_version
37
+ if defined?(JRUBY_VERISON) && ! (JRUBY_VERSION =~ /^9.0/)
38
+ mvn.inherit_jruby_version
39
+ end
38
40
 
39
41
  desc 'compile java sources and build jar'
40
42
  task :jar do
@@ -2,3 +2,18 @@ ENV['BUNDLE_WITHOUT'] = '<%= config.bundle_without.join(':') %>'
2
2
  <% if config.bundler[:frozen] -%>
3
3
  ENV['BUNDLE_FROZEN'] = '1'
4
4
  <% end -%>
5
+
6
+ module Bundler
7
+ module Patch
8
+ def clean_load_path
9
+ # nothing to be done for embedded JRuby
10
+ end
11
+ end
12
+ module SharedHelpers
13
+ def included(bundler)
14
+ bundler.send :include, Patch
15
+ end
16
+ end
17
+ end
18
+
19
+ require 'bundler/shared_helpers'
@@ -234,7 +234,7 @@ module Warbler
234
234
  end
235
235
 
236
236
  def servlet_context_listeners
237
- @cservlet_ontext_listeners ||= [ servlet_context_listener ]
237
+ @servlet_context_listeners ||= [ servlet_context_listener ]
238
238
  end
239
239
 
240
240
  def servlet_context_params(escape = true)
@@ -6,5 +6,5 @@
6
6
  #++
7
7
 
8
8
  module Warbler
9
- VERSION = "2.0.3"
9
+ VERSION = "2.0.4"
10
10
  end
Binary file
metadata CHANGED
@@ -1,45 +1,44 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: warbler
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.3
4
+ version: 2.0.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nick Sieger
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-05-26 00:00:00.000000000 Z
11
+ date: 2016-10-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
- name: rake
15
14
  requirement: !ruby/object:Gem::Requirement
16
15
  requirements:
17
16
  - - ">="
18
17
  - !ruby/object:Gem::Version
19
18
  version: 10.1.0
20
- type: :runtime
19
+ name: rake
21
20
  prerelease: false
21
+ type: :runtime
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: 10.1.0
27
27
  - !ruby/object:Gem::Dependency
28
- name: jruby-jars
29
28
  requirement: !ruby/object:Gem::Requirement
30
29
  requirements:
31
30
  - - ">="
32
31
  - !ruby/object:Gem::Version
33
32
  version: 9.0.0.0
34
- type: :runtime
33
+ name: jruby-jars
35
34
  prerelease: false
35
+ type: :runtime
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: 9.0.0.0
41
41
  - !ruby/object:Gem::Dependency
42
- name: jruby-rack
43
42
  requirement: !ruby/object:Gem::Requirement
44
43
  requirements:
45
44
  - - ">="
@@ -48,8 +47,9 @@ dependencies:
48
47
  - - "<"
49
48
  - !ruby/object:Gem::Version
50
49
  version: '1.3'
51
- type: :runtime
50
+ name: jruby-rack
52
51
  prerelease: false
52
+ type: :runtime
53
53
  version_requirements: !ruby/object:Gem::Requirement
54
54
  requirements:
55
55
  - - ">="
@@ -59,7 +59,6 @@ dependencies:
59
59
  - !ruby/object:Gem::Version
60
60
  version: '1.3'
61
61
  - !ruby/object:Gem::Dependency
62
- name: rubyzip
63
62
  requirement: !ruby/object:Gem::Requirement
64
63
  requirements:
65
64
  - - "~>"
@@ -68,8 +67,9 @@ dependencies:
68
67
  - - "<"
69
68
  - !ruby/object:Gem::Version
70
69
  version: '1.4'
71
- type: :runtime
70
+ name: rubyzip
72
71
  prerelease: false
72
+ type: :runtime
73
73
  version_requirements: !ruby/object:Gem::Requirement
74
74
  requirements:
75
75
  - - "~>"
@@ -79,28 +79,28 @@ dependencies:
79
79
  - !ruby/object:Gem::Version
80
80
  version: '1.4'
81
81
  - !ruby/object:Gem::Dependency
82
- name: jbundler
83
82
  requirement: !ruby/object:Gem::Requirement
84
83
  requirements:
85
84
  - - "~>"
86
85
  - !ruby/object:Gem::Version
87
86
  version: '0.9'
88
- type: :development
87
+ name: jbundler
89
88
  prerelease: false
89
+ type: :development
90
90
  version_requirements: !ruby/object:Gem::Requirement
91
91
  requirements:
92
92
  - - "~>"
93
93
  - !ruby/object:Gem::Version
94
94
  version: '0.9'
95
95
  - !ruby/object:Gem::Dependency
96
- name: rspec
97
96
  requirement: !ruby/object:Gem::Requirement
98
97
  requirements:
99
98
  - - "~>"
100
99
  - !ruby/object:Gem::Version
101
100
  version: '2.10'
102
- type: :development
101
+ name: rspec
103
102
  prerelease: false
103
+ type: :development
104
104
  version_requirements: !ruby/object:Gem::Requirement
105
105
  requirements:
106
106
  - - "~>"
@@ -168,7 +168,7 @@ homepage: https://github.com/jruby/warbler
168
168
  licenses:
169
169
  - MIT
170
170
  metadata: {}
171
- post_install_message:
171
+ post_install_message:
172
172
  rdoc_options:
173
173
  - "--main"
174
174
  - README.rdoc
@@ -188,10 +188,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
188
188
  - !ruby/object:Gem::Version
189
189
  version: '0'
190
190
  requirements: []
191
- rubyforge_project:
192
- rubygems_version: 2.4.5.1
193
- signing_key:
191
+ rubyforge_project:
192
+ rubygems_version: 2.6.6
193
+ signing_key:
194
194
  specification_version: 4
195
195
  summary: Warbler chirpily constructs .war files of your Rails applications.
196
196
  test_files: []
197
- has_rdoc: