Merge pull request #213 from MicrosoftDocs/master

11/13 AM Publish
yucwan · Nov 13, 2019 · 25cef39 · 25cef39
2 parents 794f7f7 + ed97684
commit 25cef39
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/java/TOC.yml b/java/TOC.yml
@@ -42,7 +42,7 @@
                 - name: MongoDB API
                   href: /azure/cosmos-db/create-mongodb-java?toc=/azure/java/toc.json&bc=/azure/java/breadcrumb/toc.json
         - name: Storage Blobs
-          href: /azure/storage/blobs/storage-quickstart-blobs-java-v10?toc=/azure/java/toc.json&bc=/azure/java/breadcrumb/toc.json
+          href: /azure/storage/blobs/storage-quickstart-blobs-java?toc=/azure/java/toc.json&bc=/azure/java/breadcrumb/toc.json
         - name: Redis Cache
           href: /azure/azure-cache-for-redis/cache-java-get-started?toc=/azure/java/toc.json&bc=/azure/java/breadcrumb/toc.json
         - name: Service Fabric

diff --git a/java/spring-framework/deploy-spring-boot-java-app-on-kubernetes.md b/java/spring-framework/deploy-spring-boot-java-app-on-kubernetes.md
@@ -8,7 +8,7 @@ manager: douge
 editor: ''
 ms.assetid: 
 ms.author: brendm
-ms.date: 12/19/2018
+ms.date: 11/12/2019
 ms.devlang: java
 ms.service: multiple
 ms.tgt_pltfrm: multiple
@@ -118,7 +118,7 @@ The following steps walk you through building a Spring Boot web application and
    ```xml
    <properties>
       <docker.image.prefix>wingtiptoysregistry.azurecr.io</docker.image.prefix>
-      <jib-maven-plugin.version>1.2.0</jib-maven-plugin.version>
+      <jib-maven-plugin.version>1.7.0</jib-maven-plugin.version>
       <java.version>1.8</java.version>
    </properties>
    ```

diff --git a/java/spring-framework/deploy-spring-boot-java-app-on-linux.md b/java/spring-framework/deploy-spring-boot-java-app-on-linux.md
@@ -8,7 +8,7 @@ manager: douge
 editor: ''
 ms.assetid: 
 ms.author: brendm
-ms.date: 12/19/2018
+ms.date: 11/12/2019
 ms.devlang: java
 ms.service: app-service
 ms.tgt_pltfrm: multiple
@@ -70,15 +70,15 @@ The following steps walk you through the steps that are required to create a sim
 1. Once the web app has been created, change directory to the `target` directory where the JAR file is located and start the web app; for example:
    ```
    cd target
-   java -jar gs-spring-boot-docker-0.1.0.jar
+   java -jar gs-spring-boot-docker-0.1.0.jar --server.port=80
    ```
 
 1. Test the web app by browsing to it locally using a web browser. For example, if you have curl available and you configured the Tomcat server to run on port 80:
    ```
    curl http://localhost
    ```
 
-1. You should see the following message displayed: **Hello Docker World!**
+1. You should see the following message displayed: **Hello Docker World**
 
    ![Browse Sample App Locally][SB01]
 
@@ -119,7 +119,7 @@ The following steps walk you through using the Azure portal to create an Azure C
 
    ```xml
    <properties>
-      <jib-maven-plugin.version>1.2.0</jib-maven-plugin.version>
+      <jib-maven-plugin.version>1.7.0</jib-maven-plugin.version>
       <docker.image.prefix>wingtiptoysregistry.azurecr.io</docker.image.prefix>
       <java.version>1.8</java.version>
       <username>wingtiptoysregistry</username>

diff --git a/java/spring-framework/spring-app-service-e2e.md b/java/spring-framework/spring-app-service-e2e.md
@@ -4,7 +4,7 @@ description: End-to-end tutorial for Java App Service with MySQL
 author: KarlErickson
 manager: barbkess
 ms.author: karler
-ms.date: 08/38/2019
+ms.date: 11/12/2019
 ms.service: app-service
 ms.devlang: java
 ms.topic: article
@@ -18,7 +18,7 @@ This tutorial builds on the popular Spring PetClinic sample app. In this topic,
 
 ## Prerequisites
 
-* [Azure CLI](http://docs.microsoft.com/cli/azure/overview)
+* [Azure CLI](https://docs.microsoft.com/cli/azure/overview)
 * [Java 8](http://java.oracle.com/)
 * [Maven 3](http://maven.apache.org/)
 * [Git](https://github.com/)
@@ -118,13 +118,18 @@ Next, update the *pom.xml* file to configure Maven for an Azure deployment. Add
 <plugin>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-webapp-maven-plugin</artifactId>
-    <version>1.7.0</version>
+    <version>1.8.0</version>
     <configuration>
+        <schemaVersion>v2</schemaVersion>
         <resourceGroup>${RESOURCEGROUP_NAME}</resourceGroup>
         <appServicePlanName>${WEBAPP_PLAN_NAME}</appServicePlanName>
         <appName>${WEBAPP_NAME}</appName>
         <region>${REGION}</region>
-        <linuxRuntime>tomcat 8.5-jre8</linuxRuntime>
+        <runtime>
+            <os>linux</os>
+            <javaVersion>jre8</javaVersion>            
+            <webContainer>TOMCAT 8.5</webContainer>
+        </runtime>
     </configuration>
 </plugin>
 ```