Keep concurrentlinkedhashmap as it is (cherry picked from commit cebc337)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/5ca5eea8 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5ca5eea8 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5ca5eea8 Branch: refs/heads/GROOVY_2_6_X Commit: 5ca5eea8298d25e2ef18ee3de0a5b68e806dd0ab Parents: 9432d38 Author: sunlan <[email protected]> Authored: Sat Dec 2 00:28:49 2017 +0800 Committer: sunlan <[email protected]> Committed: Sat Dec 2 00:37:43 2017 +0800 ---------------------------------------------------------------------- build.gradle | 4 + .../ConcurrentLinkedHashMap.java | 2628 +++++++++--------- .../concurrentlinkedhashmap/EntryWeigher.java | 4 +- .../EvictionListener.java | 4 +- .../concurrentlinkedhashmap/LinkedDeque.java | 5 +- .../util/concurrentlinkedhashmap/Weigher.java | 4 +- 6 files changed, 1270 insertions(+), 1379 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/5ca5eea8/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index dffbde9..185e730 100644 --- a/build.gradle +++ b/build.gradle @@ -184,6 +184,7 @@ ext { xstreamVersion = '1.4.10' spockVersion = '1.1-groovy-2.4' antlr4Version = '4.7' + jsr305Version = '3.0.2' isReleaseVersion = !groovyVersion.toLowerCase().endsWith("snapshot") } @@ -210,9 +211,12 @@ dependencies { } compile files("${buildDir}/generated-classes") + compileOnly "com.google.code.findbugs:jsr305:$jsr305Version" + runtime("org.codehaus.gpars:gpars:$gparsVersion") { exclude(group: 'org.codehaus.groovy', module: 'groovy-all') } + testCompile "jmock:jmock:$jmockVersion" testCompile "jmock:jmock-cglib:$jmockVersion" testCompile "xmlunit:xmlunit:$xmlunitVersion"
