Merge branch 'main' into regions-belgium-central-ga

Author: johndowns

.openpublishing.redirection.json

@@ -4309,6 +4309,16 @@
       "redirect_url": "/azure/firewall/monitor-firewall",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/firewall/premium-migrate.md",
+      "redirect_url": "/azure/firewall/change-sku",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/firewall/easy-upgrade.md",
+      "redirect_url": "/azure/firewall/change-sku",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/firewall/firewall-network-rule-logging.md",
       "redirect_url": "/azure/firewall/monitor-firewall",

articles/app-service/language-support-policy.md

@@ -71,7 +71,7 @@ To learn more about how to update language versions for your App Service applica
 
 ### JDK versions and maintenance
 
-Microsoft and Adoptium builds of OpenJDK are provided and supported on App Service for Java 21, 17, 11, and 8. These binaries are provided as a no-cost, multiplatform, production-ready distribution of OpenJDK for Azure. The binaries contain all the components for building and running Java SE applications. For local development or testing, you can [download the Microsoft build of OpenJDK](/java/openjdk/download).
+Microsoft and Adoptium builds of OpenJDK are provided and supported on App Service for Java 8, 11, 17 and 21. These binaries are provided as a no-cost, multiplatform, production-ready distribution of OpenJDK for Azure. The binaries contain all the components for building and running Java SE applications. For local development or testing, you can [download the Microsoft build of OpenJDK](/java/openjdk/download).
 
 # [Linux](#tab/linux)
 
@@ -94,11 +94,16 @@ Microsoft and Adoptium builds of OpenJDK are provided and supported on App Servi
 | Tomcat 10.1 Java 11     | Ubuntu        | MSFT OpenJDK 11           |
 | Tomcat 10.1 Java 17     | Ubuntu        | MSFT OpenJDK 17           |
 | Tomcat 10.1 Java 21     | Ubuntu        | MSFT OpenJDK 21           |
+| Tomcat 11.0 Java 17     | Ubuntu        | MSFT OpenJDK 17           |
+| Tomcat 11.0 Java 21     | Ubuntu        | MSFT OpenJDK 21           |
 | JBoss 7.3 Java 8        | Ubuntu        | Adoptium Temurin 8        |
 | JBoss 7.3 Java 11       | Ubuntu        | MSFT OpenJDK 11           |
 | JBoss 7.4 Java 8        | Ubuntu        | Adoptium Temurin 8        |
 | JBoss 7.4 Java 11       | Ubuntu        | MSFT OpenJDK 11           |
 | JBoss 7.4 Java 17       | Ubuntu        | MSFT OpenJDK 17           |
+| JBoss 8.0 Java 11       | Ubuntu        | MSFT OpenJDK 11           |
+| JBoss 8.0 Java 17       | Ubuntu        | MSFT OpenJDK 17           |
+| JBoss 8.0 Java 21       | Ubuntu        | MSFT OpenJDK 21           |
 
 \* Alpine 3.16 is the last supported Alpine distribution in App Service. You should pin to a version to avoid switching over to Ubuntu automatically. Make sure that you test and switch to a Java offering that is supported by Ubuntu-based distributions when possible.
 
@@ -123,6 +128,8 @@ Microsoft and Adoptium builds of OpenJDK are provided and supported on App Servi
 | Tomcat 10.1, Java 11 | Windows Server 2022 | MSFT OpenJDK 11       |
 | Tomcat 10.1, Java 17 | Windows Server 2022 | MSFT OpenJDK 17       |
 | Tomcat 10.1, Java 21 | Windows Server 2022 | MSFT OpenJDK 21       |
+| Tomcat 11.0, Java 17 | Windows Server 2022 | MSFT OpenJDK 17       |
+| Tomcat 11.0, Java 21 | Windows Server 2022 | MSFT OpenJDK 21       |
 
 -----
 

articles/azure-functions/functions-deployment-technologies.md

@@ -132,7 +132,7 @@ The following deployment methods are available in Azure Functions. To determine
 ### One deploy
 One deploy is the only deployment technology supported for apps on a [Flex Consumption plan](./flex-consumption-plan.md). The end result is a ready-to-run .zip package that your function app runs on.
 
->__How to use it:__ Deploy with the [Visual Studio Code](functions-develop-vs-code.md#publish-to-azure) publish feature, or from the command line using [Azure Functions Core Tools](functions-run-local.md#project-file-deployment) or the [Azure CLI](/cli/azure/functionapp/deployment/source#az-functionapp-deployment-source-config-zip). Our [Azure Dev Ops Task](functions-how-to-azure-devops.md#deploy-your-app-1) and [GitHub Action](functions-how-to-github-actions.md) similarly leverage one deploy when they detect that a Flex Consumption app is being deployed to.
+>__How to use it:__ Deploy with the [Visual Studio Code](functions-develop-vs-code.md#publish-to-azure) publish feature, or from the command line using [Azure Functions Core Tools](functions-run-local.md#project-file-deployment) or the [Azure CLI](/cli/azure/functionapp/deployment/source#az-functionapp-deployment-source-config-zip). Our [Azure Dev Ops Task](functions-how-to-azure-devops.md#deploy-your-app) and [GitHub Action](functions-how-to-github-actions.md) similarly leverage one deploy when they detect that a Flex Consumption app is being deployed to.
 >
 > When you create a Flex Consumption app, you must specify a deployment storage (blob) container as well as an authentication method to it. By default the same storage account as the `AzureWebJobsStorage` connection is used, with a connection string as the authentication method. Thus, your [deployment settings](flex-consumption-how-to.md#configure-deployment-settings) are configured during app create time without any need of application settings.
 
@@ -144,7 +144,7 @@ One deploy is the only deployment technology supported for apps on a [Flex Consu
 
 Zip deploy is the default and recommended deployment technology for function apps on the Consumption, Elastic Premium, and App Service (Dedicated) plans. The end result a ready-to-run .zip package that your function app runs on. It differs from [external package URL](#external-package-url) in that our platform is responsible for remote building and storing your app content.
 
->__How to use it:__ Deploy by using your favorite client tool: [Visual Studio Code](functions-develop-vs-code.md#publish-to-azure), [Visual Studio](functions-develop-vs.md#publish-to-azure), or from the command line using [Azure Functions Core Tools](functions-run-local.md#project-file-deployment) or the [Azure CLI](/cli/azure/functionapp/deployment/source#az-functionapp-deployment-source-config-zip). Our [Azure Dev Ops Task](functions-how-to-azure-devops.md#deploy-your-app-1) and [GitHub Action](functions-how-to-github-actions.md) similarly leverage zip deploy. 
+>__How to use it:__ Deploy by using your favorite client tool: [Visual Studio Code](functions-develop-vs-code.md#publish-to-azure), [Visual Studio](functions-develop-vs.md#publish-to-azure), or from the command line using [Azure Functions Core Tools](functions-run-local.md#project-file-deployment) or the [Azure CLI](/cli/azure/functionapp/deployment/source#az-functionapp-deployment-source-config-zip). Our [Azure Dev Ops Task](functions-how-to-azure-devops.md#deploy-your-app) and [GitHub Action](functions-how-to-github-actions.md) similarly leverage zip deploy. 
 >
 >When you deploy by using zip deploy, you can set your app to [run from package](run-functions-from-deployment-package.md). To run from package, set the [`WEBSITE_RUN_FROM_PACKAGE`](functions-app-settings.md#website_run_from_package) application setting value to `1`. We recommend zip deployment. It yields faster loading times for your applications, and it's the default for VS Code, Visual Studio, and the Azure CLI.