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 2017/04/27 09:32:58 UTC
[1/3] camel git commit: Use -starter in spring boot examples
Repository: camel
Updated Branches:
refs/heads/master d1177cd92 -> 11fcf39d7
Use -starter in spring boot examples
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/11fcf39d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/11fcf39d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/11fcf39d
Branch: refs/heads/master
Commit: 11fcf39d7bea71bf1755abff2d1a8012e23c2a04
Parents: d170341
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 27 11:25:05 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 27 11:32:51 2017 +0200
----------------------------------------------------------------------
examples/camel-example-spring-boot-rest-jpa/pom.xml | 8 ++++----
examples/camel-example-spring-boot-rest-swagger/pom.xml | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/11fcf39d/examples/camel-example-spring-boot-rest-jpa/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-rest-jpa/pom.xml b/examples/camel-example-spring-boot-rest-jpa/pom.xml
index 6e23a7f..352764a 100644
--- a/examples/camel-example-spring-boot-rest-jpa/pom.xml
+++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml
@@ -83,19 +83,19 @@
<!-- Camel -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-servlet</artifactId>
+ <artifactId>camel-servlet-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jackson</artifactId>
+ <artifactId>camel-jackson-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-swagger-java</artifactId>
+ <artifactId>camel-swagger-java-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jpa</artifactId>
+ <artifactId>camel-jpa-starter</artifactId>
</dependency>
<!-- JDBC -->
http://git-wip-us.apache.org/repos/asf/camel/blob/11fcf39d/examples/camel-example-spring-boot-rest-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-spring-boot-rest-swagger/pom.xml b/examples/camel-example-spring-boot-rest-swagger/pom.xml
index 09fc575..1ce20f7 100644
--- a/examples/camel-example-spring-boot-rest-swagger/pom.xml
+++ b/examples/camel-example-spring-boot-rest-swagger/pom.xml
@@ -67,15 +67,15 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-swagger-java</artifactId>
+ <artifactId>camel-swagger-java-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-servlet</artifactId>
+ <artifactId>camel-servlet-starter</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-jackson</artifactId>
+ <artifactId>camel-jackson-starter</artifactId>
</dependency>
<!-- Test -->
[2/3] camel git commit: Bump osgi range for jackson
Posted by da...@apache.org.
Bump osgi range for jackson
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d170341a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d170341a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d170341a
Branch: refs/heads/master
Commit: d170341ac3edfc5c176452ec0ffe66f945a55d24
Parents: bb998e3
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 27 11:20:25 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 27 11:32:51 2017 +0200
----------------------------------------------------------------------
components/camel-swagger-java/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d170341a/components/camel-swagger-java/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/pom.xml b/components/camel-swagger-java/pom.xml
index 68bc4e1..7cd3762 100644
--- a/components/camel-swagger-java/pom.xml
+++ b/components/camel-swagger-java/pom.xml
@@ -36,7 +36,7 @@
<label>rest,api</label>
<camel.osgi.import.before.defaults>
- com.fasterxml.jackson.*;version="[2.4,3)"
+ com.fasterxml.jackson.*;version="[2.8,3)"
</camel.osgi.import.before.defaults>
<camel.osgi.export.pkg>org.apache.camel.swagger.*</camel.osgi.export.pkg>
</properties>
[3/3] camel git commit: CAMEL-11208: camel-swagger-java - Should use
guava 20 and not 19
Posted by da...@apache.org.
CAMEL-11208: camel-swagger-java - Should use guava 20 and not 19
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bb998e38
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bb998e38
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bb998e38
Branch: refs/heads/master
Commit: bb998e38bef7cdc28297efb9b2b9e3013b415d07
Parents: d1177cd
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 27 11:19:03 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 27 11:32:51 2017 +0200
----------------------------------------------------------------------
components/camel-swagger-java/pom.xml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bb998e38/components/camel-swagger-java/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/pom.xml b/components/camel-swagger-java/pom.xml
index 8f8ca9e..68bc4e1 100644
--- a/components/camel-swagger-java/pom.xml
+++ b/components/camel-swagger-java/pom.xml
@@ -76,7 +76,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${google-guava-version}</version>
+ <version>${swagger-java-guava-version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -89,6 +89,12 @@
<groupId>io.swagger</groupId>
<artifactId>swagger-core</artifactId>
<version>${swagger-java-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
@@ -99,6 +105,12 @@
<groupId>io.swagger</groupId>
<artifactId>swagger-jaxrs</artifactId>
<version>${swagger-java-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.swagger</groupId>