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
The following commit(s) were added to refs/heads/master by this push:
new 03db548 escaped incorrectly render links and ran ./mvnw -Pfastinstall
install
new 3056165 Merge pull request #3024 from Nayananga/master
03db548 is described below
commit 03db5482a517ac2a4dd01ae8720535f98aec8483
Author: [email protected] <[email protected]>
AuthorDate: Mon Jul 8 07:18:47 2019 +0530
escaped incorrectly render links and ran ./mvnw -Pfastinstall install
---
components/camel-jolt/src/main/docs/jolt-component.adoc | 2 +-
.../camel-mustache/src/main/docs/mustache-component.adoc | 2 +-
components/camel-mvel/src/main/docs/mvel-component.adoc | 2 +-
.../camel-velocity/src/main/docs/velocity-component.adoc | 2 +-
components/readme.adoc | 10 ++++++----
docs/components/modules/ROOT/pages/jolt-component.adoc | 2 +-
docs/components/modules/ROOT/pages/mustache-component.adoc | 2 +-
docs/components/modules/ROOT/pages/mvel-component.adoc | 2 +-
docs/components/modules/ROOT/pages/velocity-component.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/index.adoc | 2 +-
10 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/components/camel-jolt/src/main/docs/jolt-component.adoc
b/components/camel-jolt/src/main/docs/jolt-component.adoc
index a05b592..9f1806b 100644
--- a/components/camel-jolt/src/main/docs/jolt-component.adoc
+++ b/components/camel-jolt/src/main/docs/jolt-component.adoc
@@ -31,7 +31,7 @@ jolt:specName[?options]
Where *specName* is the classpath-local URI of the specification to
invoke; or the complete URL of the remote specification
-(eg: file://folder/myfile.vm[file://folder/myfile.json]).
+(eg: \file://folder/myfile.vm).
You can append query options to the URI in the following
format, `?option=value&option=value&...`
diff --git a/components/camel-mustache/src/main/docs/mustache-component.adoc
b/components/camel-mustache/src/main/docs/mustache-component.adoc
index 92cee3e..0f54b1d 100644
--- a/components/camel-mustache/src/main/docs/mustache-component.adoc
+++ b/components/camel-mustache/src/main/docs/mustache-component.adoc
@@ -29,7 +29,7 @@ mustache:templateName[?options]
Where *templateName* is the classpath-local URI of the template to
invoke; or the complete URL of the remote template (eg:
-file://folder/myfile.mustache[file://folder/myfile.mustache]).
+\file://folder/myfile.mustache).
You can append query options to the URI in the following format,
`?option=value&option=value&...`
diff --git a/components/camel-mvel/src/main/docs/mvel-component.adoc
b/components/camel-mvel/src/main/docs/mvel-component.adoc
index 825a112..a696ac7 100644
--- a/components/camel-mvel/src/main/docs/mvel-component.adoc
+++ b/components/camel-mvel/src/main/docs/mvel-component.adoc
@@ -29,7 +29,7 @@ mvel:templateName[?options]
Where *templateName* is the classpath-local URI of the template to
invoke; or the complete URL of the remote template (eg:
-file://folder/myfile.mvel[file://folder/myfile.mvel]).
+\file://folder/myfile.mvel).
You can append query options to the URI in the following format,
`?option=value&option=value&...`
diff --git a/components/camel-velocity/src/main/docs/velocity-component.adoc
b/components/camel-velocity/src/main/docs/velocity-component.adoc
index 27b7254..763e917 100644
--- a/components/camel-velocity/src/main/docs/velocity-component.adoc
+++ b/components/camel-velocity/src/main/docs/velocity-component.adoc
@@ -30,7 +30,7 @@ velocity:templateName[?options]
Where *templateName* is the classpath-local URI of the template to
invoke; or the complete URL of the remote template (eg:
-file://folder/myfile.vm[file://folder/myfile.vm]).
+\file://folder/myfile.vm).
You can append query options to the URI in the following format,
`?option=value&option=value&...`
diff --git a/components/readme.adoc b/components/readme.adoc
index 037831b..46a0527 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1007,7 +1007,7 @@ Number of Data Formats: 45 in 37 JAR artifacts (0
deprecated)
==== Expression Languages
// languages: START
-Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
+Number of Languages: 16 in 10 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -1041,8 +1041,6 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
| link:camel-base/src/main/docs/tokenize-language.adoc[Tokenize] (camel-base)
| 2.0 | To use Camel message body or header with a tokenizer in Camel
expressions or predicates.
-| link:camel-jaxp/src/main/docs/xtokenize-language.adoc[XML Tokenize]
(camel-jaxp) | 2.14 | To use Camel message body or header with a XML tokenizer
in Camel expressions or predicates.
-
| link:camel-xpath/src/main/docs/xpath-language.adoc[XPath] (camel-xpath) |
1.1 | To use XPath (XML) in Camel expressions or predicates.
| link:camel-saxon/src/main/docs/xquery-language.adoc[XQuery] (camel-saxon) |
1.0 | To use XQuery (XML) in Camel expressions or predicates.
@@ -1053,7 +1051,7 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
==== Miscellaneous Components
// others: START
-Number of Miscellaneous Components: 32 in 32 JAR artifacts (0 deprecated)
+Number of Miscellaneous Components: 34 in 34 JAR artifacts (0 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -1067,6 +1065,8 @@ Number of Miscellaneous Components: 32 in 32 JAR
artifacts (0 deprecated)
| link:camel-hystrix/src/main/docs/hystrix.adoc[Hystrix] (camel-hystrix) |
2.18 | Circuit Breaker EIP using Netflix Hystrix
+| link:camel-ignite/src/main/docs/ignite.adoc[Ignite] (camel-ignite) | |
Camel Ignite component
+
| link:camel-jasypt/src/main/docs/jasypt.adoc[Jasypt] (camel-jasypt) | 2.5 |
Security using Jasypt
| link:camel-kura/src/main/docs/kura.adoc[Kura] (camel-kura) | 2.15 | Using
Camel with Eclipse Kura (OSGi)
@@ -1079,6 +1079,8 @@ Number of Miscellaneous Components: 32 in 32 JAR
artifacts (0 deprecated)
| link:camel-opentracing/src/main/docs/opentracing.adoc[OpenTracing]
(camel-opentracing) | 2.19 | Distributed tracing using OpenTracing
+| link:camel-pulsar/src/main/docs/pulsar.adoc[Pulsar] (camel-pulsar) | |
Camel Apache Pulsar Component
+
|
link:camel-reactive-executor-vertx/src/main/docs/reactive-executor-vertx.adoc[Reactive
Executor Vertx] (camel-reactive-executor-vertx) | 3.0 | Reactive Executor for
camel-core using Vert X
| link:camel-reactor/src/main/docs/reactor.adoc[Reactor] (camel-reactor) |
2.20 | Reactor based back-end for Camel's reactive streams component
diff --git a/docs/components/modules/ROOT/pages/jolt-component.adoc
b/docs/components/modules/ROOT/pages/jolt-component.adoc
index a05b592..9f1806b 100644
--- a/docs/components/modules/ROOT/pages/jolt-component.adoc
+++ b/docs/components/modules/ROOT/pages/jolt-component.adoc
@@ -31,7 +31,7 @@ jolt:specName[?options]
Where *specName* is the classpath-local URI of the specification to
invoke; or the complete URL of the remote specification
-(eg: file://folder/myfile.vm[file://folder/myfile.json]).
+(eg: \file://folder/myfile.vm).
You can append query options to the URI in the following
format, `?option=value&option=value&...`
diff --git a/docs/components/modules/ROOT/pages/mustache-component.adoc
b/docs/components/modules/ROOT/pages/mustache-component.adoc
index 92cee3e..0f54b1d 100644
--- a/docs/components/modules/ROOT/pages/mustache-component.adoc
+++ b/docs/components/modules/ROOT/pages/mustache-component.adoc
@@ -29,7 +29,7 @@ mustache:templateName[?options]
Where *templateName* is the classpath-local URI of the template to
invoke; or the complete URL of the remote template (eg:
-file://folder/myfile.mustache[file://folder/myfile.mustache]).
+\file://folder/myfile.mustache).
You can append query options to the URI in the following format,
`?option=value&option=value&...`
diff --git a/docs/components/modules/ROOT/pages/mvel-component.adoc
b/docs/components/modules/ROOT/pages/mvel-component.adoc
index 825a112..a696ac7 100644
--- a/docs/components/modules/ROOT/pages/mvel-component.adoc
+++ b/docs/components/modules/ROOT/pages/mvel-component.adoc
@@ -29,7 +29,7 @@ mvel:templateName[?options]
Where *templateName* is the classpath-local URI of the template to
invoke; or the complete URL of the remote template (eg:
-file://folder/myfile.mvel[file://folder/myfile.mvel]).
+\file://folder/myfile.mvel).
You can append query options to the URI in the following format,
`?option=value&option=value&...`
diff --git a/docs/components/modules/ROOT/pages/velocity-component.adoc
b/docs/components/modules/ROOT/pages/velocity-component.adoc
index 27b7254..763e917 100644
--- a/docs/components/modules/ROOT/pages/velocity-component.adoc
+++ b/docs/components/modules/ROOT/pages/velocity-component.adoc
@@ -30,7 +30,7 @@ velocity:templateName[?options]
Where *templateName* is the classpath-local URI of the template to
invoke; or the complete URL of the remote template (eg:
-file://folder/myfile.vm[file://folder/myfile.vm]).
+\file://folder/myfile.vm).
You can append query options to the URI in the following format,
`?option=value&option=value&...`
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc
b/docs/user-manual/modules/ROOT/pages/index.adoc
index e0b6030..f5f77cb 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -129,7 +129,7 @@ camel routes without them knowing
* xref:java-dsl.adoc[Java DSL]
* xref:spring.adoc[Spring DSL]
* xref:using-osgi-blueprint-with-camel.adoc[Blueprint DSL]
-* xref:../../../camel-core/src/main/docs/rest-dsl.adoc[Rest DSL]
+* xref:rest-dsl.adoc[Rest DSL]
* xref:groovy-dsl.adoc[Groovy DSL]
* xref:scala-dsl.adoc[Scala DSL]
* xref:bean-integration.adoc[Annotation DSL]
