Skip to content

Commit d979bba

Browse files
committed
Expose AspectJ 1.9.1 in Maven POMs
Includes upgrade to Hibernate ORM 5.2.17 for integration tests. Issue: SPR-16780
1 parent a683472 commit d979bba

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ configure(allprojects) { project ->
4141
group = "org.springframework"
4242
version = qualifyVersionIfNecessary(version)
4343

44-
ext.aspectjVersion = "1.8.13"
44+
ext.aspectjVersion = "1.9.1"
4545
ext.freemarkerVersion = "2.3.28"
4646
ext.groovyVersion = "2.4.15"
4747
ext.hsqldbVersion = "2.4.0"

spring-aspects/spring-aspects.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ compileTestJava {
8080

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

spring-test/spring-test.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dependencies {
6565
testCompile("javax.ejb:javax.ejb-api:3.2")
6666
testCompile("javax.interceptor:javax.interceptor-api:1.2.1")
6767
testCompile("javax.mail:javax.mail-api:1.6.1")
68-
testCompile("org.hibernate:hibernate-core:5.2.16.Final")
68+
testCompile("org.hibernate:hibernate-core:5.2.17.Final")
6969
testCompile("org.hibernate:hibernate-validator:6.0.9.Final")
7070
// Enable use of the JUnit Platform Runner
7171
testCompile("org.junit.platform:junit-platform-runner:${junitPlatformVersion}")

0 commit comments

Comments
 (0)