Updated Branches:
refs/heads/camel-2.12.x 2fba41005 -> 616ce1677
include 2.5 for compatibility in CAMEL-7020
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/616ce167
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/616ce167
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/616ce167
Branch: refs/heads/camel-2.12.x
Commit: 616ce167769ae4373b2fe2af996a2d93ac24d943
Parents: 2fba410
Author: Akitoshi Yoshida <[email protected]>
Authored: Wed Nov 27 15:08:00 2013 +0100
Committer: Akitoshi Yoshida <[email protected]>
Committed: Wed Nov 27 15:10:41 2013 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/616ce167/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f2f89ea..95f2a9e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -349,7 +349,7 @@
<serp-bundle-version>1.14.1_1</serp-bundle-version>
<servicemix-specs-version>2.2.0</servicemix-specs-version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
- <servlet-version-range>[2.6,4)</servlet-version-range>
+ <servlet-version-range>[2.5,4)</servlet-version-range>
<shiro-version>1.2.2</shiro-version>
<!-- use slf4j-api 1.6.x to be easy compatible with older Camel releases
-->
<slf4j-api-version>1.6.6</slf4j-api-version>