Skip to content

Feat: collapse maven-executor and apply fixes #11976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cstamas merged 1 commit into from
Apr 25, 2026
Merged

Feat: collapse maven-executor and apply fixes #11976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...va/org/apache/maven/api/cli/Executor.java → ...apache/maven/cling/executor/Executor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.maven.api.cli;
package org.apache.maven.cling.executor;

import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nonnull;
Expand Down
2 changes: 1 addition & 1 deletion ...ache/maven/api/cli/ExecutorException.java → ...ven/cling/executor/ExecutorException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.maven.api.cli;
package org.apache.maven.cling.executor;

import org.apache.maven.api.annotations.Experimental;
import org.apache.maven.api.annotations.Nullable;
Expand Down
3 changes: 0 additions & 3 deletions impl/maven-executor/src/main/java/org/apache/maven/cling/executor/ExecutorHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
package org.apache.maven.cling.executor;

import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.cli.Executor;
import org.apache.maven.api.cli.ExecutorException;
import org.apache.maven.api.cli.ExecutorRequest;

/**
* Helper class for routing Maven execution based on preferences and/or issued execution requests.
Expand Down
2 changes: 1 addition & 1 deletion ...apache/maven/api/cli/ExecutorRequest.java → ...maven/cling/executor/ExecutorRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.maven.api.cli;
package org.apache.maven.cling.executor;

import java.io.InputStream;
import java.io.OutputStream;
Expand Down
2 changes: 0 additions & 2 deletions impl/maven-executor/src/main/java/org/apache/maven/cling/executor/ExecutorTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import java.util.Map;

import org.apache.maven.api.annotations.Nullable;
import org.apache.maven.api.cli.ExecutorException;
import org.apache.maven.api.cli.ExecutorRequest;

/**
* A tool implementing some common Maven operations.
Expand Down
23 changes: 18 additions & 5 deletions ...xecutor/src/main/java/org/apache/maven/cling/executor/embedded/EmbeddedMavenExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
import java.util.function.Function;
import java.util.stream.Stream;

import org.apache.maven.api.cli.Executor;
import org.apache.maven.api.cli.ExecutorException;
import org.apache.maven.api.cli.ExecutorRequest;
import org.apache.maven.cling.executor.Executor;
import org.apache.maven.cling.executor.ExecutorException;
import org.apache.maven.cling.executor.ExecutorRequest;

import static java.util.Objects.requireNonNull;

Expand Down Expand Up @@ -267,7 +267,11 @@ protected Context doCreate(Path mavenHome, ExecutorRequest executorRequest) {
throw new IllegalArgumentException(getClass().getSimpleName() + " w/ mvn3 does not support command "
+ executorRequest.command());
}
keepAlive.add(cliClass.getClassLoader().loadClass("org.fusesource.jansi.internal.JansiLoader"));
// 3.9.x
mayAddToKeepAlive(keepAlive, cliClass, "org.fusesource.jansi.internal.JansiLoader");
// 3.10.x
mayAddToKeepAlive(keepAlive, cliClass, "org.jline.nativ.JLineNativeLoader");

Constructor<?> newMavenCli = cliClass.getConstructor(classWorld.getClass());
Object mavenCli = newMavenCli.newInstance(classWorld);
Class<?>[] parameterTypes = {String[].class, String.class, PrintStream.class, PrintStream.class};
Expand All @@ -292,7 +296,7 @@ protected Context doCreate(Path mavenHome, ExecutorRequest executorRequest) {
});
} else {
// assume 4.x
keepAlive.add(cliClass.getClassLoader().loadClass("org.jline.nativ.JLineNativeLoader"));
mayAddToKeepAlive(keepAlive, cliClass, "org.jline.nativ.JLineNativeLoader");
for (Map.Entry<String, String> cmdEntry : MVN4_MAIN_CLASSES.entrySet()) {
Class<?> cmdClass = cliClass.getClassLoader().loadClass(cmdEntry.getValue());
Method mainMethod = cmdClass.getMethod(
Expand Down Expand Up @@ -337,6 +341,15 @@ protected Context doCreate(Path mavenHome, ExecutorRequest executorRequest) {
}
}

private boolean mayAddToKeepAlive(List<Object> keepAlive, Class<?> cliClass, String className) {
try {
keepAlive.add(cliClass.getClassLoader().loadClass(className));
return true;
} catch (ClassNotFoundException e) {
return false;
}
}

protected Properties prepareProperties(ExecutorRequest request) {
System.setProperties(null); // this "inits" them!

Expand Down
8 changes: 4 additions & 4 deletions ...en-executor/src/main/java/org/apache/maven/cling/executor/forked/ForkedMavenExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;

import org.apache.maven.api.cli.Executor;
import org.apache.maven.api.cli.ExecutorException;
import org.apache.maven.api.cli.ExecutorRequest;
import org.apache.maven.cling.executor.Executor;
import org.apache.maven.cling.executor.ExecutorException;
import org.apache.maven.cling.executor.ExecutorRequest;

import static java.util.Objects.requireNonNull;
import static org.apache.maven.api.cli.ExecutorRequest.getCanonicalPath;
import static org.apache.maven.cling.executor.ExecutorRequest.getCanonicalPath;

/**
* Forked executor implementation, that spawns a subprocess with Maven from the installation directory. Very costly
Expand Down
6 changes: 3 additions & 3 deletions impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/HelperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
import java.util.concurrent.ConcurrentHashMap;

import org.apache.maven.api.annotations.Nullable;
import org.apache.maven.api.cli.Executor;
import org.apache.maven.api.cli.ExecutorException;
import org.apache.maven.api.cli.ExecutorRequest;
import org.apache.maven.cling.executor.Executor;
import org.apache.maven.cling.executor.ExecutorException;
import org.apache.maven.cling.executor.ExecutorHelper;
import org.apache.maven.cling.executor.ExecutorRequest;

import static java.util.Objects.requireNonNull;

Expand Down
4 changes: 2 additions & 2 deletions impl/maven-executor/src/main/java/org/apache/maven/cling/executor/internal/ToolboxTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
import java.util.Properties;
import java.util.stream.Collectors;

import org.apache.maven.api.cli.ExecutorException;
import org.apache.maven.api.cli.ExecutorRequest;
import org.apache.maven.cling.executor.ExecutorException;
import org.apache.maven.cling.executor.ExecutorHelper;
import org.apache.maven.cling.executor.ExecutorRequest;
import org.apache.maven.cling.executor.ExecutorTool;

import static java.util.Objects.requireNonNull;
Expand Down
2 changes: 0 additions & 2 deletions ...aven-executor/src/test/java/org/apache/maven/cling/executor/MavenExecutorTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@

import eu.maveniverse.maven.mimir.testing.MimirInfuser;
import org.apache.maven.api.annotations.Nullable;
import org.apache.maven.api.cli.Executor;
import org.apache.maven.api.cli.ExecutorRequest;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down
2 changes: 1 addition & 1 deletion ...tor/src/test/java/org/apache/maven/cling/executor/embedded/EmbeddedMavenExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.maven.cling.executor.embedded;

import org.apache.maven.api.cli.Executor;
import org.apache.maven.cling.executor.Executor;
import org.apache.maven.cling.executor.MavenExecutorTestSupport;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...xecutor/src/test/java/org/apache/maven/cling/executor/forked/ForkedMavenExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.maven.cling.executor.forked;

import org.apache.maven.api.cli.Executor;
import org.apache.maven.cling.executor.Executor;
import org.apache.maven.cling.executor.MavenExecutorTestSupport;

/**
Expand Down
4 changes: 2 additions & 2 deletions impl/maven-executor/src/test/java/org/apache/maven/cling/executor/impl/ToolboxToolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
import java.util.Map;

import eu.maveniverse.maven.mimir.testing.MimirInfuser;
import org.apache.maven.api.cli.Executor;
import org.apache.maven.api.cli.ExecutorRequest;
import org.apache.maven.cling.executor.Environment;
import org.apache.maven.cling.executor.Executor;
import org.apache.maven.cling.executor.ExecutorHelper;
import org.apache.maven.cling.executor.ExecutorRequest;
import org.apache.maven.cling.executor.embedded.EmbeddedMavenExecutor;
import org.apache.maven.cling.executor.forked.ForkedMavenExecutor;
import org.apache.maven.cling.executor.internal.HelperImpl;
Expand Down
4 changes: 2 additions & 2 deletions its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/Verifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@
import java.util.stream.Collectors;
import java.util.stream.Stream;

import org.apache.maven.api.cli.ExecutorException;
import org.apache.maven.api.cli.ExecutorRequest;
import org.apache.maven.cling.executor.ExecutorException;
import org.apache.maven.cling.executor.ExecutorRequest;
import org.apache.maven.cling.executor.ExecutorHelper;
import org.apache.maven.cling.executor.ExecutorTool;
import org.apache.maven.cling.executor.embedded.EmbeddedMavenExecutor;
Expand Down