Skip to content

Commit

Permalink
[release] Prepare for beta4.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@jianghaolu
jianghaolu committed Jan 7, 2017
1 parent 7d23fb1 commit 3b5aadb
Show file tree
Hide file tree
Showing 26 changed files with 82 additions and 80 deletions.
2 changes: 1 addition & 1 deletion azure-batch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta2</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion azure-keyvault-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions azure-keyvault-cryptography/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -57,12 +57,12 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-core</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta3</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-webkey</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta3</version>
</dependency>
</dependencies>
</project>
10 changes: 5 additions & 5 deletions azure-keyvault-extensions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -68,22 +68,22 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-core</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta3</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-cryptography</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta3</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta3</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-webkey</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta3</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
Expand Down
2 changes: 1 addition & 1 deletion azure-keyvault-webkey/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions azure-keyvault/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta3</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-webkey</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta3</version>
</dependency>

<!-- Test dependencies -->
Expand Down
6 changes: 3 additions & 3 deletions azure-mgmt-appservice/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -53,12 +53,12 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-keyvault</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
Expand Down
6 changes: 3 additions & 3 deletions azure-mgmt-batch/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -68,7 +68,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-storage</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
Expand Down
6 changes: 3 additions & 3 deletions azure-mgmt-cdn/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -71,7 +71,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-storage</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions azure-mgmt-compute/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -53,17 +53,17 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-storage</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-network</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
4 changes: 2 additions & 2 deletions azure-mgmt-dns/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
4 changes: 2 additions & 2 deletions azure-mgmt-graph-rbac/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
6 changes: 3 additions & 3 deletions azure-mgmt-keyvault/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -53,12 +53,12 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-graph-rbac</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
4 changes: 2 additions & 2 deletions azure-mgmt-network/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
6 changes: 3 additions & 3 deletions azure-mgmt-redis/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -51,7 +51,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -71,7 +71,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-storage</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-resources/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
9 changes: 5 additions & 4 deletions ...ain/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsInner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -101,12 +102,12 @@ interface ResourceGroupsService {
Observable<Response<ResponseBody>> 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<Response<ResponseBody>> listResourcesNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@GET
Observable<Response<ResponseBody>> 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<Response<ResponseBody>> listNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@GET
Observable<Response<ResponseBody>> listNext(@Url String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);

}

Expand Down
5 changes: 3 additions & 2 deletions ...src/main/java/com/microsoft/azure/management/resources/implementation/ResourcesInner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -124,8 +125,8 @@ interface ResourcesService {
Observable<Response<ResponseBody>> 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<Response<ResponseBody>> listNext(@Path(value = "nextLink", encoded = true) String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
@GET
Observable<Response<ResponseBody>> listNext(@Url String nextPageLink, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);

}

Expand Down
4 changes: 2 additions & 2 deletions azure-mgmt-search/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-parent</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-beta5-SNAPSHOT</version>
<version>1.0.0-beta4.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
Loading

0 comments on commit 3b5aadb

Please sign in to comment.