# HG changeset patch # User Dave Smith # Date 1391049570 0 # Node ID c4b7c8a119136012552f6aa323480551f4ab60ab # Parent 7f023317034baf15fc2fb620eb2dead7b074407f normalize spring security diff -r 7f023317034b -r c4b7c8a11913 init.gradle --- a/init.gradle Wed Jan 29 16:33:39 2014 +0000 +++ b/init.gradle Thu Jan 30 02:39:30 2014 +0000 @@ -23,16 +23,22 @@ gradle.ext.hgRepositoryUrl = ("hg path".execute().text.split('=') ?: ['',''] )[1].trim() } catch (e) { } -def springModuleTranslator = ['spring-transaction':'spring-tx'].withDefault { it } +def springModuleTranslator = [ + 'spring-transaction' : 'spring-tx', + 'spring-web-servlet' : 'spring-webmvc', + ].withDefault { it } gradle.ext.normalizeSpring = { DependencyResolveDetails details -> - if (details.requested.group == 'org.springframework') { - if (details.requested.name.startsWith ('org.springframework.' )) { - def shortName = springModuleTranslator[details.requested.name.replace('org.springframework.', 'spring-').replace('.','-')] - details.useTarget(group: 'org.springframework', name: shortName, version: details.requested.version) - } - } - } + if (details.requested.group == 'org.springframework' && details.requested.name.startsWith ('org.springframework.' )) { + def shortName = springModuleTranslator[details.requested.name.replace('org.springframework.', 'spring-').replace('.','-')] + details.useTarget(group: 'org.springframework', name: shortName, version: details.requested.version) + } + if (details.requested.group == 'org.springframework.security' && details.requested.name.startsWith ('org.springframework.' )) { + def shortName = springModuleTranslator[details.requested.name.replace('org.springframework.', 'spring-').replace('.','-')] + details.useTarget( "${details.requested.group}:$shortName:${details.requested.version}") + } + } + gradle.ext.branchName = System.getenv('bamboo_planRepository_branch') gradle.ext.branchStream = ""