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

Upgrade to AspectJ 1.9 beta 7 (with 1.8.10 exposed in POMs) 

Issue: SPR-15974
This commit is contained in:
Juergen Hoeller 2017-09-25 13:50:50 +02:00
parent 1a3cc3df94
commit ac45aa2022
4 changed files with 9 additions and 7 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"
version = qualifyVersionIfNecessary(version)
ext.aspectjVersion = "1.9.0.BETA-6"
ext.aspectjVersion = "1.8.10"
ext.freemarkerVersion = "2.3.26-incubating"
ext.groovyVersion = "2.4.12"
ext.hsqldbVersion = "2.4.0"

1
spring-aop/spring-aop.gradle
View File

@ -6,4 +6,5 @@ dependencies {
optional("org.aspectj:aspectjweaver:${aspectjVersion}")
optional("org.apache.commons:commons-pool2:2.4.2")
optional("com.jamonapi:jamon:2.81")
testRuntime("org.aspectj:aspectjweaver:1.9.0.BETA-7") // for JDK 9 build compatibility
}

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

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

7
spring-context/spring-context.gradle
View File

@ -5,8 +5,8 @@ apply plugin: "groovy"
dependencies {
compile(project(":spring-aop"))
compile(project(":spring-beans"))
compile(project(":spring-expression"))
compile(project(':spring-core'))
compile(project(":spring-expression"))
optional(project(":spring-instrument"))
optional("javax.annotation:javax.annotation-api:1.3.1")
optional("javax.ejb:javax.ejb-api:3.2")
@ -16,11 +16,11 @@ dependencies {
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}")
optional("org.codehaus.groovy:groovy-all:${groovyVersion}")
optional("org.beanshell:bsh:2.0b5")
optional("joda-time:joda-time:2.9.9")
optional("org.hibernate:hibernate-validator:5.4.1.Final")
optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
optional("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
testCompile("org.apache.commons:commons-pool2:2.4.2")
@ -29,4 +29,5 @@ dependencies {
testRuntime("javax.xml.bind:jaxb-api:2.3.0")
testRuntime("org.glassfish:javax.el:3.0.1-b08")
testRuntime("org.javamoney:moneta:1.1")
testRuntime("org.aspectj:aspectjweaver:1.9.0.BETA-7") // for JDK 9 build compatibility
}