Ignore configs from DistributionDownload plugin and bwc for resolveAllDependencies (#110828)

This commit is contained in:
Rene Groeschke 2024-07-12 17:17:55 +02:00 committed by GitHub
parent be6583d274
commit 320f2414aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 8 deletions

View File

@ -42,8 +42,10 @@ public class DistributionDownloadPlugin implements Plugin<Project> {
private static final String FAKE_SNAPSHOT_IVY_GROUP = "elasticsearch-distribution-snapshot";
private static final String DOWNLOAD_REPO_NAME = "elasticsearch-downloads";
private static final String SNAPSHOT_REPO_NAME = "elasticsearch-snapshots";
public static final String DISTRO_EXTRACTED_CONFIG_PREFIX = "es_distro_extracted_";
public static final String DISTRO_CONFIG_PREFIX = "es_distro_file_";
public static final String ES_DISTRO_CONFIG_PREFIX = "es_distro_";
public static final String DISTRO_EXTRACTED_CONFIG_PREFIX = ES_DISTRO_CONFIG_PREFIX + "extracted_";
public static final String DISTRO_CONFIG_PREFIX = ES_DISTRO_CONFIG_PREFIX + "file_";
private final ObjectFactory objectFactory;
private NamedDomainObjectContainer<ElasticsearchDistribution> distributionsContainer;

View File

@ -19,6 +19,7 @@ import org.elasticsearch.gradle.internal.info.BuildParams
import org.elasticsearch.gradle.util.GradleUtils
import org.gradle.plugins.ide.eclipse.model.AccessRule
import org.gradle.plugins.ide.eclipse.model.ProjectDependency
import org.elasticsearch.gradle.DistributionDownloadPlugin
import java.nio.file.Files
@ -284,11 +285,16 @@ allprojects {
}
tasks.register('resolveAllDependencies', ResolveAllDependencies) {
configs = project.configurations
def ignoredPrefixes = [DistributionDownloadPlugin.ES_DISTRO_CONFIG_PREFIX, "jdbcDriver"]
configs = project.configurations.matching { config -> ignoredPrefixes.any { config.name.startsWith(it) } == false }
resolveJavaToolChain = true
if (project.path.contains("fixture")) {
dependsOn tasks.withType(ComposePull)
}
if (project.path.contains(":distribution:docker")) {
enabled = false
}
}
plugins.withId('lifecycle-base') {

View File

@ -36,8 +36,3 @@ tasks.named("test").configure { enabled = false }
tasks.register('destructivePackagingTest') {
dependsOn 'destructiveDistroTest'
}
tasks.named('resolveAllDependencies') {
// avoid resolving all elasticsearch distros
enabled = false
}