Build against EE 8 API level wherever possible

jhoeller · jhoeller · commit e2882fe1db6f · 2017-09-24T17:18:21.000+02:00
Upgrade to JAXB 2.3, JAX-WS 2.3, Annotations 1.3.1, Interceptor 1.2.1.
Also includes Log4J 2.9.1 and Asciidoctor 1.5.6.
diff --git a/build.gradle b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
 	dependencies {
 		classpath("io.spring.gradle:propdeps-plugin:0.0.8")
 		classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")
-		classpath("org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.14")
-		classpath("org.asciidoctor:asciidoctorj-epub3:1.5.0-alpha.6")
+		classpath("org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16")
+		classpath("org.asciidoctor:asciidoctorj-epub3:1.5.0-alpha.7")
 	}
 }
 
@@ -41,25 +41,18 @@ configure(allprojects) { project ->
 	group = "org.springframework"
 	version = qualifyVersionIfNecessary(version)
 
-	ext.activationVersion    = "1.1.1"
 	ext.aspectjVersion       = "1.9.0.BETA-6"
 	ext.freemarkerVersion    = "2.3.26-incubating"
 	ext.groovyVersion        = "2.4.12"
 	ext.hsqldbVersion        = "2.4.0"
-	ext.httpclientVersion    = "4.5.3"
 	ext.jackson2Version      = "2.9.1"
-	ext.javamailVersion      = "1.6.0"
-	ext.jaxbVersion          = "2.2.11"
-	ext.jaxwsVersion         = "2.2.11"
 	ext.jettyVersion         = "9.4.7.v20170914"
-	ext.jsr305Version        = "3.0.2"
 	ext.junitJupiterVersion  = '5.0.0'
 	ext.junitPlatformVersion = '1.0.0'
 	ext.junitVintageVersion  = "4.12.0"
 	ext.kotlinVersion        = '1.1.4-3'
-	ext.log4jVersion         = '2.9.0'
+	ext.log4jVersion         = '2.9.1'
 	ext.nettyVersion         = "4.1.15.Final"
-	ext.okhttp3Version       = "3.9.0"
 	ext.reactorVersion       = "Bismuth-RC1"
 	ext.rxjavaVersion        = '1.3.2'
 	ext.rxjavaAdapterVersion = '1.2.1'
@@ -151,9 +144,9 @@ configure(allprojects) { project ->
 		testCompile("org.hamcrest:hamcrest-all:1.3")
 		testCompile("org.xmlunit:xmlunit-matchers:2.3.0")
 		testRuntime("org.apache.logging.log4j:log4j-core:${log4jVersion}")
-
-		compileOnly("com.google.code.findbugs:jsr305:${jsr305Version}")
-		testCompileOnly("com.google.code.findbugs:jsr305:${jsr305Version}")
+        // JSR-305 only used for non-required meta-annotations
+		compileOnly("com.google.code.findbugs:jsr305:3.0.2")
+		testCompileOnly("com.google.code.findbugs:jsr305:3.0.2")
 	}
 
 	ext.javadocLinks = [
diff --git a/spring-aspects/spring-aspects.gradle b/spring-aspects/spring-aspects.gradle
@@ -100,7 +100,7 @@ dependencies {
 	optional("javax.transaction:javax.transaction-api:1.2")  // for @javax.transaction.Transactional support
 	testCompile(project(":spring-core"))  // for CodeStyleAspect
 	testCompile(project(":spring-test"))
-	testCompile("javax.mail:javax.mail-api:${javamailVersion}")
+	testCompile("javax.mail:javax.mail-api:1.6.0")
 }
 
 eclipse.project {
diff --git a/spring-context-indexer/spring-context-indexer.gradle b/spring-context-indexer/spring-context-indexer.gradle
@@ -3,6 +3,6 @@ description = "Spring Context Indexer"
 dependencies {
 	testCompile(project(":spring-context"))
 	testCompile("javax.inject:javax.inject:1")
-	testCompile("javax.annotation:javax.annotation-api:1.3")
+	testCompile("javax.annotation:javax.annotation-api:1.3.1")
 	testCompile("org.eclipse.persistence:javax.persistence:2.1.1")
 }
diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle
@@ -6,8 +6,8 @@ dependencies {
 	compile(project(":spring-core"))
 	optional(project(":spring-jdbc"))  // for Quartz support
 	optional(project(":spring-tx"))  // for Quartz support
-	optional("javax.activation:activation:${activationVersion}")
-	optional("javax.mail:javax.mail-api:${javamailVersion}")
+	optional("javax.activation:activation:1.1.1")
+	optional("javax.mail:javax.mail-api:1.6.0")
 	optional("javax.cache:cache-api:1.0.0")
 	optional("com.github.ben-manes.caffeine:caffeine:2.5.6")
 	optional("net.sf.ehcache:ehcache:2.10.4")
@@ -21,6 +21,6 @@ dependencies {
 	testRuntime("org.ehcache:jcache:1.0.1")
 	testRuntime("org.ehcache:ehcache:3.4.0")
 	testRuntime("org.glassfish:javax.el:3.0.1-b08")
-	testRuntime("javax.annotation:javax.annotation-api:1.3")
-	testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
+	testRuntime("javax.annotation:javax.annotation-api:1.3.1")
+	testRuntime("com.sun.mail:javax.mail:1.6.0")
 }
diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle
@@ -8,14 +8,14 @@ dependencies {
 	compile(project(":spring-expression"))
 	compile(project(':spring-core'))
 	optional(project(":spring-instrument"))
-	optional("javax.inject:javax.inject:1")
-	optional("javax.annotation:javax.annotation-api:1.3")
-	optional("javax.xml.ws:jaxws-api:${jaxwsVersion}")
+	optional("javax.annotation:javax.annotation-api:1.3.1")
 	optional("javax.ejb:javax.ejb-api:3.2")
-	optional("javax.interceptor:javax.interceptor-api:1.2")
 	optional("javax.enterprise.concurrent:javax.enterprise.concurrent-api:1.0")
+	optional("javax.inject:javax.inject:1")
+	optional("javax.interceptor:javax.interceptor-api:1.2.1")
 	optional("javax.money:money-api:1.0.1")
 	optional("javax.validation:validation-api:1.1.0.Final")
+	optional("javax.xml.ws:jaxws-api:2.3.0")
 	optional("org.hibernate:hibernate-validator:5.4.1.Final")
 	optional("joda-time:joda-time:2.9.9")
 	optional("org.aspectj:aspectjweaver:${aspectjVersion}")
@@ -26,7 +26,7 @@ dependencies {
 	testCompile("org.apache.commons:commons-pool2:2.4.2")
 	testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
 	testCompile("javax.inject:javax.inject-tck:1")
-	testRuntime("javax.xml.bind:jaxb-api:${jaxbVersion}")
+	testRuntime("javax.xml.bind:jaxb-api:2.3.0")
 	testRuntime("org.glassfish:javax.el:3.0.1-b08")
 	testRuntime("org.javamoney:moneta:1.1")
 }
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
@@ -86,7 +86,7 @@ dependencies {
 	optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
 	optional("io.netty:netty-buffer")
 	testCompile("io.projectreactor:reactor-test")
-	testCompile("javax.xml.bind:jaxb-api:${jaxbVersion}")
+	testCompile("javax.xml.bind:jaxb-api:2.3.0")
 	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
 	testCompile("com.fasterxml.woodstox:woodstox-core:5.0.3") {
 		exclude group: "stax", module: "stax-api"
diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle
@@ -24,7 +24,7 @@ dependencies {
 	}
 	optional("org.eclipse.jetty.websocket:websocket-client:${jettyVersion}")
 	optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
-	optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
+	optional("javax.xml.bind:jaxb-api:2.3.0")
 	testCompile("javax.inject:javax.inject-tck:1")
 	testCompile("javax.servlet:javax.servlet-api:3.1.0")
 	testCompile("javax.validation:validation-api:1.1.0.Final")
@@ -41,7 +41,7 @@ dependencies {
 	testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
 	testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
-	testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
-	testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
-	testRuntime("javax.activation:activation:${activationVersion}")
+	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
+	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
+	testRuntime("javax.activation:activation:1.1.1")
 }
diff --git a/spring-orm/spring-orm.gradle b/spring-orm/spring-orm.gradle
@@ -13,5 +13,5 @@ dependencies {
 	optional("javax.servlet:javax.servlet-api:3.1.0")
 	testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")
 	testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
-	testRuntime("javax.xml.bind:jaxb-api:${jaxbVersion}")
+	testRuntime("javax.xml.bind:jaxb-api:2.3.0")
 }
diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle
@@ -10,11 +10,11 @@ dependencies {
 	castor "org.codehaus.castor:castor-anttasks:1.4.1"
 	jibx "org.jibx:jibx-bind:1.3.1"
 	jibx "org.apache.bcel:bcel:6.0"
-	xjc 'com.sun.xml.bind:jaxb-xjc:2.2.11'
-	xjc 'javax.xml.bind:jaxb-api:2.2.11'
-	xjc 'com.sun.xml.bind:jaxb-core:2.2.11'
-	xjc 'com.sun.xml.bind:jaxb-impl:2.2.11'
 	xjc 'javax.activation:activation:1.1.1'
+	xjc 'javax.xml.bind:jaxb-api:2.3.0'
+	xjc 'com.sun.xml.bind:jaxb-core:2.3.0'
+	xjc 'com.sun.xml.bind:jaxb-impl:2.3.0'
+	xjc 'com.sun.xml.bind:jaxb-xjc:2.3.0'
 }
 
 ext.genSourcesDir = "${buildDir}/generated-sources"
@@ -98,8 +98,8 @@ task genJaxb {
 dependencies {
 	compile(project(":spring-beans"))
 	compile(project(":spring-core"))
-	optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
-	optional("javax.activation:activation:${activationVersion}")
+	optional("javax.xml.bind:jaxb-api:2.3.0")
+	optional("javax.activation:activation:1.1.1")
 	optional("org.codehaus.castor:castor-xml:1.4.1")  {
 		exclude group: 'stax', module: 'stax-api'
 		exclude group: "org.springframework", module: "spring-context"
@@ -118,8 +118,8 @@ dependencies {
 	testCompile(files(genCastor.classesDir).builtBy(genCastor))
 	testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
 	testRuntime("xerces:xercesImpl:2.11.0")  // for Castor
-	testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
-	testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
+	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
+	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
 }
 
 // JiBX compiler is currently not compatible with JDK 9
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
@@ -25,23 +25,23 @@ dependencies {
 	optional(project(":spring-webflux"))
 	optional(project(":spring-webmvc"))
 	optional(project(":spring-websocket"))
-	optional("junit:junit:4.12")
-	optional("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
-	optional("org.testng:testng:6.12")
+	optional("javax.activation:activation:1.1.1")
+	optional("javax.el:javax.el-api:3.0.1-b04")
 	optional("javax.inject:javax.inject:1")
 	optional("javax.servlet:javax.servlet-api:4.0.0")
 	optional("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02")
 	optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
-	optional("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
-		exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
-	}
-	optional("javax.el:javax.el-api:3.0.1-b04")
+	optional("javax.xml.bind:jaxb-api:2.3.0")
 	optional("javax.websocket:javax.websocket-api:1.1")
-	optional("javax.activation:activation:${activationVersion}")
-	optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
+	optional("junit:junit:4.12")
+	optional("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
+	optional("org.testng:testng:6.12")
 	optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 	optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
 	optional("org.hamcrest:hamcrest-core:1.3")
+	optional("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
+		exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
+	}
 	optional("net.sourceforge.htmlunit:htmlunit:2.27") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
@@ -60,10 +60,10 @@ dependencies {
 	optional("io.projectreactor:reactor-test")
 	testCompile(project(":spring-context-support"))
 	testCompile(project(":spring-oxm"))
-	testCompile("javax.mail:javax.mail-api:${javamailVersion}")
-	testCompile("javax.ejb:javax.ejb-api:3.2")
-	testCompile("javax.interceptor:javax.interceptor-api:1.2")
 	testCompile("javax.cache:cache-api:1.0.0")
+	testCompile("javax.ejb:javax.ejb-api:3.2")
+	testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
+	testCompile("javax.mail:javax.mail-api:1.6.0")
 	testCompile("org.hibernate:hibernate-core:5.2.11.Final")
 	testCompile("org.hibernate:hibernate-validator:6.0.2.Final")
 	// Enable use of the JUnitPlatform Runner
@@ -80,7 +80,7 @@ dependencies {
 		exclude group: "org.slf4j", module: "jcl-over-slf4j"
 	}
 	testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
-	testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}") {
+	testCompile("org.apache.httpcomponents:httpclient:4.5.3") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
 	testCompile('io.projectreactor.ipc:reactor-netty')
@@ -91,10 +91,10 @@ dependencies {
 	testRuntime("org.junit.vintage:junit-vintage-engine:${junitVintageVersion}")
 	testCompile('de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1')
 	testRuntime("org.apache.logging.log4j:log4j-jul:${log4jVersion}")  // Java Util Logging for JUnit 5
-	testRuntime("javax.annotation:javax.annotation-api:1.3")
+	testRuntime("javax.annotation:javax.annotation-api:1.3.1")
 	testRuntime("org.glassfish:javax.el:3.0.1-b08")
-	testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
-	testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
+	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
+	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
 }
 
 task testNG(type: Test) {
diff --git a/spring-tx/spring-tx.gradle b/spring-tx/spring-tx.gradle
@@ -6,7 +6,7 @@ dependencies {
 	optional(project(":spring-aop"))
 	optional(project(":spring-context"))  // for JCA, @EnableTransactionManagement
 	optional("javax.ejb:javax.ejb-api:3.2")
-	optional("javax.interceptor:javax.interceptor-api:1.2")
+	optional("javax.interceptor:javax.interceptor-api:1.2.1")
 	optional("javax.resource:javax.resource-api:1.7")
 	optional("javax.transaction:javax.transaction-api:1.2")
 	optional("com.ibm.websphere:uow:6.0.2.17")
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
@@ -25,10 +25,10 @@ dependencies {
 	optional("javax.el:javax.el-api:3.0.1-b04")
 	optional("javax.faces:javax.faces-api:2.2")
 	optional("javax.json.bind:javax.json.bind-api:1.0")
-	optional("javax.mail:javax.mail-api:${javamailVersion}")
+	optional("javax.mail:javax.mail-api:1.6.0")
 	optional("javax.validation:validation-api:1.1.0.Final")
-	optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
-	optional("javax.xml.ws:jaxws-api:${jaxwsVersion}")
+	optional("javax.xml.bind:jaxb-api:2.3.0")
+	optional("javax.xml.ws:jaxws-api:2.3.0")
 	optional("io.reactivex:rxjava:${rxjavaVersion}")
 	optional("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")
 	optional("io.reactivex.rxjava2:rxjava:${rxjava2Version}")
@@ -42,8 +42,8 @@ dependencies {
 		exclude group: "javax.servlet", module: "javax.servlet-api"
 	}
 	optional("io.undertow:undertow-core:${undertowVersion}")
-	optional("com.squareup.okhttp3:okhttp:${okhttp3Version}")
-	optional("org.apache.httpcomponents:httpclient:${httpclientVersion}") {
+	optional("com.squareup.okhttp3:okhttp:3.9.0")
+	optional("org.apache.httpcomponents:httpclient:4.5.3") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
 	optional("org.apache.httpcomponents:httpasyncclient:4.1.3") {
@@ -68,7 +68,7 @@ dependencies {
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
 	testCompile("io.projectreactor:reactor-test")
-	testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.1") {
+	testCompile("org.apache.taglibs:taglibs-standard-jstlel:1.2.5") {
 		exclude group: "org.apache.taglibs", module: "taglibs-standard-spec"
 	}
 	testCompile("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${jackson2Version}")
@@ -81,12 +81,12 @@ dependencies {
 	testCompile("io.reactivex:rxnetty-http:0.5.2") {
 		exclude group: 'io.reactivex', module: 'rxjava'
 	}
-	testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
+	testCompile("com.squareup.okhttp3:mockwebserver:3.9.0")
 	testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	testCompile("org.skyscreamer:jsonassert:1.5.0")
-	testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
-	testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
-	testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
+	testRuntime("com.sun.mail:javax.mail:1.6.0")
+	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
+	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
 	testRuntime("javax.json:javax.json-api:1.1")
 	testRuntime("org.apache.johnzon:johnzon-jsonb:1.1.3")
 }
diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle
@@ -39,12 +39,12 @@ dependencies {
 	optional("io.undertow:undertow-websockets-jsr:${undertowVersion}") {
 		exclude group: "org.jboss.spec.javax.websocket", module: "jboss-websocket-api_1.1_spec"
 	}
-	optional("org.apache.httpcomponents:httpclient:${httpclientVersion}") {
+	optional("org.apache.httpcomponents:httpclient:4.5.3") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
-	testCompile("javax.xml.bind:jaxb-api:${jaxbVersion}")
+	testCompile("javax.xml.bind:jaxb-api:2.3.0")
 	testCompile("org.hibernate:hibernate-validator:6.0.2.Final")
 	testCompile "io.reactivex.rxjava2:rxjava:${rxjava2Version}"
 	testCompile("io.projectreactor:reactor-test")
@@ -57,7 +57,7 @@ dependencies {
 	testCompile("org.eclipse.jetty:jetty-servlet:${jettyVersion}")
 	testCompile("io.undertow:undertow-core:${undertowVersion}")
 	testCompile("com.fasterxml:aalto-xml:1.0.0")
-	testCompile("com.squareup.okhttp3:mockwebserver:${okhttp3Version}")
+	testCompile("com.squareup.okhttp3:mockwebserver:3.9.0")
 	testCompile("org.jetbrains.kotlin:kotlin-script-runtime:${kotlinVersion}")
 	testRuntime("org.jetbrains.kotlin:kotlin-script-util:${kotlinVersion}")
 	testRuntime("org.jetbrains.kotlin:kotlin-compiler:${kotlinVersion}")
@@ -66,7 +66,7 @@ dependencies {
 	testRuntime("org.synchronoss.cloud:nio-multipart-parser:1.1.0")
 	testRuntime("org.webjars:underscorejs:1.8.3")
 	testRuntime("org.glassfish:javax.el:3.0.1-b08")
-	testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
-	testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
-	testRuntime("javax.activation:activation:${activationVersion}")
+	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
+	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
+	testRuntime("javax.activation:activation:1.1.1")
 }
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
@@ -25,7 +25,7 @@ dependencies {
 	optional("javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02")
 	optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
 	optional("javax.el:javax.el-api:3.0.1-b04")
-	optional("javax.xml.bind:jaxb-api:${jaxbVersion}")
+	optional("javax.xml.bind:jaxb-api:2.3.0")
 	optional('org.webjars:webjars-locator:0.32-1')
 	optional("com.rometools:rome:1.8.0")
 	optional("com.lowagie:itext:2.1.7")
@@ -64,7 +64,7 @@ dependencies {
 		exclude group: "javax.servlet", module: "javax.servlet"
 	}
 	testCompile("org.hibernate:hibernate-validator:6.0.2.Final")
-	testCompile("org.apache.httpcomponents:httpclient:${httpclientVersion}") {
+	testCompile("org.apache.httpcomponents:httpclient:4.5.3") {
 		exclude group: "commons-logging", module: "commons-logging"
 	}
 	testCompile("commons-fileupload:commons-fileupload:1.3.3")
@@ -90,7 +90,7 @@ dependencies {
 	testRuntime("org.python:jython-standalone:2.7.1")
 	testRuntime("org.webjars:underscorejs:1.8.3")
 	testRuntime("org.glassfish:javax.el:3.0.1-b08")
-	testRuntime("com.sun.xml.bind:jaxb-core:${jaxbVersion}")
-	testRuntime("com.sun.xml.bind:jaxb-impl:${jaxbVersion}")
-	testRuntime("javax.activation:activation:${activationVersion}")
+	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0")
+	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0")
+	testRuntime("javax.activation:activation:1.1.1")
 }

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ dependencies {`
`100`	`100`	`optional("javax.transaction:javax.transaction-api:1.2") // for @javax.transaction.Transactional support`
`101`	`101`	`testCompile(project(":spring-core")) // for CodeStyleAspect`
`102`	`102`	`testCompile(project(":spring-test"))`
`103`		`- testCompile("javax.mail:javax.mail-api:${javamailVersion}")`
	`103`	`+ testCompile("javax.mail:javax.mail-api:1.6.0")`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`eclipse.project {`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ description = "Spring Context Indexer"`
`3`	`3`	`dependencies {`
`4`	`4`	`testCompile(project(":spring-context"))`
`5`	`5`	`testCompile("javax.inject:javax.inject:1")`
`6`		`- testCompile("javax.annotation:javax.annotation-api:1.3")`
	`6`	`+ testCompile("javax.annotation:javax.annotation-api:1.3.1")`
`7`	`7`	`testCompile("org.eclipse.persistence:javax.persistence:2.1.1")`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ dependencies {`
`13`	`13`	`optional("javax.servlet:javax.servlet-api:3.1.0")`
`14`	`14`	`testCompile("org.aspectj:aspectjweaver:${aspectjVersion}")`
`15`	`15`	`testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")`
`16`		`- testRuntime("javax.xml.bind:jaxb-api:${jaxbVersion}")`
	`16`	`+ testRuntime("javax.xml.bind:jaxb-api:2.3.0")`
`17`	`17`	`}`