Upgrade Jetty8 to 8.1.17.v20150415 and Jetty9 to 9.2.10.v20150310
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2749481c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2749481c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2749481c
Branch: refs/heads/camel-2.15.x
Commit: 2749481c38adcf49b0f78f870f7cb86c8ea9c689
Parents: 0d5f305
Author: Willem Jiang <willem.ji...@gmail.com>
Authored: Thu May 7 10:52:45 2015 +0800
Committer: Willem Jiang <willem.ji...@gmail.com>
Committed: Thu May 7 11:08:49 2015 +0800
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2749481c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index c43589f..5922d12 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -255,8 +255,8 @@
<jedis-client-bundle-version>2.6.2_1</jedis-client-bundle-version>
<jetty6-bundle-version>6.1.26_4</jetty6-bundle-version>
<jetty6-version>6.1.26</jetty6-version>
- <jetty8-version>8.1.16.v20140903</jetty8-version>
- <jetty9-version>9.2.9.v20150224</jetty9-version>
+ <jetty8-version>8.1.17.v20150415</jetty8-version>
+ <jetty9-version>9.2.10.v20150310</jetty9-version>
<jetty-version>${jetty8-version}</jetty-version>
<jetty-runner-groupId>org.mortbay.jetty</jetty-runner-groupId>
<jettison-version>1.3.7</jettison-version>
