CAMEL-8602: Java 8: ConcurrentLinkedHashMap -> Caffeine. Also include spi-annotations in camel-core after recent changes in building to make it included again.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/798f6c45 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/798f6c45 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/798f6c45 Branch: refs/heads/master Commit: 798f6c4525d9e212aa48db678af4b951a5481999 Parents: b259321 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Mar 31 13:55:21 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Mar 31 13:55:21 2016 +0200 ---------------------------------------------------------------------- camel-core/pom.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/798f6c45/camel-core/pom.xml ---------------------------------------------------------------------- diff --git a/camel-core/pom.xml b/camel-core/pom.xml index 08e932f..f69c447 100644 --- a/camel-core/pom.xml +++ b/camel-core/pom.xml @@ -215,7 +215,7 @@ </plugins> </pluginManagement> <plugins> - <!-- shade concurrent hashmap for faster Camel and spi-annotations as needed by everybody --> + <!-- shade caffeine cache for faster Camel and spi-annotations as needed by everybody --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> @@ -229,6 +229,7 @@ <artifactSet> <includes> <include>com.github.ben-manes.caffeine:caffeine</include> + <include>org.apache.camel:spi-annotations</include> </includes> <excludes> <exclude>org.apache.camel:apt</exclude> @@ -236,8 +237,8 @@ </artifactSet> <relocations> <relocation> - <pattern>com.github.benmanes.caffeine.cache</pattern> - <shadedPattern>org.apache.camel.com.github.benmanes.caffeine.cache</shadedPattern> + <pattern>com.github.benmanes.caffeine</pattern> + <shadedPattern>org.apache.camel.com.github.benmanes.caffeine</shadedPattern> </relocation> </relocations> </configuration> @@ -347,7 +348,6 @@ </links> <linksource>true</linksource> <maxmemory>256m</maxmemory> - <groups> <group> <title>Camel API</title> @@ -358,7 +358,7 @@ <packages>org.apache.camel.builder:org.apache.camel.builder.*</packages> </group> <group> - <title>The bean and JAXB2 model for EIP rule definitions</title> + <title>The routing model for EIP rule definitions</title> <packages>org.apache.camel.model:org.apache.camel.model.*</packages> </group> <group>
