You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/05/18 17:12:10 UTC
[3/3] incubator-brooklyn git commit: This closes #627
This closes #627
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/de67eb0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/de67eb0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/de67eb0c
Branch: refs/heads/master
Commit: de67eb0cd678e32a3e5341772f046f1ebb2b728f
Parents: e4f44c8 4076d3b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon May 18 16:11:57 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon May 18 16:11:57 2015 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
.../brooklyn/entity/proxy/nginx/server.conf | 8 ++
.../brooklyn/entity/webapp/tomcat/server.xml | 57 +++++++++++-
.../brooklyn/launcher/BrooklynWebServer.java | 97 +++++++++++++-------
.../launcher/BrooklynWebServerTest.java | 22 +++++
.../java/brooklyn/rest/BrooklynWebConfig.java | 58 ++++++++++++
6 files changed, 208 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/de67eb0c/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 62dc798,c063d79..f8ff1e1
--- a/pom.xml
+++ b/pom.xml
@@@ -152,9 -144,10 +152,9 @@@
<sshj.version>0.8.1</sshj.version>
<felix.framework.version>4.4.0</felix.framework.version>
<reflections.version>0.9.9-RC1</reflections.version>
- <jetty.version>8.1.4.v20120524</jetty.version>
+ <jetty.version>8.1.17.v20150415</jetty.version>
<airline.version>0.6</airline.version>
<mockwebserver.version>20121111</mockwebserver.version>
- <httpclient.version>4.2.5</httpclient.version>
<freemarker.version>2.3.19</freemarker.version>
<commons-io.version>2.4</commons-io.version>
<hazelcast.version>3.0</hazelcast.version>