Repository: camel Updated Branches: refs/heads/master c631bc624 -> e8e2a511a
Add a profile to start working on full Jetty9 support Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/70334b83 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/70334b83 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/70334b83 Branch: refs/heads/master Commit: 70334b832b075cb11624197bfa28c5d2793cab71 Parents: c631bc6 Author: Daniel Kulp <dk...@apache.org> Authored: Wed Aug 13 11:36:19 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Wed Aug 13 11:36:19 2014 -0400 ---------------------------------------------------------------------- parent/pom.xml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/70334b83/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 8f4f2e3..8066699 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -226,10 +226,11 @@ <jdom-bundle-version>1.1_4</jdom-bundle-version> <jdom-version>1.1.3</jdom-version> <jedis-client-bundle-version>2.1.0_1</jedis-client-bundle-version> - <jetty-version>8.1.14.v20131031</jetty-version> <jetty6-bundle-version>6.1.26_4</jetty6-bundle-version> <jetty6-version>6.1.26</jetty6-version> - <jetty9-version>9.2.1.v20140609</jetty9-version> + <jetty8-version>8.1.15.v20140411</jetty8-version> + <jetty9-version>9.2.2.v20140723</jetty9-version> + <jetty-version>${jetty8-version}</jetty-version> <jettison-version>1.3.5</jettison-version> <jexcelapi-bundle-version>2.4.2_4</jexcelapi-bundle-version> <jexcelapi-version>2.4.2</jexcelapi-version> @@ -475,7 +476,7 @@ org.apache.commons.httpclient.*;version="[3.1,4.0)", org.apache.velocity.*;version="[1.6.2,2)", org.apache.xmlbeans.*;version="[2.4,3)", - org.eclipse.jetty.*;version="[7.5,8.2)", + org.eclipse.jetty.*;version="[7.5,10)", com.thoughtworks.xstream.*;version="[1.3,2)", org.antlr.stringtemplate.*;version="[3.0,4)", org.jivesoftware.smack.*;version="[3.0,4)", @@ -2863,6 +2864,13 @@ </profile> <profile> + <id>jetty9</id> + <properties> + <jetty-version>${jetty9-version}</jetty-version> + </properties> + </profile> + + <profile> <id>jdk1.7</id> <activation> <jdk>1.7</jdk>
