Permalink
Browse files

corrections to POMs to avoid commons-logging being pulled in

  • Loading branch information...
graemerocher committed Mar 13, 2013
1 parent 9538b82 commit 3ecf53c326e0bc720e310c75cbb741a7c3de58e1
View
@@ -55,8 +55,8 @@ task wrapper(type: Wrapper) {
subprojects {
ext {
- releaseType = "RELEASE"
-// releaseType = "BUILD-SNAPSHOT"
+// releaseType = "RELEASE"
+ releaseType = "BUILD-SNAPSHOT"
//releaseType = "RC3"
isCiBuild = project.hasProperty("isCiBuild")
isBuildSnapshot = releaseType == "BUILD-SNAPSHOT"
@@ -1,23 +1,26 @@
dependencies {
compile "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.3.1"
compile "org.springframework:spring-core:$springVersion" , {
- exclude module:'commons-logging'
+ exclude group:'commons-logging',module:'commons-logging'
}
compile "org.springframework:spring-beans:$springVersion", {
- exclude module:'spring-core'
+ exclude group:'org.springframework', module:'spring-core'
+ exclude group:'commons-logging',module:'commons-logging'
}
compile "org.springframework:spring-tx:$springVersion", {
- exclude module:'spring-context'
- exclude module:'spring-core'
- exclude module:'spring-beans'
- exclude module:'spring-aop'
+ exclude group:'commons-logging',module:'commons-logging'
+ exclude group:'org.springframework', module:'spring-context'
+ exclude group:'org.springframework', module:'spring-core'
+ exclude group:'org.springframework', module:'spring-beans'
+ exclude group:'org.springframework', module:'spring-aop'
}
compile "org.springframework:spring-context:$springVersion", {
- exclude module:'spring-core'
- exclude module:'spring-expression'
- exclude module:'spring-aop'
- exclude module:'spring-beans'
- exclude module:'spring-asm'
+ exclude group:'commons-logging',module:'commons-logging'
+ exclude group:'org.springframework', module:'spring-core'
+ exclude group:'org.springframework', module:'spring-expression'
+ exclude group:'org.springframework', module:'spring-aop'
+ exclude group:'org.springframework', module:'spring-beans'
+ exclude group:'org.springframework', module:'spring-asm'
}
compile 'javax.persistence:persistence-api:1.0'
compile 'org.javassist:javassist:3.16.1-GA'
@@ -2,5 +2,11 @@ version = "0.1.2.BUILD-SNAPSHOT"
dependencies {
compile project(":grails-datastore-core")
- compile('com.amazonaws:aws-java-sdk:1.3.30')
+ compile('com.amazonaws:aws-java-sdk:1.3.30') {
+ exclude group:'commons-logging', module:'commons-logging'
+ exclude group:'org.apache.httpcomponents', module:'httpclient'
+ }
+ compile('org.apache.httpcomponents:httpclient:4.1'){
+ exclude group:'commons-logging', module:'commons-logging'
+ }
}
@@ -5,14 +5,16 @@ configurations {
}
dependencies {
- grails("org.grails:grails-core:1.3.7") {
+ grails("org.grails:grails-core:$grailsVersion") {
transitive = false
}
- grails("org.grails:grails-bootstrap:1.3.7") {
+ grails("org.grails:grails-bootstrap:$grailsVersion") {
transitive = false
}
- compile project(":grails-datastore-gorm"),
- project(":grails-datastore-gorm-plugin-support"),
+ compile project(":grails-datastore-gorm"), {
+ exclude group:"org.grails", module:"grails-datastore-core"
+ }
+ compile project(":grails-datastore-gorm-plugin-support"),
project(":grails-datastore-jpa"),
project(":grails-datastore-core"),
project(":grails-datastore-web")
@@ -5,7 +5,19 @@ configurations {
}
dependencies {
- compile "org.springframework:spring-orm:$springVersion"
+ compile "org.springframework:spring-orm:$springVersion", {
+ exclude group:'org.springframework', module:'spring-jdbc'
+ exclude group:'org.springframework', module:'spring-core'
+ }
+ compile "org.springframework:spring-jdbc:$springVersion", {
+ exclude group:'org.springframework', module:'spring-tx'
+ exclude group:'org.springframework', module:'spring-core'
+ exclude group:'org.springframework', module:'spring-beans'
+ }
+ compile "org.springframework:spring-tx:$springVersion", {
+ exclude group:'org.springframework', module:'spring-core'
+ exclude group:'org.springframework', module:'spring-beans'
+ }
compile project(":grails-datastore-core")
grails("org.grails:grails-core:$grailsVersion")
grails("org.grails:grails-bootstrap:$grailsVersion") {
@@ -1,5 +1,18 @@
dependencies {
compile project(":grails-datastore-core")
- compile "org.springframework:spring-web:$springVersion"
- compile "org.springframework:spring-context:$springVersion"
+ compile "org.springframework:spring-web:$springVersion", {
+ exclude group:'commons-logging',module:'commons-logging'
+ exclude group:'org.springframework', module:'spring-context'
+ exclude group:'org.springframework', module:'spring-core'
+ exclude group:'org.springframework', module:'spring-beans'
+ exclude group:'org.springframework', module:'spring-aop'
+ }
+ compile "org.springframework:spring-context:$springVersion", {
+ exclude group:'commons-logging',module:'commons-logging'
+ exclude group:'org.springframework', module:'spring-core'
+ exclude group:'org.springframework', module:'spring-expression'
+ exclude group:'org.springframework', module:'spring-aop'
+ exclude group:'org.springframework', module:'spring-beans'
+ exclude group:'org.springframework', module:'spring-asm'
+ }
}

0 comments on commit 3ecf53c

Please sign in to comment.