Make quarkus:run a proper launch mode

core/deployment/src/main/java/io/quarkus/deployment/IsDevResourcesSupportedByLaunchMode.java

@@ -0,0 +1,24 @@
+package io.quarkus.deployment;
+
+import java.util.function.BooleanSupplier;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.runtime.LaunchMode;
+
+/**
+ * boolean supplier that returns true if Dev Resources are enabled.
+ * Intended for use with {@link BuildStep#onlyIf()}
+ */
+public class IsDevResourcesSupportedByLaunchMode implements BooleanSupplier {
+
+    private final LaunchMode launchMode;
+
+    public IsDevResourcesSupportedByLaunchMode(LaunchMode launchMode) {
+        this.launchMode = launchMode;
+    }
+
+    @Override
+    public boolean getAsBoolean() {
+        return launchMode.isDevResourcesSupported();
+    }
+}

core/deployment/src/main/java/io/quarkus/deployment/IsDevServicesSupportedByLaunchMode.java

@@ -0,0 +1,24 @@
+package io.quarkus.deployment;
+
+import java.util.function.BooleanSupplier;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.runtime.LaunchMode;
+
+/**
+ * boolean supplier that returns true if Dev Services are enabled.
+ * Intended for use with {@link BuildStep#onlyIf()}
+ */
+public class IsDevServicesSupportedByLaunchMode implements BooleanSupplier {
+
+    private final LaunchMode launchMode;
+
+    public IsDevServicesSupportedByLaunchMode(LaunchMode launchMode) {
+        this.launchMode = launchMode;
+    }
+
+    @Override
+    public boolean getAsBoolean() {
+        return launchMode.isDevServicesSupported();
+    }
+}

core/deployment/src/main/java/io/quarkus/deployment/IsLiveReloadSupportedByLaunchMode.java

@@ -0,0 +1,24 @@
+package io.quarkus.deployment;
+
+import java.util.function.BooleanSupplier;
+
+import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.runtime.LaunchMode;
+
+/**
+ * boolean supplier that returns true if live reload is enabled.
+ * Intended for use with {@link BuildStep#onlyIf()}
+ */
+public class IsLiveReloadSupportedByLaunchMode implements BooleanSupplier {
+
+    private final LaunchMode launchMode;
+
+    public IsLiveReloadSupportedByLaunchMode(LaunchMode launchMode) {
+        this.launchMode = launchMode;
+    }
+
+    @Override
+    public boolean getAsBoolean() {
+        return launchMode.isLiveReloadSupported();
+    }
+}

core/deployment/src/main/java/io/quarkus/deployment/IsNormal.java

@@ -19,6 +19,6 @@ public IsNormal(LaunchMode launchMode) {
 
     @Override
     public boolean getAsBoolean() {
-        return launchMode == LaunchMode.NORMAL;
+        return launchMode == LaunchMode.NORMAL || launchMode == LaunchMode.RUN;
     }
 }

core/deployment/src/main/java/io/quarkus/runner/bootstrap/AugmentActionImpl.java

@@ -112,6 +112,10 @@ public AugmentActionImpl(CuratedApplication curatedApplication, List<Consumer<Bu
                 launchMode = LaunchMode.NORMAL;
                 devModeType = null;
                 break;
+            case RUN:
+                launchMode = LaunchMode.RUN;
+                devModeType = null;
+                break;
             case TEST:
                 launchMode = LaunchMode.TEST;
                 devModeType = null;

core/runtime/src/main/java/io/quarkus/runtime/LaunchMode.java

@@ -5,15 +5,20 @@ public enum LaunchMode {
      * A normal production build. At the moment this can be both native image or
      * JVM mode, but eventually these will likely be split
      */
-    NORMAL(LaunchMode.PROD_PROFILE, "quarkus.profile"),
+    NORMAL(LaunchMode.PROD_PROFILE, "quarkus.profile", false, false),
+    /**
+     * A normal production build. At the moment this can be both native image or
+     * JVM mode, but eventually these will likely be split
+     */
+    RUN(LaunchMode.PROD_PROFILE, "quarkus.profile", true, false),
     /**
      * quarkus:dev or an IDE launch (when we support IDE launch)
      */
-    DEVELOPMENT(LaunchMode.DEV_PROFILE, "quarkus.profile"),
+    DEVELOPMENT(LaunchMode.DEV_PROFILE, "quarkus.profile", true, true),
     /**
      * a test run
      */
-    TEST(LaunchMode.TEST_PROFILE, "quarkus.test.profile");
+    TEST(LaunchMode.TEST_PROFILE, "quarkus.test.profile", true, true);
 
     public static final String DEV_PROFILE = "dev";
     public static final String PROD_PROFILE = "prod";
@@ -36,10 +41,15 @@ public static boolean isRemoteDev() {
 
     private final String defaultProfile;
     private final String profileKey;
+    private final boolean devServicesSupported;
+    private final boolean liveReloadSupported;
 
-    LaunchMode(final String defaultProfile, final String profileKey) {
+    LaunchMode(final String defaultProfile, final String profileKey, final boolean devServicesSupported,
+            final boolean liveReloadSupported) {
         this.defaultProfile = defaultProfile;
         this.profileKey = profileKey;
+        this.devServicesSupported = devServicesSupported;
+        this.liveReloadSupported = liveReloadSupported;
     }
 
     public String getDefaultProfile() {
@@ -50,6 +60,19 @@ public String getProfileKey() {
         return profileKey;
     }
 
+    public boolean isDevServicesSupported() {
+        return devServicesSupported;
+    }
+
+    public boolean isDevResourcesSupported() {
+        // for now, we support Dev Resources when Dev Services are supported but we have the option to split it later
+        return devServicesSupported;
+    }
+
+    public boolean isLiveReloadSupported() {
+        return liveReloadSupported;
+    }
+
     private static volatile LaunchMode launchMode = LaunchMode.NORMAL;
 
     public static void set(LaunchMode mode) {

devtools/maven/src/main/java/io/quarkus/maven/RunMojo.java

@@ -55,12 +55,12 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
             }
         }
 
-        try (CuratedApplication curatedApplication = bootstrapApplication(LaunchMode.NORMAL,
+        try (CuratedApplication curatedApplication = bootstrapApplication(LaunchMode.RUN,
                 new Consumer<QuarkusBootstrap.Builder>() {
                     @Override
                     public void accept(QuarkusBootstrap.Builder builder) {
                         // we need this for dev services
-                        builder.setMode(QuarkusBootstrap.Mode.TEST);
+                        builder.setMode(QuarkusBootstrap.Mode.RUN);
                     }
                 })) {
             AugmentAction action = curatedApplication.createAugmentor();

extensions/amazon-lambda/common-deployment/src/main/java/io/quarkus/amazon/lambda/deployment/DevServicesLambdaProcessor.java

@@ -12,6 +12,7 @@
 import io.quarkus.amazon.lambda.runtime.LambdaHotReplacementRecorder;
 import io.quarkus.amazon.lambda.runtime.MockEventServer;
 import io.quarkus.deployment.Feature;
+import io.quarkus.deployment.IsLiveReloadSupportedByLaunchMode;
 import io.quarkus.deployment.IsNormal;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -26,7 +27,7 @@
 public class DevServicesLambdaProcessor {
     private static final Logger log = Logger.getLogger(DevServicesLambdaProcessor.class);
 
-    @BuildStep(onlyIfNot = IsNormal.class)
+    @BuildStep(onlyIf = IsLiveReloadSupportedByLaunchMode.class)
     @Record(STATIC_INIT)
     public void enableHotReplacementChecker(LaunchModeBuildItem launchMode,
             LambdaHotReplacementRecorder recorder,

extensions/datasource/deployment/src/main/java/io/quarkus/datasource/deployment/devservices/DevServicesDatasourceProcessor.java

@@ -24,7 +24,7 @@
 import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsDevServicesSupportedByLaunchMode;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
@@ -42,7 +42,7 @@
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.configuration.ConfigUtils;
 
-@BuildSteps(onlyIfNot = IsNormal.class, onlyIf = DevServicesConfig.Enabled.class)
+@BuildSteps(onlyIf = { IsDevServicesSupportedByLaunchMode.class, DevServicesConfig.Enabled.class })
 public class DevServicesDatasourceProcessor {
 
     private static final Logger log = Logger.getLogger(DevServicesDatasourceProcessor.class);

extensions/devservices/deployment/src/main/java/io/quarkus/devservices/deployment/DevServicesProcessor.java

@@ -36,8 +36,8 @@
 import com.github.dockerjava.api.model.Container;
 import com.github.dockerjava.api.model.ContainerNetworkSettings;
 
+import io.quarkus.deployment.IsDevServicesSupportedByLaunchMode;
 import io.quarkus.deployment.IsDevelopment;
-import io.quarkus.deployment.IsNormal;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.Produce;
@@ -89,7 +89,7 @@ public DevServicesNetworkIdBuildItem networkId(
         return new DevServicesNetworkIdBuildItem(networkId);
     }
 
-    @BuildStep(onlyIfNot = IsNormal.class)
+    @BuildStep(onlyIf = IsDevServicesSupportedByLaunchMode.class)
     @Produce(ServiceStartBuildItem.class)
     public DevServicesCustomizerBuildItem containerCustomizer(LaunchModeBuildItem launchModeBuildItem,
             DevServicesConfig globalDevServicesConfig) {
@@ -140,7 +140,7 @@ private Optional<String> getSharedNetworkId() {
         }
     }
 
-    @BuildStep(onlyIfNot = IsNormal.class)
+    @BuildStep(onlyIf = IsDevServicesSupportedByLaunchMode.class)
     @Produce(ServiceStartBuildItem.class)
     DevServicesRegistryBuildItem devServicesRegistry(LaunchModeBuildItem launchMode,
             ApplicationInstanceIdBuildItem applicationId,

extensions/devservices/deployment/src/main/java/io/quarkus/devservices/deployment/compose/ComposeDevServicesProcessor.java

@@ -27,7 +27,7 @@
 import org.jboss.logging.Logger;
 
 import io.quarkus.deployment.Feature;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsDevServicesSupportedByLaunchMode;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
@@ -56,7 +56,7 @@
 /**
  * Processor that starts the Compose dev services.
  */
-@BuildSteps(onlyIfNot = IsNormal.class, onlyIf = DevServicesConfig.Enabled.class)
+@BuildSteps(onlyIf = { IsDevServicesSupportedByLaunchMode.class, DevServicesConfig.Enabled.class })
 public class ComposeDevServicesProcessor {
 
     private static final Logger log = Logger.getLogger(ComposeDevServicesProcessor.class);

extensions/devservices/keycloak/src/main/java/io/quarkus/devservices/keycloak/KeycloakDevServicesProcessor.java

@@ -49,8 +49,8 @@
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.utility.DockerImageName;
 
+import io.quarkus.deployment.IsDevServicesSupportedByLaunchMode;
 import io.quarkus.deployment.IsDevelopment;
-import io.quarkus.deployment.IsNormal;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
@@ -82,7 +82,7 @@
 import io.vertx.mutiny.ext.web.client.HttpResponse;
 import io.vertx.mutiny.ext.web.client.WebClient;
 
-@BuildSteps(onlyIfNot = IsNormal.class, onlyIf = DevServicesConfig.Enabled.class)
+@BuildSteps(onlyIf = { IsDevServicesSupportedByLaunchMode.class, DevServicesConfig.Enabled.class })
 public class KeycloakDevServicesProcessor {
 
     private static final Logger LOG = Logger.getLogger(KeycloakDevServicesProcessor.class);

extensions/devservices/oidc/src/main/java/io/quarkus/devservices/oidc/OidcDevServicesProcessor.java

@@ -31,7 +31,7 @@
 import org.jboss.logging.Logger;
 import org.jose4j.base64url.Base64Url;
 
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsDevServicesSupportedByLaunchMode;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
@@ -51,7 +51,7 @@
 import io.vertx.mutiny.ext.web.RoutingContext;
 import io.vertx.mutiny.ext.web.handler.BodyHandler;
 
-@BuildSteps(onlyIfNot = IsNormal.class, onlyIf = DevServicesConfig.Enabled.class)
+@BuildSteps(onlyIf = { IsDevServicesSupportedByLaunchMode.class, DevServicesConfig.Enabled.class })
 public class OidcDevServicesProcessor {
 
     private static final Logger LOG = Logger.getLogger(OidcDevServicesProcessor.class);

extensions/elasticsearch-rest-client-common/deployment/src/main/java/io/quarkus/elasticsearch/restclient/common/deployment/DevServicesElasticsearchProcessor.java

@@ -21,7 +21,7 @@
 
 import io.quarkus.builder.BuildException;
 import io.quarkus.deployment.Feature;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsDevServicesSupportedByLaunchMode;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
 import io.quarkus.deployment.builditem.CuratedApplicationShutdownBuildItem;
@@ -48,7 +48,7 @@
 /**
  * Starts an Elasticsearch server as dev service if needed.
  */
-@BuildSteps(onlyIfNot = IsNormal.class, onlyIf = DevServicesConfig.Enabled.class)
+@BuildSteps(onlyIf = { IsDevServicesSupportedByLaunchMode.class, DevServicesConfig.Enabled.class })
 public class DevServicesElasticsearchProcessor {
     private static final Logger log = Logger.getLogger(DevServicesElasticsearchProcessor.class);
 

extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/dev/HibernateOrmDevServicesProcessor.java

@@ -11,7 +11,7 @@
 
 import io.quarkus.agroal.spi.JdbcDataSourceSchemaReadyBuildItem;
 import io.quarkus.datasource.common.runtime.DataSourceUtil;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsDevServicesSupportedByLaunchMode;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
@@ -23,7 +23,7 @@
 import io.quarkus.hibernate.orm.runtime.HibernateOrmRuntimeConfig;
 import io.quarkus.runtime.configuration.ConfigUtils;
 
-@BuildSteps(onlyIf = HibernateOrmEnabled.class, onlyIfNot = IsNormal.class)
+@BuildSteps(onlyIf = { IsDevServicesSupportedByLaunchMode.class, HibernateOrmEnabled.class })
 public class HibernateOrmDevServicesProcessor {
 
     private static final Logger LOG = Logger.getLogger(HibernateOrmDevServicesProcessor.class);

extensions/hibernate-search-orm-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/orm/elasticsearch/deployment/HibernateSearchElasticsearchProcessor.java

@@ -29,7 +29,7 @@
 import org.jboss.logging.Logger;
 
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsDevServicesSupportedByLaunchMode;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
@@ -261,7 +261,7 @@ void setRuntimeConfig(HibernateSearchElasticsearchRecorder recorder,
         }
     }
 
-    @BuildStep(onlyIfNot = IsNormal.class)
+    @BuildStep(onlyIf = IsDevServicesSupportedByLaunchMode.class)
     DevservicesElasticsearchBuildItem devServices(HibernateSearchElasticsearchBuildTimeConfig buildTimeConfig) {
         var defaultPUConfig = buildTimeConfig.persistenceUnits().get(PersistenceUnitUtil.DEFAULT_PERSISTENCE_UNIT_NAME);
         if (defaultPUConfig == null) {
@@ -289,7 +289,7 @@ DevservicesElasticsearchBuildItem devServices(HibernateSearchElasticsearchBuildT
                 Distribution.valueOf(version.distribution().toString().toUpperCase()));
     }
 
-    @BuildStep(onlyIfNot = IsNormal.class)
+    @BuildStep(onlyIf = IsDevServicesSupportedByLaunchMode.class)
     void devServicesDropAndCreateAndDropByDefault(
             List<HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem> configuredPersistenceUnits,
             BuildProducer<DevServicesAdditionalConfigBuildItem> devServicesAdditionalConfigProducer) {

extensions/hibernate-search-standalone-elasticsearch/deployment/src/main/java/io/quarkus/hibernate/search/standalone/elasticsearch/deployment/HibernateSearchStandaloneProcessor.java

@@ -33,7 +33,7 @@
 import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.arc.processor.DotNames;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsDevServicesSupportedByLaunchMode;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
@@ -210,7 +210,7 @@ void boot(Optional<HibernateSearchStandaloneEnabledBuildItem> enabled,
         serviceStart.produce(new ServiceStartBuildItem("Hibernate Search Standalone"));
     }
 
-    @BuildStep(onlyIfNot = IsNormal.class)
+    @BuildStep(onlyIf = IsDevServicesSupportedByLaunchMode.class)
     void devServices(Optional<HibernateSearchStandaloneEnabledBuildItem> enabled,
             HibernateSearchStandaloneBuildTimeConfig buildTimeConfig,
             BuildProducer<DevservicesElasticsearchBuildItem> buildItemBuildProducer,

extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/devservices/InfinispanDevServiceProcessor.java

@@ -23,7 +23,7 @@
 import org.testcontainers.containers.BindMode;
 
 import io.quarkus.deployment.Feature;
-import io.quarkus.deployment.IsNormal;
+import io.quarkus.deployment.IsDevServicesSupportedByLaunchMode;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
 import io.quarkus.deployment.builditem.CuratedApplicationShutdownBuildItem;
@@ -49,7 +49,7 @@
 import io.quarkus.runtime.LaunchMode;
 import io.quarkus.runtime.configuration.ConfigUtils;
 
-@BuildSteps(onlyIfNot = IsNormal.class, onlyIf = DevServicesConfig.Enabled.class)
+@BuildSteps(onlyIf = { IsDevServicesSupportedByLaunchMode.class, DevServicesConfig.Enabled.class })
 public class InfinispanDevServiceProcessor {
     private static final Logger log = Logger.getLogger(InfinispanDevServiceProcessor.class);