Upgrade feature aware check usage of ASM to 7.3.1 (#54577)

This commit upgrades the ASM dependency used in the feature aware check
to 7.3.1. This gives support for JDK 14. Additionally, now that Gradle
understands JDK 13, it means we can remove a restriction on running the
feature aware check to JDK 12 and lower.
This commit is contained in:
Jason Tedor 2020-04-18 10:49:57 -04:00 committed by GitHub
parent 405ff0ce27
commit 23049391be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 12 deletions

View File

@ -30,7 +30,7 @@ subprojects {
dependsOn project.configurations.featureAwarePlugin
outputs.file(successMarker)
executable = "${BuildParams.runtimeJavaHome}/bin/java"
executable = "${BuildParams.compilerJavaHome}/bin/java"
// default to main class files if such a source set exists
final List files = []
@ -41,14 +41,6 @@ subprojects {
// filter out non-existent classes directories from empty source sets
final FileCollection classDirectories = project.files(files).filter { it.exists() }
onlyIf {
/*
* The latest version of ASM does not understand JDK 14. However, Gradle can not distinguish between JDK 13 and JDK 14 (treating
* anything above JDK 12 as JDK 13). So, to exclude JDK 14 until a newer version of ASM is available, we also have to exclude JDK
* 13. See https://github.com/elastic/elasticsearch/issues/45927.
*/
Integer.parseInt(BuildParams.runtimeJavaVersion.majorVersion) < 13
}
doFirst {
args('-cp', project.configurations.featureAwarePlugin.asPath, 'org.elasticsearch.xpack.test.feature_aware.FeatureAwareCheck')
classDirectories.each { args it.getAbsolutePath() }

View File

@ -65,7 +65,7 @@ dependencies {
compile "net.jcip:jcip-annotations:1.0"
compile "net.minidev:json-smart:2.3"
compile "net.minidev:accessors-smart:1.2"
compile "org.ow2.asm:asm:7.1"
compile "org.ow2.asm:asm:7.3.1"
testCompile 'org.elasticsearch:securemock:1.2'
testCompile "org.elasticsearch:mocksocket:${versions.mocksocket}"

View File

@ -1 +0,0 @@
fa29aa438674ff19d5e1386d2c3527a0267f291e

View File

@ -0,0 +1 @@
7ec32f922315924e82bf58b36ee1b673b2a9b820

View File

@ -1,7 +1,7 @@
apply plugin: 'elasticsearch.build'
dependencies {
compile 'org.ow2.asm:asm:7.1'
compile 'org.ow2.asm:asm:7.3.1'
compile project(':server')
compile project(':x-pack:plugin:core')
testCompile project(':test:framework')