From 58289402aabe554da200897162c7f4ac42e0a8ed Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Thu, 14 May 2026 11:37:42 +0200
Subject: [PATCH] [2.x] Undo GAV changes

The top level G is `org.apache.maven.executor` and everything
except for maven-executor-plugin is there.
---
 maven-batch-executor/pom.xml                       |  5 ++---
 maven-executor-plugin/pom.xml                      |  4 ++--
 maven-executor/pom.xml                             |  5 ++---
 .../maven/executor/support/ExecutorHelperImpl.java | 14 ++++++++------
 pom.xml                                            |  7 ++++---
 providers/pom.xml                                  |  4 ++--
 test-utilities/pom.xml                             |  5 ++---
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/maven-batch-executor/pom.xml b/maven-batch-executor/pom.xml
index ec39de6..ce5edce 100644
--- a/maven-batch-executor/pom.xml
+++ b/maven-batch-executor/pom.xml
@@ -22,12 +22,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-executor</artifactId>
+    <groupId>org.apache.maven.executor</groupId>
+    <artifactId>executor</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.maven.executor</groupId>
   <artifactId>maven-batch-executor</artifactId>
   <packaging>jar</packaging>
 
diff --git a/maven-executor-plugin/pom.xml b/maven-executor-plugin/pom.xml
index ad9bee1..4b9cb21 100644
--- a/maven-executor-plugin/pom.xml
+++ b/maven-executor-plugin/pom.xml
@@ -22,8 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-executor</artifactId>
+    <groupId>org.apache.maven.executor</groupId>
+    <artifactId>executor</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
diff --git a/maven-executor/pom.xml b/maven-executor/pom.xml
index 522817a..d4da40e 100644
--- a/maven-executor/pom.xml
+++ b/maven-executor/pom.xml
@@ -22,12 +22,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-executor</artifactId>
+    <groupId>org.apache.maven.executor</groupId>
+    <artifactId>executor</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.maven.executor</groupId>
   <artifactId>maven-executor</artifactId>
   <packaging>jar</packaging>
 
diff --git a/maven-executor/src/main/java/org/apache/maven/executor/support/ExecutorHelperImpl.java b/maven-executor/src/main/java/org/apache/maven/executor/support/ExecutorHelperImpl.java
index 3eb9925..c6fc1bb 100644
--- a/maven-executor/src/main/java/org/apache/maven/executor/support/ExecutorHelperImpl.java
+++ b/maven-executor/src/main/java/org/apache/maven/executor/support/ExecutorHelperImpl.java
@@ -73,12 +73,14 @@ public String mavenVersion() {
         if (closed.get()) {
             throw new ExecutorException("Executor is closed");
         }
-        return cache.computeIfAbsent("maven.version", k -> getExecutor(
-                        Mode.AUTO,
-                        ExecutorRequest.mavenBuilder()
-                                .userHomeDirectory(ExecutorRequest.discoverUserHomeDirectory())
-                                .build())
-                .mavenVersion());
+        return cache.computeIfAbsent(
+                "maven.version",
+                k -> getExecutor(
+                                Mode.AUTO,
+                                ExecutorRequest.mavenBuilder()
+                                        .userHomeDirectory(ExecutorRequest.discoverUserHomeDirectory())
+                                        .build())
+                        .mavenVersion());
     }
 
     @Override
diff --git a/pom.xml b/pom.xml
index 89a51f4..5ea3121 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,11 +23,12 @@
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven-parent</artifactId>
-    <version>47</version>
+    <version>48</version>
     <relativePath />
   </parent>
-  <groupId>org.apache.maven</groupId>
-  <artifactId>maven-executor</artifactId>
+
+  <groupId>org.apache.maven.executor</groupId>
+  <artifactId>executor</artifactId>
   <version>2.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
diff --git a/providers/pom.xml b/providers/pom.xml
index d7edfb7..75318be 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -22,8 +22,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-executor</artifactId>
+    <groupId>org.apache.maven.executor</groupId>
+    <artifactId>executor</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
diff --git a/test-utilities/pom.xml b/test-utilities/pom.xml
index 1deaab7..153a242 100644
--- a/test-utilities/pom.xml
+++ b/test-utilities/pom.xml
@@ -22,12 +22,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-executor</artifactId>
+    <groupId>org.apache.maven.executor</groupId>
+    <artifactId>executor</artifactId>
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.apache.maven.executor</groupId>
   <artifactId>test-utilities</artifactId>
   <packaging>jar</packaging>