From c2d2192f74ddd8fa47980d2702486e62f1907dd3 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 24 Sep 2025 19:41:08 +0200 Subject: [PATCH 1/2] Update apache archive mirror url for faster artifact resolution --- .../hadoop/gradle/fixture/hadoop/HadoopFixturePlugin.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/HadoopFixturePlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/HadoopFixturePlugin.groovy index ede5715e7..e34886e59 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/HadoopFixturePlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/HadoopFixturePlugin.groovy @@ -32,7 +32,7 @@ import org.gradle.api.publish.ivy.IvyArtifact class HadoopFixturePlugin implements Plugin { - private static final String APACHE_MIRROR = "https://archive.apache.org/dist/" + private static final String APACHE_MIRROR = "https://dlcdn.apache.org/" static class HadoopFixturePluginExtension { private NamedDomainObjectContainer clusters From 22d9fbc7d3d0ecd1fefd66d81ebb8f2fad7b71b7 Mon Sep 17 00:00:00 2001 From: Rene Groeschke Date: Wed, 24 Sep 2025 20:18:37 +0200 Subject: [PATCH 2/2] Use mirror in addition to existing archive repo --- .../fixture/hadoop/HadoopFixturePlugin.groovy | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/HadoopFixturePlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/HadoopFixturePlugin.groovy index e34886e59..3b99b1af7 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/HadoopFixturePlugin.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/HadoopFixturePlugin.groovy @@ -32,7 +32,8 @@ import org.gradle.api.publish.ivy.IvyArtifact class HadoopFixturePlugin implements Plugin { - private static final String APACHE_MIRROR = "https://dlcdn.apache.org/" + private static final String APACHE_MIRROR_1 = "https://dlcdn.apache.org/" + private static final String APACHE_MIRROR_2 = "https://archive.apache.org/dist/" static class HadoopFixturePluginExtension { private NamedDomainObjectContainer clusters @@ -70,18 +71,20 @@ class HadoopFixturePlugin implements Plugin { private static configureApacheMirrorRepository(Project project) { RepositoryHandler repositoryHandler = project.getRepositories() - repositoryHandler.add(repositoryHandler.ivy({IvyArtifactRepository ivyArtifactRepository -> - ivyArtifactRepository.setUrl(APACHE_MIRROR) - ivyArtifactRepository.patternLayout({IvyPatternRepositoryLayout ivyPatternRepositoryLayout -> - // We use this pattern normally and break the regular tradition of a strictly numerical version - // because Hive does not provide a reasonable artifact name that makes a more robust pattern - // reasonable (it has a very unorthodox layout) - ivyPatternRepositoryLayout.artifact("[organization]/[module]/[revision].[ext]") - ivyPatternRepositoryLayout.setM2compatible(true) - }) - ivyArtifactRepository.metadataSources({IvyArtifactRepository.MetadataSources metadataSources -> - metadataSources.artifact() - }) - })) + [APACHE_MIRROR_1, APACHE_MIRROR_2].each { APACHE_MIRROR -> + repositoryHandler.add(repositoryHandler.ivy({IvyArtifactRepository ivyArtifactRepository -> + ivyArtifactRepository.setUrl(APACHE_MIRROR) + ivyArtifactRepository.patternLayout({IvyPatternRepositoryLayout ivyPatternRepositoryLayout -> + // We use this pattern normally and break the regular tradition of a strictly numerical version + // because Hive does not provide a reasonable artifact name that makes a more robust pattern + // reasonable (it has a very unorthodox layout) + ivyPatternRepositoryLayout.artifact("[organization]/[module]/[revision].[ext]") + ivyPatternRepositoryLayout.setM2compatible(true) + }) + ivyArtifactRepository.metadataSources({IvyArtifactRepository.MetadataSources metadataSources -> + metadataSources.artifact() + }) + })) + } } }