Skip to content

Commit c52b6bc

Browse files
authored
Merge pull request #1185 from gsmet/quarkus-3.9.4
Upgrade to Quarkus 3.9.4
2 parents dd9001e + 59ab18c commit c52b6bc

File tree

6 files changed

+1359
-1350
lines changed

6 files changed

+1359
-1350
lines changed

generated-platform-project/quarkus-maven-plugin/src/main/java/io/quarkus/maven/DevMojo.java

+24-5
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,6 @@ public class DevMojo extends AbstractMojo {
155155
private static final String ORG_JETBRAINS_KOTLIN = "org.jetbrains.kotlin";
156156
private static final String KOTLIN_MAVEN_PLUGIN = "kotlin-maven-plugin";
157157

158-
private static final String IO_SMALLRYE = "io.smallrye";
159-
private static final String ORG_JBOSS_JANDEX = "org.jboss.jandex";
160-
private static final String JANDEX_MAVEN_PLUGIN = "jandex-maven-plugin";
161-
private static final String JANDEX = "jandex";
162-
163158
private static final String BOOTSTRAP_ID = "DevMojo";
164159

165160
/**
@@ -367,6 +362,17 @@ public class DevMojo extends AbstractMojo {
367362
@Component
368363
BuildAnalyticsProvider analyticsProvider;
369364

365+
/**
366+
* A comma-separated list of Maven plugin keys in {@code groupId:artifactId} format
367+
* (for example {@code org.codehaus.mojo:flatten-maven-plugin} and/or goal prefixes,
368+
* (for example {@code flatten}) that should be skipped when {@code quarkus:dev} identifies
369+
* Maven plugin goals that should be executed before the application is launched in dev mode.
370+
* <p>
371+
* Only the {@code flatten} Maven plugin is skipped by default.
372+
*/
373+
@Parameter(defaultValue = "org.codehaus.mojo:flatten-maven-plugin")
374+
Set<String> skipPlugins;
375+
370376
/**
371377
* console attributes, used to restore the console state
372378
*/
@@ -587,6 +593,12 @@ private String handleAutoCompile() throws MojoExecutionException {
587593
if (p.getExecutions().isEmpty()) {
588594
continue;
589595
}
596+
if (skipPlugins.contains(p.getKey())) {
597+
if (getLog().isDebugEnabled()) {
598+
getLog().debug("Skipping " + p.getId() + " execution according to skipPlugins value");
599+
}
600+
continue;
601+
}
590602
for (PluginExecution e : p.getExecutions()) {
591603
if (e.getPhase() != null && !PRE_DEV_MODE_PHASES.contains(e.getPhase())) {
592604
// skip executions with phases post quarkus:dev, such as install, deploy, site, etc
@@ -598,6 +610,13 @@ private String handleAutoCompile() throws MojoExecutionException {
598610
String goalPrefix = null;
599611
if (!e.getGoals().isEmpty()) {
600612
goalPrefix = getMojoDescriptor(p, e.getGoals().get(0)).getPluginDescriptor().getGoalPrefix();
613+
if (skipPlugins.contains(goalPrefix)) {
614+
if (getLog().isDebugEnabled()) {
615+
getLog().debug("Skipping " + goalPrefix + " execution according to skipPlugins value");
616+
continue;
617+
}
618+
continue;
619+
}
601620
pluginPrefixes.put(goalPrefix, p);
602621
pluginPrefixes.put(p.getId(), p);
603622
}

0 commit comments

Comments
 (0)