You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/11/07 10:56:21 UTC
[1/4] camel git commit: Upgrade Hystrix and related bundle to version
1.5.6
Repository: camel
Updated Branches:
refs/heads/master 70ac57f42 -> 782b04c55
Upgrade Hystrix and related bundle to version 1.5.6
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/782b04c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/782b04c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/782b04c5
Branch: refs/heads/master
Commit: 782b04c556423b108b32fc8dc6b2d634868d32cf
Parents: f2fe7da
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Nov 7 11:54:18 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Nov 7 11:56:01 2016 +0100
----------------------------------------------------------------------
components-starter/camel-hystrix-starter/pom.xml | 4 ----
parent/pom.xml | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/782b04c5/components-starter/camel-hystrix-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-hystrix-starter/pom.xml b/components-starter/camel-hystrix-starter/pom.xml
index 8d47976..a4c6b13 100644
--- a/components-starter/camel-hystrix-starter/pom.xml
+++ b/components-starter/camel-hystrix-starter/pom.xml
@@ -36,16 +36,13 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-hystrix</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
- <!--START OF GENERATED CODE-->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-starter</artifactId>
@@ -54,6 +51,5 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
- <!--END OF GENERATED CODE-->
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/782b04c5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 26f1248..951daee 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -261,8 +261,8 @@
<httpclient4-version>4.5.2</httpclient4-version>
<httpasyncclient-version>4.1.2</httpasyncclient-version>
<httpclient-version>3.1</httpclient-version>
- <hystrix-version>1.5.5</hystrix-version>
- <hystrix-bundle-version>1.5.5_1</hystrix-bundle-version>
+ <hystrix-version>1.5.6</hystrix-version>
+ <hystrix-bundle-version>1.5.6_1</hystrix-bundle-version>
<ibatis-bundle-version>2.3.4.726_4</ibatis-bundle-version>
<ibatis-version>2.3.4.726</ibatis-version>
<ical4j-version>1.0.7</ical4j-version>
[4/4] camel git commit: Upgrade AWS SDK and related bundle to version
1.11.49
Posted by ac...@apache.org.
Upgrade AWS SDK and related bundle to version 1.11.49
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/902135b5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/902135b5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/902135b5
Branch: refs/heads/master
Commit: 902135b5921891f23f109e2e5a2af5c5b32e01a8
Parents: 70ac57f
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Nov 7 11:22:59 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Nov 7 11:56:01 2016 +0100
----------------------------------------------------------------------
components-starter/camel-aws-starter/pom.xml | 4 ----
parent/pom.xml | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/902135b5/components-starter/camel-aws-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-aws-starter/pom.xml b/components-starter/camel-aws-starter/pom.xml
index 7434cfd..0b14ca2 100644
--- a/components-starter/camel-aws-starter/pom.xml
+++ b/components-starter/camel-aws-starter/pom.xml
@@ -36,16 +36,13 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-aws</artifactId>
<version>${project.version}</version>
- <!--START OF GENERATED CODE-->
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
- <!--START OF GENERATED CODE-->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-starter</artifactId>
@@ -54,6 +51,5 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
- <!--END OF GENERATED CODE-->
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/902135b5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0d04d3c..761b471 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -70,8 +70,8 @@
<avro-bundle-version>1.8.1_1</avro-bundle-version>
<avro-ipc-bundle-version>1.8.1_1</avro-ipc-bundle-version>
<awaitility.version>1.7.0</awaitility.version>
- <aws-java-sdk-bundle-version>1.11.18_1</aws-java-sdk-bundle-version>
- <aws-java-sdk-version>1.11.18</aws-java-sdk-version>
+ <aws-java-sdk-bundle-version>1.11.49_1</aws-java-sdk-bundle-version>
+ <aws-java-sdk-version>1.11.49</aws-java-sdk-version>
<axiom-version>1.2.14</axiom-version>
<backport-util-concurrent-version>3.1</backport-util-concurrent-version>
<bcel-bundle-version>5.2_4</bcel-bundle-version>
[2/4] camel git commit: Upgrade Facebook4j and related bundle to
version 2.4.8
Posted by ac...@apache.org.
Upgrade Facebook4j and related bundle to version 2.4.8
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0be20517
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0be20517
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0be20517
Branch: refs/heads/master
Commit: 0be20517ca862de772ec18ca2208ec5289ebe6ba
Parents: 902135b
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Nov 7 11:46:08 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Nov 7 11:56:01 2016 +0100
----------------------------------------------------------------------
components-starter/camel-facebook-starter/pom.xml | 2 --
.../component/facebook/data/FacebookMethodsType.java | 11 ++++++++++-
parent/pom.xml | 4 ++--
3 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0be20517/components-starter/camel-facebook-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-facebook-starter/pom.xml b/components-starter/camel-facebook-starter/pom.xml
index 5e224d5..3d90746 100644
--- a/components-starter/camel-facebook-starter/pom.xml
+++ b/components-starter/camel-facebook-starter/pom.xml
@@ -37,7 +37,6 @@
<artifactId>camel-facebook</artifactId>
<version>${project.version}</version>
</dependency>
- <!--START OF GENERATED CODE-->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-starter</artifactId>
@@ -46,6 +45,5 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
- <!--END OF GENERATED CODE-->
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/0be20517/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
----------------------------------------------------------------------
diff --git a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
index 049eedf..7b13276 100644
--- a/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
+++ b/components/camel-facebook/src/main/java/org/apache/camel/component/facebook/data/FacebookMethodsType.java
@@ -142,7 +142,16 @@ public enum FacebookMethodsType {
GETCOMMENTLIKES_WITH_OPTIONS(ResponseList.class, "getCommentLikes", String.class, "commentId", Reading.class, FacebookConstants.READING_PROPERTY),
LIKECOMMENT(boolean.class, "likeComment", String.class, "commentId"),
UNLIKECOMMENT(Boolean.class, "unlikeComment", String.class, "commentId"),
-
+
+ // ConversationMethods
+ GETCONVERSATIONS_WITH_OPTIONS(InboxResponseList.class, "getConversations", String.class, "pageId", Reading.class, FacebookConstants.READING_PROPERTY),
+ GETCONVERSATIONS_WITH_ID(InboxResponseList.class, "getConversations", String.class, "pageId"),
+ GETCONVERSATIONS_WITH_READING(InboxResponseList.class, "getConversations", Reading.class, FacebookConstants.READING_PROPERTY),
+ GETCONVERSATIONS(InboxResponseList.class, "getConversations"),
+ GETCONVERSATION(InboxResponseList.class, "getConversation", String.class, "conversationId"),
+ GETCONVERSATION_WITH_OPTIONS(InboxResponseList.class, "getConversation", String.class, "conversationId", Reading.class, FacebookConstants.READING_PROPERTY),
+ ANSWERCONVERSATION(String.class, "answerConversation", String.class, "conversationId", String.class, "conversation"),
+
// DomainMethods
GETDOMAIN(Domain.class, "getDomain", String.class, "domainId"),
GETDOMAINBYNAME(Domain.class, "getDomainByName", String.class, "domainName"),
http://git-wip-us.apache.org/repos/asf/camel/blob/0be20517/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 761b471..79f3779 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -181,8 +181,8 @@
<etcd4j-version>2.12.0</etcd4j-version>
<exec-maven-plugin-version>1.5.0</exec-maven-plugin-version>
<ezmorph-bundle-version>1.0.6_1</ezmorph-bundle-version>
- <facebook4j-core-version>2.4.6</facebook4j-core-version>
- <facebook4j-core-bundle-version>2.4.6_1</facebook4j-core-bundle-version>
+ <facebook4j-core-version>2.4.8</facebook4j-core-version>
+ <facebook4j-core-bundle-version>2.4.8_1</facebook4j-core-bundle-version>
<fastinfoset-version>1.2.13_1</fastinfoset-version>
<felix-configadmin-version>1.8.8</felix-configadmin-version>
<felix-connect-version>0.1.0</felix-connect-version>
[3/4] camel git commit: Upgrade Jolt and related bundle to version
0.0.23
Posted by ac...@apache.org.
Upgrade Jolt and related bundle to version 0.0.23
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f2fe7da8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f2fe7da8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f2fe7da8
Branch: refs/heads/master
Commit: f2fe7da8849b1a7da7e1e4a093aa30ecf093683c
Parents: 0be2051
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Nov 7 11:49:33 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Nov 7 11:56:01 2016 +0100
----------------------------------------------------------------------
components-starter/camel-jolt-starter/pom.xml | 2 --
parent/pom.xml | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f2fe7da8/components-starter/camel-jolt-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-jolt-starter/pom.xml b/components-starter/camel-jolt-starter/pom.xml
index 60aaf54..ab31412 100644
--- a/components-starter/camel-jolt-starter/pom.xml
+++ b/components-starter/camel-jolt-starter/pom.xml
@@ -37,7 +37,6 @@
<artifactId>camel-jolt</artifactId>
<version>${project.version}</version>
</dependency>
- <!--START OF GENERATED CODE-->
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-starter</artifactId>
@@ -46,6 +45,5 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-spring-boot-starter</artifactId>
</dependency>
- <!--END OF GENERATED CODE-->
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/f2fe7da8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 79f3779..26f1248 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -340,8 +340,8 @@
<jodatime-bundle-version>1.6.2</jodatime-bundle-version>
<jodatime2-bundle-version>2.9.4</jodatime2-bundle-version>
<jolokia-version>1.3.5</jolokia-version>
- <jolt-version>0.0.22</jolt-version>
- <jolt-bundle-version>0.0.22_1</jolt-bundle-version>
+ <jolt-version>0.0.23</jolt-version>
+ <jolt-bundle-version>0.0.23_1</jolt-bundle-version>
<johnzon-version>0.9.5</johnzon-version>
<josql-bundle-version>1.5_5</josql-bundle-version>
<josql-version>1.5</josql-version>