Fixing samples publishing and typo in README (#489)

* Fixing samples publishing * Fixing typo in README * adding missing resource file for samples
Azure · Jun 27, 2018 · 0355275 · 0355275
1 parent 1bd0169
commit 0355275
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -697,7 +697,7 @@ If you would like to become an active contributor to this project please follow
 
 | Version           | SHA1                                                                                      | Remarks                                               |
 |-------------------|-------------------------------------------------------------------------------------------|-------------------------------------------------------|
-| 1.10.0       | [1.11.0](https://github.com/Azure/azure-libraries-for-java/tree/v1.11.0)               | Tagged release for 1.10.0 version of Azure management libraries |
+| 1.11.0       | [1.11.0](https://github.com/Azure/azure-libraries-for-java/tree/v1.11.0)               | Tagged release for 1.10.0 version of Azure management libraries |
 | 1.10.0       | [1.10.0](https://github.com/Azure/azure-libraries-for-java/tree/v1.10.0)               | Tagged release for 1.10.0 version of Azure management libraries |
 | 1.9.0       | [1.9.0](https://github.com/Azure/azure-libraries-for-java/tree/v1.9.0)               | Tagged release for 1.9.0 version of Azure management libraries |
 | 1.8.0       | [1.8.0](https://github.com/Azure/azure-libraries-for-java/tree/v1.8.0)               | Tagged release for 1.8.0 version of Azure management libraries |

diff --git a/azure-samples/pom.xml b/azure-samples/pom.xml
@@ -105,10 +105,22 @@
         <dependency>
             <groupId>commons-net</groupId>
             <artifactId>commons-net</artifactId>
+            <version>3.3</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit</artifactId>
+            <version>4.5.0.201609210915-r</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.7</version>
         </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>

diff --git a/...ain/java/com/microsoft/azure/management/appservice/samples/ManageWebAppCosmosDbByMsi.java b/...ain/java/com/microsoft/azure/management/appservice/samples/ManageWebAppCosmosDbByMsi.java
@@ -140,8 +140,8 @@ public String doAuthenticate(String authorization, String resource, String scope
 
             System.out.println("Deploying a spring boot app to " + appName + " through FTP...");
 
-            Utils.uploadFileToWebAppWwwRoot(app.getPublishingProfile(), "ROOT.jar", ManageWebAppSourceControl.class.getResourceAsStream("/todo-app-java-on-azure-1.0-SNAPSHOT.jar"));
-            Utils.uploadFileToWebAppWwwRoot(app.getPublishingProfile(), "web.config", ManageWebAppSourceControl.class.getResourceAsStream("/web.config"));
+            Utils.uploadFileToWebAppWwwRoot(app.getPublishingProfile(), "ROOT.jar", ManageWebAppCosmosDbByMsi.class.getResourceAsStream("/todo-app-java-on-azure-1.0-SNAPSHOT.jar"));
+            Utils.uploadFileToWebAppWwwRoot(app.getPublishingProfile(), "web.config", ManageWebAppCosmosDbByMsi.class.getResourceAsStream("/web.config"));
 
             System.out.println("Deployment to web app " + app.name() + " completed");
             Utils.print(app);

diff --git a/...om/microsoft/azure/management/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java b/...om/microsoft/azure/management/appservice/samples/ManageWebAppCosmosDbThroughKeyVault.java
@@ -134,8 +134,8 @@ public static boolean runSample(Azure azure) {
 
             System.out.println("Deploying a spring boot app to " + appName + " through FTP...");
 
-            Utils.uploadFileToWebAppWwwRoot(app.getPublishingProfile(), "ROOT.jar", ManageWebAppSourceControl.class.getResourceAsStream("/todo-app-java-on-azure-1.0-SNAPSHOT.jar"));
-            Utils.uploadFileToWebAppWwwRoot(app.getPublishingProfile(), "web.config", ManageWebAppSourceControl.class.getResourceAsStream("/web.config"));
+            Utils.uploadFileToWebAppWwwRoot(app.getPublishingProfile(), "ROOT.jar", ManageWebAppCosmosDbThroughKeyVault.class.getResourceAsStream("/todo-app-java-on-azure-1.0-SNAPSHOT.jar"));
+            Utils.uploadFileToWebAppWwwRoot(app.getPublishingProfile(), "web.config", ManageWebAppCosmosDbThroughKeyVault.class.getResourceAsStream("/web.config"));
 
             System.out.println("Deployment to web app " + app.name() + " completed");
             Utils.print(app);

diff --git a/azure-samples/src/main/resources/coffeeshop.war b/azure-samples/src/main/resources/coffeeshop.war