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 2019/11/12 14:15:19 UTC
[camel] branch master updated (ff56fd7 -> 5ba93d7)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
discard ff56fd7 Regen examples docs
discard 79c71dd Merge branch 'CAMEL-13626' of https://github.com/omarsmak/camel
omit ff975fa CAMEL-13626: Change camel-parent with camel-bom in examples
new e816d08 CAMEL-13626: Change camel-parent with camel-bom in examples
new 5ba93d7 Regen examples docs
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ff56fd7)
\
N -- N -- N refs/heads/master (5ba93d7)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[camel] 02/02: Regen examples docs
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5ba93d70e29bdf97f4b9554ab15b179cdf3afc56
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 12 15:13:21 2019 +0100
Regen examples docs
---
examples/README.adoc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/examples/README.adoc b/examples/README.adoc
index d32a8e3..b70d3fa 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -11,7 +11,7 @@ View the individual example READMEs for details.
== Examples
// examples: START
-Number of Examples: 116 (0 deprecated)
+Number of Examples: 117 (0 deprecated)
[width="100%",cols="4,2,4",options="header"]
|===
@@ -43,6 +43,8 @@ Number of Examples: 116 (0 deprecated)
| link:camel-example-main-tiny/readme.adoc[Main Tiny] (camel-example-main-tiny) | Beginner | An example for showing standalone Camel with as few JARs on classpath as possible
+| link:camel-example-main-xml/readme.adoc[Main Xml] (camel-example-main-xml) | Beginner | An example for showing standalone Camel using XML
+
| link:camel-example-pojo-messaging/README.adoc[POJO Routing] (camel-example-pojo-messaging) | Beginner | An example showing how to produce and consume messages from Camel endpoints using annotated POJOs
[camel] 01/02: CAMEL-13626: Change camel-parent with camel-bom in
examples
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e816d08d823896beb1405cbf9b17ead97daeb148
Author: Omar Al-Safi <om...@gmail.com>
AuthorDate: Tue Nov 12 14:07:03 2019 +0100
CAMEL-13626: Change camel-parent with camel-bom in examples
---
examples/camel-example-hystrix/service2/pom.xml | 2 +-
examples/camel-example-opentracing/client/pom.xml | 2 +-
examples/camel-example-opentracing/loggingtracer/pom.xml | 2 +-
examples/camel-example-zipkin/client/pom.xml | 2 +-
examples/camel-example-zipkin/service2/pom.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/examples/camel-example-hystrix/service2/pom.xml b/examples/camel-example-hystrix/service2/pom.xml
index 2e70726..65b154c 100644
--- a/examples/camel-example-hystrix/service2/pom.xml
+++ b/examples/camel-example-hystrix/service2/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
+ <artifactId>camel-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
diff --git a/examples/camel-example-opentracing/client/pom.xml b/examples/camel-example-opentracing/client/pom.xml
index ab02759..62c473d 100644
--- a/examples/camel-example-opentracing/client/pom.xml
+++ b/examples/camel-example-opentracing/client/pom.xml
@@ -38,7 +38,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
+ <artifactId>camel-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
diff --git a/examples/camel-example-opentracing/loggingtracer/pom.xml b/examples/camel-example-opentracing/loggingtracer/pom.xml
index 14e8f84..c83de9a 100644
--- a/examples/camel-example-opentracing/loggingtracer/pom.xml
+++ b/examples/camel-example-opentracing/loggingtracer/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
+ <artifactId>camel-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
diff --git a/examples/camel-example-zipkin/client/pom.xml b/examples/camel-example-zipkin/client/pom.xml
index bed8dc6..5be4183 100644
--- a/examples/camel-example-zipkin/client/pom.xml
+++ b/examples/camel-example-zipkin/client/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
+ <artifactId>camel-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
diff --git a/examples/camel-example-zipkin/service2/pom.xml b/examples/camel-example-zipkin/service2/pom.xml
index 0b905ce..a5be404 100644
--- a/examples/camel-example-zipkin/service2/pom.xml
+++ b/examples/camel-example-zipkin/service2/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-parent</artifactId>
+ <artifactId>camel-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>