You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2016/12/14 15:25:02 UTC

camel git commit: CAMEL-10598: Upgrade ehcache to 3.2.0

Repository: camel
Updated Branches:
  refs/heads/master 65b7ac727 -> b3d2a2ae5


CAMEL-10598: Upgrade ehcache to 3.2.0


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b3d2a2ae
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b3d2a2ae
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b3d2a2ae

Branch: refs/heads/master
Commit: b3d2a2ae5ebffec42c61ae8723498e44dcb9d416
Parents: 65b7ac7
Author: lburgazzoli <lb...@gmail.com>
Authored: Wed Dec 14 16:24:39 2016 +0100
Committer: lburgazzoli <lb...@gmail.com>
Committed: Wed Dec 14 16:24:39 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/camel/component/ehcache/EhcacheConsumer.java   | 2 +-
 parent/pom.xml                                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b3d2a2ae/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheConsumer.java
----------------------------------------------------------------------
diff --git a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheConsumer.java b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheConsumer.java
index 1dc92ab..4e1f0ab 100644
--- a/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheConsumer.java
+++ b/components/camel-ehcache/src/main/java/org/apache/camel/component/ehcache/EhcacheConsumer.java
@@ -57,7 +57,7 @@ public class EhcacheConsumer extends DefaultConsumer implements CacheEventListen
     }
 
     @Override
-    public void onEvent(CacheEvent<Object, Object> event) {
+    public void onEvent(CacheEvent<? extends Object, ? extends Object> event) {
         final Exchange exchange = getEndpoint().createExchange();
         final Message message = exchange.getIn();
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b3d2a2ae/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index de69b6a..c389014 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -169,7 +169,7 @@
     <egit-github-core-version>2.1.5</egit-github-core-version>
     <egit-github-core-bundle-version>2.1.5_1</egit-github-core-bundle-version>
     <ehcache-version>2.10.1</ehcache-version>
-    <ehcache3-version>3.1.3</ehcache3-version>
+    <ehcache3-version>3.2.0</ehcache3-version>
     <ekstazi-maven-plugin-version>4.6.2</ekstazi-maven-plugin-version>
     <elasticsearch-bundle-version>2.4.0_1</elasticsearch-bundle-version>
     <elasticsearch-guava-version>18.0</elasticsearch-guava-version>