Updated Branches: refs/heads/camel-2.11.x f5c4ef6cf -> 999e552fa
include 2.5 for compatibility in CAMEL-7020 Conflicts: parent/pom.xml 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/999e552f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/999e552f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/999e552f Branch: refs/heads/camel-2.11.x Commit: 999e552fa15280997843f8d2439c28dbeb561f0a Parents: f5c4ef6 Author: Akitoshi Yoshida <a...@apache.org> Authored: Wed Nov 27 15:08:00 2013 +0100 Committer: Akitoshi Yoshida <a...@apache.org> Committed: Wed Nov 27 15:12:49 2013 +0100 ---------------------------------------------------------------------- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/999e552f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index e08b8cb..659b2d7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -333,7 +333,7 @@ <servicemix-specs-version>2.2.0</servicemix-specs-version> <servlet-api-2.5-version>1.1.2</servlet-api-2.5-version> <shiro-version>1.2.1</shiro-version> - <servlet-version-range>[2.6,4)</servlet-version-range> + <servlet-version-range>[2.5,4)</servlet-version-range> <!-- use slf4j-api 1.6.x to be easy compatible with older Camel releases --> <slf4j-api-version>1.6.6</slf4j-api-version> <slf4j-version>1.7.5</slf4j-version>