(maven) branch maven-4.0.x updated: Improvements in ITs executing - provide default local repo

[sjaranowski]

This is an automated email from the ASF dual-hosted git repository.

sjaranowski pushed a commit to branch maven-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/maven-4.0.x by this push:
     new 3f71dcf8fa Improvements in ITs executing - provide default local repo
3f71dcf8fa is described below

commit 3f71dcf8fa58ab06aa4b525eb8e44277151a2ee5
Author: Slawomir Jaranowski <s.jaranow...@gmail.com>
AuthorDate: Sat Jul 19 11:58:58 2025 +0200

    Improvements in ITs executing - provide default local repo
    
    When local repo is not provided, method getLocalRepository executes 
external mojo from toolbox,
    it will be more effective to provide it statically and avoid external mojo 
even in embedded mode
    
    (cherry picked from commit 63374c17e6bb8347f9c72f0e2238f2c4cdab3c9a)
---
 its/core-it-suite/pom.xml                                |  3 ++-
 .../src/main/java/org/apache/maven/it/Verifier.java      | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/its/core-it-suite/pom.xml b/its/core-it-suite/pom.xml
index adf7d4afb9..6a3e42fa3e 100644
--- a/its/core-it-suite/pom.xml
+++ b/its/core-it-suite/pom.xml
@@ -520,7 +520,8 @@ under the License.
           
<promoteUserPropertiesToSystemProperties>false</promoteUserPropertiesToSystemProperties>
           <systemPropertyVariables>
             <maven.test.user.home>${preparedUserHome}</maven.test.user.home>
-            
<maven.test.repo.local>${settings.localRepository}</maven.test.repo.local>
+            
<maven.test.repo.outer>${settings.localRepository}</maven.test.repo.outer>
+            
<maven.test.repo.local>${preparedUserHome}/.m2/repository</maven.test.repo.local>
             
<maven.test.tmpdir>${project.build.testOutputDirectory}</maven.test.tmpdir>
             <maven.version>${maven.version}</maven.version>
             <maven.home>${preparedMavenHome}</maven.home>
diff --git 
a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java
 
b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java
index 376ed1f7b3..75367b8c83 100644
--- 
a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java
+++ 
b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java
@@ -144,7 +144,7 @@ public Verifier(String basedir, List<String> 
defaultCliArguments) throws Verific
             this.tempBasedir = Files.createTempDirectory("verifier");
             this.userHomeDirectory = 
Paths.get(System.getProperty("maven.test.user.home", "user.home"));
             Files.createDirectories(this.userHomeDirectory);
-            this.outerLocalRepository = 
Paths.get(System.getProperty("maven.test.repo.local", ".m2/repository"));
+            this.outerLocalRepository = 
Paths.get(System.getProperty("maven.test.repo.outer", ".m2/repository"));
             this.executorHelper = new HelperImpl(
                     VERIFIER_FORK_MODE,
                     Paths.get(System.getProperty("maven.home")),
@@ -357,10 +357,7 @@ public String getLocalRepository() {
     }
 
     public String getLocalRepositoryWithSettings(String settingsXml) {
-        String outerHead = System.getProperty("maven.repo.local", "").trim();
-        if (!outerHead.isEmpty()) {
-            return outerHead;
-        } else if (settingsXml != null) {
+        if (settingsXml != null) {
             // when invoked with settings.xml, the file must be resolved from 
basedir (as Maven does)
             // but we should not use basedir, as it may contain extensions.xml 
or a project, that Maven will eagerly
             // load, and may fail, as it would need more (like CI friendly 
versioning, etc).
@@ -376,8 +373,13 @@ public String getLocalRepositoryWithSettings(String 
settingsXml) {
                     .argument("-s")
                     .argument(settingsFile.toString()));
         } else {
-            return executorTool.localRepository(
-                    
executorHelper.executorRequest().cwd(tempBasedir).userHomeDirectory(userHomeDirectory));
+            String outerHead = System.getProperty("maven.test.repo.local", 
"").trim();
+            if (!outerHead.isEmpty()) {
+                return outerHead;
+            } else {
+                return executorTool.localRepository(
+                        
executorHelper.executorRequest().cwd(tempBasedir).userHomeDirectory(userHomeDirectory));
+            }
         }
     }