Skip to content
This repository was archived by the owner on Jul 15, 2019. It is now read-only.

Add support for jetty 9.1 #19

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for jetty 9.1 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d00b747
Add support for jetty 9.1
Nov 6, 2014
012e28d
Create log directory for the request logs
Nov 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Berksfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ site :opscode

metadata

cookbook "java"
cookbook "apt"
cookbook "minitest-handler", "~> 0.2.1"
cookbook "hipsnip-jetty_test", :path => "test/cookbooks/hipsnip-jetty_test"
cookbook "hipsnip-jetty_test", :path => "test/cookbooks/hipsnip-jetty_test"
16 changes: 5 additions & 11 deletions Berksfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,20 @@
"hipsnip-jetty": {
"path": "."
},
"java": {
"locked_version": "1.28.0"
},
"apt": {
"locked_version": "2.1.0"
"locked_version": "2.6.0"
},
"minitest-handler": {
"locked_version": "0.2.1"
},
"hipsnip-jetty_test": {
"path": "./test/cookbooks/hipsnip-jetty_test"
},
"java": {
"locked_version": "1.14.0"
},
"windows": {
"locked_version": "1.10.0"
},
"chef_handler": {
"locked_version": "1.1.4"
},
"aws": {
"locked_version": "0.101.6"
"locked_version": "1.1.6"
}
}
}
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ gem "json", "= 1.7.7"
gem "minitest-chef-handler", "~> 1.0.1", :group => :integration
gem "kitchen-vagrant", "~> 0.11.0", :group => :integration
gem "cookbook-development", :github => "hipsnip-cookbooks/cookbook-development"
gem "chefspec"
205 changes: 110 additions & 95 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,191 +1,204 @@
GIT
remote: git://github.com/hipsnip-cookbooks/cookbook-development.git
revision: 9c2f9baeebd80be2276c84785940dde7cd457417
revision: 0fd89884cd3fcb235c38c8c13858e2fc15579444
specs:
cookbook-development (0.2.0)
chef (~> 11.6.0)
chefspec (~> 2.0.0)
foodcritic (~> 2.2.0)
cookbook-development (0.3.0)
chef (~> 11.10.0)
chefspec (~> 3.2.0)
foodcritic (~> 3.0.3)
strainer (~> 3.3.0)

GEM
remote: https://rubygems.org/
specs:
activesupport (3.2.14)
activesupport (3.2.20)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
addressable (2.3.5)
akami (1.2.0)
addressable (2.3.6)
akami (1.2.2)
gyoku (>= 0.4.0)
nokogiri (>= 1.4.0)
berkshelf (2.0.10)
nokogiri
berkshelf (2.0.18)
activesupport (~> 3.2.0)
addressable (~> 2.3.4)
buff-shell_out (~> 0.1)
chozo (>= 0.6.1)
faraday (>= 0.8.5)
hashie (>= 2.0.2)
faraday (~> 0.8.5)
hashie (~> 2.0)
minitar (~> 0.5.4)
rbzip2 (~> 0.2.0)
retryable (~> 1.3.3)
ridley (~> 1.5.0)
solve (>= 0.5.0)
ridley (~> 1.7.0)
solve (~> 0.8.2)
thor (~> 0.18.0)
buff-config (0.4.0)
buff-extensions (~> 0.3)
varia_model (~> 0.1)
buff-extensions (0.5.0)
buff-ignore (1.1.0)
buff-ignore (1.1.1)
buff-platform (0.1.0)
buff-ruby_engine (0.1.0)
buff-shell_out (0.1.0)
buff-shell_out (0.2.0)
buff-ruby_engine (~> 0.1.0)
builder (3.2.2)
celluloid (0.14.1)
timers (>= 1.0.0)
celluloid-io (0.14.1)
celluloid (>= 0.14.1)
nio4r (>= 0.4.5)
chef (11.6.0)
erubis
highline (>= 1.6.9)
json (>= 1.4.4, <= 1.7.7)
mixlib-authentication (>= 1.3.0)
mixlib-cli (~> 1.3.0)
mixlib-config (>= 1.1.2)
mixlib-log (>= 1.3.0)
mixlib-shellout
celluloid (0.16.0)
timers (~> 4.0.0)
celluloid-io (0.16.1)
celluloid (>= 0.16.0)
nio4r (>= 1.0.0)
chef (11.10.4)
chef-zero (~> 1.7, >= 1.7.2)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
highline (~> 1.6, >= 1.6.9)
json (>= 1.4.4, <= 1.8.1)
mime-types (~> 1.16)
mixlib-authentication (~> 1.3)
mixlib-cli (~> 1.4)
mixlib-config (~> 2.0)
mixlib-log (~> 1.3)
mixlib-shellout (~> 1.3)
net-ssh (~> 2.6)
net-ssh-multi (~> 1.1.0)
ohai (>= 0.6.0)
net-ssh-multi (~> 1.1)
ohai (~> 6.0)
pry (~> 0.9)
puma (~> 1.6)
rest-client (>= 1.0.4, < 1.7.0)
yajl-ruby (~> 1.1)
chefspec (2.0.1)
chef (>= 10.0)
erubis
fauxhai (~> 1.1)
minitest-chef-handler (>= 0.6.0)
rspec (~> 2.0)
chef-zero (1.7.3)
hashie (~> 2.0)
json
mixlib-log (~> 1.3)
moneta (< 0.7.0)
rack
chefspec (3.2.0)
chef (~> 11.0)
fauxhai (~> 2.0)
i18n (>= 0.6.9, < 1.0.0)
rspec (~> 2.14)
chozo (0.6.1)
activesupport (>= 3.2.0)
hashie (>= 2.0.2)
multi_json (>= 1.3.0)
ci_reporter (1.9.0)
ci_reporter (1.9.3)
builder (>= 2.1.2)
coderay (1.0.9)
diff-lcs (1.2.4)
diff-lcs (1.2.5)
erubis (2.7.0)
faraday (0.8.8)
faraday (0.8.9)
multipart-post (~> 1.2.0)
fauxhai (1.1.1)
httparty
fauxhai (2.2.0)
net-ssh
ohai
ffi (1.9.0)
foodcritic (2.2.0)
ffi (1.9.6)
foodcritic (3.0.3)
erubis
gherkin (~> 2.11.7)
nokogiri (~> 1.5.4)
rake
treetop (~> 1.4.10)
yajl-ruby (~> 1.1.0)
gherkin (2.11.8)
multi_json (~> 1.3)
gssapi (1.0.3)
ffi (>= 1.0.1)
gyoku (1.1.0)
gyoku (1.2.2)
builder (>= 2.1.2)
hashie (2.0.5)
highline (1.6.19)
httparty (0.11.0)
multi_json (~> 1.0)
multi_xml (>= 0.5.2)
httpclient (2.2.0.2)
hashie (2.1.2)
highline (1.6.21)
hitimes (1.2.2)
httpclient (2.5.3.2)
httpi (0.9.7)
rack
i18n (0.6.5)
i18n (0.6.11)
ipaddress (0.8.0)
json (1.7.7)
kitchen-vagrant (0.11.1)
test-kitchen (~> 1.0.0.beta.3)
little-plugger (1.1.3)
logging (1.6.2)
logging (1.8.2)
little-plugger (>= 1.1.3)
multi_json (>= 1.8.4)
method_source (0.8.2)
mime-types (1.25)
mime-types (1.25.1)
minitar (0.5.4)
minitest (4.7.5)
minitest-chef-handler (1.0.1)
chef
ci_reporter
minitest-chef-handler (1.0.3)
chef (>= 10.12.0)
ci_reporter (< 2.0)
minitest (~> 4.7.3)
mixlib-authentication (1.3.0)
mixlib-log
mixlib-cli (1.3.0)
mixlib-config (1.1.2)
mixlib-cli (1.5.0)
mixlib-config (2.1.0)
mixlib-log (1.6.0)
mixlib-shellout (1.2.0)
multi_json (1.7.9)
multi_xml (0.5.5)
mixlib-shellout (1.6.0)
moneta (0.6.0)
multi_json (1.10.1)
multipart-post (1.2.0)
net-http-persistent (2.9)
net-http-persistent (2.9.4)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-ssh (2.6.8)
net-ssh (2.9.1)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
net-ssh-multi (1.1)
net-ssh (>= 2.1.4)
net-ssh-gateway (>= 0.99.0)
nio4r (0.5.0)
nokogiri (1.5.10)
net-ssh-multi (1.2.0)
net-ssh (>= 2.6.5)
net-ssh-gateway (>= 1.2.0)
nio4r (1.0.1)
nokogiri (1.5.11)
nori (1.1.5)
ohai (6.18.0)
ohai (6.24.2)
ipaddress
mixlib-cli
mixlib-config
mixlib-log
mixlib-shellout
systemu
systemu (~> 2.5.2)
yajl-ruby
polyglot (0.3.3)
polyglot (0.3.5)
pry (0.9.12.2)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.4)
puma (1.6.3)
rack (~> 1.2)
rack (1.5.2)
rake (10.1.0)
rbzip2 (0.2.0)
rest-client (1.6.7)
mime-types (>= 1.16)
retryable (1.3.3)
ridley (1.5.2)
rdoc (4.1.2)
json (~> 1.4)
rest-client (1.6.8)
mime-types (~> 1.16)
rdoc (>= 2.4.2)
retryable (1.3.6)
ridley (1.7.1)
addressable
buff-config (~> 0.2)
buff-extensions (~> 0.3)
buff-ignore (~> 1.1)
buff-shell_out (~> 0.1)
celluloid (~> 0.14.0)
celluloid-io (~> 0.14.0)
celluloid (~> 0.15)
celluloid-io (~> 0.15)
erubis
faraday (>= 0.8.4)
hashie (>= 2.0.2)
json (>= 1.7.7)
mixlib-authentication (>= 1.3.0)
net-http-persistent (>= 2.8)
net-ssh
nio4r (>= 0.5.0)
retryable
solve (>= 0.4.4)
varia_model (~> 0.1)
winrm (~> 1.1.0)
rspec (2.14.1)
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.5)
rspec-expectations (2.14.2)
rspec (2.99.0)
rspec-core (~> 2.99.0)
rspec-expectations (~> 2.99.0)
rspec-mocks (~> 2.99.0)
rspec-core (2.99.2)
rspec-expectations (2.99.2)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.3)
rspec-mocks (2.99.2)
rubyntlm (0.1.1)
safe_yaml (0.9.5)
savon (0.9.5)
Expand All @@ -197,7 +210,7 @@ GEM
nori (~> 1.0)
wasabi (~> 1.0)
slop (3.4.6)
solve (0.8.1)
solve (0.8.2)
strainer (3.3.0)
berkshelf (~> 2.0)
buff-platform (~> 0.1)
Expand All @@ -211,21 +224,22 @@ GEM
safe_yaml (~> 0.9.5)
thor
thor (0.18.1)
timers (1.1.0)
timers (4.0.1)
hitimes
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
uuidtools (2.1.4)
varia_model (0.2.0)
uuidtools (2.1.5)
varia_model (0.3.2)
buff-extensions (~> 0.2)
hashie (>= 2.0.2)
wasabi (1.0.0)
nokogiri (>= 1.4.0)
winrm (1.1.2)
winrm (1.1.3)
gssapi (~> 1.0.0)
httpclient (~> 2.2.0.2)
logging (~> 1.6.1)
nokogiri (~> 1.5.0)
httpclient (~> 2.2, >= 2.2.0.2)
logging (~> 1.6, >= 1.6.1)
nokogiri (~> 1.5)
rubyntlm (~> 0.1.1)
savon (= 0.9.5)
uuidtools (~> 2.1.2)
Expand All @@ -236,6 +250,7 @@ PLATFORMS

DEPENDENCIES
berkshelf (~> 2.0.9)
chefspec
cookbook-development!
json (= 1.7.7)
kitchen-vagrant (~> 0.11.0)
Expand Down
Loading