Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr

Author: markingmyname

articles/active-directory-b2c/partner-idemia.md

@@ -8,7 +8,7 @@ ms.service: active-directory
 ms.subservice: domain-services
 ms.workload: identity
 ms.topic: how-to
-ms.date: 01/29/2023
+ms.date: 03/10/2023
 ms.author: justinha 
 ---
 
@@ -174,11 +174,11 @@ Before you begin the migration process, complete the following initial checks an
 
     The following network security group Inbound rules are required for the managed domain to provide authentication and management services. Don't edit or delete these network security group rules for the virtual network subnet your managed domain is deployed into.
 
-    | Inbound port number | Protocol | Source                             | Destination | Action | Required | Purpose |
-    |:-----------:|:--------:|:----------------------------------:|:-----------:|:------:|:--------:|:--------|
-    | 5986        | TCP      | AzureActiveDirectoryDomainServices | Any         | Allow  | Yes      | Management of your domain. |
-    | 3389        | TCP      | CorpNetSaw                         | Any         | Allow  | Optional      | Debugging for support. |
-    | 636         | TCP      | AzureActiveDirectoryDomainServices | Inbound         | Allow  | Optional      | Secure LDAP. |
+    | Source      | Source service tag                 | Source port ranges |  Destination  | Service | Destination port ranges | Protocol | Action | Required | Purpose |
+    |:-----------:|:----------------------------------:|:------------------:|:-------------:|:-------:|:-----------------------:|:--------:|:------:|:--------:|:--------|
+    | Service tag | AzureActiveDirectoryDomainServices | *                  | Any           | WinRM   | 5986        | TCP       | Allow  | Yes       | Management of your domain |
+    | Service tag | CorpNetSaw                         | *                  | Any           | WinRM   | 3389        | TCP       | Allow  | Optional  | Debugging for support |
+    | Service tag | AzureActiveDirectoryDomainServices | *                  | Any           | WinRM   | 636         | TCP       | Allow  | Optional  | Secure LDAP |
 
     Make a note of this target resource group, target virtual network, and target virtual network subnet. These resource names are used during the migration process.
 

articles/active-directory-domain-services/migrate-from-classic-vnet.md

@@ -15,17 +15,19 @@ ms.reviewer: manrath, sureshja
 
 # Validation differences by supported account types (signInAudience)
 
-When registering an application with the Microsoft identity platform for developers, you're asked to select which account types your application supports. In the application object and manifest, this property is `signInAudience`.
+When registering an application with the Microsoft identity platform for developers, you're asked to select which account types your application supports. You can refer to the **Help me choose** link under **Supported account types** during the registration process. The value you select for this property has implications on other app object properties.
 
-The options include the following values:
+After the application has been registered, you can check or change the account type that the application supports at any time. Under the **Manage** pane of your application, search for **Manifest** and find the `signInAudience` value. The different account types, and the corresponding `signInAudience` are shown in the following table:
 
-- **AzureADMyOrg**: Only accounts in the organizational directory where the app is registered (single-tenant).
-- **AzureADMultipleOrgs**: Accounts in any organizational directory (multi-tenant).
-- **AzureADandPersonalMicrosoftAccount**: Accounts in any organizational directory (multi-tenant) and personal Microsoft accounts (for example, Skype, Xbox, and Outlook.com).
+| Supported account types (Register an application) | `signInAudience` (Manifest) |
+|---------------------------------------------------|-----------------------------|
+| Accounts in this organizational directory only (Single tenant) | `AzureADMyOrg` |
+| Accounts in any organizational directory (Any Azure AD directory - Multitenant) | `AzureADMultipleOrgs` |
+| Accounts in any organizational directory (Any Azure AD directory - Multitenant) and personal Microsoft accounts (e.g. Skype, Xbox) | `AzureADandPersonalMicrosoftAccount` |
 
-For registered applications, you can find the value for supported account types on the **Authentication** section of an application. You can also find it under the `signInAudience` property in the **Manifest**.
+If you change this property you may need to change other properties first. 
 
-The value you select for this property has implications on other app object properties. As a result, if you change this property you may need to change other properties first.
+## Validation differences
 
 See the following table for the validation differences of various properties for different supported account types.
 

articles/active-directory/develop/supported-accounts-validation.md

@@ -39,19 +39,23 @@ If Maven isn't your preferred development tool, check out our similar tutorials
 
 # [Java SE](#tab/javase)
 
-Clone the [Spring Boot Getting Started](https://github.com/spring-guides/gs-spring-boot) sample project and check out the source code that runs with this version of the article.
+Clone the [sample project](https://github.com/Azure-Samples/app-service-java-quickstart) and check out the source code that runs with this version of the article.
 
 ```azurecli-interactive
-git clone https://github.com/spring-guides/gs-spring-boot
-git checkout 05ffa84
+git clone https://github.com/Azure-Samples/app-service-java-quickstart
 ```
 
-Change directory to the completed project.
+Change directory to the completed project and build from the top level. Then `cd` to the subdirectory for booty duke.
 
 ```azurecli-interactive
-cd gs-spring-boot/complete
+cd app-service-java-quickstart
+git checkout 20230308
+mvn clean install
+cd booty-duke-app-service
 ```
 
+
+
 # [Tomcat](#tab/tomcat)
 
 Execute the following Maven command in the Cloud Shell prompt to create a new app named `helloworld`:
@@ -71,13 +75,16 @@ cd helloworld
 Clone the Pet Store demo application.
 
 ```azurecli-interactive
-git clone https://github.com/agoncal/agoncal-application-petstore-ee7.git
+git clone https://github.com/Azure-Samples/app-service-java-quickstart
 ```
 
-Change directory to the cloned project.
+Change directory to the completed project and build from the top level. Then `cd` to the subdirectory for petstore.
 
 ```azurecli-interactive
-cd agoncal-application-petstore-ee7
+cd app-service-java-quickstart
+git checkout 20230308
+mvn clean install
+cd petstore-ee7
 ```
 
 ---
@@ -88,45 +95,47 @@ cd agoncal-application-petstore-ee7
 > The Maven plugin supports **Java 17** and **Tomcat 10.0**. For more information about latest support, see [Java 17 and Tomcat 10.0 are available on Azure App Service](https://devblogs.microsoft.com/java/java-17-and-tomcat-10-0-available-on-azure-app-service/).
 
 
-The deployment process to Azure App Service will use your Azure credentials from the Azure CLI automatically. If the Azure CLI is not installed locally, then the Maven plugin will authenticate with Oauth or device login. For more information, see [authentication with Maven plugins](https://github.com/microsoft/azure-maven-plugins/wiki/Authentication).
+The deployment process to Azure App Service uses your Azure credentials from the Azure CLI automatically. If the Azure CLI isn't installed locally, then the Maven plugin authenticates with Oauth or device login. For more information, see [authentication with Maven plugins](https://github.com/microsoft/azure-maven-plugins/wiki/Authentication).
 
-Run the Maven command below to configure the deployment. This command will help you to set up the App Service operating system, Java version, and Tomcat version.
+Run the Maven command shown next to configure the deployment. This command helps you to set up the App Service operating system, Java version, and Tomcat version.
 
 ```azurecli-interactive
 mvn com.microsoft.azure:azure-webapp-maven-plugin:2.9.0:config
 ```
 
 # [Java SE](#tab/javase)
 
+1. If prompted for **Create new run configuration**, select **Y**.
 1. When prompted with **Subscription** option, select the proper `Subscription` by entering the number printed at the start of the line.
 1. When prompted with **Web App** option, select the default option, `<create>`, by pressing enter.
 1. When prompted with **OS** option, select **Linux** by pressing enter.
-1. When prompted with **javaVersion** option, select **Java 11**.
+1. When prompted with **javaVersion** option, select **Java 17**.
 1. When prompted with **Pricing Tier** option, select **P1v2**.
 1. Finally, press enter on the last prompt to confirm your selections.
 
     ```
     Please confirm webapp properties
-    Subscription Id : ********-****-****-****-************
-    AppName : spring-boot-1599007116351
-    ResourceGroup : spring-boot-1599007116351-rg
+    AppName : booty-duke-1678285507374
+    ResourceGroup : booty-duke-1678285507374-rg
     Region : centralus
     PricingTier : P1v2
     OS : Linux
-    Web server stack : Java SE
+    Java Version: Java 17
+    Web server stack: Java SE
     Deploy to slot : false
-    Confirm (Y/N)? : Y
+    Confirm (Y/N) [Y]: Y
     [INFO] Saving configuration to pom.
     [INFO] ------------------------------------------------------------------------
     [INFO] BUILD SUCCESS
     [INFO] ------------------------------------------------------------------------
-    [INFO] Total time: 20.925 s
-    [INFO] Finished at: 2020-09-01T17:38:51-07:00
+    [INFO] Total time:  01:03 min
+    [INFO] Finished at: 2023-03-08T15:25:47+01:00
     [INFO] ------------------------------------------------------------------------
     ```
 
 # [Tomcat](#tab/tomcat)
 
+1. If prompted for **Create new run configuration**, select **Y**.
 1. When prompted with **Subscription** option, select the proper `Subscription` by entering the number printed at the line start.
 1. When prompted with **Web App** option, select the default option, `<create>`, by pressing enter.
 1. When prompted with **OS** option, select **Linux** by pressing enter.
@@ -157,6 +166,7 @@ mvn com.microsoft.azure:azure-webapp-maven-plugin:2.9.0:config
 
 # [JBoss EAP](#tab/jbosseap)
 
+1. If prompted for **Create new run configuration**, select **Y**.
 1. If prompted with **Subscription** option, select the proper `Subscription` by entering the number printed at the line start.
 1. When prompted with **Web App** option, accept the default option `<create>` by pressing enter.
 1. When prompted with **OS** option, select **Linux** by pressing enter.
@@ -181,8 +191,8 @@ mvn com.microsoft.azure:azure-webapp-maven-plugin:2.9.0:config
     [INFO] ------------------------------------------------------------------------
     [INFO] BUILD SUCCESS
     [INFO] ------------------------------------------------------------------------
-    [INFO] Total time: 01:01 min
-    [INFO] Finished at: 2021-06-11T15:52:25-07:00
+    [INFO] Total time:  02:07 min
+    [INFO] Finished at: 2023-03-10T15:34:00+01:00
     [INFO] ------------------------------------------------------------------------
     ```
 
@@ -197,14 +207,14 @@ Property | Required | Description | Version
 `<subscriptionId>` | false | Specify the subscription ID. | 0.1.0+
 `<resourceGroup>` | true | Azure Resource Group for your Web App. | 0.1.0+
 `<appName>` | true | The name of your Web App. | 0.1.0+
-`<region>` | false | Specifies the region where your Web App will be hosted; the default value is **centralus**. All valid regions at [Supported Regions](https://azure.microsoft.com/global-infrastructure/services/?products=app-service) section. | 0.1.0+
+`<region>` | false | Specifies the region to host your Web App; the default value is **centralus**. All valid regions at [Supported Regions](https://azure.microsoft.com/global-infrastructure/services/?products=app-service) section. | 0.1.0+
 `<pricingTier>` | false | The pricing tier for your Web App. The default value is **P1v2** for production workload, while **B2** is the recommended minimum for Java dev/test. For more information, see [App Service Pricing](https://azure.microsoft.com/pricing/details/app-service/linux/)| 0.1.0+
 `<runtime>` | false | The runtime environment configuration. For more information, see [Configuration Details](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Web-App:-Configuration-Details). | 0.1.0+
 `<deployment>` | false | The deployment configuration. For more information, see [Configuration Details](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Web-App:-Configuration-Details). | 0.1.0+
 
 For the complete list of configurations, see the plugin reference documentation. All the Azure Maven Plugins share a common set of configurations. For these configurations see [Common Configurations](https://github.com/microsoft/azure-maven-plugins/wiki/Common-Configuration). For configurations specific to App Service, see [Azure Web App: Configuration Details](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Web-App:-Configuration-Details).
 
-Be careful about the values of `<appName>` and `<resourceGroup>` (`helloworld-1590394316693` and `helloworld-1590394316693-rg` accordingly in the demo), they'll be used later.
+Be careful about the values of `<appName>` and `<resourceGroup>` (`helloworld-1590394316693` and `helloworld-1590394316693-rg` accordingly in the demo), they are used later.
 
 ## 4 - Deploy the app
 
@@ -227,7 +237,7 @@ mvn package azure-webapp:deploy -DskipTests
 
 -----
 
-Once deployment is completed, your application will be ready at `http://<appName>.azurewebsites.net/` (`http://helloworld-1590394316693.azurewebsites.net` in the demo). Open the url with your local web browser, you should see
+Once deployment is completed, your application is ready at `http://<appName>.azurewebsites.net/` (`http://helloworld-1590394316693.azurewebsites.net` in the demo). Open the url with your local web browser, you should see
 
 # [Java SE](#tab/javase)
 
@@ -245,9 +255,6 @@ Once deployment is completed, your application will be ready at `http://<appName
 
 **Congratulations!** You've deployed your first Java app to App Service.
 
-> [!div class="nextstepaction"]
-> [I ran into an issue](https://www.research.net/r/javae2e?tutorial=app-service-linux-quickstart&step=deploy)
-
 ## 5 - Clean up resources
 
 In the preceding steps, you created Azure resources in a resource group. If you don't need the resources in the future, delete the resource group from portal, or by running the following command in the Cloud Shell:

articles/app-service/includes/quickstart-java/quickstart-java-linux-maven-pivot.md

@@ -6,7 +6,7 @@ ms.assetid: 582bb3c2-164b-42f5-b081-95bfcb7a502a
 ms.devlang: java
 ms.topic: quickstart
 ms.date: 08/01/2020
-ms.custom: mvc, seo-java-july2019, seo-java-august2019, seo-java-september2019, mode-other
+ms.custom: mvc, seo-java-july2019, seo-java-august2019, seo-java-september2019, mode-other, devx-track-java, devx-track-javaee-jbosseap-appsvc, devx-track-javaee-jbosseap, devx-track-javaee
 zone_pivot_groups: app-service-platform-windows-linux
 ROBOTS: NOINDEX,NOFOLLOW
 ---

articles/app-service/media/quickstart-java/java-se-greetings-in-browser.png

@@ -5,8 +5,8 @@ keywords: azure, app service, web app, windows, linux, java, maven, quickstart
 ms.assetid: 582bb3c2-164b-42f5-b081-95bfcb7a502a
 ms.devlang: java
 ms.topic: quickstart
-ms.date: 03/03/2022
-ms.custom: mvc, seo-java-july2019, seo-java-august2019, seo-java-september2019, mode-other, devdivchpfy22
+ms.date: 03/08/2023
+ms.custom: mvc, seo-java-july2019, seo-java-august2019, seo-java-september2019, mode-other, devdivchpfy22, devx-track-java, devx-track-javaee-jbosseap-appsvc, devx-track-javaee-jbosseap, devx-track-javaee
 zone_pivot_groups: app-service-platform-environment
 adobe-target: true
 adobe-target-activity: DocsExp–386541–A/B–Enhanced-Readability-Quickstarts–2.19.2021