Merge pull request #297143 from m-reza-rahman/java-suggestions-reza

Update Java positioning and content

Author: Stacyrch140

articles/app-service/configure-common.md

@@ -4,7 +4,7 @@ description: Learn how to configure common settings for an Azure App Service app
 keywords: azure app service, web app, app settings, environment variables
 ms.assetid: 9af8a367-7d39-4399-9941-b80cbc5f39a0
 ms.topic: how-to
-ms.date: 03/24/2025
+ms.date: 03/27/2025
 ms.custom: devx-track-csharp, devx-track-azurecli, devx-track-azurepowershell, AppServiceConnectivity
 ms.devlang: azurecli
 author: cephalin
@@ -34,10 +34,10 @@ For ASP.NET and ASP.NET Core developers, configuring app settings in App Service
 Other language stacks get the app settings as environment variables at runtime. For steps that are specific to each language stack, see:
 
 - [ASP.NET Core](configure-language-dotnetcore.md#access-environment-variables)
+- [Java](configure-language-java-data-sources.md)
 - [Node.js](configure-language-nodejs.md#access-environment-variables)
-- [PHP](configure-language-php.md#access-environment-variables)
 - [Python](configure-language-python.md#access-app-settings-as-environment-variables)
-- [Java](configure-language-java-data-sources.md)
+- [PHP](configure-language-php.md#access-environment-variables)
 - [Custom containers](configure-custom-container.md#configure-environment-variables)
 
 App settings are always encrypted when they're stored (encrypted at rest).
@@ -230,10 +230,10 @@ At runtime, connection strings are available as environment variables, prefixed
 For example, a MySQL connection string named *connectionstring1* can be accessed as the environment variable `MYSQLCONNSTR_connectionString1`. For steps that are specific to each language stack, see:
 
 - [ASP.NET Core](configure-language-dotnetcore.md#access-environment-variables)
+- [Java](configure-language-java-data-sources.md)
 - [Node.js](configure-language-nodejs.md#access-environment-variables)
-- [PHP](configure-language-php.md#access-environment-variables)
 - [Python](configure-language-python.md#access-environment-variables)
-- [Java](configure-language-java-data-sources.md)
+- [PHP](configure-language-php.md#access-environment-variables)
 - [Custom containers](configure-custom-container.md#configure-environment-variables)
 
 Connection strings are always encrypted when they're stored (encrypted at rest).
@@ -411,10 +411,10 @@ It's not possible to edit connection strings in bulk by using a JSON file with A
 To configure language stack settings, see these resources:
 
 - [ASP.NET Core](configure-language-dotnetcore.md)
+- [Java](configure-language-java-deploy-run.md)
 - [Node.js](configure-language-nodejs.md)
-- [PHP](configure-language-php.md)
 - [Python](configure-language-python.md)
-- [Java](configure-language-java-deploy-run.md)
+- [PHP](configure-language-php.md)
 
 <a name="alwayson"></a>
 

articles/app-service/configure-language-java-deploy-run.md

@@ -2,11 +2,11 @@
 author: cephalin
 ms.author: cephalin
 ms.topic: include
-ms.date: 05/17/2024
+ms.date: 03/27/2025
 ---
 
 Azure App Service runs Java web applications on a fully managed service in three variants:
 
-* Java SE - Can run an app deployed as a JAR package that contains an embedded server (such as Spring Boot, Dropwizard, Quarkus, or one with an embedded Tomcat or Jetty server).   
-* Tomcat - The built-in Tomcat server can run an app deployed as a WAR package.
-* JBoss EAP - Supported for Linux apps in the Free, Premium v3, and Isolated v2 pricing tiers only. The built-in JBoss EAP server can run an app deployed as a WAR or EAR package.
+* Java Standard Edition (SE) - Can run an app deployed as a Java Archive (JAR) package that contains an embedded server (such as Spring Boot, Quarkus, Dropwizard, or one with an embedded Tomcat or Jetty server).   
+* Tomcat - The built-in Tomcat server can run an app deployed as a Web application ARchive (WAR) package.
+* JBoss Enterprise Application Platform (EAP) - The built-in JBoss EAP server can run an app deployed as a WAR or Enterprise Archive (EAR) package. Supported for Linux apps in a set of pricing tiers which includes Free, Premium v3, and Isolated v2.

articles/app-service/includes/configure-language-java/java-variants.md

@@ -4,7 +4,7 @@ ms.service: azure-app-service
 ms.devlang: java
 ms.custom: linux-related-content
 ms.topic: quickstart
-ms.date: 02/14/2025
+ms.date: 03/18/2025
 ms.author: cephalin
 ---
 
@@ -70,6 +70,23 @@ docker --version
    ENTRYPOINT ["dotnet", "/defaulthome/hostingstart/hostingstart.dll"]
    ```
 
+   # [Java](#tab/java)
+
+   In this Dockerfile, the parent image is one of the built-in Java containers of App Service. You can find the source files for it at
+   [java/tree/dev/java11-alpine](https://github.com/Azure-App-Service/java/tree/dev/java11-alpine).
+   Its [Dockerfile](https://github.com/Azure-App-Service/java/blob/dev/java11-alpine/Dockerfile) copies a simple Java app into `/tmp/appservice`. Your Dockerfile starts
+   that app.
+
+   <!-- https://mcr.microsoft.com/v2/azure-app-service%2Fjava/tags/list -->
+   ```dockerfile
+   FROM mcr.microsoft.com/azure-app-service/java:11-java11_stable
+
+   ENV PORT 80
+   EXPOSE 80
+
+   ENTRYPOINT ["java", "-Dserver.port=80", "-jar", "/tmp/appservice/parkingpage.jar"]
+   ```
+
    # [Node.js](#tab/node)
 
    In this Dockerfile, the parent image is one of the built-in Node.js containers of App Service.
@@ -98,20 +115,6 @@ docker --version
 
    ENTRYPOINT ["gunicorn", "--timeout", "600", "--access-logfile", "'-'", "--error-logfile", "'-'", "--chdir=/opt/defaultsite", "application:app"]
    ```
-
-   # [Java](#tab/java)
-
-   In this Dockerfile, the parent image is one of the built-in Java containers of App Service. You can find the source files for it at [java/tree/dev/java11-alpine](https://github.com/Azure-App-Service/java/tree/dev/java11-alpine). Its [Dockerfile](https://github.com/Azure-App-Service/java/blob/dev/java11-alpine/Dockerfile) copies a simple Java app into `/tmp/appservice`. Your Dockerfile starts that app.
-
-   <!-- https://mcr.microsoft.com/v2/azure-app-service%2Fjava/tags/list -->
-   ```dockerfile
-   FROM mcr.microsoft.com/azure-app-service/java:11-java11_stable
-
-   ENV PORT 80
-   EXPOSE 80
-
-   ENTRYPOINT ["java", "-Dserver.port=80", "-jar", "/tmp/appservice/parkingpage.jar"]
-   ```
    ---
 
 1. [Open the Command Palette](https://code.visualstudio.com/docs/getstarted/userinterface#_command-palette), and type **Docker Images: Build Image**. Select **Enter** to run the command.
@@ -155,7 +158,7 @@ The **Output** panel shows the status of the deployment operations. When the ope
 
 ## Related content
 
-Congratulations, you've successfully completed this quickstart.
+Congratulations, you successfully completed this quickstart!
 
 The App Service app pulls from the container registry every time it starts. If you rebuild your image, you just need to push it to your container registry, and the app pulls in the updated image when it restarts. To tell your app to pull in the updated image immediately, restart it.
 

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-linux-visual-studio-code-pivot.md

@@ -5,7 +5,7 @@ author: msangapu-msft
 ms.author: msangapu
 ms.assetid: 582bb3c2-164b-42f5-b081-95bfcb7a502a
 ms.topic: quickstart
-ms.date: 02/06/2024
+ms.date: 03/18/2025
 ms.custom: subject-armqs, mode-arm, devdivchpfy22, devx-track-arm-template, linux-related-content
 zone_pivot_groups: app-service-platform-windows-linux-windows-container
 adobe-target: true
@@ -19,7 +19,7 @@ adobe-target-content: ./quickstart-arm-template-uiex
 ::: zone pivot="platform-windows"
 Get started with [Azure App Service](overview.md) by deploying an app to the cloud using an Azure Resource Manager template (ARM template) and [Azure CLI](/cli/azure/get-started-with-azure-cli) in Cloud Shell. A Resource Manager template is a JavaScript Object Notation (JSON) file that defines the infrastructure and configuration for your project. You incur no costs to complete this quickstart because you use a free App Service tier.
 
-To complete this quickstart, you'll need an Azure account with an active subscription. If you don't have an Azure account, you can [create one for free](https://azure.microsoft.com/free/).
+To complete this quickstart, you need an Azure account with an active subscription. If you don't have an Azure account, you can [create one for free](https://azure.microsoft.com/free/).
 
 ## Skip to the end
 
@@ -33,7 +33,7 @@ In the Azure portal, select **Create new** to create a new Resource Group and th
 ::: zone pivot="platform-linux"
 Get started with [Azure App Service](overview.md) by deploying an app to the cloud using an Azure Resource Manager template (ARM template) and [Azure CLI](/cli/azure/get-started-with-azure-cli) in Cloud Shell. A Resource Manager template is a JavaScript Object Notation (JSON) file that defines the infrastructure and configuration for your project. You incur no costs to complete this quickstart because you use a free App Service tier.
 
-To complete this quickstart, you'll need an Azure account with an active subscription. If you don't have an Azure account, you can [create one for free](https://azure.microsoft.com/free/).
+To complete this quickstart, you need an Azure account with an active subscription. If you don't have an Azure account, you can [create one for free](https://azure.microsoft.com/free/).
 
 ## Skip to the end
 
@@ -132,7 +132,7 @@ This template contains several parameters that are predefined for your convenien
 
 Azure CLI is used here to deploy the template. You can also use the Azure portal, Azure PowerShell, and REST API. To learn other deployment methods, see [Deploy templates](../azure-resource-manager/templates/deploy-powershell.md).
 
-The following code creates a resource group, an App Service plan, and a web app. A default resource group, App Service plan, and location have been set for you. Replace `<app-name>` with a globally unique app name (valid characters are `a-z`, `0-9`, and `-`).
+The following code creates a resource group, an App Service plan, and a web app. A default resource group, App Service plan, and location are set for you. Replace `<app-name>` with a globally unique app name (valid characters are `a-z`, `0-9`, and `-`).
 
 ::: zone pivot="platform-windows"
 Run the following commands to deploy a .NET framework app on Windows.
@@ -154,15 +154,19 @@ az deployment group create --resource-group myResourceGroup --parameters webAppN
 --template-uri "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/quickstarts/microsoft.web/app-service-docs-linux/azuredeploy.json"
 ```
 
-To deploy a different language stack, update `linuxFxVersion` with appropriate values. Samples are shown in the table. To show current versions, run the following command in the Cloud Shell: `az webapp config show --resource-group myResourceGroup --name <app-name> --query linuxFxVersion`
+To deploy a different language stack, update `linuxFxVersion` with appropriate values. Samples are shown in the table. To show current versions, run the following command in the Cloud Shell:
 
-| Language    | Example                                              |
-|-------------|------------------------------------------------------|
-| **.NET**    | linuxFxVersion="DOTNETCORE&#124;3.0"                 |
-| **PHP**     | linuxFxVersion="PHP&#124;7.4"                        |
-| **Node.js** | linuxFxVersion="NODE&#124;10.15"                     |
-| **Java**    | linuxFxVersion="JAVA&#124;1.8 &#124;TOMCAT&#124;9.0" |
-| **Python**  | linuxFxVersion="PYTHON&#124;3.7"                     |
+```azurecli-interactive
+az webapp config show --resource-group myResourceGroup --name <app-name> --query linuxFxVersion
+```
+
+| Language    | Example                                                                            |
+|-------------|------------------------------------------------------------------------------------|
+| **.NET**    | linuxFxVersion="DOTNETCORE&#124;3.0"                                               |
+| **Java**    | linuxFxVersion="JAVA&#124;21-java21 TOMCAT&#124;10.1-java21 JBOSSEAP&#124;8-java17"|
+| **Node.js** | linuxFxVersion="NODE&#124;10.15"                                                   |
+| **Python**  | linuxFxVersion="PYTHON&#124;3.7"                                                   |
+| **PHP**     | linuxFxVersion="PHP&#124;7.4"                                                      |
 
 ---
 ::: zone-end