Skip to content

Commit

Permalink
Require java 1.7+ for running jetty out of the box
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeer committed Mar 14, 2015
1 parent 2894a98 commit df4c001
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
3 changes: 3 additions & 0 deletions config/jetty.yml
@@ -1,10 +1,13 @@
development:
startup_wait: 15
jetty_port: 8983
java_version: ">= 1.7"
test:
startup_wait: 60
jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %>
<%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>
java_version: ">= 1.7"
production:
startup_wait: 15
jetty_port: 8983
java_version: ">= 1.7"
3 changes: 3 additions & 0 deletions lib/generators/blacklight/templates/config/jetty.yml
@@ -1,10 +1,13 @@
development:
startup_wait: 15
jetty_port: 8983
java_version: ">= 1.7"
test:
startup_wait: 60
jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %>
<%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>
java_version: ">= 1.7"
production:
startup_wait: 15
jetty_port: 8983
java_version: ">= 1.7"

0 comments on commit df4c001

Please sign in to comment.