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 2017/08/10 11:37:34 UTC
[6/7] camel git commit: Regen
Regen
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cd6ed426
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cd6ed426
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cd6ed426
Branch: refs/heads/master
Commit: cd6ed426de2e0600440f83bdf6101d46e90d924c
Parents: 3ca4fe7
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Aug 10 13:04:41 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Aug 10 13:04:41 2017 +0200
----------------------------------------------------------------------
components/readme.adoc | 12 +++++-------
docs/user-manual/en/SUMMARY.md | 2 ++
.../spring-boot-dm/camel-spring-boot-bom/pom.xml | 5 +++++
3 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cd6ed426/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index 670f5b8..9717e8e 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
^^^^^^^^^^
// components: START
-Number of Components: 278 in 191 JAR artifacts (17 deprecated)
+Number of Components: 280 in 192 JAR artifacts (17 deprecated)
[width="100%",cols="4,1,5",options="header"]
|=======================================================================
@@ -354,10 +354,10 @@ Number of Components: 278 in 191 JAR artifacts (17 deprecated)
`ibatis:statement` | 1.2 | *deprecated* Performs a query poll insert update or delete in a relational database using Apache iBATIS.
| link:camel-iec60870/src/main/docs/iec60870-client-component.adoc[IEC 60870 Client] (camel-iec60870) +
-`iec60870-client:endpoint` | 2.20 | A component which acts as client, allowing to remote control IEC 60870-5-104 capable devices.
+`iec60870-client:endpointUri` | 2.20 | Camel IEC 60870-5-104 support
-| link:camel-iec60870/src/main/docs/iec60870-client-component.adoc[IEC 60870 Client] (camel-iec60870) +
-`iec60870-server:endpoint` | 2.20 | A component which acts as server, offering remote control capabilities using IEC 60870-5-104.
+| link:camel-iec60870/src/main/docs/iec60870-server-component.adoc[IEC 60870-5-104 server] (camel-iec60870) +
+`iec60870-server:endpointUri` | 2.20 | Camel IEC 60870-5-104 support
| link:camel-ignite/src/main/docs/ignite-cache-component.adoc[Ignite Cache] (camel-ignite) +
`ignite-cache:cacheName` | 2.17 | The Ignite Cache endpoint is one of camel-ignite endpoints which allows you to interact with an Ignite Cache.
@@ -1024,7 +1024,7 @@ Miscellaneous Components
^^^^^^^^^^^^^^^^^^^^^^^^
// others: START
-Number of Miscellaneous Components: 38 in 38 JAR artifacts (14 deprecated)
+Number of Miscellaneous Components: 37 in 37 JAR artifacts (13 deprecated)
[width="100%",cols="4,1,5",options="header"]
|=======================================================================
@@ -1080,8 +1080,6 @@ Number of Miscellaneous Components: 38 in 38 JAR artifacts (14 deprecated)
| link:camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc[Spring Cloud Netflix] (camel-spring-cloud-netflix) | 2.19 | Camel Cloud integration with Spring Cloud Netflix
-| link:camel-spring-dm/src/main/docs/spring-dm.adoc[Spring DM] (camel-spring-dm) | 2.18 | *deprecated* Camel SpringDM (OSGi) XML DSL
-
| link:camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc[Spring Java Configuration] (camel-spring-javaconfig) | 2.0 | Using Camel with Spring Java Configuration
| link:camel-spring-security/src/main/docs/spring-security.adoc[Spring Security] (camel-spring-security) | 2.3 | Security using Spring Security
http://git-wip-us.apache.org/repos/asf/camel/blob/cd6ed426/docs/user-manual/en/SUMMARY.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 34bb690..8cbbb55 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -229,6 +229,8 @@
* [HTTP](http-component.adoc)
* [HTTP4](http4-component.adoc)
* [iBatis](ibatis-component.adoc)
+ * [IEC 60870 Client](iec60870-client-component.adoc)
+ * [IEC 60870-5-104 server](iec60870-server-component.adoc)
* [Ignite Cache](ignite-cache-component.adoc)
* [Ignite Compute](ignite-compute-component.adoc)
* [Ignite Events](ignite-events-component.adoc)
http://git-wip-us.apache.org/repos/asf/camel/blob/cd6ed426/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml
index feda875..b6210ba 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-bom/pom.xml
@@ -547,6 +547,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-iec60870-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-ignite-starter</artifactId>
<version>${project.version}</version>
</dependency>