Build update for pruned modules

build.gradle

@@ -33,7 +33,7 @@ configure(allprojects) { project ->
 
 	ext.aspectjVersion       = "1.8.9"
 	ext.caffeineVersion      = "2.3.1"
-	ext.eclipselinkVersion   = "2.4.2"
+	ext.eclipselinkVersion   = "2.6.3"
 	ext.ehcacheVersion       = "2.10.2"
 	ext.ehcachejcacheVersion = "1.0.1"
 	ext.ehcache3Version      = "3.1.0"
@@ -44,10 +44,7 @@ configure(allprojects) { project ->
 	ext.gsonVersion          = "2.7"
 	ext.guavaVersion         = "19.0"
 	ext.hamcrestVersion      = "1.3"
-	ext.hibernate3Version    = "3.6.10.Final"
-	ext.hibernate4Version    = "4.3.11.Final"
 	ext.hibernate5Version    = "5.2.1.Final"
-	ext.hibval4Version       = "4.3.2.Final"
 	ext.hibval5Version       = "5.2.4.Final"
 	ext.hsqldbVersion        = "2.3.4"
 	ext.httpasyncVersion     = "4.1.2"
@@ -66,7 +63,6 @@ configure(allprojects) { project ->
 	ext.nettyVersion         = "4.1.1.Final"
 	ext.okhttpVersion        = "2.7.5"
 	ext.okhttp3Version       = "3.3.1"
-	ext.openjpaVersion       = "2.4.1"
 	ext.poiVersion           = "3.14"
 	ext.reactorVersion       = "2.0.8.RELEASE"
 	ext.romeVersion          = "1.6.0"
@@ -74,10 +70,9 @@ configure(allprojects) { project ->
 	ext.snakeyamlVersion     = "1.17"
 	ext.snifferVersion       = "1.15"
 	ext.testngVersion        = "6.9.10"
-	ext.tiles2Version        = "2.2.2"
 	ext.tiles3Version        = "3.0.5"
 	ext.tomcatVersion        = "8.5.3"
-	ext.tyrusVersion         = "1.3.5"  // constrained by WebLogic 12.1.3 support
+	ext.tyrusVersion         = "1.13"
 	ext.undertowVersion      = "1.4.0.CR2"
 	ext.xmlunitVersion       = "1.6"
 	ext.xstreamVersion       = "1.4.9"
@@ -197,7 +192,6 @@ configure(allprojects) { project ->
 		"http://commons.apache.org/proper/commons-lang/javadocs/api-2.5/",
 		"http://commons.apache.org/proper/commons-codec/apidocs/",
 		"http://commons.apache.org/proper/commons-dbcp/apidocs/",
-		"http://portals.apache.org/pluto/portlet-2.0-apidocs/",
 		"http://tiles.apache.org/tiles-request/apidocs/",
 		"http://tiles.apache.org/framework/apidocs/",
 		"http://www.eclipse.org/aspectj/doc/released/aspectj5rt-api/",
@@ -413,8 +407,8 @@ project("spring-beans-groovy") {
 	}
 
 	compileGroovy {
-		sourceCompatibility = 1.6
-		targetCompatibility = 1.6
+		sourceCompatibility = 1.8
+		targetCompatibility = 1.8
 	}
 }
 
@@ -455,18 +449,6 @@ project("spring-instrument") {
 	}
 }
 
-project("spring-instrument-tomcat") {
-	description = "Spring Instrument Tomcat"
-
-	dependencies {
-		provided("org.apache.tomcat:catalina:6.0.16")
-	}
-
-	jar {
-		exclude("org/apache/**")  // exclude the mock used to bridge between pre-7.0.63 and 7.0.63+
-	}
-}
-
 project("spring-context") {
 	description = "Spring Context"
 	apply plugin: "groovy"
@@ -482,15 +464,17 @@ project("spring-context") {
 		optional("javax.ejb:ejb-api:${ejbVersion}")
 		optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0")
 		optional("javax.money:money-api:1.0")
-		optional("org.eclipse.persistence:javax.persistence:2.0.0")
-		optional("javax.validation:validation-api:1.0.0.GA")
-		optional("org.hibernate:hibernate-validator:${hibval4Version}")
+		optional("org.eclipse.persistence:javax.persistence:2.1.1")
+		optional("javax.validation:validation-api:1.1.0.Final")
+		optional("org.hibernate:hibernate-validator:${hibval5Version}")
 		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:${jrubyVersion}")
 		testCompile("javax.inject:javax.inject-tck:1")
+		testCompile("javax.el:javax.el-api:2.2.5")
+		testCompile("org.glassfish.web:javax.el:2.2.6")
 		testCompile("org.javamoney:moneta:1.1")
 		testCompile("commons-dbcp:commons-dbcp:1.4")
 		testCompile("org.apache.commons:commons-pool2:2.4.2")
@@ -518,7 +502,7 @@ project("spring-messaging") {
 		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 		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("javax.validation:validation-api:1.1.0.Final")
 		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") {
@@ -551,7 +535,7 @@ project("spring-tx") {
 		optional("javax.ejb:ejb-api:${ejbVersion}")
 		optional("com.ibm.websphere:uow:6.0.2.17")
 		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
-		testCompile("org.eclipse.persistence:javax.persistence:2.0.0")
+		testCompile("org.eclipse.persistence:javax.persistence:2.1.1")
 		testCompile("org.codehaus.groovy:groovy-all:${groovyVersion}")
 	}
 }
@@ -563,8 +547,8 @@ project("spring-oxm") {
 	compileTestJava {
 		// necessary to avoid java.lang.VerifyError on jibx compilation
 		// see http://jira.codehaus.org/browse/JIBX-465
-		sourceCompatibility = 1.6
-		targetCompatibility = 1.6
+		sourceCompatibility = 1.8
+		targetCompatibility = 1.8
 	}
 
 	dependencies {
@@ -574,9 +558,6 @@ project("spring-oxm") {
 			exclude group: 'stax', module: 'stax-api'
 			exclude group: "org.springframework", module: "spring-context"
 		}
-		optional("org.apache.xmlbeans:xmlbeans:2.6.0") {
-			exclude group: 'stax', module: 'stax-api'
-		}
 		optional("com.thoughtworks.xstream:xstream:${xstreamVersion}") {
 			exclude group: 'xpp3', module: 'xpp3_min'
 			exclude group: 'xmlpull', module: 'xmlpull'
@@ -591,7 +572,6 @@ project("spring-oxm") {
 		if (compileTestJava.enabled) {
 			testCompile(files(genCastor.classesDir).builtBy(genCastor))
 			testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
-			testCompile(files(genXmlbeans.classesDir).builtBy(genXmlbeans))
 		}
 	}
 }
@@ -647,7 +627,6 @@ project("spring-context-support") {
 		optional("net.sf.ehcache:ehcache:${ehcacheVersion}")
 		optional("org.quartz-scheduler:quartz:2.2.3")
 		optional("org.codehaus.fabric3.api:commonj:1.1.0")
-		optional("org.apache.velocity:velocity:1.7")
 		optional("org.freemarker:freemarker:${freemarkerVersion}")
 		optional("com.lowagie:itext:2.1.7")
 		optional("net.sf.jasperreports:jasperreports:$jasperreportsVersion") {
@@ -660,8 +639,6 @@ project("spring-context-support") {
 		}
 		testCompile(project(":spring-context"))
 		testCompile("org.apache.poi:poi:${poiVersion}")
-		testCompile("commons-beanutils:commons-beanutils:1.8.0")  // for Velocity/JasperReports
-		testCompile("commons-digester:commons-digester:1.8.1")  // for Velocity/JasperReports
 		testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
 		testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
 		testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
@@ -696,10 +673,9 @@ project("spring-web") {
 		provided("javax.servlet:javax.servlet-api:3.0.1")
 		optional(project(":spring-oxm"))  // for MarshallingHttpMessageConverter
 		optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
-		optional("javax.portlet:portlet-api:2.0")
 		optional("javax.el:javax.el-api:2.2.5")
 		optional("javax.faces:javax.faces-api:2.2")
-		optional("javax.validation:validation-api:1.0.0.GA")
+		optional("javax.validation:validation-api:1.1.0.Final")
 		optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 		optional("com.caucho:hessian:4.0.38")
 		optional("commons-fileupload:commons-fileupload:${fileuploadVersion}")
@@ -746,27 +722,12 @@ project("spring-orm") {
 		optional(project(":spring-aop"))
 		optional(project(":spring-context"))
 		optional(project(":spring-web"))
-		optional("org.eclipse.persistence:javax.persistence:2.0.5")
+		optional("org.eclipse.persistence:javax.persistence:2.1.1")
 		optional("org.eclipse.persistence:org.eclipse.persistence.core:${eclipselinkVersion}")
 		optional("org.eclipse.persistence:org.eclipse.persistence.jpa:${eclipselinkVersion}") {
 			exclude group: 'org.eclipse.persistence', module: 'javax.persistence'
 		}
-		optional("org.hibernate:hibernate-core:${hibernate3Version}") {
-			exclude group: 'org.hibernate.javax.persistence', module: 'hibernate-jpa-2.0-api'
-			exclude group: 'javax.transaction', module: 'jta'
-		}
-		optional("org.hibernate:hibernate-entitymanager:${hibernate3Version}") {
-			exclude group: 'org.hibernate.javax.persistence', module: 'hibernate-jpa-2.0-api'
-		}
-		optional("org.apache.openjpa:openjpa:${openjpaVersion}") {
-			exclude group: 'junit', module: 'junit'
-			exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jpa_2.0_spec'
-			exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jta_1.1_spec'
-			exclude group: 'org.apache.geronimo.specs', module: 'geronimo-jms_1.1_spec'
-		}
-		optional("javax.jdo:jdo-api:3.1") {
-			exclude group: 'javax.transaction', module: 'transaction-api'
-		}
+		optional("org.hibernate:hibernate-core:${hibernate5Version}")
 		optional("javax.servlet:javax.servlet-api:3.0.1")
 		testCompile("commons-dbcp:commons-dbcp:1.4")
 		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
@@ -775,38 +736,6 @@ project("spring-orm") {
 	}
 }
 
-project("spring-orm-hibernate4") {
-	description = "Spring Object/Relational Mapping - Hibernate 4 support"
-	merge.into = project(":spring-orm")
-
-	dependencies {
-		provided(project(":spring-jdbc"))
-		provided(project(":spring-tx"))
-		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")
-		testCompile("javax.validation:validation-api:1.1.0.GA")
-		testCompile("org.hibernate:hibernate-validator:${hibval5Version}")
-		testCompile("javax.el:javax.el-api:2.2.5")
-		testCompile("org.glassfish.web:javax.el:2.2.6")
-	}
-}
-
-project("spring-orm-hibernate5") {
-	description = "Spring Object/Relational Mapping - Hibernate 5 support"
-	merge.into = project(":spring-orm")
-
-	dependencies {
-		provided(project(":spring-jdbc"))
-		provided(project(":spring-tx"))
-		optional(project(":spring-web"))
-		optional("org.hibernate:hibernate-core:${hibernate5Version}")
-		optional("javax.servlet:javax.servlet-api:3.0.1")
-		optional("javax.transaction:javax.transaction-api:${jtaVersion}")
-	}
-}
-
 project("spring-webmvc") {
 	description = "Spring Web MVC"
 
@@ -819,15 +748,13 @@ project("spring-webmvc") {
 		compile(project(":spring-expression"))
 		compile(project(":spring-web"))
 		provided("javax.servlet:javax.servlet-api:3.1.0")
-		optional(project(":spring-context-support"))  // for Velocity support
+		optional(project(":spring-context-support"))  // for FreeMarker support
 		optional(project(":spring-oxm"))  // for MarshallingView
 		optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
 		optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
 		optional("net.sourceforge.jexcelapi:jxl:2.6.12")
 		optional("org.apache.poi:poi:${poiVersion}")
 		optional("org.apache.poi:poi-ooxml:${poiVersion}")
-		optional("org.apache.velocity:velocity:1.7")
-		optional("velocity-tools:velocity-tools-view:1.4")
 		optional("org.freemarker:freemarker:${freemarkerVersion}")
 		optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 		optional("com.lowagie:itext:2.1.7")
@@ -876,8 +803,8 @@ project("spring-webmvc") {
 		testCompile("org.eclipse.jetty:jetty-server:${jettyVersion}") {
 			exclude group: "javax.servlet", module: "javax.servlet"
 		}
-		testCompile("javax.validation:validation-api:1.0.0.GA")
-		testCompile("org.hibernate:hibernate-validator:${hibval4Version}")
+		testCompile("javax.validation:validation-api:1.1.0.Final")
+		testCompile("org.hibernate:hibernate-validator:${hibval5Version}")
 		testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}")
 		testCompile("commons-fileupload:commons-fileupload:${fileuploadVersion}")
 		testCompile("commons-io:commons-io:1.3")
@@ -890,53 +817,6 @@ project("spring-webmvc") {
 	}
 }
 
-project("spring-webmvc-tiles2") {
-	description = "Spring Framework Tiles2 Integration"
-	merge.into = project(":spring-webmvc")
-
-	dependencies {
-		provided(project(":spring-context"))
-		provided(project(":spring-web"))
-		provided("javax.servlet:javax.servlet-api:3.0.1")
-		optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
-		optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
-		optional("org.apache.tiles:tiles-api:${tiles2Version}")
-		optional("org.apache.tiles:tiles-core:${tiles2Version}") {
-			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-		}
-		optional("org.apache.tiles:tiles-servlet:${tiles2Version}") {
-			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-		}
-		optional("org.apache.tiles:tiles-jsp:${tiles2Version}") {
-			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-		}
-		optional("org.apache.tiles:tiles-el:${tiles2Version}") {
-			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-		}
-		optional("org.apache.tiles:tiles-extras:${tiles2Version}") {
-			exclude group: "org.slf4j", module: "jcl-over-slf4j"
-			exclude group: "org.apache.velocity", module: "velocity-tools"
-			exclude group: "org.springframework", module: "spring-web"
-		}
-		testCompile("org.slf4j:slf4j-jcl:${slf4jVersion}")
-	}
-}
-
-project("spring-webmvc-portlet") {
-	description = "Spring Web Portlet"
-
-	dependencies {
-		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:${fileuploadVersion}")
-	}
-}
-
 project("spring-websocket") {
 	description = "Spring WebSocket"
 
@@ -994,7 +874,6 @@ project("spring-test") {
 		optional(project(":spring-orm"))
 		optional(project(":spring-web"))
 		optional(project(":spring-webmvc"))
-		optional(project(":spring-webmvc-portlet"))
 		optional(project(":spring-websocket"))
 		optional("junit:junit:${junitVersion}")
 		optional("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
@@ -1006,7 +885,6 @@ project("spring-test") {
 		optional("org.apache.taglibs:taglibs-standard-jstlel:1.2.1") {
 			exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
 		}
-		optional("javax.portlet:portlet-api:2.0")
 		optional("javax.el:javax.el-api:2.2.5")
 		optional("javax.websocket:javax.websocket-api:1.0")
 		optional("org.aspectj:aspectjweaver:${aspectjVersion}")
@@ -1022,8 +900,7 @@ project("spring-test") {
 		testCompile(project(":spring-oxm"))
 		testCompile("javax.mail:javax.mail-api:${javamailVersion}")
 		testCompile("javax.ejb:ejb-api:${ejbVersion}")
-		testCompile("org.hibernate:hibernate-core:${hibernate4Version}")
-		testCompile("org.hibernate:hibernate-entitymanager:${hibernate4Version}")
+		testCompile("org.hibernate:hibernate-core:${hibernate5Version}")
 		testCompile("org.hibernate:hibernate-validator:${hibval5Version}")
 		// Enable use of the JUnitPlatform Runner
 		testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")
@@ -1085,7 +962,7 @@ project("spring-aspects") {
 		ajc("org.aspectj:aspectjtools:${aspectjVersion}")
 		rt("org.aspectj:aspectjrt:${aspectjVersion}")
 		compile("org.aspectj:aspectjweaver:${aspectjVersion}")
-		provided("org.eclipse.persistence:javax.persistence:2.0.0")
+		provided("org.eclipse.persistence:javax.persistence:2.1.1")
 		optional(project(":spring-aop"))  // for @Async support
 		optional(project(":spring-beans"))  // for @Configurable support
 		optional(project(":spring-context"))  // for @Enable* support
@@ -1192,7 +1069,7 @@ configure(rootProject) {
 	// don't publish the default jar for the root project
 	configurations.archives.artifacts.clear()
 
-	dependencies { // for integration tests
+	dependencies {  // for integration tests
 		testCompile(project(":spring-aop"))
 		testCompile(project(":spring-beans"))
 		testCompile(project(":spring-context"))
@@ -1203,13 +1080,11 @@ configure(rootProject) {
 		testCompile(project(":spring-test"))
 		testCompile(project(":spring-tx"))
 		testCompile(project(":spring-web"))
-		testCompile(project(":spring-webmvc-portlet"))
 		testCompile("javax.servlet:javax.servlet-api:3.0.1")
-		testCompile("javax.portlet:portlet-api:2.0")
 		testCompile("javax.inject:javax.inject:1")
 		testCompile("javax.resource:connector-api:1.5")
 		testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
-		testCompile("org.hibernate:hibernate-core:${hibernate4Version}")
+		testCompile("org.hibernate:hibernate-core:${hibernate5Version}")
 		testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
 	}
 
@@ -1238,18 +1113,6 @@ configure(rootProject) {
 
 		maxMemory = "1024m"
 		destinationDir = new File(buildDir, "api")
-
-		doFirst {
-			classpath = files(
-				// ensure Servlet 3.x and Hibernate 4.x have precedence on the javadoc
-				// classpath over their respective 2.5 and 3.x variants
-				project(":spring-webmvc").sourceSets.main.compileClasspath.files.find { it =~ "servlet-api" },
-				rootProject.sourceSets.test.compileClasspath.files.find { it =~ "hibernate-core" },
-				// ensure the javadoc process can resolve types compiled from .aj sources
-				project(":spring-aspects").sourceSets.main.output
-			)
-			classpath += files(subprojects.collect { it.sourceSets.main.compileClasspath })
-		}
 	}
 
 	task docsZip(type: Zip, dependsOn: 'reference') {

settings.gradle

@@ -9,20 +9,15 @@ include "spring-context-support"
 include "spring-core"
 include "spring-expression"
 include "spring-instrument"
-include "spring-instrument-tomcat"
 include "spring-jdbc"
 include "spring-jms"
 include "spring-messaging"
 include "spring-orm"
-include "spring-orm-hibernate4"
-include "spring-orm-hibernate5"
 include "spring-oxm"
 include "spring-test"
 include "spring-tx"
 include "spring-web"
 include "spring-webmvc"
-include "spring-webmvc-portlet"
-include "spring-webmvc-tiles2"
 include "spring-websocket"
 include "spring-framework-bom"