root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Expose AspectJ 1.9.1 in Maven POMs 

Includes upgrade to Hibernate ORM 5.2.17 for integration tests.

Issue: SPR-16780
This commit is contained in:
Juergen Hoeller 2018-04-27 19:33:50 +02:00
parent a683472daa
commit d979bbad2d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -41,7 +41,7 @@ configure(allprojects) { project ->
group = "org.springframework" group = "org.springframework"
version = qualifyVersionIfNecessary(version) version = qualifyVersionIfNecessary(version)
ext.aspectjVersion = "1.8.13" ext.aspectjVersion = "1.9.1"
ext.freemarkerVersion = "2.3.28" ext.freemarkerVersion = "2.3.28"
ext.groovyVersion = "2.4.15" ext.groovyVersion = "2.4.15"
ext.hsqldbVersion = "2.4.0" ext.hsqldbVersion = "2.4.0"

6
spring-aspects/spring-aspects.gradle
View File

@ -80,9 +80,9 @@ compileTestJava {
dependencies { dependencies {
aspects(project(":spring-orm")) aspects(project(":spring-orm"))
ajc("org.aspectj:aspectjtools:1.9.0") // for JDK 9+ build compatibility ajc("org.aspectj:aspectjtools:${aspectjVersion}")
rt("org.aspectj:aspectjrt:1.9.0") // for JDK 9+ build compatibility rt("org.aspectj:aspectjrt:${aspectjVersion}")
compile("org.aspectj:aspectjweaver:${aspectjVersion}") // for Maven POM exposure compile("org.aspectj:aspectjweaver:${aspectjVersion}")
optional(project(":spring-aop")) // for @Async support optional(project(":spring-aop")) // for @Async support
optional(project(":spring-beans")) // for @Configurable support optional(project(":spring-beans")) // for @Configurable support
optional(project(":spring-context")) // for @Enable* support optional(project(":spring-context")) // for @Enable* support

2
spring-test/spring-test.gradle
View File

@ -65,7 +65,7 @@ dependencies {
testCompile("javax.ejb:javax.ejb-api:3.2") testCompile("javax.ejb:javax.ejb-api:3.2")
testCompile("javax.interceptor:javax.interceptor-api:1.2.1") testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
testCompile("javax.mail:javax.mail-api:1.6.1") testCompile("javax.mail:javax.mail-api:1.6.1")
testCompile("org.hibernate:hibernate-core:5.2.16.Final") testCompile("org.hibernate:hibernate-core:5.2.17.Final")
testCompile("org.hibernate:hibernate-validator:6.0.9.Final") testCompile("org.hibernate:hibernate-validator:6.0.9.Final")
// Enable use of the JUnit Platform Runner // Enable use of the JUnit Platform Runner
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}") testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")