You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2017/11/10 09:39:13 UTC
[camel] branch camel-2.20.x updated: Fix merge conflict leftovers
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch camel-2.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.20.x by this push:
new cfd558f Fix merge conflict leftovers
cfd558f is described below
commit cfd558fd12e74084bec7e7cf6bf4c7ee1d62e681
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Fri Nov 10 10:28:53 2017 +0100
Fix merge conflict leftovers
---
.../examples/foo-connector/src/main/resources/camel-connector.json | 6 +-----
.../petstore-connector/src/main/resources/camel-connector.json | 6 +-----
.../src/main/resources/camel-connector.json | 6 +-----
.../twitter-find-connector/src/main/resources/camel-connector.json | 6 +-----
.../src/main/resources/camel-connector.json | 6 +-----
5 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/connectors/examples/foo-connector/src/main/resources/camel-connector.json b/connectors/examples/foo-connector/src/main/resources/camel-connector.json
index 1c809f5..7155b4a 100644
--- a/connectors/examples/foo-connector/src/main/resources/camel-connector.json
+++ b/connectors/examples/foo-connector/src/main/resources/camel-connector.json
@@ -2,11 +2,7 @@
"baseScheme" : "timer",
"baseGroupId" : "org.apache.camel",
"baseArtifactId" : "camel-core",
-<<<<<<< HEAD
- "baseVersion" : "2.20.1-20171103.154156-30",
-=======
- "baseVersion" : "2.21.0-SNAPSHOT",
->>>>>>> 176975e3de... CAMEL-12001: Cannot create a component based on the SqlComponent
+ "baseVersion" : "2.20.1-SNAPSHOT",
"baseJavaType" : "org.apache.camel.component.timer.TimerComponent",
"name" : "Foo",
"scheme" : "foo",
diff --git a/connectors/examples/petstore-connector/src/main/resources/camel-connector.json b/connectors/examples/petstore-connector/src/main/resources/camel-connector.json
index 346f261..5af3aec 100644
--- a/connectors/examples/petstore-connector/src/main/resources/camel-connector.json
+++ b/connectors/examples/petstore-connector/src/main/resources/camel-connector.json
@@ -2,11 +2,7 @@
"baseScheme" : "rest-swagger",
"baseGroupId" : "org.apache.camel",
"baseArtifactId" : "camel-rest-swagger",
-<<<<<<< HEAD
- "baseVersion" : "2.20.1-20171103.161431-29",
-=======
- "baseVersion" : "2.21.0-20171109.020941-31",
->>>>>>> 176975e3de... CAMEL-12001: Cannot create a component based on the SqlComponent
+ "baseVersion" : "2.20.1-SNAPSHOT",
"baseJavaType" : "org.apache.camel.component.rest.swagger.RestSwaggerComponent",
"name" : "PetStore",
"scheme" : "petstore",
diff --git a/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json b/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json
index b4044a5..e628165 100644
--- a/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json
+++ b/connectors/examples/salesforce-upsert-contact-connector/src/main/resources/camel-connector.json
@@ -2,11 +2,7 @@
"baseScheme" : "salesforce",
"baseGroupId" : "org.apache.camel",
"baseArtifactId" : "camel-salesforce",
-<<<<<<< HEAD
- "baseVersion" : "2.20.1-20171103.161619-29",
-=======
- "baseVersion" : "2.21.0-20171109.021225-31",
->>>>>>> 176975e3de... CAMEL-12001: Cannot create a component based on the SqlComponent
+ "baseVersion" : "2.20.1-SNAPSHOT",
"baseJavaType" : "org.apache.camel.component.salesforce.SalesforceComponent",
"name" : "SalesforceUpsertContact",
"scheme" : "salesforce-upsert-contact",
diff --git a/connectors/examples/twitter-find-connector/src/main/resources/camel-connector.json b/connectors/examples/twitter-find-connector/src/main/resources/camel-connector.json
index e858d44..6d9284a 100644
--- a/connectors/examples/twitter-find-connector/src/main/resources/camel-connector.json
+++ b/connectors/examples/twitter-find-connector/src/main/resources/camel-connector.json
@@ -2,11 +2,7 @@
"baseScheme" : "twitter-search",
"baseGroupId" : "org.apache.camel",
"baseArtifactId" : "camel-twitter",
-<<<<<<< HEAD
- "baseVersion" : "2.20.1-20171103.162737-28",
-=======
- "baseVersion" : "2.21.0-20171109.022511-29",
->>>>>>> 176975e3de... CAMEL-12001: Cannot create a component based on the SqlComponent
+ "baseVersion" : "2.20.1-SNAPSHOT",
"baseJavaType" : "org.apache.camel.component.twitter.search.TwitterSearchComponent",
"name" : "TwitterFind",
"scheme" : "twitter-find",
diff --git a/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json
index f102ca2..889dce6 100644
--- a/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json
+++ b/connectors/examples/twitter-mention-connector/src/main/resources/camel-connector.json
@@ -2,11 +2,7 @@
"baseScheme" : "twitter",
"baseGroupId" : "org.apache.camel",
"baseArtifactId" : "camel-twitter",
-<<<<<<< HEAD
- "baseVersion" : "2.20.1-20171103.162737-28",
-=======
- "baseVersion" : "2.21.0-20171109.022511-29",
->>>>>>> 176975e3de... CAMEL-12001: Cannot create a component based on the SqlComponent
+ "baseVersion" : "2.20.1-SNAPSHOT",
"baseJavaType" : "org.apache.camel.component.twitter.TwitterComponent",
"name" : "TwitterMention",
"scheme" : "twitter-mention",
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" <co...@camel.apache.org>'].