Skip to content

Commit b33e08c

Browse files
committed
Dependency updates
This change updates all of the dependencies to their latest versions. It includes changes to some tests to handle the new version of RSpec.
1 parent 93be4d4 commit b33e08c

3 files changed

Lines changed: 48 additions & 48 deletions

File tree

Gemfile.lock

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@ GEM
77
simplecov (>= 0.7.1, < 1.0.0)
88
crack (0.4.2)
99
safe_yaml (~> 1.0.0)
10-
debugger-ruby_core_source (1.3.1)
10+
debugger-ruby_core_source (1.3.2)
1111
diff-lcs (1.2.5)
1212
docile (1.1.3)
1313
json (1.8.1)
1414
multi_json (1.8.4)
15-
parser (2.1.4)
15+
parser (2.1.5)
1616
ast (~> 1.1)
1717
slop (~> 3.4, >= 3.4.5)
1818
powerpack (0.0.9)
1919
rainbow (2.0.0)
2020
rake (10.1.1)
21-
redcarpet (3.1.0)
22-
rspec (3.0.0.beta1)
23-
rspec-core (= 3.0.0.beta1)
24-
rspec-expectations (= 3.0.0.beta1)
25-
rspec-mocks (= 3.0.0.beta1)
26-
rspec-core (3.0.0.beta1)
27-
rspec-support (= 3.0.0.beta1)
28-
rspec-expectations (3.0.0.beta1)
29-
diff-lcs (>= 1.1.3, < 2.0)
30-
rspec-support (= 3.0.0.beta1)
31-
rspec-mocks (3.0.0.beta1)
32-
rspec-support (= 3.0.0.beta1)
33-
rspec-support (3.0.0.beta1)
21+
redcarpet (3.1.1)
22+
rspec (3.0.0.beta2)
23+
rspec-core (= 3.0.0.beta2)
24+
rspec-expectations (= 3.0.0.beta2)
25+
rspec-mocks (= 3.0.0.beta2)
26+
rspec-core (3.0.0.beta2)
27+
rspec-support (= 3.0.0.beta2)
28+
rspec-expectations (3.0.0.beta2)
29+
diff-lcs (>= 1.2.0, < 2.0)
30+
rspec-support (= 3.0.0.beta2)
31+
rspec-mocks (3.0.0.beta2)
32+
rspec-support (= 3.0.0.beta2)
33+
rspec-support (3.0.0.beta2)
3434
rubocop (0.18.1)
3535
json (>= 1.7.7, < 2)
3636
parser (~> 2.1.3)

java-buildpack.iml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -266,38 +266,38 @@
266266
<excludeFolder url="file://$MODULE_DIR$/coverage" />
267267
<excludeFolder url="file://$MODULE_DIR$/doc" />
268268
</content>
269-
<orderEntry type="jdk" jdkName="rbenv: 1.9.3-p484" jdkType="RUBY_SDK" />
269+
<orderEntry type="jdk" jdkName="rbenv: 1.9.3-p545" jdkType="RUBY_SDK" />
270270
<orderEntry type="sourceFolder" forTests="false" />
271-
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.3.5, rbenv: 1.9.3-p484) [gem]" level="application" />
272-
<orderEntry type="library" scope="PROVIDED" name="ast (v1.1.0, rbenv: 1.9.3-p484) [gem]" level="application" />
273-
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.5.3, rbenv: 1.9.3-p484) [gem]" level="application" />
274-
<orderEntry type="library" scope="PROVIDED" name="codeclimate-test-reporter (v0.3.0, rbenv: 1.9.3-p484) [gem]" level="application" />
275-
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.2, rbenv: 1.9.3-p484) [gem]" level="application" />
276-
<orderEntry type="library" scope="PROVIDED" name="debugger-ruby_core_source (v1.3.1, rbenv: 1.9.3-p484) [gem]" level="application" />
277-
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 1.9.3-p484) [gem]" level="application" />
278-
<orderEntry type="library" scope="PROVIDED" name="docile (v1.1.3, rbenv: 1.9.3-p484) [gem]" level="application" />
279-
<orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, rbenv: 1.9.3-p484) [gem]" level="application" />
280-
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.8.4, rbenv: 1.9.3-p484) [gem]" level="application" />
281-
<orderEntry type="library" scope="PROVIDED" name="parser (v2.1.4, rbenv: 1.9.3-p484) [gem]" level="application" />
282-
<orderEntry type="library" scope="PROVIDED" name="powerpack (v0.0.9, rbenv: 1.9.3-p484) [gem]" level="application" />
283-
<orderEntry type="library" scope="PROVIDED" name="rainbow (v2.0.0, rbenv: 1.9.3-p484) [gem]" level="application" />
284-
<orderEntry type="library" scope="PROVIDED" name="rake (v10.1.1, rbenv: 1.9.3-p484) [gem]" level="application" />
285-
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.1.0, rbenv: 1.9.3-p484) [gem]" level="application" />
286-
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.0.0.beta1, rbenv: 1.9.3-p484) [gem]" level="application" />
287-
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.0.0.beta1, rbenv: 1.9.3-p484) [gem]" level="application" />
288-
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.0.0.beta1, rbenv: 1.9.3-p484) [gem]" level="application" />
289-
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.0.0.beta1, rbenv: 1.9.3-p484) [gem]" level="application" />
290-
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.0.0.beta1, rbenv: 1.9.3-p484) [gem]" level="application" />
291-
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.18.1, rbenv: 1.9.3-p484) [gem]" level="application" />
292-
<orderEntry type="library" scope="PROVIDED" name="ruby-debug-base19x (v0.11.30.pre15, rbenv: 1.9.3-p484) [gem]" level="application" />
293-
<orderEntry type="library" scope="PROVIDED" name="ruby-debug-ide (v0.4.22, rbenv: 1.9.3-p484) [gem]" level="application" />
294-
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.1, rbenv: 1.9.3-p484) [gem]" level="application" />
295-
<orderEntry type="library" scope="PROVIDED" name="simplecov (v0.8.2, rbenv: 1.9.3-p484) [gem]" level="application" />
296-
<orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.8.0, rbenv: 1.9.3-p484) [gem]" level="application" />
297-
<orderEntry type="library" scope="PROVIDED" name="slop (v3.4.7, rbenv: 1.9.3-p484) [gem]" level="application" />
298-
<orderEntry type="library" scope="PROVIDED" name="tee (v1.0.0, rbenv: 1.9.3-p484) [gem]" level="application" />
299-
<orderEntry type="library" scope="PROVIDED" name="webmock (v1.17.3, rbenv: 1.9.3-p484) [gem]" level="application" />
300-
<orderEntry type="library" scope="PROVIDED" name="yard (v0.8.7.3, rbenv: 1.9.3-p484) [gem]" level="application" />
271+
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.3.5, rbenv: 1.9.3-p545) [gem]" level="application" />
272+
<orderEntry type="library" scope="PROVIDED" name="ast (v1.1.0, rbenv: 1.9.3-p545) [gem]" level="application" />
273+
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.5.3, rbenv: 1.9.3-p545) [gem]" level="application" />
274+
<orderEntry type="library" scope="PROVIDED" name="codeclimate-test-reporter (v0.3.0, rbenv: 1.9.3-p545) [gem]" level="application" />
275+
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.2, rbenv: 1.9.3-p545) [gem]" level="application" />
276+
<orderEntry type="library" scope="PROVIDED" name="debugger-ruby_core_source (v1.3.2, rbenv: 1.9.3-p545) [gem]" level="application" />
277+
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 1.9.3-p545) [gem]" level="application" />
278+
<orderEntry type="library" scope="PROVIDED" name="docile (v1.1.3, rbenv: 1.9.3-p545) [gem]" level="application" />
279+
<orderEntry type="library" scope="PROVIDED" name="json (v1.8.1, rbenv: 1.9.3-p545) [gem]" level="application" />
280+
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.8.4, rbenv: 1.9.3-p545) [gem]" level="application" />
281+
<orderEntry type="library" scope="PROVIDED" name="parser (v2.1.5, rbenv: 1.9.3-p545) [gem]" level="application" />
282+
<orderEntry type="library" scope="PROVIDED" name="powerpack (v0.0.9, rbenv: 1.9.3-p545) [gem]" level="application" />
283+
<orderEntry type="library" scope="PROVIDED" name="rainbow (v2.0.0, rbenv: 1.9.3-p545) [gem]" level="application" />
284+
<orderEntry type="library" scope="PROVIDED" name="rake (v10.1.1, rbenv: 1.9.3-p545) [gem]" level="application" />
285+
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.1.1, rbenv: 1.9.3-p545) [gem]" level="application" />
286+
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
287+
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
288+
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
289+
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
290+
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.0.0.beta2, rbenv: 1.9.3-p545) [gem]" level="application" />
291+
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.18.1, rbenv: 1.9.3-p545) [gem]" level="application" />
292+
<orderEntry type="library" scope="PROVIDED" name="ruby-debug-base19x (v0.11.30.pre15, rbenv: 1.9.3-p545) [gem]" level="application" />
293+
<orderEntry type="library" scope="PROVIDED" name="ruby-debug-ide (v0.4.22, rbenv: 1.9.3-p545) [gem]" level="application" />
294+
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.1, rbenv: 1.9.3-p545) [gem]" level="application" />
295+
<orderEntry type="library" scope="PROVIDED" name="simplecov (v0.8.2, rbenv: 1.9.3-p545) [gem]" level="application" />
296+
<orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.8.0, rbenv: 1.9.3-p545) [gem]" level="application" />
297+
<orderEntry type="library" scope="PROVIDED" name="slop (v3.4.7, rbenv: 1.9.3-p545) [gem]" level="application" />
298+
<orderEntry type="library" scope="PROVIDED" name="tee (v1.0.0, rbenv: 1.9.3-p545) [gem]" level="application" />
299+
<orderEntry type="library" scope="PROVIDED" name="webmock (v1.17.3, rbenv: 1.9.3-p545) [gem]" level="application" />
300+
<orderEntry type="library" scope="PROVIDED" name="yard (v0.8.7.3, rbenv: 1.9.3-p545) [gem]" level="application" />
301301
</component>
302302
<component name="RModuleSettingsStorage">
303303
<LOAD_PATH number="2" string0="$MODULE_DIR$/lib" string1="$MODULE_DIR$/spec" />

spec/java_buildpack/buildpack_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,15 +65,15 @@
6565
allow(stub_container2).to receive(:detect).and_return('stub-container-2')
6666

6767
expect { buildpack.detect }
68-
.to raise_error(/Application can be run by more than one container: Mock, Mock/)
68+
.to raise_error(/Application can be run by more than one container: Double, Double/)
6969
end
7070

7171
it 'should raise an error if more than one JRE can run an application' do
7272
allow(stub_container1).to receive(:detect).and_return('stub-container-1')
7373
allow(stub_jre1).to receive(:detect).and_return('stub-jre-1')
7474
allow(stub_jre2).to receive(:detect).and_return('stub-jre-2')
7575

76-
expect { buildpack.detect }.to raise_error(/Application can be run by more than one JRE: Mock, Mock/)
76+
expect { buildpack.detect }.to raise_error(/Application can be run by more than one JRE: Double, Double/)
7777
end
7878

7979
it 'should return no detections if no container can run an application' do

0 commit comments

Comments
 (0)