Re-order dependencies
This commit is contained in:
Chris Beams
72
build.gradle
72
build.gradle
@@ -118,15 +118,6 @@ configure(javaprojects) {
|
||||
}
|
||||
}
|
||||
|
||||
// 'provided' dependencies should be transitive (e.g. servlet-api)
|
||||
configurations {
|
||||
provided { transitive = false }
|
||||
}
|
||||
|
||||
sourceSets.main.compileClasspath += configurations.provided
|
||||
sourceSets.test.compileClasspath += configurations.provided
|
||||
sourceSets.test.runtimeClasspath += configurations.provided
|
||||
|
||||
// dependencies that are common across all java projects
|
||||
dependencies {
|
||||
testCompile "cglib:cglib-nodep:$cglibVersion"
|
||||
@@ -157,19 +148,18 @@ project('spring-integration-core') {
|
||||
dependencies {
|
||||
compile "org.springframework:spring-aop:$springVersion"
|
||||
compile "org.springframework:spring-context:$springVersion"
|
||||
compile "org.springframework:spring-tx:$springVersion"
|
||||
// 'jackson' should be 'optional' in the generated POM
|
||||
compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
|
||||
testCompile "org.aspectj:aspectjrt:$aspectjVersion"
|
||||
testCompile "org.aspectj:aspectjweaver:$aspectjVersion"
|
||||
compile("org.springframework:spring-tx:$springVersion")
|
||||
compile("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion")
|
||||
testCompile("org.aspectj:aspectjrt:$aspectjVersion")
|
||||
testCompile("org.aspectj:aspectjweaver:$aspectjVersion")
|
||||
}
|
||||
}
|
||||
|
||||
project('spring-integration-event') {
|
||||
description = 'Spring Integration Event Support'
|
||||
dependencies {
|
||||
compile "org.springframework:spring-context:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
compile "org.springframework:spring-context:$springVersion"
|
||||
testCompile project(":spring-integration-test")
|
||||
}
|
||||
}
|
||||
@@ -189,8 +179,8 @@ project('spring-integration-feed') {
|
||||
project('spring-integration-file') {
|
||||
description = 'Spring Integration File Support'
|
||||
dependencies {
|
||||
compile "org.springframework:spring-context:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
compile "org.springframework:spring-context:$springVersion"
|
||||
testCompile project(":spring-integration-test")
|
||||
}
|
||||
}
|
||||
@@ -198,12 +188,12 @@ project('spring-integration-file') {
|
||||
project('spring-integration-ftp') {
|
||||
description = 'Spring Integration FTP Support'
|
||||
dependencies {
|
||||
compile project(":spring-integration-file")
|
||||
compile "commons-io:commons-io:$commonsIoVersion"
|
||||
compile "commons-lang:commons-lang:$commonsLangVersion"
|
||||
compile "commons-net:commons-net:$commonsNetVersion"
|
||||
compile "javax.activation:activation:$javaxActivationVersion"
|
||||
compile("javax.activation:activation:$javaxActivationVersion")
|
||||
compile "org.springframework:spring-context-support:$springVersion"
|
||||
compile project(":spring-integration-file")
|
||||
testCompile project(":spring-integration-test")
|
||||
}
|
||||
}
|
||||
@@ -211,38 +201,38 @@ project('spring-integration-ftp') {
|
||||
project('spring-integration-groovy') {
|
||||
description = 'Spring Integration Groovy Support'
|
||||
dependencies {
|
||||
compile project(":spring-integration-core")
|
||||
compile "org.codehaus.groovy:groovy-all:1.7.5"
|
||||
compile "org.springframework:spring-context-support:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
}
|
||||
}
|
||||
|
||||
project('spring-integration-http') {
|
||||
description = 'Spring Integration HTTP Support'
|
||||
dependencies {
|
||||
compile project(":spring-integration-core")
|
||||
compile "commons-httpclient:commons-httpclient:3.1"
|
||||
compile "org.springframework:spring-webmvc:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
compile("javax.servlet:servlet-api:2.4")
|
||||
testCompile project(":spring-integration-test")
|
||||
provided "javax.servlet:servlet-api:2.4"
|
||||
}
|
||||
}
|
||||
|
||||
project('spring-integration-httpinvoker') {
|
||||
description = 'Spring Integration HttpInvoker Support'
|
||||
dependencies {
|
||||
compile project(":spring-integration-core")
|
||||
compile "org.springframework:spring-aop:$springVersion"
|
||||
compile "org.springframework:spring-web:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
provided "javax.servlet:servlet-api:2.4"
|
||||
compile("javax.servlet:servlet-api:2.4")
|
||||
}
|
||||
}
|
||||
|
||||
project('spring-integration-ip') {
|
||||
description = 'Spring Integration IP Support'
|
||||
dependencies {
|
||||
compile "org.springframework:spring-context:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
compile "org.springframework:spring-context:$springVersion"
|
||||
runtime project(":spring-integration-stream")
|
||||
testCompile project(":spring-integration-test")
|
||||
}
|
||||
@@ -268,34 +258,34 @@ project('spring-integration-jdbc') {
|
||||
project('spring-integration-jms') {
|
||||
description = 'Spring Integration JMS Support'
|
||||
dependencies {
|
||||
compile project(":spring-integration-core")
|
||||
compile "org.springframework:spring-jms:$springVersion"
|
||||
compile "org.springframework:spring-tx:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
compile ("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
|
||||
testCompile "org.apache.activemq:activemq-core:5.3.0"
|
||||
testCompile "org.springframework:spring-oxm:$springVersion"
|
||||
testCompile project(":spring-integration-test")
|
||||
provided "org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1"
|
||||
}
|
||||
}
|
||||
|
||||
project('spring-integration-jmx') {
|
||||
description = 'Spring Integration JMX Support'
|
||||
dependencies {
|
||||
compile project(":spring-integration-core")
|
||||
compile "org.aspectj:aspectjrt:$aspectjVersion"
|
||||
compile "org.aspectj:aspectjweaver:$aspectjVersion"
|
||||
compile "org.springframework:spring-context:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
}
|
||||
}
|
||||
|
||||
project('spring-integration-mail') {
|
||||
description = 'Spring Integration Mail Support'
|
||||
dependencies {
|
||||
compile project(":spring-integration-core")
|
||||
compile "javax.activation:activation:$javaxActivationVersion"
|
||||
compile "org.springframework:spring-context-support:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
compile("javax.mail:mail:1.4.1")
|
||||
testCompile project(":spring-integration-test")
|
||||
provided "javax.mail:mail:1.4.1"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -326,43 +316,43 @@ project('spring-integration-security') {
|
||||
project('spring-integration-sftp') {
|
||||
description = 'Spring Integration SFTP Support'
|
||||
dependencies {
|
||||
compile project(":spring-integration-core")
|
||||
compile project(":spring-integration-file")
|
||||
compile project(":spring-integration-stream")
|
||||
compile "com.jcraft:jsch:0.1.42"
|
||||
compile "commons-io:commons-io:$commonsIoVersion"
|
||||
compile "commons-lang:commons-lang:$commonsLangVersion"
|
||||
compile "javax.activation:activation:$javaxActivationVersion"
|
||||
compile "org.springframework:spring-context-support:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
compile project(":spring-integration-file")
|
||||
compile project(":spring-integration-stream")
|
||||
}
|
||||
}
|
||||
|
||||
project('spring-integration-stream') {
|
||||
description = 'Spring Integration Stream Support'
|
||||
dependencies {
|
||||
compile "org.springframework:spring-context:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
compile "org.springframework:spring-context:$springVersion"
|
||||
}
|
||||
}
|
||||
|
||||
project('spring-integration-test') {
|
||||
description = 'Spring Integration Test Support'
|
||||
dependencies {
|
||||
compile project(":spring-integration-core")
|
||||
compile "junit:junit:$junitVersion"
|
||||
compile "org.mockito:mockito-all:$mockitoVersion"
|
||||
compile "org.springframework:spring-context:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
}
|
||||
}
|
||||
|
||||
project('spring-integration-twitter') {
|
||||
description = 'Spring Integration Twitter Support'
|
||||
dependencies {
|
||||
compile project(":spring-integration-core")
|
||||
compile "commons-io:commons-io:$commonsIoVersion"
|
||||
compile "commons-lang:commons-lang:$commonsLangVersion"
|
||||
compile "javax.activation:activation:$javaxActivationVersion"
|
||||
compile "org.springframework:spring-context-support:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
compile "org.twitter4j:twitter4j-core:2.1.3"
|
||||
}
|
||||
}
|
||||
@@ -370,14 +360,14 @@ project('spring-integration-twitter') {
|
||||
project('spring-integration-ws') {
|
||||
description = 'Spring Integration Web Services Support'
|
||||
dependencies {
|
||||
compile "com.sun.xml.messaging.saaj:saaj-impl:1.3" // should be optional
|
||||
compile project(":spring-integration-core")
|
||||
compile("com.sun.xml.messaging.saaj:saaj-impl:1.3")
|
||||
compile("javax.xml.soap:saaj-api:1.3") {
|
||||
exclude(module: 'activation')
|
||||
}
|
||||
compile "org.apache.geronimo.specs:geronimo-activation_1.1_spec:1.1"
|
||||
compile "org.springframework:spring-expression:$springVersion"
|
||||
compile "org.springframework:spring-oxm:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
compile "org.springframework.ws:spring-ws-core:$springWsVersion"
|
||||
testCompile project(":spring-integration-test")
|
||||
}
|
||||
@@ -386,26 +376,26 @@ project('spring-integration-ws') {
|
||||
project('spring-integration-xml') {
|
||||
description = 'Spring Integration XML Support'
|
||||
dependencies {
|
||||
compile project(":spring-integration-core")
|
||||
compile "org.springframework:spring-context:$springVersion"
|
||||
compile "org.springframework:spring-oxm:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
compile("javax.activation:activation:$javaxActivationVersion")
|
||||
compile "org.springframework.ws:spring-xml:$springWsVersion"
|
||||
testCompile "xmlunit:xmlunit:1.2"
|
||||
testCompile project(":spring-integration-test")
|
||||
provided "javax.activation:activation:$javaxActivationVersion"
|
||||
testCompile "xmlunit:xmlunit:1.2"
|
||||
}
|
||||
}
|
||||
|
||||
project('spring-integration-xmpp') {
|
||||
description = 'Spring Integration XMPP Support'
|
||||
dependencies {
|
||||
compile project(":spring-integration-core")
|
||||
compile "commons-io:commons-io:$commonsIoVersion"
|
||||
compile "commons-lang:commons-lang:$commonsLangVersion"
|
||||
compile "javax.activation:activation:$javaxActivationVersion"
|
||||
compile "jivesoftware:smack:3.1.0"
|
||||
compile "jivesoftware:smackx:3.1.0"
|
||||
compile "org.springframework:spring-context-support:$springVersion"
|
||||
compile project(":spring-integration-core")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user