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 2016/08/25 14:13:48 UTC

[1/4] camel git commit: bump rev on google service libs

Repository: camel
Updated Branches:
  refs/heads/camel-2.17.x 68a90d9ad -> ac501457d
  refs/heads/master 432d41d33 -> 3b60136ab


bump rev on google service libs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5caa9d28
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5caa9d28
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5caa9d28

Branch: refs/heads/master
Commit: 5caa9d2856f9f5999cb17f51189b4f991f37118e
Parents: 432d41d
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Aug 25 11:23:58 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Aug 25 11:23:58 2016 -0230

----------------------------------------------------------------------
 parent/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/5caa9d28/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index fb5d7db..e6b655e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -221,9 +221,9 @@
     <gmetric4j-version>1.0.10</gmetric4j-version>
     <google-guava-version>19.0</google-guava-version>
     <google-api-client-version>1.19.0</google-api-client-version>
-    <google-api-services-drive-version>v2-rev151-1.19.0</google-api-services-drive-version>
-    <google-api-services-calendar-version>v3-rev99-1.19.0</google-api-services-calendar-version>
-    <google-api-services-mail-version>v1-rev15-1.19.0</google-api-services-mail-version>
+    <google-api-services-drive-version>v2-rev193-1.19.0</google-api-services-drive-version>
+    <google-api-services-calendar-version>v3-rev152-1.19.0</google-api-services-calendar-version>
+    <google-api-services-mail-version>v1-rev34-1.19.0</google-api-services-mail-version>
     <google-truth-version>0.27</google-truth-version>
     <grizzly-websockets-version>2.3.25</grizzly-websockets-version>
     <groovy-version>2.4.7</groovy-version>


[4/4] camel git commit: fix google drive unit test failure

Posted by ja...@apache.org.
fix google drive unit test failure


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ac501457
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ac501457
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ac501457

Branch: refs/heads/camel-2.17.x
Commit: ac501457d38d2d83ff3992eb9864f8807fb55ae8
Parents: 6ab52a3
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Aug 25 11:42:52 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Aug 25 11:43:30 2016 -0230

----------------------------------------------------------------------
 .../component/google/drive/AbstractGoogleDriveTestSupport.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ac501457/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
index 067bbe6..fac64bc 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
@@ -42,7 +42,7 @@ public abstract class AbstractGoogleDriveTestSupport extends CamelTestSupport {
     protected static String testFolderId;
     protected static String testFileId;
 
-    protected static final String TEST_UPLOAD_FILE = "src/test/resources/log4j.properties";
+    protected static final String TEST_UPLOAD_FILE = "src/test/resources/log4j2.properties";
     protected static final String TEST_UPLOAD_IMG = "src/test/resources/camel-box-small.png";
     protected static final java.io.File UPLOAD_FILE = new java.io.File(TEST_UPLOAD_FILE);
 


[3/4] camel git commit: bump rev on google service libs

Posted by ja...@apache.org.
bump rev on google service libs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6ab52a3a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6ab52a3a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6ab52a3a

Branch: refs/heads/camel-2.17.x
Commit: 6ab52a3a80709cb14fea6f10c2ab5c6df79e7196
Parents: 68a90d9
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Aug 25 11:23:58 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Aug 25 11:43:23 2016 -0230

----------------------------------------------------------------------
 parent/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/6ab52a3a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 29776bf..26cfadc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -206,9 +206,9 @@
     <google-gdata-bundle-version>1.41.1_1</google-gdata-bundle-version>
     <google-guava-version>19.0</google-guava-version>
     <google-api-client-version>1.19.0</google-api-client-version>
-    <google-api-services-drive-version>v2-rev151-1.19.0</google-api-services-drive-version>
-    <google-api-services-calendar-version>v3-rev99-1.19.0</google-api-services-calendar-version>
-    <google-api-services-mail-version>v1-rev15-1.19.0</google-api-services-mail-version>
+    <google-api-services-drive-version>v2-rev193-1.19.0</google-api-services-drive-version>
+    <google-api-services-calendar-version>v3-rev152-1.19.0</google-api-services-calendar-version>
+    <google-api-services-mail-version>v1-rev34-1.19.0</google-api-services-mail-version>
     <google-truth-version>0.27</google-truth-version>
     <grizzly-websockets-version>2.3.24</grizzly-websockets-version>
     <groovy-version>2.4.6</groovy-version>


[2/4] camel git commit: fix google drive unit test failure

Posted by ja...@apache.org.
fix google drive unit test failure


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3b60136a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3b60136a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3b60136a

Branch: refs/heads/master
Commit: 3b60136abf1e6970f2318084df0a069fbfdbdb29
Parents: 5caa9d2
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Aug 25 11:42:52 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Aug 25 11:42:52 2016 -0230

----------------------------------------------------------------------
 .../component/google/drive/AbstractGoogleDriveTestSupport.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/3b60136a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
index 067bbe6..fac64bc 100644
--- a/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
+++ b/components/camel-google-drive/src/test/java/org/apache/camel/component/google/drive/AbstractGoogleDriveTestSupport.java
@@ -42,7 +42,7 @@ public abstract class AbstractGoogleDriveTestSupport extends CamelTestSupport {
     protected static String testFolderId;
     protected static String testFileId;
 
-    protected static final String TEST_UPLOAD_FILE = "src/test/resources/log4j.properties";
+    protected static final String TEST_UPLOAD_FILE = "src/test/resources/log4j2.properties";
     protected static final String TEST_UPLOAD_IMG = "src/test/resources/camel-box-small.png";
     protected static final java.io.File UPLOAD_FILE = new java.io.File(TEST_UPLOAD_FILE);