You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/02/19 10:46:00 UTC
[2/2] camel git commit: Polished to avoid mixed versions of http
client
Polished to avoid mixed versions of http client
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ff1578cb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff1578cb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff1578cb
Branch: refs/heads/camel-2.16.x
Commit: ff1578cb45f31bdfba7b66053d8c154b4b3998a5
Parents: 9933b43
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 19 10:45:20 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 19 10:45:51 2016 +0100
----------------------------------------------------------------------
components/camel-restlet/pom.xml | 41 ++++++++++-------------------------
1 file changed, 12 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ff1578cb/components/camel-restlet/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index 3870bbf..5606bdb 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -15,7 +15,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -30,10 +31,10 @@
<description>Camel REST (Restlet based) Component</description>
<properties>
- <camel.osgi.export.pkg>
- org.apache.camel.component.restlet.*
- </camel.osgi.export.pkg>
- <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=restlet</camel.osgi.export.service>
+ <camel.osgi.export.pkg>
+ org.apache.camel.component.restlet.*
+ </camel.osgi.export.pkg>
+ <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=restlet</camel.osgi.export.service>
</properties>
<repositories>
@@ -45,6 +46,7 @@
</repositories>
<dependencies>
+
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
@@ -54,25 +56,18 @@
<groupId>org.restlet.jee</groupId>
<artifactId>org.restlet</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.restlet.jee</groupId>
- <artifactId>org.restlet.ext.httpclient</artifactId>
- </dependency>
-
+ <!-- used for restlet producer -->
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient4-version}</version>
+ <groupId>org.restlet.jee</groupId>
+ <artifactId>org.restlet.ext.httpclient</artifactId>
</dependency>
- <!-- test dependencies -->
+ <!-- camel test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-jetty</artifactId>
@@ -96,18 +91,17 @@
<scope>test</scope>
</dependency>
+ <!-- other test dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
@@ -121,15 +115,4 @@
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <reportFormat>brief</reportFormat>
- <useFile>false</useFile>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>