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

Merge pull request #15555 from rjernst/upgrade_provided 

Allow plugins to "upgrade" provided deps
This commit is contained in:
Ryan Ernst 2015-12-19 00:10:31 -08:00
parent af11707da0 583ba76d0b
commit c2e6243ea2
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy
View File

@ -22,6 +22,7 @@ import org.elasticsearch.gradle.BuildPlugin
import org.elasticsearch.gradle.test.RestIntegTestTask import org.elasticsearch.gradle.test.RestIntegTestTask
import org.elasticsearch.gradle.test.RunTask import org.elasticsearch.gradle.test.RunTask
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.artifacts.Dependency
import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.SourceSet
import org.gradle.api.tasks.bundling.Zip import org.gradle.api.tasks.bundling.Zip
@ -99,7 +100,12 @@ public class PluginBuildPlugin extends BuildPlugin {
from buildProperties // plugin properties file from buildProperties // plugin properties file
from pluginMetadata // metadata (eg custom security policy) from pluginMetadata // metadata (eg custom security policy)
from project.jar // this plugin's jar from project.jar // this plugin's jar
from project.configurations.runtime - project.configurations.provided // the dep jars // the dependency jars, filtered for those provided
from project.configurations.runtime.fileCollection { Dependency dep ->
project.configurations.provided.contains(dep) == false ||
// handle dependencies upgraded explicitly from provided to compile
project.configurations.compile.contains(dep)
}
// extra files for the plugin to go into the zip // extra files for the plugin to go into the zip
from('src/main/packaging') // TODO: move all config/bin/_size/etc into packaging from('src/main/packaging') // TODO: move all config/bin/_size/etc into packaging
from('src/main') { from('src/main') {