File tree Expand file tree Collapse file tree 3 files changed +16
-7
lines changed
build-tools/src/main/java/org/elasticsearch/gradle Expand file tree Collapse file tree 3 files changed +16
-7
lines changed Original file line number Diff line number Diff line change @@ -42,8 +42,10 @@ public class DistributionDownloadPlugin implements Plugin<Project> {
42
42
private static final String FAKE_SNAPSHOT_IVY_GROUP = "elasticsearch-distribution-snapshot" ;
43
43
private static final String DOWNLOAD_REPO_NAME = "elasticsearch-downloads" ;
44
44
private static final String SNAPSHOT_REPO_NAME = "elasticsearch-snapshots" ;
45
- public static final String DISTRO_EXTRACTED_CONFIG_PREFIX = "es_distro_extracted_" ;
46
- public static final String DISTRO_CONFIG_PREFIX = "es_distro_file_" ;
45
+
46
+ public static final String ES_DISTRO_CONFIG_PREFIX = "es_distro_" ;
47
+ public static final String DISTRO_EXTRACTED_CONFIG_PREFIX = ES_DISTRO_CONFIG_PREFIX + "extracted_" ;
48
+ public static final String DISTRO_CONFIG_PREFIX = ES_DISTRO_CONFIG_PREFIX + "file_" ;
47
49
48
50
private final ObjectFactory objectFactory ;
49
51
private NamedDomainObjectContainer <ElasticsearchDistribution > distributionsContainer ;
Original file line number Diff line number Diff line change @@ -24,6 +24,12 @@ import static org.elasticsearch.gradle.util.GradleUtils.maybeConfigure
24
24
import org.gradle.plugins.ide.eclipse.model.ProjectDependency
25
25
import org.elasticsearch.gradle.internal.BaseInternalPluginBuildPlugin
26
26
import org.elasticsearch.gradle.internal.ResolveAllDependencies
27
+ import org.elasticsearch.gradle.internal.info.BuildParams
28
+ import org.elasticsearch.gradle.util.GradleUtils
29
+ import org.gradle.plugins.ide.eclipse.model.AccessRule
30
+ import org.gradle.plugins.ide.eclipse.model.ProjectDependency
31
+ import org.elasticsearch.gradle.DistributionDownloadPlugin
32
+
27
33
import java.nio.file.Files
28
34
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
29
35
@@ -273,10 +279,15 @@ allprojects {
273
279
}
274
280
275
281
tasks. register(' resolveAllDependencies' , ResolveAllDependencies ) {
276
- configs = project. configurations
282
+ def ignoredPrefixes = [DistributionDownloadPlugin . ES_DISTRO_CONFIG_PREFIX , " jdbcDriver" ]
283
+ configs = project. configurations. matching { config -> ignoredPrefixes. any { config. name. startsWith(it) } == false }
277
284
if (project. path. contains(" fixture" )) {
278
285
dependsOn tasks. withType(ComposePull )
279
286
}
287
+ if (project. path. contains(" :distribution:docker" )) {
288
+ enabled = false
289
+ }
290
+
280
291
}
281
292
282
293
def checkPart1 = tasks. register(' checkPart1' )
Original file line number Diff line number Diff line change @@ -45,7 +45,3 @@ subprojects { Project platformProject ->
45
45
hostEnv ' VAGRANT_PROJECT_DIR' , platformProject. projectDir. absolutePath
46
46
}
47
47
}
48
- tasks. named(' resolveAllDependencies' ) {
49
- // avoid resolving all elasticsearch distros
50
- enabled = false
51
- }
You can’t perform that action at this time.
0 commit comments