Merge pull request #104242 from yucwan/patch-10

PMEds28 · web-flow · commit 23bd0f4572a1 · 2020-03-04T10:19:43.000Z
add gradle pivot to functions java quickstart
diff --git a/articles/azure-functions/TOC.yml b/articles/azure-functions/TOC.yml
@@ -22,7 +22,7 @@
       href: functions-create-your-first-function-visual-studio.md
     - name: Command line
       href: functions-create-first-azure-function-azure-cli.md
-    - name: Maven (Java)
+    - name: Maven/Gradle (Java)
       href: functions-create-first-java-maven.md
   - name: Connect to storage
     items:
@@ -32,7 +32,7 @@
       href: functions-add-output-binding-storage-queue-vs.md
     - name: Command line
       href: functions-add-output-binding-storage-queue-cli.md
-    - name: Maven (Java)
+    - name: Maven/Gradle (Java)
       href: functions-add-output-binding-storage-queue-java.md
 - name: Tutorials
   items:
diff --git a/articles/azure-functions/functions-add-output-binding-storage-queue-java.md b/articles/azure-functions/functions-add-output-binding-storage-queue-java.md
@@ -1,8 +1,11 @@
 ---
 title: Connect your Java function to Azure Storage 
 description: Learn how to connect an HTTP-triggered Java function to Azure Storage by using a Queue storage output binding.
+author: KarlErickson
+ms.author: karler
 ms.date: 10/14/2019
 ms.topic: quickstart
+zone_pivot_groups: java-build-tools-set
 ---
 
 # Connect your Java function to Azure Storage
@@ -107,10 +110,19 @@ You're now ready to try out the new output binding locally.
 
 As before, use the following command to build the project and start the Functions runtime locally:
 
+::: zone pivot="java-build-tools-maven"  
 ```bash
 mvn clean package 
 mvn azure-functions:run
 ```
+::: zone-end
+
+::: zone pivot="java-build-tools-gradle"  
+```bash
+gradle jar --info
+gradle azureFunctionsRun
+```
+::: zone-end
 
 > [!NOTE]  
 > Because you enabled extension bundles in the host.json, the [Storage binding extension](functions-bindings-storage-blob.md#add-to-your-functions-app) was downloaded and installed for you during startup, along with the other Microsoft binding extensions.
@@ -133,9 +145,17 @@ Next, you use the Azure CLI to view the new queue and verify that a message was
 
 To update your published app, run the following command again:  
 
-```azurecli
+::: zone pivot="java-build-tools-maven"  
+```bash
 mvn azure-functions:deploy
 ```
+::: zone-end
+
+::: zone pivot="java-build-tools-gradle"  
+```bash
+gradle azureFunctionsDeploy
+```
+::: zone-end
 
 Again, you can use cURL to test the deployed function. As before, pass the value `AzureFunctions` in the body of the POST request to the URL, as in this example:
 
@@ -157,4 +177,4 @@ Next, you should enable Application Insights monitoring for your function app:
 > [Enable Application Insights integration](functions-monitoring.md#manually-connect-an-app-insights-resource)
 
 
-[Azure Storage Explorer]: https://storageexplorer.com/
+[Azure Storage Explorer]: https://storageexplorer.com/
diff --git a/articles/azure-functions/functions-create-first-java-maven.md b/articles/azure-functions/functions-create-first-java-maven.md
@@ -1,15 +1,17 @@
 ---
-title: Use Java and Maven to publish a function to Azure
-description: Create and publish an HTTP-triggered function to Azure with Java and Maven.
-author: rloutlaw
+title: Use Java and Maven/Gradle to publish a function to Azure
+description: Create and publish an HTTP-triggered function to Azure with Java and Maven or Gradle.
+author: KarlErickson
+ms.author: karler
 ms.topic: quickstart
 ms.date: 08/10/2018
 ms.custom: mvc, devcenter, seo-java-july2019, seo-java-august2019, seo-java-september2019
+zone_pivot_groups: java-build-tools-set
 ---
 
-# Quickstart: Use Java and Maven to create and publish a function to Azure
+# Quickstart: Use Java and Maven/Gradle to create and publish a function to Azure
 
-This article shows you how to build and publish a Java function to Azure Functions with the Maven command-line tool. When you're done, your function code runs in Azure in a [serverless hosting plan](functions-scale.md#consumption-plan) and is triggered by an HTTP request.
+This article shows you how to build and publish a Java function to Azure Functions with the Maven/Gradle command-line tool. When you're done, your function code runs in Azure in a [serverless hosting plan](functions-scale.md#consumption-plan) and is triggered by an HTTP request.
 
 <!--
 > [!NOTE] 
@@ -21,44 +23,36 @@ This article shows you how to build and publish a Java function to Azure Functio
 To develop functions using Java, you must have the following installed:
 
 - [Java Developer Kit](https://aka.ms/azure-jdks), version 8
-- [Apache Maven](https://maven.apache.org), version 3.0 or above
 - [Azure CLI]
 - [Azure Functions Core Tools](./functions-run-local.md#v2) version 2.6.666 or above
+::: zone pivot="java-build-tools-maven" 
+- [Apache Maven](https://maven.apache.org), version 3.0 or above
+::: zone-end
+
+::: zone pivot="java-build-tools-gradle"  
+- [Gradle](https://gradle.org/), version 4.10 and above
+::: zone-end 
 
 You also need an active Azure subscription. [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
 
 
 > [!IMPORTANT]
 > The JAVA_HOME environment variable must be set to the install location of the JDK to complete this quickstart.
 
-## Generate a new Functions project
+## Prepare a Functions project
 
+::: zone pivot="java-build-tools-maven" 
 In an empty folder, run the following command to generate the Functions project from a [Maven archetype](https://maven.apache.org/guides/introduction/introduction-to-archetypes.html).
 
-### Linux/macOS
-
 ```bash
-mvn archetype:generate \
-    -DarchetypeGroupId=com.microsoft.azure \
-	-DarchetypeArtifactId=azure-functions-archetype 
+mvn archetype:generate -DarchetypeGroupId=com.microsoft.azure -DarchetypeArtifactId=azure-functions-archetype 
 ```
 
 > [!NOTE]
-> If you're experiencing issues with running the command, take a look at what `maven-archetype-plugin` version is used. Because you are running the command in an empty directory with no `.pom` file, it might be attempting to use a plugin of the older version from `~/.m2/repository/org/apache/maven/plugins/maven-archetype-plugin` if you upgraded your Maven from an older version. If so, try deleting the `maven-archetype-plugin` directory and re-running the command.
+> If you're using Powershell, remeber to add "" around parameters.
 
-### Windows
-
-```powershell
-mvn archetype:generate `
-    "-DarchetypeGroupId=com.microsoft.azure" `
-    "-DarchetypeArtifactId=azure-functions-archetype"
-```
-
-```cmd
-mvn archetype:generate ^
-	"-DarchetypeGroupId=com.microsoft.azure" ^
-	"-DarchetypeArtifactId=azure-functions-archetype"
-```
+> [!NOTE]
+> If you're experiencing issues with running the command, take a look at what `maven-archetype-plugin` version is used. Because you are running the command in an empty directory with no `.pom` file, it might be attempting to use a plugin of the older version from `~/.m2/repository/org/apache/maven/plugins/maven-archetype-plugin` if you upgraded your Maven from an older version. If so, try deleting the `maven-archetype-plugin` directory and re-running the command.
 
 Maven asks you for values needed to finish generating the project on deployment. Provide the following values when prompted:
 
@@ -74,7 +68,35 @@ Maven asks you for values needed to finish generating the project on deployment.
 
 Type `Y` or press Enter to confirm.
 
-Maven creates the project files in a new folder with a name of _artifactId_, which in this example is `fabrikam-functions`. 
+Maven creates the project files in a new folder with a name of _artifactId_, which in this example is `fabrikam-functions`. Run the following command to change the directory to the created project folder.
+```bash
+cd fabrikam-function
+```
+
+::: zone-end 
+::: zone pivot="java-build-tools-gradle"
+Use the following command to clone the sample project:
+
+```bash
+git clone https://github.com/Azure-Samples/azure-functions-samples-java.git
+cd azure-functions-samples-java/
+```
+
+Open `build.gradle` and change the `appName` in the following section to a unique name to avoid domain name conflict when deploying to Azure. 
+
+```gradle
+azurefunctions {
+    resourceGroup = 'java-functions-group'
+    appName = 'azure-functions-sample-demo'
+    pricingTier = 'Consumption'
+    region = 'westus'
+    runtime {
+      os = 'windows'
+    }
+    localDebug = "transport=dt_socket,server=y,suspend=n,address=5005"
+}
+```
+::: zone-end
 
 Open the new Function.java file from the *src/main/java* path in a text editor and review the generated code. This code is an [HTTP triggered](functions-bindings-http-webhook.md) function that echoes the body of the request. 
 
@@ -83,15 +105,23 @@ Open the new Function.java file from the *src/main/java* path in a text editor a
 
 ## Run the function locally
 
-Run the following command, which changes the directory to the newly created project folder, then builds and runs the function project:
+Run the following command to build then run the function project:
 
-```console
-cd fabrikam-function
+::: zone pivot="java-build-tools-maven" 
+```bash
 mvn clean package 
 mvn azure-functions:run
 ```
+::: zone-end 
+
+::: zone pivot="java-build-tools-gradle"  
+```bash
+gradle jar --info
+gradle azureFunctionsRun
+```
+::: zone-end 
 
-You see output like the following from Azure Functions Core Tools when you run the project locally:
+You will see output like the following from Azure Functions Core Tools when you run the project locally:
 
 ```output
 ...
@@ -107,7 +137,7 @@ Http Functions:
 
 Trigger the function from the command line using cURL in a new terminal window:
 
-```CMD
+```bash
 curl -w "\n" http://localhost:7071/api/HttpTrigger-Java --data AzureFunctions
 ```
 
@@ -130,13 +160,22 @@ az login
 > [!TIP]
 > If your account can access multiple subscriptions, use [az account set](/cli/azure/account#az-account-set) to set the default subscription for this session. 
 
-Use the following Maven command to deploy your project to a new function app. 
+Use the following command to deploy your project to a new function app. 
 
-```console
+
+::: zone pivot="java-build-tools-maven" 
+```bash
 mvn azure-functions:deploy
 ```
+::: zone-end 
+
+::: zone pivot="java-build-tools-gradle"  
+```bash
+gradle azureFunctionsDeploy
+```
+::: zone-end
 
-This `azure-functions:deploy` Maven target creates the following resources in Azure:
+This will create the following resources in Azure:
 
 + Resource group. Named with the _resourceGroup_ you supplied.
 + Storage account. Required by Functions. The name is generated randomly based on Storage account name requirements.
diff --git a/articles/zone-pivot-groups.yml b/articles/zone-pivot-groups.yml
@@ -211,6 +211,14 @@ groups:
     title: JavaScript
   - id: programming-language-python
     title: Python
+- id: java-build-tools-set
+  title: Build tools
+  prompt: Choose a build tool
+  pivots:
+  - id: java-build-tools-maven
+    title: Maven
+  - id: java-build-tools-gradle
+    title: Gradle
 - id: platforms-set-of-three
   title: Platforms
   prompt: Choose a platform
