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.8 

This commit also upgades the dedicated Gradle plugin for AspectJ build
integration.

Closes gh-27416
This commit is contained in:
Brian Clozel 2022-02-11 11:13:52 +01:00
parent 1a4573641d
commit 2019e176ee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -1,7 +1,7 @@
plugins { plugins {
id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
id 'io.spring.nohttp' version '0.0.10' id 'io.spring.nohttp' version '0.0.10'
id "io.freefair.aspectj" version '6.3.0' apply false id "io.freefair.aspectj" version '6.4.0' apply false
id 'org.jetbrains.dokka' version '1.6.0' apply false id 'org.jetbrains.dokka' version '1.6.0' apply false
id 'org.jetbrains.kotlin.jvm' version '1.6.10' apply false id 'org.jetbrains.kotlin.jvm' version '1.6.10' apply false
id "org.jetbrains.kotlin.plugin.serialization" version '1.6.10' apply false id "org.jetbrains.kotlin.plugin.serialization" version '1.6.10' apply false
@ -51,7 +51,7 @@ configure(allprojects) { project ->
} }
dependency "com.google.code.findbugs:jsr305:3.0.2" dependency "com.google.code.findbugs:jsr305:3.0.2"
dependencySet(group: 'org.aspectj', version: '1.9.8.RC3') { dependencySet(group: 'org.aspectj', version: '1.9.8') {
entry 'aspectjrt' entry 'aspectjrt'
entry 'aspectjtools' entry 'aspectjtools'
entry 'aspectjweaver' entry 'aspectjweaver'

2
gradle/toolchains.gradle
View File

@ -118,7 +118,7 @@ pluginManager.withPlugin("kotlin") {
} }
} }
else { else {
// Fallback to JDK11 // Fallback to JDK17
compileKotlin { compileKotlin {
kotlinOptions { kotlinOptions {
jvmTarget = '1.8' jvmTarget = '1.8'