Raised all dependencies to latest possible maintenance releases; introduced additional library version variables; consistently grouped dependency scopes
This commit is contained in:
		
							parent
							
								
									61b6d398a5
								
							
						
					
					
						commit
						9154871a45
					
				
							
								
								
									
										185
									
								
								build.gradle
								
								
								
								
							
							
						
						
									
										185
									
								
								build.gradle
								
								
								
								
							| 
						 | 
				
			
			@ -15,12 +15,18 @@ configure(allprojects) { project ->
 | 
			
		|||
 | 
			
		||||
	ext.aspectjVersion    = "1.7.4"
 | 
			
		||||
	ext.groovyVersion     = "1.8.9"
 | 
			
		||||
	ext.hibernate3Version = "3.6.9.Final"
 | 
			
		||||
	ext.hibernate3Version = "3.6.10.Final"
 | 
			
		||||
	ext.hibernate4Version = "4.2.8.Final"
 | 
			
		||||
	ext.hibValVersion     = "4.3.1.Final"
 | 
			
		||||
	ext.hsqldbVersion     = "2.3.1"
 | 
			
		||||
	ext.jettyVersion      = "9.1.0.v20131115"
 | 
			
		||||
	ext.jackson1Version   = "1.9.13"
 | 
			
		||||
	ext.jackson2Version   = "2.3.1"
 | 
			
		||||
	ext.jettyVersion      = "9.1.1.v20140108"
 | 
			
		||||
	ext.jodaVersion       = "2.3"
 | 
			
		||||
	ext.junitVersion      = "4.11"
 | 
			
		||||
	ext.slf4jVersion      = "1.6.1"
 | 
			
		||||
	ext.xstreamVersion    = "1.4.6"
 | 
			
		||||
 | 
			
		||||
	ext.gradleScriptDir   = "${rootProject.projectDir}/gradle"
 | 
			
		||||
 | 
			
		||||
	apply plugin: "propdeps"
 | 
			
		||||
| 
						 | 
				
			
			@ -297,14 +303,14 @@ project("spring-aop") {
 | 
			
		|||
	description = "Spring AOP"
 | 
			
		||||
 | 
			
		||||
	dependencies {
 | 
			
		||||
		compile(project(":spring-beans"))
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		compile(files(project(":spring-core").cglibRepackJar))
 | 
			
		||||
		compile(files(project(":spring-core").objenesisRepackJar))
 | 
			
		||||
		compile(project(":spring-beans"))
 | 
			
		||||
		compile("aopalliance:aopalliance:1.0")
 | 
			
		||||
		optional("com.jamonapi:jamon:2.4")
 | 
			
		||||
		optional("commons-pool:commons-pool:1.5.3")
 | 
			
		||||
		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 | 
			
		||||
		optional("commons-pool:commons-pool:1.5.3")
 | 
			
		||||
		optional("com.jamonapi:jamon:2.4")
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -343,26 +349,24 @@ project("spring-context") {
 | 
			
		|||
	apply plugin: "groovy"
 | 
			
		||||
 | 
			
		||||
	dependencies {
 | 
			
		||||
		optional(project(":spring-instrument"))
 | 
			
		||||
		compile(project(":spring-aop"))
 | 
			
		||||
		compile(project(":spring-beans"))
 | 
			
		||||
		compile(project(":spring-expression"))
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		compile(files(project(":spring-core").cglibRepackJar))
 | 
			
		||||
		optional("javax.ejb:ejb-api:3.0")
 | 
			
		||||
		optional(project(":spring-instrument"))
 | 
			
		||||
		optional("javax.inject:javax.inject:1")
 | 
			
		||||
		optional("javax.ejb:ejb-api:3.0")
 | 
			
		||||
		optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0")
 | 
			
		||||
		optional("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
 | 
			
		||||
		optional("org.eclipse.persistence:javax.persistence:2.0.0")
 | 
			
		||||
		optional("joda-time:joda-time:2.2")
 | 
			
		||||
		optional("org.beanshell:bsh:2.0b4")
 | 
			
		||||
		optional("javax.validation:validation-api:1.0.0.GA")
 | 
			
		||||
		optional("org.hibernate:hibernate-validator:${hibValVersion}")
 | 
			
		||||
		optional("joda-time:joda-time:${jodaVersion}")
 | 
			
		||||
		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 | 
			
		||||
		optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 | 
			
		||||
		optional("org.beanshell:bsh:2.0b4")
 | 
			
		||||
		optional("org.jruby:jruby:1.7.2")
 | 
			
		||||
		optional("org.slf4j:slf4j-api:${slf4jVersion}")
 | 
			
		||||
		optional("javax.validation:validation-api:1.0.0.GA")
 | 
			
		||||
		optional("org.hibernate:hibernate-validator:4.3.0.Final")
 | 
			
		||||
		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 | 
			
		||||
		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 | 
			
		||||
		testCompile("commons-dbcp:commons-dbcp:1.2.2")
 | 
			
		||||
		testCompile("javax.inject:javax.inject-tck:1")
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			@ -382,20 +386,18 @@ project("spring-messaging") {
 | 
			
		|||
		compile(project(":spring-beans"))
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		compile(project(":spring-context"))
 | 
			
		||||
		optional("com.fasterxml.jackson.core:jackson-databind:2.3.0")
 | 
			
		||||
		optional("org.projectreactor:reactor-core:1.0.0.RELEASE")
 | 
			
		||||
		optional("org.projectreactor:reactor-tcp:1.0.0.RELEASE")
 | 
			
		||||
		optional("org.eclipse.jetty.websocket:websocket-server:${jettyVersion}") {
 | 
			
		||||
			exclude group: "javax.servlet", module: "javax.servlet-api"
 | 
			
		||||
		}
 | 
			
		||||
		optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}")
 | 
			
		||||
		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 | 
			
		||||
		testCompile(project(":spring-test"))
 | 
			
		||||
		testCompile("com.thoughtworks.xstream:xstream:${xstreamVersion}")
 | 
			
		||||
		testCompile("commons-dbcp:commons-dbcp:1.2.2")
 | 
			
		||||
		testCompile("javax.inject:javax.inject-tck:1")
 | 
			
		||||
		testCompile("javax.servlet:javax.servlet-api:3.1.0")
 | 
			
		||||
		testCompile("javax.validation:validation-api:1.0.0.GA")
 | 
			
		||||
		testCompile("log4j:log4j:1.2.17")
 | 
			
		||||
		testCompile("com.thoughtworks.xstream:xstream:${xstreamVersion}")
 | 
			
		||||
		testCompile("org.apache.activemq:activemq-broker:5.8.0")
 | 
			
		||||
		testCompile("org.apache.activemq:activemq-kahadb-store:5.8.0") {
 | 
			
		||||
			exclude group: "org.springframework", module: "spring-context"
 | 
			
		||||
| 
						 | 
				
			
			@ -406,6 +408,8 @@ project("spring-messaging") {
 | 
			
		|||
		}
 | 
			
		||||
		testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC10")
 | 
			
		||||
		testCompile("org.apache.tomcat.embed:tomcat-embed-logging-juli:8.0.0-RC10")
 | 
			
		||||
		testCompile("commons-dbcp:commons-dbcp:1.2.2")
 | 
			
		||||
		testCompile("log4j:log4j:1.2.17")
 | 
			
		||||
		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -414,17 +418,17 @@ project("spring-tx") {
 | 
			
		|||
	description = "Spring Transaction"
 | 
			
		||||
 | 
			
		||||
	dependencies {
 | 
			
		||||
		optional(project(":spring-context")) // for JCA, @EnableTransactionManagement
 | 
			
		||||
		optional(project(":spring-aop"))
 | 
			
		||||
		compile(project(":spring-beans"))
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		compile("aopalliance:aopalliance:1.0")
 | 
			
		||||
		provided("com.ibm.websphere:uow:6.0.2.17")
 | 
			
		||||
		optional("javax.resource:connector-api:1.5")
 | 
			
		||||
		optional(project(":spring-aop"))
 | 
			
		||||
		optional(project(":spring-context")) // for JCA, @EnableTransactionManagement
 | 
			
		||||
		optional("aopalliance:aopalliance:1.0")
 | 
			
		||||
		optional("javax.transaction:javax.transaction-api:1.2")
 | 
			
		||||
		optional("javax.resource:connector-api:1.5")
 | 
			
		||||
		optional("javax.ejb:ejb-api:3.0")
 | 
			
		||||
		testCompile("org.eclipse.persistence:javax.persistence:2.0.0")
 | 
			
		||||
		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
 | 
			
		||||
		testCompile("org.eclipse.persistence:javax.persistence:2.0.0")
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -447,11 +451,11 @@ project("spring-oxm") {
 | 
			
		|||
	dependencies {
 | 
			
		||||
		compile(project(":spring-beans"))
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		testCompile(project(":spring-context"))
 | 
			
		||||
		optional("com.thoughtworks.xstream:xstream:${xstreamVersion}")
 | 
			
		||||
		optional("org.jibx:jibx-run:1.2.5")
 | 
			
		||||
		optional("org.apache.xmlbeans:xmlbeans:2.6.0")
 | 
			
		||||
		optional("org.codehaus.castor:castor-xml:1.3.2")
 | 
			
		||||
		testCompile(project(":spring-context"))
 | 
			
		||||
		testCompile("org.codehaus.jettison:jettison:1.0.1")
 | 
			
		||||
		testCompile("xmlunit:xmlunit:1.3")
 | 
			
		||||
		testCompile("xmlpull:xmlpull:1.1.3.4a")
 | 
			
		||||
| 
						 | 
				
			
			@ -470,13 +474,13 @@ project("spring-jms") {
 | 
			
		|||
		compile(project(":spring-aop"))
 | 
			
		||||
		compile(project(":spring-context"))
 | 
			
		||||
		compile(project(":spring-tx"))
 | 
			
		||||
		optional(project(":spring-oxm"))
 | 
			
		||||
		compile("aopalliance:aopalliance:1.0")
 | 
			
		||||
		provided("org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1")
 | 
			
		||||
		optional(project(":spring-oxm"))
 | 
			
		||||
		optional("aopalliance:aopalliance:1.0")
 | 
			
		||||
		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 | 
			
		||||
		optional("javax.resource:connector-api:1.5")
 | 
			
		||||
		optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
 | 
			
		||||
		optional("com.fasterxml.jackson.core:jackson-databind:2.3.0")
 | 
			
		||||
		optional("org.codehaus.jackson:jackson-mapper-asl:${jackson1Version}")
 | 
			
		||||
		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -484,16 +488,16 @@ project("spring-jdbc") {
 | 
			
		|||
	description = "Spring JDBC"
 | 
			
		||||
 | 
			
		||||
	dependencies {
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		compile(project(":spring-beans"))
 | 
			
		||||
		optional(project(":spring-context")) // for JndiDataSourceLookup
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		compile(project(":spring-tx"))
 | 
			
		||||
		optional(project(":spring-context")) // for JndiDataSourceLookup
 | 
			
		||||
		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 | 
			
		||||
		optional("c3p0:c3p0:0.9.1.2")
 | 
			
		||||
		optional("org.hsqldb:hsqldb:${hsqldbVersion}")
 | 
			
		||||
		optional("com.h2database:h2:1.0.71")
 | 
			
		||||
		optional("org.apache.derby:derby:10.10.1.1")
 | 
			
		||||
		optional("org.apache.derby:derbyclient:10.10.1.1")
 | 
			
		||||
		optional("org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1")
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -519,7 +523,6 @@ project("spring-context-support") {
 | 
			
		|||
		optional("com.lowagie:itext:2.1.7")
 | 
			
		||||
		optional("net.sf.jasperreports:jasperreports:5.5.0")
 | 
			
		||||
		optional("org.slf4j:slf4j-api:${slf4jVersion}")
 | 
			
		||||
		provided("javax.activation:activation:1.1")
 | 
			
		||||
		testCompile("org.apache.poi:poi:3.9")
 | 
			
		||||
		testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
 | 
			
		||||
		testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
 | 
			
		||||
| 
						 | 
				
			
			@ -534,25 +537,24 @@ project("spring-web") {
 | 
			
		|||
	description = "Spring Web"
 | 
			
		||||
 | 
			
		||||
	dependencies {
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		compile(project(":spring-beans")) // for MultiPartFilter
 | 
			
		||||
		compile(project(":spring-aop")) // for JaxWsPortProxyFactoryBean
 | 
			
		||||
		compile(project(":spring-beans")) // for MultiPartFilter
 | 
			
		||||
		compile(project(":spring-context"))
 | 
			
		||||
		optional(project(":spring-oxm")) // for MarshallingHttpMessageConverter
 | 
			
		||||
		compile("aopalliance:aopalliance:1.0")
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		provided("javax.el:javax.el-api:2.2.4")
 | 
			
		||||
		provided("javax.faces:javax.faces-api:2.2")
 | 
			
		||||
		provided("javax.portlet:portlet-api:2.0")
 | 
			
		||||
		provided("javax.servlet:javax.servlet-api:3.0.1")
 | 
			
		||||
		provided("javax.servlet.jsp:jsp-api:2.1")
 | 
			
		||||
		provided("javax.activation:activation:1.1")
 | 
			
		||||
		optional(project(":spring-oxm")) // for MarshallingHttpMessageConverter
 | 
			
		||||
		optional("aopalliance:aopalliance:1.0")
 | 
			
		||||
		optional("com.caucho:hessian:4.0.7")
 | 
			
		||||
		optional("rome:rome:1.0")
 | 
			
		||||
		optional("commons-fileupload:commons-fileupload:1.3")
 | 
			
		||||
		optional("org.apache.httpcomponents:httpclient:4.3.1")
 | 
			
		||||
		optional("org.apache.httpcomponents:httpasyncclient:4.0")
 | 
			
		||||
		optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
 | 
			
		||||
		optional("com.fasterxml.jackson.core:jackson-databind:2.3.0")
 | 
			
		||||
		optional("org.codehaus.jackson:jackson-mapper-asl:${jackson1Version}")
 | 
			
		||||
		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 | 
			
		||||
		optional("rome:rome:1.0")
 | 
			
		||||
		optional("taglibs:standard:1.1.2")
 | 
			
		||||
		optional("org.eclipse.jetty:jetty-servlet:${jettyVersion}") {
 | 
			
		||||
			exclude group: "javax.servlet", module: "javax.servlet-api"
 | 
			
		||||
| 
						 | 
				
			
			@ -602,7 +604,7 @@ project("spring-websocket") {
 | 
			
		|||
		optional("io.undertow:undertow-websockets-jsr:1.0.0.Beta31") {
 | 
			
		||||
			exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.0_spec"
 | 
			
		||||
		}
 | 
			
		||||
		optional("com.fasterxml.jackson.core:jackson-databind:2.3.0")
 | 
			
		||||
		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 | 
			
		||||
		testCompile("org.apache.tomcat.embed:tomcat-embed-core:8.0.0-RC10")
 | 
			
		||||
		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 | 
			
		||||
		testCompile("log4j:log4j:1.2.17")
 | 
			
		||||
| 
						 | 
				
			
			@ -615,7 +617,15 @@ project("spring-orm") {
 | 
			
		|||
	description = "Spring Object/Relational Mapping"
 | 
			
		||||
 | 
			
		||||
	dependencies {
 | 
			
		||||
		compile("aopalliance:aopalliance:1.0")
 | 
			
		||||
		compile(project(":spring-beans"))
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		compile(project(":spring-jdbc"))
 | 
			
		||||
		compile(project(":spring-tx"))
 | 
			
		||||
		provided("javax.servlet:javax.servlet-api:3.0.1")
 | 
			
		||||
		optional(project(":spring-aop"))
 | 
			
		||||
		optional(project(":spring-context"))
 | 
			
		||||
		optional(project(":spring-web"))
 | 
			
		||||
		optional("aopalliance:aopalliance:1.0")
 | 
			
		||||
		optional("org.eclipse.persistence:javax.persistence:2.0.0")
 | 
			
		||||
		optional("org.eclipse.persistence:org.eclipse.persistence.core:2.4.0")
 | 
			
		||||
		optional("org.eclipse.persistence:org.eclipse.persistence.jpa:2.4.0")
 | 
			
		||||
| 
						 | 
				
			
			@ -623,17 +633,9 @@ project("spring-orm") {
 | 
			
		|||
		optional("org.hibernate:hibernate-entitymanager:${hibernate3Version}")
 | 
			
		||||
		optional("org.apache.openjpa:openjpa:2.2.1")
 | 
			
		||||
		optional("javax.jdo:jdo-api:3.0")
 | 
			
		||||
		provided("javax.servlet:javax.servlet-api:3.0.1")
 | 
			
		||||
		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 | 
			
		||||
		testCompile("commons-dbcp:commons-dbcp:1.2.2")
 | 
			
		||||
		testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		compile(project(":spring-beans"))
 | 
			
		||||
		optional(project(":spring-aop"))
 | 
			
		||||
		optional(project(":spring-context"))
 | 
			
		||||
		compile(project(":spring-tx"))
 | 
			
		||||
		compile(project(":spring-jdbc"))
 | 
			
		||||
		optional(project(":spring-web"))
 | 
			
		||||
		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -644,9 +646,9 @@ project("spring-orm-hibernate4") {
 | 
			
		|||
	dependencies {
 | 
			
		||||
		provided(project(":spring-tx"))
 | 
			
		||||
		provided(project(":spring-jdbc"))
 | 
			
		||||
		optional("org.hibernate:hibernate-core:4.2.2.Final")
 | 
			
		||||
		optional("org.hibernate:hibernate-entitymanager:4.2.2.Final")
 | 
			
		||||
		optional(project(":spring-web"))
 | 
			
		||||
		optional("org.hibernate:hibernate-core:${hibernate4Version}")
 | 
			
		||||
		optional("org.hibernate:hibernate-entitymanager:${hibernate4Version}")
 | 
			
		||||
		optional("javax.servlet:javax.servlet-api:3.0.1")
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -655,26 +657,29 @@ project("spring-webmvc") {
 | 
			
		|||
	description = "Spring Web MVC"
 | 
			
		||||
 | 
			
		||||
	dependencies {
 | 
			
		||||
		compile(project(":spring-beans"))
 | 
			
		||||
		compile(project(":spring-context"))
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		compile(files(project(":spring-core").objenesisRepackJar))
 | 
			
		||||
		compile(project(":spring-expression"))
 | 
			
		||||
		compile(project(":spring-beans"))
 | 
			
		||||
		compile(project(":spring-web"))
 | 
			
		||||
		compile(project(":spring-context"))
 | 
			
		||||
		provided("javax.servlet:javax.servlet-api:3.0.1")
 | 
			
		||||
		provided("javax.servlet.jsp:jsp-api:2.1")
 | 
			
		||||
		provided("javax.servlet:jstl:1.2")
 | 
			
		||||
		optional(project(":spring-context-support")) // for Velocity support
 | 
			
		||||
		optional(project(":spring-oxm")) // for MarshallingView
 | 
			
		||||
		optional("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
 | 
			
		||||
		optional("com.fasterxml.jackson.core:jackson-databind:2.3.0")
 | 
			
		||||
		optional("net.sf.jasperreports:jasperreports:5.5.0") {
 | 
			
		||||
			exclude group: "xml-apis", module: "xml-apis"
 | 
			
		||||
		}
 | 
			
		||||
		optional("rome:rome:1.0")
 | 
			
		||||
		optional("com.lowagie:itext:2.1.7")
 | 
			
		||||
		optional("net.sourceforge.jexcelapi:jxl:2.6.12")
 | 
			
		||||
		optional("org.apache.poi:poi:3.9")
 | 
			
		||||
		optional("org.apache.velocity:velocity:1.7")
 | 
			
		||||
		optional("velocity-tools:velocity-tools-view:1.4")
 | 
			
		||||
		optional("org.freemarker:freemarker:2.3.20")
 | 
			
		||||
		optional("com.lowagie:itext:2.1.7")
 | 
			
		||||
		optional("net.sf.jasperreports:jasperreports:5.5.0") {
 | 
			
		||||
			exclude group: "xml-apis", module: "xml-apis"
 | 
			
		||||
		}
 | 
			
		||||
		optional("org.codehaus.jackson:jackson-mapper-asl:${jackson1Version}")
 | 
			
		||||
		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 | 
			
		||||
		optional("rome:rome:1.0")
 | 
			
		||||
		optional("org.apache.tiles:tiles-api:2.2.2")
 | 
			
		||||
		optional("org.apache.tiles:tiles-core:2.2.2") {
 | 
			
		||||
			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 | 
			
		||||
| 
						 | 
				
			
			@ -692,9 +697,6 @@ project("spring-webmvc") {
 | 
			
		|||
			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 | 
			
		||||
			exclude group: "org.springframework", module: "spring-web"
 | 
			
		||||
		}
 | 
			
		||||
		provided("javax.servlet:jstl:1.2")
 | 
			
		||||
		provided("javax.servlet:javax.servlet-api:3.0.1")
 | 
			
		||||
		provided("javax.servlet.jsp:jsp-api:2.1")
 | 
			
		||||
		testCompile(project(":spring-aop"))
 | 
			
		||||
		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 | 
			
		||||
		testCompile("rhino:js:1.7R1")
 | 
			
		||||
| 
						 | 
				
			
			@ -714,11 +716,11 @@ project("spring-webmvc") {
 | 
			
		|||
			exclude group: "javax.servlet", module: "javax.servlet"
 | 
			
		||||
		}
 | 
			
		||||
		testCompile("javax.validation:validation-api:1.0.0.GA")
 | 
			
		||||
		testCompile("org.hibernate:hibernate-validator:${hibValVersion}")
 | 
			
		||||
		testCompile("org.apache.httpcomponents:httpclient:4.3.1")
 | 
			
		||||
		testCompile("commons-fileupload:commons-fileupload:1.3")
 | 
			
		||||
		testCompile("commons-io:commons-io:1.3")
 | 
			
		||||
		testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
 | 
			
		||||
		testCompile("org.apache.httpcomponents:httpclient:4.3.1")
 | 
			
		||||
		testCompile("joda-time:joda-time:2.2")
 | 
			
		||||
		testCompile("joda-time:joda-time:${jodaVersion}")
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// pick up DispatcherServlet.properties in src/main
 | 
			
		||||
| 
						 | 
				
			
			@ -733,8 +735,9 @@ project("spring-webmvc-tiles3") {
 | 
			
		|||
		provided(project(":spring-context"))
 | 
			
		||||
		provided(project(":spring-web"))
 | 
			
		||||
		provided("javax.el:javax.el-api:2.2.4")
 | 
			
		||||
		provided("javax.servlet:jstl:1.2")
 | 
			
		||||
		provided("javax.servlet:javax.servlet-api:3.0.1")
 | 
			
		||||
		provided("javax.servlet.jsp:jsp-api:2.1")
 | 
			
		||||
		provided("javax.servlet:jstl:1.2")
 | 
			
		||||
		optional("org.apache.tiles:tiles-request-api:1.0.1")
 | 
			
		||||
		optional("org.apache.tiles:tiles-api:3.0.1")
 | 
			
		||||
		optional("org.apache.tiles:tiles-core:3.0.1") {
 | 
			
		||||
| 
						 | 
				
			
			@ -753,7 +756,6 @@ project("spring-webmvc-tiles3") {
 | 
			
		|||
			exclude group: "org.slf4j", module: "jcl-over-slf4j"
 | 
			
		||||
			exclude group: "org.springframework", module: "spring-web"
 | 
			
		||||
		}
 | 
			
		||||
		provided("javax.servlet:javax.servlet-api:3.0.1")
 | 
			
		||||
		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -762,13 +764,13 @@ project("spring-webmvc-portlet") {
 | 
			
		|||
	description = "Spring Web Portlet"
 | 
			
		||||
 | 
			
		||||
	dependencies {
 | 
			
		||||
		provided("javax.servlet:javax.servlet-api:3.0.1")
 | 
			
		||||
		provided("javax.portlet:portlet-api:2.0")
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		compile(project(":spring-beans"))
 | 
			
		||||
		compile(project(":spring-context"))
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		compile(project(":spring-web"))
 | 
			
		||||
		compile(project(":spring-webmvc"))
 | 
			
		||||
		provided("javax.servlet:javax.servlet-api:3.0.1")
 | 
			
		||||
		provided("javax.portlet:portlet-api:2.0")
 | 
			
		||||
		optional("commons-fileupload:commons-fileupload:1.3")
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -781,6 +783,8 @@ project("spring-test") {
 | 
			
		|||
 | 
			
		||||
	dependencies {
 | 
			
		||||
		compile(project(":spring-core"))
 | 
			
		||||
		provided("javax.inject:javax.inject:1")
 | 
			
		||||
		provided("javax.servlet:jstl:1.2")
 | 
			
		||||
		optional(project(":spring-beans"))
 | 
			
		||||
		optional(project(":spring-context"))
 | 
			
		||||
		optional(project(":spring-jdbc"))
 | 
			
		||||
| 
						 | 
				
			
			@ -791,32 +795,28 @@ project("spring-test") {
 | 
			
		|||
		optional(project(":spring-webmvc-portlet"))
 | 
			
		||||
		optional("junit:junit:${junitVersion}")
 | 
			
		||||
		optional("org.testng:testng:6.8.7")
 | 
			
		||||
		optional("javax.portlet:portlet-api:2.0")
 | 
			
		||||
		optional("javax.servlet:javax.servlet-api:3.0.1")
 | 
			
		||||
		optional("javax.servlet.jsp:jsp-api:2.1")
 | 
			
		||||
		optional("javax.portlet:portlet-api:2.0")
 | 
			
		||||
		optional("org.eclipse.persistence:javax.persistence:2.0.0")
 | 
			
		||||
		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 | 
			
		||||
		provided("javax.inject:javax.inject:1")
 | 
			
		||||
		provided("javax.activation:activation:1.1")
 | 
			
		||||
		provided("javax.servlet:jstl:1.2")
 | 
			
		||||
		optional("org.hamcrest:hamcrest-core:1.3")
 | 
			
		||||
		optional("com.jayway.jsonpath:json-path:0.9.0")
 | 
			
		||||
		optional("xmlunit:xmlunit:1.3")
 | 
			
		||||
		testCompile(project(":spring-context-support"))
 | 
			
		||||
		testCompile(project(":spring-oxm"))
 | 
			
		||||
		testCompile(project(":spring-webmvc-tiles3"))
 | 
			
		||||
		testCompile("javax.mail:mail:1.4.7")
 | 
			
		||||
		testCompile("javax.ejb:ejb-api:3.0")
 | 
			
		||||
		testCompile("org.hibernate:hibernate-core:${hibernate3Version}")
 | 
			
		||||
		testCompile("org.hibernate:hibernate-entitymanager:${hibernate3Version}")
 | 
			
		||||
		testCompile "org.slf4j:slf4j-jcl:${slf4jVersion}"
 | 
			
		||||
		testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
 | 
			
		||||
		testCompile("org.hibernate:hibernate-validator:4.3.0.Final")
 | 
			
		||||
		testCompile("org.codehaus.jackson:jackson-mapper-asl:1.9.12")
 | 
			
		||||
		testCompile("com.fasterxml.jackson.core:jackson-databind:2.3.0")
 | 
			
		||||
		testCompile("org.hibernate:hibernate-core:${hibernate3Version}")
 | 
			
		||||
		testCompile("org.hibernate:hibernate-entitymanager:${hibernate3Version}")
 | 
			
		||||
		testCompile("org.hibernate:hibernate-validator:${hibValVersion}")
 | 
			
		||||
		testCompile("com.thoughtworks.xstream:xstream:${xstreamVersion}")
 | 
			
		||||
		testCompile("org.codehaus.jackson:jackson-mapper-asl:${jackson1Version}")
 | 
			
		||||
		testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 | 
			
		||||
		testCompile("rome:rome:1.0")
 | 
			
		||||
		testCompile("javax.activation:activation:1.1")
 | 
			
		||||
		testCompile("javax.mail:mail:1.4.7")
 | 
			
		||||
		testCompile("org.apache.tiles:tiles-request-api:1.0.1")
 | 
			
		||||
		testCompile("org.apache.tiles:tiles-api:3.0.1")
 | 
			
		||||
		testCompile("org.apache.tiles:tiles-core:3.0.1") {
 | 
			
		||||
| 
						 | 
				
			
			@ -856,21 +856,20 @@ project("spring-aspects") {
 | 
			
		|||
	apply from: "aspects.gradle"
 | 
			
		||||
 | 
			
		||||
	dependencies {
 | 
			
		||||
		optional(project(":spring-beans")) // for @Configurable support
 | 
			
		||||
		optional(project(":spring-aop")) // for @Async support
 | 
			
		||||
		optional(project(":spring-context")) // for @Enable* support
 | 
			
		||||
		compile(project(":spring-context-support")) // for JavaMail support
 | 
			
		||||
		optional(project(":spring-tx")) // for JPA, @Transactional support
 | 
			
		||||
		optional(project(":spring-orm")) // for JPA exception translation support
 | 
			
		||||
		aspects(project(":spring-orm"))
 | 
			
		||||
		provided("org.eclipse.persistence:javax.persistence:2.0.0")
 | 
			
		||||
		testCompile("javax.mail:mail:1.4.7")
 | 
			
		||||
		ajc("org.aspectj:aspectjtools:1.8.0.M1") // needed for ajc on JDK 8 only
 | 
			
		||||
		rt("org.aspectj:aspectjrt:1.8.0.M1") // needed for ajc on JDK 8 only
 | 
			
		||||
		compile("org.aspectj:aspectjweaver:${aspectjVersion}") // exposing regular AspectJ version to users
 | 
			
		||||
		provided("org.eclipse.persistence:javax.persistence:2.0.0")
 | 
			
		||||
		optional(project(":spring-aop")) // for @Async support
 | 
			
		||||
		optional(project(":spring-beans")) // for @Configurable support
 | 
			
		||||
		optional(project(":spring-context")) // for @Enable* support
 | 
			
		||||
		optional(project(":spring-context-support")) // for JavaMail support
 | 
			
		||||
		optional(project(":spring-orm")) // for JPA exception translation support
 | 
			
		||||
		optional(project(":spring-tx")) // for JPA, @Transactional support
 | 
			
		||||
		testCompile(project(":spring-core")) // for CodeStyleAspect
 | 
			
		||||
		compile(project(":spring-beans")) // for "p" namespace visibility
 | 
			
		||||
		testCompile(project(":spring-test"))
 | 
			
		||||
		testCompile("javax.mail:mail:1.4.7")
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	eclipse.project {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue