diff --git a/devtools/maven/pom.xml b/devtools/maven/pom.xml
index 6b20bff6c6dcf..84c9089b70b75 100644
--- a/devtools/maven/pom.xml
+++ b/devtools/maven/pom.xml
@@ -142,13 +142,7 @@
org.twdata.maven
mojo-executor
- 2.3.0
-
-
- org.slf4j
- slf4j-simple
-
-
+ 2.3.1
diff --git a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
index e33b829ec46fd..000de691f99fd 100644
--- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
+++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java
@@ -1,5 +1,14 @@
package io.quarkus.maven;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.configuration;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.executeMojo;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.executionEnvironment;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.goal;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.groupId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.plugin;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.version;
+
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.File;
@@ -64,7 +73,6 @@
import org.eclipse.aether.resolution.DependencyResolutionException;
import org.eclipse.aether.resolution.DependencyResult;
import org.eclipse.aether.util.artifact.JavaScopes;
-import org.twdata.maven.mojoexecutor.MojoExecutor;
import io.quarkus.bootstrap.model.AppArtifactKey;
import io.quarkus.bootstrap.resolver.maven.options.BootstrapMavenOptions;
@@ -410,11 +418,11 @@ private void handleAutoCompile() throws MojoExecutionException {
private void triggerPrepare() throws MojoExecutionException {
Plugin quarkusPlugin = project.getPlugin(QUARKUS_PLUGIN_GROUPID + ":" + QUARKUS_PLUGIN_ARTIFACTID);
- MojoExecutor.executeMojo(
+ executeMojo(
quarkusPlugin,
- MojoExecutor.goal(QUARKUS_PREPARE_GOAL),
- MojoExecutor.configuration(),
- MojoExecutor.executionEnvironment(
+ goal(QUARKUS_PREPARE_GOAL),
+ configuration(),
+ executionEnvironment(
project,
session,
pluginManager));
@@ -450,37 +458,37 @@ private void handleResources() throws MojoExecutionException {
if (resourcesPlugin == null) {
return;
}
- MojoExecutor.executeMojo(
- MojoExecutor.plugin(
- MojoExecutor.groupId(ORG_APACHE_MAVEN_PLUGINS),
- MojoExecutor.artifactId(MAVEN_RESOURCES_PLUGIN),
- MojoExecutor.version(resourcesPlugin.getVersion()),
+ executeMojo(
+ plugin(
+ groupId(ORG_APACHE_MAVEN_PLUGINS),
+ artifactId(MAVEN_RESOURCES_PLUGIN),
+ version(resourcesPlugin.getVersion()),
resourcesPlugin.getDependencies()),
- MojoExecutor.goal("resources"),
+ goal("resources"),
getPluginConfig(resourcesPlugin),
- MojoExecutor.executionEnvironment(
+ executionEnvironment(
project,
session,
pluginManager));
}
private void executeCompileGoal(Plugin plugin, String groupId, String artifactId) throws MojoExecutionException {
- MojoExecutor.executeMojo(
- MojoExecutor.plugin(
- MojoExecutor.groupId(groupId),
- MojoExecutor.artifactId(artifactId),
- MojoExecutor.version(plugin.getVersion()),
+ executeMojo(
+ plugin(
+ groupId(groupId),
+ artifactId(artifactId),
+ version(plugin.getVersion()),
plugin.getDependencies()),
- MojoExecutor.goal("compile"),
+ goal("compile"),
getPluginConfig(plugin),
- MojoExecutor.executionEnvironment(
+ executionEnvironment(
project,
session,
pluginManager));
}
private Xpp3Dom getPluginConfig(Plugin plugin) {
- Xpp3Dom configuration = MojoExecutor.configuration();
+ Xpp3Dom configuration = configuration();
Xpp3Dom pluginConfiguration = (Xpp3Dom) plugin.getConfiguration();
if (pluginConfiguration != null) {
//Filter out `test*` configurations