Skip to content

Commit b212884

Browse files
author
Christopher Frost
committed
Dependency Updates
This change updates the dependencies of the buildpack. It makes some changes to the code in order to accommodate Rubocop.
1 parent e73b0bc commit b212884

File tree

4 files changed

+44
-46
lines changed

4 files changed

+44
-46
lines changed

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gemfile.lock‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,51 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.3.6)
4+
addressable (2.3.7)
55
ast (2.0.0)
66
astrolabe (1.3.0)
77
parser (>= 2.2.0.pre.3, < 3.0)
8-
codeclimate-test-reporter (0.4.3)
8+
codeclimate-test-reporter (0.4.6)
99
simplecov (>= 0.7.1, < 1.0.0)
1010
crack (0.4.2)
1111
safe_yaml (~> 1.0.0)
1212
diff-lcs (1.2.5)
1313
docile (1.1.5)
1414
multi_json (1.10.1)
15-
parser (2.2.0.pre.8)
15+
parser (2.2.0.3)
1616
ast (>= 1.1, < 3.0)
17-
slop (~> 3.4, >= 3.4.5)
18-
powerpack (0.0.9)
17+
powerpack (0.1.0)
1918
rainbow (2.0.0)
2019
rake (10.4.2)
2120
redcarpet (3.2.2)
22-
rspec (3.1.0)
23-
rspec-core (~> 3.1.0)
24-
rspec-expectations (~> 3.1.0)
25-
rspec-mocks (~> 3.1.0)
26-
rspec-core (3.1.7)
27-
rspec-support (~> 3.1.0)
28-
rspec-expectations (3.1.2)
21+
rspec (3.2.0)
22+
rspec-core (~> 3.2.0)
23+
rspec-expectations (~> 3.2.0)
24+
rspec-mocks (~> 3.2.0)
25+
rspec-core (3.2.1)
26+
rspec-support (~> 3.2.0)
27+
rspec-expectations (3.2.0)
2928
diff-lcs (>= 1.2.0, < 2.0)
30-
rspec-support (~> 3.1.0)
31-
rspec-mocks (3.1.3)
32-
rspec-support (~> 3.1.0)
33-
rspec-support (3.1.2)
34-
rubocop (0.28.0)
29+
rspec-support (~> 3.2.0)
30+
rspec-mocks (3.2.1)
31+
diff-lcs (>= 1.2.0, < 2.0)
32+
rspec-support (~> 3.2.0)
33+
rspec-support (3.2.2)
34+
rubocop (0.29.1)
3535
astrolabe (~> 1.3)
36-
parser (>= 2.2.0.pre.7, < 3.0)
37-
powerpack (~> 0.0.6)
36+
parser (>= 2.2.0.1, < 3.0)
37+
powerpack (~> 0.1)
3838
rainbow (>= 1.99.1, < 3.0)
3939
ruby-progressbar (~> 1.4)
4040
rubocop-rspec (1.2.1)
41-
ruby-progressbar (1.7.0)
42-
rubyzip (1.1.6)
41+
ruby-progressbar (1.7.1)
42+
rubyzip (1.1.7)
4343
safe_yaml (1.0.4)
44-
simplecov (0.9.1)
44+
simplecov (0.9.2)
4545
docile (~> 1.1.0)
4646
multi_json (~> 1.0)
47-
simplecov-html (~> 0.8.0)
48-
simplecov-html (0.8.0)
49-
slop (3.6.0)
47+
simplecov-html (~> 0.9.0)
48+
simplecov-html (0.9.0)
5049
tee (1.0.0)
5150
webmock (1.20.4)
5251
addressable (>= 2.3.6)

‎java-buildpack.iml‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -268,33 +268,32 @@
268268
</content>
269269
<orderEntry type="jdk" jdkName="rbenv: 1.9.3-p551" jdkType="RUBY_SDK" />
270270
<orderEntry type="sourceFolder" forTests="false" />
271-
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.3.6, rbenv: 1.9.3-p551) [gem]" level="application" />
271+
<orderEntry type="library" scope="PROVIDED" name="addressable (v2.3.7, rbenv: 1.9.3-p551) [gem]" level="application" />
272272
<orderEntry type="library" scope="PROVIDED" name="ast (v2.0.0, rbenv: 1.9.3-p551) [gem]" level="application" />
273273
<orderEntry type="library" scope="PROVIDED" name="astrolabe (v1.3.0, rbenv: 1.9.3-p551) [gem]" level="application" />
274-
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.7.8, rbenv: 1.9.3-p551) [gem]" level="application" />
275-
<orderEntry type="library" scope="PROVIDED" name="codeclimate-test-reporter (v0.4.3, rbenv: 1.9.3-p551) [gem]" level="application" />
274+
<orderEntry type="library" scope="PROVIDED" name="bundler (v1.8.2, rbenv: 1.9.3-p551) [gem]" level="application" />
275+
<orderEntry type="library" scope="PROVIDED" name="codeclimate-test-reporter (v0.4.6, rbenv: 1.9.3-p551) [gem]" level="application" />
276276
<orderEntry type="library" scope="PROVIDED" name="crack (v0.4.2, rbenv: 1.9.3-p551) [gem]" level="application" />
277277
<orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 1.9.3-p551) [gem]" level="application" />
278278
<orderEntry type="library" scope="PROVIDED" name="docile (v1.1.5, rbenv: 1.9.3-p551) [gem]" level="application" />
279279
<orderEntry type="library" scope="PROVIDED" name="multi_json (v1.10.1, rbenv: 1.9.3-p551) [gem]" level="application" />
280-
<orderEntry type="library" scope="PROVIDED" name="parser (v2.2.0.pre.8, rbenv: 1.9.3-p551) [gem]" level="application" />
281-
<orderEntry type="library" scope="PROVIDED" name="powerpack (v0.0.9, rbenv: 1.9.3-p551) [gem]" level="application" />
280+
<orderEntry type="library" scope="PROVIDED" name="parser (v2.2.0.3, rbenv: 1.9.3-p551) [gem]" level="application" />
281+
<orderEntry type="library" scope="PROVIDED" name="powerpack (v0.1.0, rbenv: 1.9.3-p551) [gem]" level="application" />
282282
<orderEntry type="library" scope="PROVIDED" name="rainbow (v2.0.0, rbenv: 1.9.3-p551) [gem]" level="application" />
283283
<orderEntry type="library" scope="PROVIDED" name="rake (v10.4.2, rbenv: 1.9.3-p551) [gem]" level="application" />
284284
<orderEntry type="library" scope="PROVIDED" name="redcarpet (v3.2.2, rbenv: 1.9.3-p551) [gem]" level="application" />
285-
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.1.0, rbenv: 1.9.3-p551) [gem]" level="application" />
286-
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.1.7, rbenv: 1.9.3-p551) [gem]" level="application" />
287-
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.1.2, rbenv: 1.9.3-p551) [gem]" level="application" />
288-
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.1.3, rbenv: 1.9.3-p551) [gem]" level="application" />
289-
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.1.2, rbenv: 1.9.3-p551) [gem]" level="application" />
290-
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.28.0, rbenv: 1.9.3-p551) [gem]" level="application" />
285+
<orderEntry type="library" scope="PROVIDED" name="rspec (v3.2.0, rbenv: 1.9.3-p551) [gem]" level="application" />
286+
<orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.2.1, rbenv: 1.9.3-p551) [gem]" level="application" />
287+
<orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.2.0, rbenv: 1.9.3-p551) [gem]" level="application" />
288+
<orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.2.1, rbenv: 1.9.3-p551) [gem]" level="application" />
289+
<orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.2.2, rbenv: 1.9.3-p551) [gem]" level="application" />
290+
<orderEntry type="library" scope="PROVIDED" name="rubocop (v0.29.1, rbenv: 1.9.3-p551) [gem]" level="application" />
291291
<orderEntry type="library" scope="PROVIDED" name="rubocop-rspec (v1.2.1, rbenv: 1.9.3-p551) [gem]" level="application" />
292-
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.7.0, rbenv: 1.9.3-p551) [gem]" level="application" />
293-
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.1.6, rbenv: 1.9.3-p551) [gem]" level="application" />
292+
<orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.7.1, rbenv: 1.9.3-p551) [gem]" level="application" />
293+
<orderEntry type="library" scope="PROVIDED" name="rubyzip (v1.1.7, rbenv: 1.9.3-p551) [gem]" level="application" />
294294
<orderEntry type="library" scope="PROVIDED" name="safe_yaml (v1.0.4, rbenv: 1.9.3-p551) [gem]" level="application" />
295-
<orderEntry type="library" scope="PROVIDED" name="simplecov (v0.9.1, rbenv: 1.9.3-p551) [gem]" level="application" />
296-
<orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.8.0, rbenv: 1.9.3-p551) [gem]" level="application" />
297-
<orderEntry type="library" scope="PROVIDED" name="slop (v3.6.0, rbenv: 1.9.3-p551) [gem]" level="application" />
295+
<orderEntry type="library" scope="PROVIDED" name="simplecov (v0.9.2, rbenv: 1.9.3-p551) [gem]" level="application" />
296+
<orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.9.0, rbenv: 1.9.3-p551) [gem]" level="application" />
298297
<orderEntry type="library" scope="PROVIDED" name="tee (v1.0.0, rbenv: 1.9.3-p551) [gem]" level="application" />
299298
<orderEntry type="library" scope="PROVIDED" name="webmock (v1.20.4, rbenv: 1.9.3-p551) [gem]" level="application" />
300299
<orderEntry type="library" scope="PROVIDED" name="yard (v0.8.7.6, rbenv: 1.9.3-p551) [gem]" level="application" />

‎spec/java_buildpack/buildpack_spec.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
allow(JavaBuildpack::Util::ConfigurationUtils).to receive(:load).and_call_original
4646
allow(JavaBuildpack::Util::ConfigurationUtils)
4747
.to receive(:load).with('components').and_return(
48-
'containers' => ['Test::StubContainer1', 'Test::StubContainer2'],
49-
'frameworks' => ['Test::StubFramework1', 'Test::StubFramework2'],
50-
'jres' => ['Test::StubJre1', 'Test::StubJre2']
51-
)
48+
'containers' => ['Test::StubContainer1', 'Test::StubContainer2'],
49+
'frameworks' => ['Test::StubFramework1', 'Test::StubFramework2'],
50+
'jres' => ['Test::StubJre1', 'Test::StubJre2']
51+
)
5252

5353
allow(Test::StubContainer1).to receive(:new).and_return(stub_container1)
5454
allow(Test::StubContainer2).to receive(:new).and_return(stub_container2)

0 commit comments

Comments
 (0)