From 9503afc34872554b803b0b46e9444aeaa458e514 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Thu, 12 Dec 2024 18:08:33 +0100
Subject: [PATCH]  [Build] Cache spotless p2 dependencies when baking ci image
 (#118523)

The eclipse formatter used by spotless is resolved at runtime and not declared as
gradle dependency. Therefore we need to run the spotless task to ensure we have
the dependencies resolved as part of our ci image baking.

This should avoid issues with connecting to p2 repos we have experienced lately
in our ci environment

* Revert "[Build] Declare mirror for eclipse p2 repository (#117732)"

This reverts commit c35777a175f10a49ae860d28aa16b40d6f66c49a.
---
 .../conventions/precommit/FormattingPrecommitPlugin.java     | 5 +----
 build.gradle                                                 | 5 ++++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java b/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java
index 41c0b4d67e1df..ea9009172c7e2 100644
--- a/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java
+++ b/build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/precommit/FormattingPrecommitPlugin.java
@@ -17,8 +17,6 @@
 import org.gradle.api.Project;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.Map;
 
 /**
  * This plugin configures formatting for Java source using Spotless
@@ -66,8 +64,7 @@ public void apply(Project project) {
                 java.importOrderFile(new File(elasticsearchWorkspace, importOrderPath));
 
                 // Most formatting is done through the Eclipse formatter
-                java.eclipse().withP2Mirrors(Map.of("https://download.eclipse.org/", "https://mirror.umd.edu/eclipse/"))
-                    .configFile(new File(elasticsearchWorkspace, formatterConfigPath));
+                java.eclipse().configFile(new File(elasticsearchWorkspace, formatterConfigPath));
 
                 // Ensure blank lines are actually empty. Since formatters are applied in
                 // order, apply this one last, otherwise non-empty blank lines can creep
diff --git a/build.gradle b/build.gradle
index 715614c1beea4..b95e34640cb5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -301,7 +301,10 @@ allprojects {
     if (project.path.contains(":distribution:docker")) {
       enabled = false
     }
-
+    if (project.path.contains(":libs:cli")) {
+      // ensure we resolve p2 dependencies for the spotless eclipse formatter
+      dependsOn "spotlessJavaCheck"
+    }
   }
 
   plugins.withId('lifecycle-base') {