You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2013/09/17 04:16:35 UTC
[2/2] git commit: CAMEL-6761 - Upgrade to restlet 2.1
CAMEL-6761 - Upgrade to restlet 2.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/df9d866d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df9d866d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df9d866d
Branch: refs/heads/camel-2.12.x
Commit: df9d866da2f56a5c02e237b8d85e7d29af7b32cc
Parents: bf683c9
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Mon Sep 16 22:15:36 2013 -0400
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Mon Sep 16 22:16:20 2013 -0400
----------------------------------------------------------------------
components/camel-restlet/pom.xml | 14 +++++++-------
.../component/restlet/DefaultRestletBinding.java | 2 +-
.../restlet/RestletHeaderFilterStrategy.java | 2 +-
.../camel/component/restlet/RestletResponseTest.java | 2 +-
parent/pom.xml | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/df9d866d/components/camel-restlet/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index 1a16eb6..a9653e1 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -57,6 +57,13 @@
<version>${restlet-version}</version>
</dependency>
+ <dependency>
+ <groupId>org.restlet.jse</groupId>
+ <artifactId>org.restlet.ext.httpclient</artifactId>
+ <version>${restlet-version}</version>
+ <scope>test</scope>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
@@ -69,13 +76,6 @@
<artifactId>camel-jetty</artifactId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient4-version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/df9d866d/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 f00de32..3a7a9ae 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
@@ -49,7 +49,7 @@ import org.restlet.data.MediaType;
import org.restlet.data.Method;
import org.restlet.data.Preference;
import org.restlet.data.Status;
-import org.restlet.engine.http.header.HeaderConstants;
+import org.restlet.engine.header.HeaderConstants;
import org.restlet.representation.FileRepresentation;
import org.restlet.representation.InputRepresentation;
import org.slf4j.Logger;
http://git-wip-us.apache.org/repos/asf/camel/blob/df9d866d/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
index a269169..b873230 100644
--- a/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
+++ b/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletHeaderFilterStrategy.java
@@ -18,7 +18,7 @@ package org.apache.camel.component.restlet;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultHeaderFilterStrategy;
-import org.restlet.engine.http.header.HeaderConstants;
+import org.restlet.engine.header.HeaderConstants;
/**
* Default header filtering strategy for Restlet
http://git-wip-us.apache.org/repos/asf/camel/blob/df9d866d/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
index 049cc20..5469aa2 100644
--- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
+++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
@@ -29,7 +29,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.junit.Test;
import org.restlet.data.CacheDirective;
-import org.restlet.engine.http.header.HeaderConstants;
+import org.restlet.engine.header.HeaderConstants;
/**
*
http://git-wip-us.apache.org/repos/asf/camel/blob/df9d866d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e555900..e3537c2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -328,7 +328,7 @@
<quickfix-bundle-version>1.5.3_1</quickfix-bundle-version>
<rabbitmq-amqp-client-version>3.1.3</rabbitmq-amqp-client-version>
<regexp-bundle-version>1.4_1</regexp-bundle-version>
- <restlet-version>2.0.15</restlet-version>
+ <restlet-version>2.1.4</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>