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 2016/09/21 12:29:02 UTC
[10/10] camel git commit: Full Rebuild
Full Rebuild
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b4d73621
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b4d73621
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b4d73621
Branch: refs/heads/master
Commit: b4d73621181f026f40aea57e14b8712ba99aa6a1
Parents: d399f8b
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Sep 21 14:27:30 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Sep 21 14:27:30 2016 +0200
----------------------------------------------------------------------
.../camel-asterisk-starter/pom.xml | 75 ++++++++++----------
components-starter/camel-core-starter/pom.xml | 55 +++++++-------
components-starter/pom.xml | 1 +
.../src/main/docs/solr-component.adoc | 3 +-
components/readme.adoc | 3 +
docs/user-manual/en/SUMMARY.md | 1 +
.../camel-spring-boot-dependencies/pom.xml | 7 +-
7 files changed, 76 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b4d73621/components-starter/camel-asterisk-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-asterisk-starter/pom.xml b/components-starter/camel-asterisk-starter/pom.xml
index 99d9f7b..d0db2c5 100644
--- a/components-starter/camel-asterisk-starter/pom.xml
+++ b/components-starter/camel-asterisk-starter/pom.xml
@@ -15,42 +15,41 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components-starter</artifactId>
- <version>2.18.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-asterisk-starter</artifactId>
- <packaging>jar</packaging>
- <name>Spring-Boot Starter :: Camel :: Asterisk</name>
- <description>Spring-Boot Starter for Camel Asterisk to interact with an Asterisk PBX Server.</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-asterisk</artifactId>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring-boot-starter</artifactId>
- </dependency>
- </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components-starter</artifactId>
+ <version>2.18.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>camel-asterisk-starter</artifactId>
+ <packaging>jar</packaging>
+ <name>Spring-Boot Starter :: Camel :: Asterisk</name>
+ <description>Spring-Boot Starter for Camel Asterisk to interact with an Asterisk PBX Server.</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ <version>${spring-boot-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-asterisk</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core-starter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-boot-starter</artifactId>
+ </dependency>
+ </dependencies>
</project>
-
http://git-wip-us.apache.org/repos/asf/camel/blob/b4d73621/components-starter/camel-core-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/camel-core-starter/pom.xml b/components-starter/camel-core-starter/pom.xml
index fe13a80..0e2677a 100644
--- a/components-starter/camel-core-starter/pom.xml
+++ b/components-starter/camel-core-starter/pom.xml
@@ -15,32 +15,31 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.camel</groupId>
- <artifactId>components-starter</artifactId>
- <version>2.18.0-SNAPSHOT</version>
- </parent>
- <artifactId>camel-core-starter</artifactId>
- <packaging>jar</packaging>
- <name>Spring-Boot Starter :: Camel :: Core</name>
- <description>Spring-Boot Starter for The Core Camel Java DSL based router</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- </dependency>
- </dependencies>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>components-starter</artifactId>
+ <version>2.18.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>camel-core-starter</artifactId>
+ <packaging>jar</packaging>
+ <name>Spring-Boot Starter :: Camel :: Core</name>
+ <description>Spring-Boot Starter for The Core Camel Java DSL based router</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ <version>${spring-boot-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.ben-manes.caffeine</groupId>
+ <artifactId>caffeine</artifactId>
+ </dependency>
+ </dependencies>
</project>
-
http://git-wip-us.apache.org/repos/asf/camel/blob/b4d73621/components-starter/pom.xml
----------------------------------------------------------------------
diff --git a/components-starter/pom.xml b/components-starter/pom.xml
index 03e4e1e..d03c71f 100644
--- a/components-starter/pom.xml
+++ b/components-starter/pom.xml
@@ -54,6 +54,7 @@
<module>camel-ahc-ws-starter</module>
<module>camel-amqp-starter</module>
<module>camel-apns-starter</module>
+ <module>camel-asterisk-starter</module>
<module>camel-atmos-starter</module>
<module>camel-atmosphere-websocket-starter</module>
<module>camel-atom-starter</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/b4d73621/components/camel-solr/src/main/docs/solr-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-solr/src/main/docs/solr-component.adoc b/components/camel-solr/src/main/docs/solr-component.adoc
index c2a6916..0be1bb4 100644
--- a/components/camel-solr/src/main/docs/solr-component.adoc
+++ b/components/camel-solr/src/main/docs/solr-component.adoc
@@ -46,7 +46,7 @@ The Solr component has no options.
// endpoint options: START
-The Solr component supports 15 endpoint options which are listed below:
+The Solr component supports 14 endpoint options which are listed below:
{% raw %}
[width="100%",cols="2,1,1m,1m,5",options="header"]
@@ -63,7 +63,6 @@ The Solr component supports 15 endpoint options which are listed below:
| soTimeout | producer | | Integer | Read timeout on the underlying HttpConnectionManager. This is desirable for queries but probably not for indexing
| streamingQueueSize | producer | 10 | int | Set the queue size for the StreamingUpdateSolrServer
| streamingThreadCount | producer | 2 | int | Set the number of threads for the StreamingUpdateSolrServer
-| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange
| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported).
| collection | solrCloud | | String | Set the collection name which the solrCloud server could use
| zkHost | solrCloud | | String | Set the ZooKeeper host information which the solrCloud could use such as zkhost=localhost:8123.
http://git-wip-us.apache.org/repos/asf/camel/blob/b4d73621/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index 6b5ec75..775c202 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -24,6 +24,9 @@ Components
| link:camel-apns/src/main/docs/apns-component.adoc[APNS] (camel-apns) +
`apns:name` | For sending notifications to Apple iOS devices.
+| link:camel-asterisk/src/main/docs/asterisk-component.adoc[Asterisk] (camel-asterisk) +
+`asterisk:name` | Represents a Asterisk endpoint.
+
| link:camel-atmos/src/main/docs/atmos-component.adoc[Atmos] (camel-atmos) +
`atmos:name/operation` | The atmos component is used for integrating with EMC's Atomos Storage.
http://git-wip-us.apache.org/repos/asf/camel/blob/b4d73621/docs/user-manual/en/SUMMARY.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index b3eda45..b96d5df 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -130,6 +130,7 @@
* [Apache Flink](flink-component.adoc)
* [Apache Spark](spark-component.adoc)
* [APNS](apns-component.adoc)
+ * [Asterisk](asterisk-component.adoc)
* [Atmos](atmos-component.adoc)
* [Atmosphere Websocket](atmosphere-websocket-component.adoc)
* [Atom](atom-component.adoc)
http://git-wip-us.apache.org/repos/asf/camel/blob/b4d73621/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 221440a..8a6efa2 100644
--- a/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -162,7 +162,7 @@
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
- <version>9.5.1-5</version>
+ <version>9.7.0-6</version>
</dependency>
<dependency>
<groupId>ognl</groupId>
@@ -257,6 +257,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-asterisk</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-atmos</artifactId>
<version>${project.version}</version>
</dependency>