Skip to content

Commit 0d3f9b7

Browse files
authored
[7.17] Ignore configs from DistributionDownload plugin and bwc for resolveAllDependencies (#110828) (#110837)
* Ignore configs from DistributionDownload plugin and bwc for resolveAllDependencies (#110828) skip resolving toolchains
1 parent aabe0a3 commit 0d3f9b7

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

build-tools/src/main/java/org/elasticsearch/gradle/DistributionDownloadPlugin.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ public class DistributionDownloadPlugin implements Plugin<Project> {
4242
private static final String FAKE_SNAPSHOT_IVY_GROUP = "elasticsearch-distribution-snapshot";
4343
private static final String DOWNLOAD_REPO_NAME = "elasticsearch-downloads";
4444
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_";
4749

4850
private final ObjectFactory objectFactory;
4951
private NamedDomainObjectContainer<ElasticsearchDistribution> distributionsContainer;

build.gradle

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ import static org.elasticsearch.gradle.util.GradleUtils.maybeConfigure
2424
import org.gradle.plugins.ide.eclipse.model.ProjectDependency
2525
import org.elasticsearch.gradle.internal.BaseInternalPluginBuildPlugin
2626
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+
2733
import java.nio.file.Files
2834
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
2935

@@ -273,10 +279,15 @@ allprojects {
273279
}
274280

275281
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 }
277284
if (project.path.contains("fixture")) {
278285
dependsOn tasks.withType(ComposePull)
279286
}
287+
if (project.path.contains(":distribution:docker")) {
288+
enabled = false
289+
}
290+
280291
}
281292

282293
def checkPart1 = tasks.register('checkPart1')

qa/os/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,3 @@ subprojects { Project platformProject ->
4545
hostEnv 'VAGRANT_PROJECT_DIR', platformProject.projectDir.absolutePath
4646
}
4747
}
48-
tasks.named('resolveAllDependencies') {
49-
// avoid resolving all elasticsearch distros
50-
enabled = false
51-
}

0 commit comments

Comments
 (0)