SQL: Fix build on Java 10
Due to a runtime classpath clash, featureAware task was failing on JVMs higher than 1.8 (since the ASM version from Painless was used instead which does not recognized Java 9 or 10 bytecode) causing the task to fail. This commit excludes the ASM dependency (since it's not used by SQL itself).
This commit is contained in:
parent
375d09c588
commit
f7a0cafe55
|
@ -43,9 +43,7 @@ subprojects {
|
|||
final FileCollection classDirectories = project.files(files).filter { it.exists() }
|
||||
|
||||
doFirst {
|
||||
String cp = project.configurations.featureAwarePlugin.asPath
|
||||
cp = cp.replaceAll(":[^:]*/asm-debug-all-5.1.jar:", ":")
|
||||
args('-cp', cp, 'org.elasticsearch.xpack.test.feature_aware.FeatureAwareCheck')
|
||||
args('-cp', project.configurations.featureAwarePlugin.asPath, 'org.elasticsearch.xpack.test.feature_aware.FeatureAwareCheck')
|
||||
classDirectories.each { args it.getAbsolutePath() }
|
||||
}
|
||||
doLast {
|
||||
|
|
|
@ -20,7 +20,10 @@ integTest.enabled = false
|
|||
|
||||
dependencies {
|
||||
compileOnly "org.elasticsearch.plugin:x-pack-core:${version}"
|
||||
compileOnly project(':modules:lang-painless')
|
||||
compileOnly(project(':modules:lang-painless')) {
|
||||
// exclude ASM to not affect featureAware task on Java 10+
|
||||
exclude group: "org.ow2.asm"
|
||||
}
|
||||
compile project('sql-proto')
|
||||
compile "org.elasticsearch.plugin:aggs-matrix-stats-client:${version}"
|
||||
compile "org.antlr:antlr4-runtime:4.5.3"
|
||||
|
|
Loading…
Reference in New Issue