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/06/21 09:33:05 UTC
[3/4] camel git commit: CAMEL-10267 - Added camel-caffeine to kit
CAMEL-10267 - Added camel-caffeine to kit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6e20fd5e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6e20fd5e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6e20fd5e
Branch: refs/heads/master
Commit: 6e20fd5e9d12c63daa7fc36844c9cbcd2d5c4cd4
Parents: 0d1e5ec
Author: Andrea Cosentino <an...@gmail.com>
Authored: Wed Jun 21 11:21:43 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Jun 21 11:21:43 2017 +0200
----------------------------------------------------------------------
apache-camel/src/main/descriptors/common-bin.xml | 2 ++
components/pom.xml | 1 +
components/readme.adoc | 12 ++++++++----
docs/user-manual/en/SUMMARY.md | 2 ++
parent/pom.xml | 10 ++++++++++
.../spring-boot-dm/camel-spring-boot-bom/pom.xml | 5 +++++
.../camel-spring-boot-dependencies/pom.xml | 10 ++++++++++
7 files changed, 38 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6e20fd5e/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 8f91230..2fc2285 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -51,6 +51,7 @@
<include>org.apache.camel:camel-box-api</include>
<include>org.apache.camel:camel-braintree</include>
<include>org.apache.camel:camel-cache</include>
+ <include>org.apache.camel:camel-caffeine</include>
<include>org.apache.camel:camel-cassandraql</include>
<include>org.apache.camel:camel-castor</include>
<include>org.apache.camel:camel-cdi</include>
@@ -343,6 +344,7 @@
<include>org.apache.camel:camel-box-starter</include>
<include>org.apache.camel:camel-braintree-starter</include>
<include>org.apache.camel:camel-cache-starter</include>
+ <include>org.apache.camel:camel-caffeine-starter</include>
<include>org.apache.camel:camel-cassandraql-starter</include>
<include>org.apache.camel:camel-castor-starter</include>
<include>org.apache.camel:camel-chronicle-starter</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/6e20fd5e/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 497ec84..f324870 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -88,6 +88,7 @@
<module>camel-box</module>
<module>camel-braintree</module>
<module>camel-cache</module>
+ <module>camel-caffeine</module>
<module>camel-cassandraql</module>
<module>camel-castor</module>
<module>camel-cdi</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/6e20fd5e/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index 525a490..1ad0d35 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
^^^^^^^^^^
// components: START
-Number of Components: 267 in 187 JAR artifacts (17 deprecated)
+Number of Components: 269 in 188 JAR artifacts (17 deprecated)
[width="100%",cols="4,1,5",options="header"]
|=======================================================================
@@ -110,6 +110,12 @@ Number of Components: 267 in 187 JAR artifacts (17 deprecated)
| link:../camel-core/src/main/docs/browse-component.adoc[Browse] (camel-core) +
`browse:name` | 1.3 | The browse component is used for viewing the messages received on endpoints that supports BrowsableEndpoint.
+| link:camel-caffeine/src/main/docs/caffeine-cache-component.adoc[Caffeine Cache] (camel-caffeine) +
+`caffeine-cache:cacheName` | 2.20 | Camel Caffeine support
+
+| link:camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc[Caffeine LoadCache] (camel-caffeine) +
+`caffeine-loadcache:cacheName` | 2.20 | Camel Caffeine support
+
| link:camel-context/src/main/docs/context-component.adoc[Camel Context] (camel-context) +
`context:contextId:localEndpointUrl` | 2.7 | *deprecated* The context component allows to send/receive messages between Camel routes in a black box way.
@@ -985,7 +991,7 @@ Miscellaneous Components
^^^^^^^^^^^^^^^^^^^^^^^^
// others: START
-Number of Miscellaneous Components: 39 in 39 JAR artifacts (14 deprecated)
+Number of Miscellaneous Components: 38 in 38 JAR artifacts (14 deprecated)
[width="100%",cols="4,1,5",options="header"]
|=======================================================================
@@ -1027,8 +1033,6 @@ Number of Miscellaneous Components: 39 in 39 JAR artifacts (14 deprecated)
| link:camel-rx/src/main/docs/rx.adoc[RX] (camel-rx) | 2.11 | *deprecated* Camel Reactive using RxJava library
-| link:camel-rxjava2/src/main/docs/rxjava2.adoc[Rxjava2] (camel-rxjava2) | 2.20 | RxJava2 based back-end for Camel's reactive streams component
-
| link:camel-scala/src/main/docs/scala.adoc[Scala DSL] (camel-scala) | 1.4 | *deprecated* Camel Scala DSL
| link:camel-scr/src/main/docs/scr.adoc[SCR] (camel-scr) | 2.15 | *deprecated* Camel with OSGi SCR (Declarative Services)
http://git-wip-us.apache.org/repos/asf/camel/blob/6e20fd5e/docs/user-manual/en/SUMMARY.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 6ab8ec0..0282bfe3 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -155,6 +155,8 @@
* [Bonita](bonita-component.adoc)
* [Box](box-component.adoc)
* [Braintree](braintree-component.adoc)
+ * [Caffeine Cache](caffeine-cache-component.adoc)
+ * [Caffeine LoadCache](caffeine-loadcache-component.adoc)
* [Camel Context](context-component.adoc)
* [Cassandra CQL](cql-component.adoc)
* [Chronicle Engine](chronicle-engine-component.adoc)
http://git-wip-us.apache.org/repos/asf/camel/blob/6e20fd5e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7a81187..2011aea 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -929,6 +929,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-caffeine</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cassandraql</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2364,6 +2369,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-caffeine-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cassandraql-starter</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/6e20fd5e/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 206441a..5a03913 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
@@ -142,6 +142,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-caffeine-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cassandraql-starter</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/6e20fd5e/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
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 ec9c11e..04e3a39 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
@@ -464,6 +464,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-caffeine</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-caffeine-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cassandraql</artifactId>
<version>${project.version}</version>
</dependency>