honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't include HLRC on downstream classpath twice (#53983)

This commit is contained in:
Mark Vieira 2020-03-23 08:47:35 -07:00
parent 5b9864db2c
commit eda023e2c3
No known key found for this signature in database
GPG Key ID: CA947EF7E6D4B105
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
View File

@ -493,7 +493,9 @@ class BuildPlugin implements Plugin<Project> {
project.pluginManager.withPlugin('com.github.johnrengelman.shadow') { project.pluginManager.withPlugin('com.github.johnrengelman.shadow') {
// Ensure that when we are compiling against the "original" JAR that we also include any "shadow" dependencies on the compile classpath // Ensure that when we are compiling against the "original" JAR that we also include any "shadow" dependencies on the compile classpath
project.configurations.getByName(JavaPlugin.API_ELEMENTS_CONFIGURATION_NAME).extendsFrom(project.configurations.getByName(ShadowBasePlugin.CONFIGURATION_NAME)) project.configurations.getByName(ShadowBasePlugin.CONFIGURATION_NAME).dependencies.all { Dependency dependency ->
project.configurations.getByName(JavaPlugin.API_ELEMENTS_CONFIGURATION_NAME).dependencies.add(dependency)
}
} }
} }