diff --git a/azure-batch/pom.xml b/azure-batch/pom.xml index b6f74bd4d8f5c..e8a92b68307ea 100644 --- a/azure-batch/pom.xml +++ b/azure-batch/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta2 ../pom.xml diff --git a/azure-keyvault-core/pom.xml b/azure-keyvault-core/pom.xml index b9719b08a0f75..2b9ea14672bf6 100755 --- a/azure-keyvault-core/pom.xml +++ b/azure-keyvault-core/pom.xml @@ -17,7 +17,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta3 ../pom.xml diff --git a/azure-keyvault-cryptography/pom.xml b/azure-keyvault-cryptography/pom.xml index 8501c81ed9f35..820b878447138 100755 --- a/azure-keyvault-cryptography/pom.xml +++ b/azure-keyvault-cryptography/pom.xml @@ -9,7 +9,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta3 ../pom.xml @@ -57,12 +57,12 @@ com.microsoft.azure azure-keyvault-core - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta3 com.microsoft.azure azure-keyvault-webkey - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta3 diff --git a/azure-keyvault-extensions/pom.xml b/azure-keyvault-extensions/pom.xml index e084c960a6936..10ae305c9f986 100755 --- a/azure-keyvault-extensions/pom.xml +++ b/azure-keyvault-extensions/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta3 ../pom.xml @@ -68,22 +68,22 @@ com.microsoft.azure azure-keyvault-core - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta3 com.microsoft.azure azure-keyvault-cryptography - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta3 com.microsoft.azure azure-keyvault - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta3 com.microsoft.azure azure-keyvault-webkey - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta3 org.mockito diff --git a/azure-keyvault-webkey/pom.xml b/azure-keyvault-webkey/pom.xml index a4fc4d77b6fbb..4faeb0a35b708 100644 --- a/azure-keyvault-webkey/pom.xml +++ b/azure-keyvault-webkey/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta3 ../pom.xml diff --git a/azure-keyvault/pom.xml b/azure-keyvault/pom.xml index 0e0934848c5ec..7a0a82e83678e 100755 --- a/azure-keyvault/pom.xml +++ b/azure-keyvault/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta3 ../pom.xml @@ -54,7 +54,7 @@ com.microsoft.azure azure-keyvault-webkey - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta3 diff --git a/azure-mgmt-appservice/pom.xml b/azure-mgmt-appservice/pom.xml index 5bab623d14dce..ab3657f0e5e1d 100644 --- a/azure-mgmt-appservice/pom.xml +++ b/azure-mgmt-appservice/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -53,12 +53,12 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-keyvault - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure diff --git a/azure-mgmt-batch/pom.xml b/azure-mgmt-batch/pom.xml index d5fd9868873f9..46c2b954aeda5 100644 --- a/azure-mgmt-batch/pom.xml +++ b/azure-mgmt-batch/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -53,7 +53,7 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit @@ -68,7 +68,7 @@ com.microsoft.azure azure-mgmt-storage - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure diff --git a/azure-mgmt-cdn/pom.xml b/azure-mgmt-cdn/pom.xml index 1747b57efad60..ecaba1c342410 100644 --- a/azure-mgmt-cdn/pom.xml +++ b/azure-mgmt-cdn/pom.xml @@ -6,7 +6,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -51,7 +51,7 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit @@ -71,7 +71,7 @@ com.microsoft.azure azure-mgmt-storage - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 test diff --git a/azure-mgmt-compute/pom.xml b/azure-mgmt-compute/pom.xml index 6a7eb86c19a74..c321161d70767 100644 --- a/azure-mgmt-compute/pom.xml +++ b/azure-mgmt-compute/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -53,17 +53,17 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-storage - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-network - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit diff --git a/azure-mgmt-dns/pom.xml b/azure-mgmt-dns/pom.xml index 22cff4a8c9ef5..bd2a24b404aef 100644 --- a/azure-mgmt-dns/pom.xml +++ b/azure-mgmt-dns/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -53,7 +53,7 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit diff --git a/azure-mgmt-graph-rbac/pom.xml b/azure-mgmt-graph-rbac/pom.xml index 06e8d6556dbbd..1565248350c80 100644 --- a/azure-mgmt-graph-rbac/pom.xml +++ b/azure-mgmt-graph-rbac/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -53,7 +53,7 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit diff --git a/azure-mgmt-keyvault/pom.xml b/azure-mgmt-keyvault/pom.xml index cb3a2c93d5fc1..f974bd98ce384 100644 --- a/azure-mgmt-keyvault/pom.xml +++ b/azure-mgmt-keyvault/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -53,12 +53,12 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-graph-rbac - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit diff --git a/azure-mgmt-network/pom.xml b/azure-mgmt-network/pom.xml index ea43a9263df1f..7b8474d4a3235 100644 --- a/azure-mgmt-network/pom.xml +++ b/azure-mgmt-network/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -53,7 +53,7 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit diff --git a/azure-mgmt-redis/pom.xml b/azure-mgmt-redis/pom.xml index 49c9e472276d6..146c5fd94d1ce 100644 --- a/azure-mgmt-redis/pom.xml +++ b/azure-mgmt-redis/pom.xml @@ -6,7 +6,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -51,7 +51,7 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit @@ -71,7 +71,7 @@ com.microsoft.azure azure-mgmt-storage - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 test diff --git a/azure-mgmt-resources/pom.xml b/azure-mgmt-resources/pom.xml index 0f291df072d08..be9de730f59d0 100644 --- a/azure-mgmt-resources/pom.xml +++ b/azure-mgmt-resources/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsInner.java index 5d9c6339bfeb4..12b88d0863ccc 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsInner.java @@ -35,6 +35,7 @@ import retrofit2.http.PUT; import retrofit2.http.Query; import retrofit2.Response; +import retrofit2.http.Url; import rx.functions.Func1; import rx.Observable; @@ -101,12 +102,12 @@ interface ResourceGroupsService { Observable> list(@Path("subscriptionId") String subscriptionId, @Query("$filter") String filter, @Query("$top") Integer top, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") - @GET("{nextLink}") - Observable> listResourcesNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @GET + Observable> listResourcesNext(@Url String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") - @GET("{nextLink}") - Observable> listNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @GET + Observable> listNext(@Url String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesInner.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesInner.java index 3ee0f97ba8ff4..0e4a7d67319d9 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesInner.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesInner.java @@ -34,6 +34,7 @@ import retrofit2.http.PUT; import retrofit2.http.Query; import retrofit2.Response; +import retrofit2.http.Url; import rx.functions.Func1; import rx.Observable; @@ -124,8 +125,8 @@ interface ResourcesService { Observable> getById(@Path(value = "resourceId", encoded = true) String resourceId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers("Content-Type: application/json; charset=utf-8") - @GET("{nextLink}") - Observable> listNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @GET + Observable> listNext(@Url String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); } diff --git a/azure-mgmt-search/pom.xml b/azure-mgmt-search/pom.xml index ae7563b03a820..af1bf0c8f449c 100644 --- a/azure-mgmt-search/pom.xml +++ b/azure-mgmt-search/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4 ../pom.xml @@ -54,7 +54,7 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit diff --git a/azure-mgmt-sql/pom.xml b/azure-mgmt-sql/pom.xml index 17800f260f53f..daf75a404f64b 100644 --- a/azure-mgmt-sql/pom.xml +++ b/azure-mgmt-sql/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -53,7 +53,7 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit diff --git a/azure-mgmt-storage/pom.xml b/azure-mgmt-storage/pom.xml index 1ef30c66d34ab..501f2580260b1 100644 --- a/azure-mgmt-storage/pom.xml +++ b/azure-mgmt-storage/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -53,7 +53,7 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit diff --git a/azure-mgmt-trafficmanager/pom.xml b/azure-mgmt-trafficmanager/pom.xml index 33fbe9d2d6ec0..577c4778c72da 100644 --- a/azure-mgmt-trafficmanager/pom.xml +++ b/azure-mgmt-trafficmanager/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -53,7 +53,7 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit @@ -69,7 +69,7 @@ com.microsoft.azure azure-mgmt-storage - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure diff --git a/azure-samples/pom.xml b/azure-samples/pom.xml index 4ed66b8d55561..50c61c5e713e7 100644 --- a/azure-samples/pom.xml +++ b/azure-samples/pom.xml @@ -11,7 +11,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -52,32 +52,32 @@ com.microsoft.azure azure - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-storage - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-network - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-compute - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-appservice - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java index 379ba52ad0228..fb912856b2350 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java @@ -87,7 +87,7 @@ public static void main(String[] args) { System.out.println("Creating another resource group with name: " + rgName2); azure.resourceGroups() - .define(rgName) + .define(rgName2) .withRegion(Region.US_WEST) .create(); diff --git a/azure/pom.xml b/azure/pom.xml index cf8a503da6a35..122fb7f49808c 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 ../pom.xml @@ -57,57 +57,57 @@ com.microsoft.azure azure-mgmt-resources - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-storage - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-network - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-compute - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-graph-rbac - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-keyvault - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-batch - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-trafficmanager - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-dns - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-redis - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-appservice - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 junit @@ -134,12 +134,12 @@ com.microsoft.azure azure-mgmt-cdn - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-mgmt-sql - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 diff --git a/pom.xml b/pom.xml index 0019905049f8d..c46d27c1061f4 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.microsoft.azure - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 azure-parent pom @@ -102,12 +102,12 @@ com.microsoft.azure azure-client-runtime - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.microsoft.azure azure-client-authentication - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 @@ -130,7 +130,7 @@ com.microsoft.azure autorest-build-tools - 1.0.0-beta5-SNAPSHOT + 1.0.0-beta4.1 com.puppycrawl.tools