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 2015/03/18 07:35:18 UTC
[1/2] camel git commit: CAMEL-8501: camel-parent does not publish
restlet dependencies. Thanks to Thomas Diesler for patch.
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 9b2deb8f6 -> 469a7b334
refs/heads/master 1deebcc9c -> e069d74fc
CAMEL-8501: camel-parent does not publish restlet dependencies. Thanks to Thomas Diesler for patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e069d74f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e069d74f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e069d74f
Branch: refs/heads/master
Commit: e069d74fc29238226f3c9090fc4db1a9be31257f
Parents: 1deebcc
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 18 07:36:45 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 18 07:36:45 2015 +0100
----------------------------------------------------------------------
components/camel-restlet/pom.xml | 6 ++----
parent/pom.xml | 12 ++++++++++++
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e069d74f/components/camel-restlet/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index d141a1b..593ee87 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -51,15 +51,13 @@
</dependency>
<dependency>
- <groupId>org.restlet.osgi</groupId>
+ <groupId>org.restlet.jee</groupId>
<artifactId>org.restlet</artifactId>
- <version>${restlet-version}</version>
</dependency>
<dependency>
- <groupId>org.restlet.osgi</groupId>
+ <groupId>org.restlet.jee</groupId>
<artifactId>org.restlet.ext.httpclient</artifactId>
- <version>${restlet-version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/e069d74f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f951f01..65254ec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2532,6 +2532,18 @@
<version>${felix-configadmin-version}</version>
</dependency>
+ <!-- Restlet -->
+ <dependency>
+ <groupId>org.restlet.jee</groupId>
+ <artifactId>org.restlet</artifactId>
+ <version>${restlet-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.restlet.jee</groupId>
+ <artifactId>org.restlet.ext.httpclient</artifactId>
+ <version>${restlet-version}</version>
+ </dependency>
+
<!-- need this to use the new 'maven-archetype' packaging type -->
<dependency>
<groupId>org.apache.maven.archetype</groupId>
[2/2] camel git commit: CAMEL-8501: camel-parent does not publish
restlet dependencies. Thanks to Thomas Diesler for patch.
Posted by da...@apache.org.
CAMEL-8501: camel-parent does not publish restlet dependencies. Thanks to Thomas Diesler for patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/469a7b33
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/469a7b33
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/469a7b33
Branch: refs/heads/camel-2.15.x
Commit: 469a7b33496547f999c0ab9c830ed9efc6fa3a28
Parents: 9b2deb8
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 18 07:36:45 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 18 07:37:05 2015 +0100
----------------------------------------------------------------------
components/camel-restlet/pom.xml | 6 ++----
parent/pom.xml | 12 ++++++++++++
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/469a7b33/components/camel-restlet/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index b9bbbcf..b73a00a 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -51,15 +51,13 @@
</dependency>
<dependency>
- <groupId>org.restlet.osgi</groupId>
+ <groupId>org.restlet.jee</groupId>
<artifactId>org.restlet</artifactId>
- <version>${restlet-version}</version>
</dependency>
<dependency>
- <groupId>org.restlet.osgi</groupId>
+ <groupId>org.restlet.jee</groupId>
<artifactId>org.restlet.ext.httpclient</artifactId>
- <version>${restlet-version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/469a7b33/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9d19663..7fb5e06 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2520,6 +2520,18 @@
<version>${felix-configadmin-version}</version>
</dependency>
+ <!-- Restlet -->
+ <dependency>
+ <groupId>org.restlet.jee</groupId>
+ <artifactId>org.restlet</artifactId>
+ <version>${restlet-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.restlet.jee</groupId>
+ <artifactId>org.restlet.ext.httpclient</artifactId>
+ <version>${restlet-version}</version>
+ </dependency>
+
<!-- need this to use the new 'maven-archetype' packaging type -->
<dependency>
<groupId>org.apache.maven.archetype</groupId>