Repository: camel Updated Branches: refs/heads/camel-2.15.x ec663813e -> 54c63fc3b refs/heads/master d85f2f0c5 -> 1669aa0c2
CAMEL-8591: Upgrade to restlet 2.3.1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1669aa0c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1669aa0c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1669aa0c Branch: refs/heads/master Commit: 1669aa0c25578a95662e3e2c38258d32e6bd749d Parents: dd0f74c Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Apr 2 10:10:57 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Apr 2 10:11:45 2015 +0200 ---------------------------------------------------------------------- .../org/apache/camel/component/restlet/DefaultRestletBinding.java | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1669aa0c/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java ---------------------------------------------------------------------- diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java index 35369bf..3d8df74 100644 --- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java +++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java @@ -47,12 +47,12 @@ import org.restlet.data.ChallengeResponse; import org.restlet.data.ChallengeScheme; import org.restlet.data.CharacterSet; import org.restlet.data.Form; +import org.restlet.data.Header; import org.restlet.data.MediaType; import org.restlet.data.Method; import org.restlet.data.Preference; import org.restlet.data.Status; import org.restlet.engine.application.DecodeRepresentation; -import org.restlet.engine.header.Header; import org.restlet.engine.header.HeaderConstants; import org.restlet.representation.FileRepresentation; import org.restlet.representation.InputRepresentation; http://git-wip-us.apache.org/repos/asf/camel/blob/1669aa0c/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index b701214..80b0174 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -394,7 +394,7 @@ <rabbitmq-amqp-client-version>3.3.4</rabbitmq-amqp-client-version> <reflections-bundle-version>0.9.8_1</reflections-bundle-version> <regexp-bundle-version>1.4_1</regexp-bundle-version> - <restlet-version>2.2.3</restlet-version> + <restlet-version>2.3.1</restlet-version> <rhino-bundle-version>1.7R2_3</rhino-bundle-version> <rhino-version>1.7R2</rhino-version> <rome-bundle-version>1.0_3</rome-bundle-version>