Merge branch 'live' into master

docs-ref-conceptual/toc.yml

@@ -41,15 +41,15 @@
           href: intellij/azure-toolkit-for-intellij.md
         - name: Eclipse
           href: eclipse/azure-toolkit-for-eclipse.md
-        - name: Maven
+        - name: Maven Plugins
           href: ~/_mavenref/README.md
           items:
-            - name: Azure Web Apps
+            - name: Azure App Service Web Apps
               href: ~/_mavenref/azure-webapp-maven-plugin/README.md
             - name: Azure Functions
               href: ~/_mavenref/azure-functions-maven-plugin/README.md
-        - name: Spring on Azure
-          href: spring-framework/index.yml
+    - name: Spring
+      href: /java/azure/spring-framework/index
     - name: Java Tutorials 
       items:
         - name: Deploy microservices on Service Fabric

docs-ref-services/eventhub.md

@@ -52,6 +52,7 @@ ehClient.sendSync(sendEvent);
 > [Explore the Client APIs](/java/api/overview/azure/eventhubs/client)
 
 
+
 ## Samples
 
 [Explore Event Hub data-plane API using samples][1]

docs-ref-services/storage.md

@@ -5,7 +5,7 @@ keywords: Azure, Java, SDK, API, Storage
 author: douge
 ms.author: douge
 manager: douge
-ms.date: 05/17/2017
+ms.date: 02/07/2018
 ms.topic: article
 ms.prod: azure
 ms.technology: azure
@@ -31,7 +31,7 @@ Use [connection strings](/azure/storage/storage-create-storage-account#manage-yo
 <dependency>
     <groupId>com.microsoft.azure</groupId>
     <artifactId>azure-storage</artifactId>
-    <version>5.3.1</version>
+    <version>7.0.0</version>
 </dependency>
 ```   
 
@@ -99,4 +99,4 @@ for(StorageAccountKey key : storageAccountKeys)    {
 [Read and write messages with queues](https://github.com/Azure-Samples/storage-queue-java-getting-started)   
 [Read files from blob storage in a web app](https://github.com/Azure-Samples/app-service-java-manage-storage-connections-for-web-apps-on-linux)
 
-Explore more [sample Java code for Azure Storage](https://azure.microsoft.com/resources/samples/?platform=java&term=storage) you can use in your apps.
+Explore more [sample Java code for Azure Storage](https://azure.microsoft.com/resources/samples/?platform=java&term=storage) you can use in your apps.