Merge branch 'master' of github.com:Azure/AutoRest into quickvm

Conflicts: AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurecustombaseuri/AzureCustomBaseUriTests.java AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SubscriptionInCredentialsTests.java AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/azurespecials/SubscriptionInMethodTests.java AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/lro/LROsCustomHeaderTests.java AutoRest/Generators/Java/Azure.Java.Tests/src/test/java/fixtures/paging/PagingTests.java AutoRest/Generators/Java/Azure.Java/AzureJavaCodeGenerator.cs AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodycomplex/PolymorphismTests.java AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/bodyfile/FilesTests.java AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/custombaseuri/CustomBaseUriTests.java AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/modelflattening/ModelFlatteningTests.java AutoRest/Generators/Java/Java.Tests/src/test/java/fixtures/url/QueriesTests.java ClientRuntimes/Java/azure-android-client-authentication/build.gradle ClientRuntimes/Java/azure-client-authentication/build.gradle
xingwu1 · May 25, 2016 · f116efa · f116efa
2 parents 5202139 + f1585bd
commit f116efa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/azure-android-client-authentication/build.gradle b/azure-android-client-authentication/build.gradle
@@ -114,4 +114,4 @@ task javadocJar(type: Jar, dependsOn: [javadoc]) {
 artifacts {
     archives sourcesJar
     archives javadocJar
-}
+}
diff --git a/azure-client-authentication/build.gradle b/azure-client-authentication/build.gradle
@@ -94,4 +94,4 @@ test {
     reports.html.destination = file("${projectDir}/../../../TestResults/JavaAzureRuntime")
 }
 
-tasks.compileJava.dependsOn 'clean'
+tasks.compileJava.dependsOn 'clean'