From ad46a09cf5aa3d0228a4f8bcdf1861d2ecdecff1 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Sat, 19 Dec 2015 01:21:53 -0800 Subject: [PATCH] Revert "Build: Allow plugins to "upgrade" provided deps" This reverts commit 583ba76d0ba40d6771487372a18024cf2aa4d7bb. --- .../elasticsearch/gradle/plugin/PluginBuildPlugin.groovy | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy index 7f92bde4b42..db3f3eca50a 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy @@ -22,7 +22,6 @@ import org.elasticsearch.gradle.BuildPlugin import org.elasticsearch.gradle.test.RestIntegTestTask import org.elasticsearch.gradle.test.RunTask import org.gradle.api.Project -import org.gradle.api.artifacts.Dependency import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.bundling.Zip @@ -100,12 +99,7 @@ public class PluginBuildPlugin extends BuildPlugin { from buildProperties // plugin properties file from pluginMetadata // metadata (eg custom security policy) from project.jar // this plugin's jar - // 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) - } + from project.configurations.runtime - project.configurations.provided // the dep jars // 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') {