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 15:14:24 UTC
[1/3] camel git commit: Update to google api client 1.22
Repository: camel
Updated Branches:
refs/heads/master 3b60136ab -> 25cce84a7
Update to google api client 1.22
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1e716df
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1e716df
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1e716df
Branch: refs/heads/master
Commit: a1e716dfe7f67b99cd29cb73db1f68de973192ed
Parents: 3b60136
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Aug 25 12:22:23 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Aug 25 12:22:23 2016 -0230
----------------------------------------------------------------------
components/camel-google-mail/pom.xml | 6 ++++++
parent/pom.xml | 8 ++++----
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a1e716df/components/camel-google-mail/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml
index 57a0717..0977de1 100644
--- a/components/camel-google-mail/pom.xml
+++ b/components/camel-google-mail/pom.xml
@@ -200,6 +200,12 @@
<argType>com.google.api.services.gmail.model.ModifyMessageRequest</argType>
<replacement>modifyMessageRequest</replacement>
</substitution>
+ <substitution>
+ <method>^.+$</method>
+ <argName>content</argName>
+ <argType>com.google.api.services.gmail.model.BatchDeleteMessagesRequest</argType>
+ <replacement>batchDeleteMessagesRequest</replacement>
+ </substitution>
</substitutions>
</configuration>
</execution>
http://git-wip-us.apache.org/repos/asf/camel/blob/a1e716df/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e6b655e..8390bb9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -220,10 +220,10 @@
<gmaven-plugin-version>1.4</gmaven-plugin-version>
<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-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-api-client-version>1.22.0</google-api-client-version>
+ <google-api-services-drive-version>v2-rev234-1.22.0</google-api-services-drive-version>
+ <google-api-services-calendar-version>v3-rev208-1.22.0</google-api-services-calendar-version>
+ <google-api-services-mail-version>v1-rev48-1.22.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>
[3/3] camel git commit: update sample config in
camel-archetype-api-component
Posted by ja...@apache.org.
update sample config in camel-archetype-api-component
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/25cce84a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/25cce84a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/25cce84a
Branch: refs/heads/master
Commit: 25cce84a77111733773ce95ae4bcd2a42d4f10b9
Parents: 8cad23c
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Aug 25 12:31:35 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Aug 25 12:31:35 2016 -0230
----------------------------------------------------------------------
.../archetype-resources/__artifactId__-component/pom.xml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/25cce84a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
----------------------------------------------------------------------
diff --git a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index 555bcb6..feedd0e 100644
--- a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++ b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -201,6 +201,11 @@
</alias>
</aliases>
-->
+ <!-- for some methods, null can be a valid input
+ <nullableOptions>
+ <nullableOption>option-name</nullableOption>
+ </nullableOptions>
+ -->
</api>
<api>
<apiName>hello-javadoc</apiName>
@@ -209,6 +214,7 @@
<!-- Use exclude patterns to limit what gets exposed in component endpoint
<excludePackages>package-name-patterns</excludePackages>
<excludeClasses>class-name-patterns</excludeClasses>
+ <includeMethods>method-name-patterns</includeMethods>
<excludeMethods>method-name-patterns</excludeMethods>
<includeStaticMethods>use 'true' to include static methods, false by default<includeStaticMethods>
-->
@@ -219,9 +225,10 @@
<substitutions/>
<excludeConfigNames/>
<excludeConfigTypes/>
- <extraOptions>
+ <extraOptions/>
<fromJavadoc/>
<aliases/>
+ <nullableOptions/>
-->
</configuration>
</execution>
[2/3] camel git commit: fix CS
Posted by ja...@apache.org.
fix CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8cad23cd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8cad23cd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8cad23cd
Branch: refs/heads/master
Commit: 8cad23cdbde00f6c51ed71dcc6a9e3be9091956d
Parents: a1e716d
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Aug 25 12:25:16 2016 -0230
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Aug 25 12:25:16 2016 -0230
----------------------------------------------------------------------
.../apache/camel/maven/packaging/PrepareReadmeMojo.java | 10 +++++-----
.../camel/maven/packaging/PrepareUserGuideMojo.java | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8cad23cd/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
index 9ae8685..7a744b5 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java
@@ -420,7 +420,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
try {
String text = loadText(new FileInputStream(file));
- String existing = StringHelper.between(text, "// eips: START" , "// eips: END");
+ String existing = StringHelper.between(text, "// eips: START", "// eips: END");
if (existing != null) {
// remove leading line breaks etc
existing = existing.trim();
@@ -454,7 +454,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
try {
String text = loadText(new FileInputStream(file));
- String existing = StringHelper.between(text, "// components: START" , "// components: END");
+ String existing = StringHelper.between(text, "// components: START", "// components: END");
if (existing != null) {
// remove leading line breaks etc
existing = existing.trim();
@@ -488,7 +488,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
try {
String text = loadText(new FileInputStream(file));
- String existing = StringHelper.between(text, "// dataformats: START" , "// dataformats: END");
+ String existing = StringHelper.between(text, "// dataformats: START", "// dataformats: END");
if (existing != null) {
// remove leading line breaks etc
existing = existing.trim();
@@ -522,7 +522,7 @@ public class PrepareReadmeMojo extends AbstractMojo {
try {
String text = loadText(new FileInputStream(file));
- String existing = StringHelper.between(text, "// languages: START" , "// languages: END");
+ String existing = StringHelper.between(text, "// languages: START", "// languages: END");
if (existing != null) {
// remove leading line breaks etc
existing = existing.trim();
@@ -658,4 +658,4 @@ public class PrepareReadmeMojo extends AbstractMojo {
return language;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/8cad23cd/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
index 88697be..1004458 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java
@@ -269,7 +269,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
try {
String text = loadText(new FileInputStream(file));
- String existing = StringHelper.between(text, "<!-- core components: START -->" , "<!-- core components: END -->");
+ String existing = StringHelper.between(text, "<!-- core components: START -->", "<!-- core components: END -->");
if (existing != null) {
// remove leading line breaks etc
existing = existing.trim();
@@ -303,7 +303,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
try {
String text = loadText(new FileInputStream(file));
- String existing = StringHelper.between(text, "<!-- components: START -->" , "<!-- components: END -->");
+ String existing = StringHelper.between(text, "<!-- components: START -->", "<!-- components: END -->");
if (existing != null) {
// remove leading line breaks etc
existing = existing.trim();
@@ -337,7 +337,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
try {
String text = loadText(new FileInputStream(file));
- String existing = StringHelper.between(text, "<!-- dataformats: START -->" , "<!-- dataformats: END -->");
+ String existing = StringHelper.between(text, "<!-- dataformats: START -->", "<!-- dataformats: END -->");
if (existing != null) {
// remove leading line breaks etc
existing = existing.trim();
@@ -371,7 +371,7 @@ public class PrepareUserGuideMojo extends AbstractMojo {
try {
String text = loadText(new FileInputStream(file));
- String existing = StringHelper.between(text, "<!-- languages: START -->" , "<!-- languages: END -->");
+ String existing = StringHelper.between(text, "<!-- languages: START -->", "<!-- languages: END -->");
if (existing != null) {
// remove leading line breaks etc
existing = existing.trim();
@@ -505,4 +505,4 @@ public class PrepareUserGuideMojo extends AbstractMojo {
return language;
}
-}
\ No newline at end of file
+}