This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 436dc90 Regen
436dc90 is described below
commit 436dc900daee8a85421e642ec01161edbd20f2dc
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Dec 10 05:37:05 2019 +0100
Regen
---
bom/camel-bom/pom.xml | 5 +++++
docs/components/modules/ROOT/pages/csv-dataformat.adoc | 17 ++++++++++++++++-
docs/components/modules/ROOT/pages/index.adoc | 2 +-
.../camel-google-bigquery-starter/pom.xml | 8 ++++++++
.../camel-google-pubsub-starter/pom.xml | 8 ++++++++
.../camel-spring-boot-dependencies/pom.xml | 5 +++++
6 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 25201c1..3d04f2f 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2730,6 +2730,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-osgi-activator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-paho</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/docs/components/modules/ROOT/pages/csv-dataformat.adoc
b/docs/components/modules/ROOT/pages/csv-dataformat.adoc
index 3695fc2..ea51f72 100644
--- a/docs/components/modules/ROOT/pages/csv-dataformat.adoc
+++ b/docs/components/modules/ROOT/pages/csv-dataformat.adoc
@@ -306,7 +306,22 @@ should illustrate this customization.
</bean>
-----------------------------------------------------------------------------------------------------------------------------
-== Using skipFirstLine option while unmarshaling
+== Using skipFirstLine or skipHeaderRecord option while unmarshaling
+
+*For Camel >= 2.16.5
+The instruction for CSV Data format to skip headers or first line is the
following.
+Usign the Spring/XML DSL:
+
+[source,xml]
+---------------------------------------------------
+<route>
+ <from uri="direct:start" />
+ <unmarshal>
+ <csv skipHeaderRecord="true" />
+ </unmarshal>
+ <to uri="bean:myCsvHandler?method=doHandleCsv" />
+</route>
+---------------------------------------------------
*Since Camel 2.10 and deleted for Camel 2.15*
diff --git a/docs/components/modules/ROOT/pages/index.adoc
b/docs/components/modules/ROOT/pages/index.adoc
index 76d53d7..c721753 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -808,7 +808,7 @@ Number of Miscellaneous Components: 40 in 40 JAR artifacts
(0 deprecated)
| xref:opentracing.adoc[OpenTracing] (camel-opentracing) | 2.19 | Distributed
tracing using OpenTracing
-| xref:osgi-activator.adoc[Osgi Activator] (camel-osgi-activator) | | Camel
OSGi Activator
+| xref:osgi-activator.adoc[Osgi Activator] (camel-osgi-activator) | 3.1 |
Camel OSGi Activator for running Camel routes from other bundles
| xref:reactive-executor-vertx.adoc[Reactive Executor Vert.x]
(camel-reactive-executor-vertx) | 3.0 | Reactive Executor for camel-core using
Vert.x
diff --git
a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/pom.xml
index 252e226..f65f715 100644
---
a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/pom.xml
+++
b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/pom.xml
@@ -44,6 +44,14 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
</exclusions>
<!--END OF GENERATED CODE-->
</dependency>
diff --git
a/platforms/spring-boot/components-starter/camel-google-pubsub-starter/pom.xml
b/platforms/spring-boot/components-starter/camel-google-pubsub-starter/pom.xml
index 6b28f41..15047cd 100644
---
a/platforms/spring-boot/components-starter/camel-google-pubsub-starter/pom.xml
+++
b/platforms/spring-boot/components-starter/camel-google-pubsub-starter/pom.xml
@@ -44,6 +44,14 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
</exclusions>
<!--END OF GENERATED CODE-->
</dependency>
diff --git
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 2df5ffc..2173956 100644
---
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2950,6 +2950,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-osgi-activator</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-paho</artifactId>
<version>${project.version}</version>
</dependency>
