Merge branch 'endgame-202301' into develop

microsoft · Feb 3, 2023 · 3cda683 · 3cda683
2 parents 666e0be + bcfeabd
commit 3cda683
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/...ebapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/AbstractWebAppMojo.java b/...ebapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/AbstractWebAppMojo.java
@@ -58,16 +58,16 @@ public abstract class AbstractWebAppMojo extends AbstractAppServiceMojo {
     /**
      * Pricing for web app <p>
      * Supported values : F1, D1, B1, B2, B3, S1, S2, S3, P1V2, P2V2, P3V2, P1V3, P2V3, P3V3
-     * @Since 0.1.0
+     * @since 0.1.0
      */
     @JsonProperty
     @Parameter(property = "webapp.pricingTier")
     protected String pricingTier;
 
     /**
      * Boolean flag to control whether stop web app during deployment.
-     * @Deprecated Please use `restartSite` instead.
-     * @Since 0.1.0
+     * @deprecated Please use `restartSite` instead.
+     * @since 0.1.0
      */
     @Getter
     @JsonProperty
@@ -77,7 +77,7 @@ public abstract class AbstractWebAppMojo extends AbstractAppServiceMojo {
 
     /**
      * Boolean flag to control whether to restart site after deployment. By default the value is true.
-     * @Since 2.8.0
+     * @since 2.8.0
      */
     @Getter
     @JsonProperty

diff --git a/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/DeployMojo.java b/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/DeployMojo.java
@@ -53,23 +53,23 @@ public class DeployMojo extends AbstractWebAppMojo {
 
     /**
      * Boolean flag to control whether to wait deployment complete in app service with deployment status API.
-     * @Since 2.8.0
+     * @since 2.8.0
      */
     @Getter
     @Parameter(property = "webapp.waitDeploymentComplete")
     protected Boolean waitDeploymentComplete;
 
     /**
      *  The interval in seconds to check deployment status.
-     *  @Since 2.8.0
+     *  @since 2.8.0
      */
     @Getter
     @Parameter(property = "webapp.deploymentStatusRefreshInterval")
     protected Long deploymentStatusRefreshInterval;
 
     /**
      *  The max retry times to check deployment status
-     *  @Since 2.8.0
+     *  @since 2.8.0
      */
     @Getter
     @Parameter(property = "webapp.deploymentStatusMaxRefreshTimes")

diff --git a/...bapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/WebAppConfiguration.java b/...bapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/WebAppConfiguration.java
@@ -93,4 +93,10 @@ public String getJavaVersionOrDefault() {
     public String getWebContainerOrDefault() {
         return Objects.toString(ObjectUtils.firstNonNull(webContainer, DEFAULT_CONTAINER));
     }
+
+    public static abstract class WebAppConfigurationBuilder<
+        C extends WebAppConfiguration,
+        B extends WebAppConfiguration.WebAppConfigurationBuilder<C, B>
+        > {
+    }
 }