Skip to content

Commit cb4eda1

Browse files
committed
Don't remove CLHM dependency from grails-web; instead add it to grails-core besides grails-web
1 parent 08d543b commit cb4eda1

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

grails-bootstrap/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@ dependencies {
2525
}
2626
}
2727

28-
compile( "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:${concurrentlinkedhashmapVersion}" ) {
29-
exclude group: 'commons-logging', module:'commons-logging'
30-
}
31-
3228
// These 3 are required by UAA but not Grails (non OSGI version of excludes above)
3329
compile 'com.google.protobuf:protobuf-java:2.3.0',
3430
'com.googlecode.json-simple:json-simple:1.1',

grails-core/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ dependencies {
88
exclude group: 'commons-logging', module:'commons-logging'
99
exclude group: 'commons-beanutils', module:'commons-beanutils'
1010
}
11+
compile( "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:${concurrentlinkedhashmapVersion}" ) {
12+
exclude group: 'commons-logging', module:'commons-logging'
13+
}
1114
compile("org.springframework:spring-aop:${springVersion}") {
1215
exclude group: 'commons-logging', module:'commons-logging'
1316
}

grails-web/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ dependencies {
1818
compile "commons-io:commons-io:${commonsIOVersion}"
1919
compile "commons-lang:commons-lang:$commonsLangVersion"
2020

21+
compile( "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:${concurrentlinkedhashmapVersion}" ) {
22+
exclude group: 'commons-logging', module:'commons-logging'
23+
}
2124
compile 'opensymphony:sitemesh:2.4'
2225

2326
compile "org.springframework:spring-webmvc:${springVersion}"

0 commit comments

Comments
 (0)