diff --git a/azure-batch/pom.xml b/azure-batch/pom.xml index b58437b7a844..dabbe69d0da7 100644 --- a/azure-batch/pom.xml +++ b/azure-batch/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta2 + 1.0.0-SNAPSHOT ../pom.xml @@ -49,7 +49,7 @@ com.microsoft.azure azure-client-runtime - 1.0.0-beta2 + 1.0.0-SNAPSHOT commons-codec @@ -64,7 +64,7 @@ com.microsoft.azure azure-client-authentication - 1.0.0-beta1 + 1.0.0-SNAPSHOT test diff --git a/azure-mgmt-compute/pom.xml b/azure-mgmt-compute/pom.xml index 2f61687882c4..550c0ab29cc6 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-beta2 + 1.0.0-SNAPSHOT ../pom.xml @@ -49,22 +49,22 @@ com.microsoft.azure azure-client-runtime - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-resources - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-storage - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-network - 1.0.0-beta2 + 1.0.0-SNAPSHOT junit @@ -74,7 +74,7 @@ com.microsoft.azure azure-client-authentication - 1.0.0-beta1 + 1.0.0-SNAPSHOT test diff --git a/azure-mgmt-datalake-analytics/pom.xml b/azure-mgmt-datalake-analytics/pom.xml index 27f685ae9a4f..d4f7c4aeb200 100644 --- a/azure-mgmt-datalake-analytics/pom.xml +++ b/azure-mgmt-datalake-analytics/pom.xml @@ -8,13 +8,13 @@ com.microsoft.azure azure-parent - 1.0.0-beta2 + 1.0.0-SNAPSHOT ../pom.xml azure-mgmt-datalake-analytics jar - 1.0.0-beta1.1 + 1.0.0-SNAPSHOT Microsoft Azure SDK for Data Lake Analytics Management This package contains Microsoft Azure Data Lake Analytics Management SDK. @@ -50,24 +50,24 @@ com.microsoft.azure azure-client-runtime - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-resources - 1.0.0-beta2 + 1.0.0-SNAPSHOT test com.microsoft.azure azure-mgmt-datalake-store - 1.0.0-beta1.1 + 1.0.0-SNAPSHOT test com.microsoft.azure azure-mgmt-storage - 1.0.0-beta2 + 1.0.0-SNAPSHOT test @@ -78,7 +78,7 @@ com.microsoft.azure azure-client-authentication - 1.0.0-beta1 + 1.0.0-SNAPSHOT test diff --git a/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsManagementTestBase.java b/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsManagementTestBase.java index 121b792a6949..a97e0f63e281 100644 --- a/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsManagementTestBase.java +++ b/azure-mgmt-datalake-analytics/src/test/java/com/microsoft/azure/management/datalake/analytics/DataLakeAnalyticsManagementTestBase.java @@ -1,6 +1,7 @@ package com.microsoft.azure.management.datalake.analytics; -import com.microsoft.azure.credentials.AzureEnvironment; +import com.microsoft.azure.AzureEnvironment; +import com.microsoft.azure.RestClient; import com.microsoft.azure.credentials.UserTokenCredentials; import com.microsoft.azure.management.datalake.analytics.implementation.DataLakeAnalyticsAccountManagementClientImpl; import com.microsoft.azure.management.datalake.analytics.implementation.DataLakeAnalyticsCatalogManagementClientImpl; @@ -13,18 +14,15 @@ import com.microsoft.azure.management.datalake.store.implementation.DataLakeStoreAccountManagementClientImpl; import com.microsoft.azure.management.resources.implementation.ResourceManagementClientImpl; import com.microsoft.azure.management.storage.implementation.StorageManagementClientImpl; - -import com.microsoft.azure.RestClient; +import okhttp3.OkHttpClient; +import okhttp3.logging.HttpLoggingInterceptor; import org.junit.Assert; +import retrofit2.Retrofit; import java.text.MessageFormat; import java.util.UUID; import java.util.concurrent.TimeUnit; -import okhttp3.OkHttpClient; -import okhttp3.logging.HttpLoggingInterceptor; -import retrofit2.Retrofit; - public abstract class DataLakeAnalyticsManagementTestBase { protected static DataLakeAnalyticsAccountManagementClientImpl dataLakeAnalyticsAccountManagementClient; protected static DataLakeAnalyticsJobManagementClientImpl dataLakeAnalyticsJobManagementClient; @@ -48,13 +46,21 @@ public static void createClients() { case "ppe": armUri = "https://api-dogfood.resources.windows-int.net"; adlaSuffix = "konaaccountdogfood.net"; - authEnv = new AzureEnvironment("https://login.windows-ppe.net/", "https://management.core.windows.net/", true); + authEnv = new AzureEnvironment( + "https://login.windows-ppe.net/", + "https://management.core.windows.net/", + true, + "https://api-dogfood.resources.windows-int.net"); break; case "test": armUri = "https://api-dogfood.resources.windows-int.net"; adlaSuffix = "konaaccountdogfood.net"; environmentLocation = "westus"; - authEnv = new AzureEnvironment("https://login.windows-ppe.net/", "https://management.core.windows.net/", true); + authEnv = new AzureEnvironment( + "https://login.windows-ppe.net/", + "https://management.core.windows.net/", + true, + "https://api-dogfood.resources.windows-int.net"); break; default: // default to production armUri = "https://management.azure.com"; diff --git a/azure-mgmt-datalake-store-uploader/pom.xml b/azure-mgmt-datalake-store-uploader/pom.xml index 0fb5797e7b74..a644c5ef651a 100644 --- a/azure-mgmt-datalake-store-uploader/pom.xml +++ b/azure-mgmt-datalake-store-uploader/pom.xml @@ -8,13 +8,13 @@ com.microsoft.azure azure-parent - 1.0.0-beta2 + 1.0.0-SNAPSHOT ../pom.xml azure-mgmt-datalake-store-uploader jar - 1.0.0-beta1.1 + 1.0.0-SNAPSHOT Microsoft Azure SDK for Data Lake Store Data Uploading This package contains Microsoft Azure Data Lake Store Uploader SDK, which enables rapid ingress of data into Azure Data Lake Storage accounts @@ -50,17 +50,17 @@ com.microsoft.azure azure-client-runtime - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-datalake-store - 1.0.0-beta1.1 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-resources - 1.0.0-beta2 + 1.0.0-SNAPSHOT test @@ -71,7 +71,7 @@ com.microsoft.azure azure-client-authentication - 1.0.0-beta2 + 1.0.0-SNAPSHOT test diff --git a/azure-mgmt-datalake-store/pom.xml b/azure-mgmt-datalake-store/pom.xml index ab2c9df69757..78ce17770c4c 100644 --- a/azure-mgmt-datalake-store/pom.xml +++ b/azure-mgmt-datalake-store/pom.xml @@ -8,13 +8,13 @@ com.microsoft.azure azure-parent - 1.0.0-beta2 + 1.0.0-SNAPSHOT ../pom.xml azure-mgmt-datalake-store jar - 1.0.0-beta1.1 + 1.0.0-SNAPSHOT Microsoft Azure SDK for Data Lake Store Management This package contains Microsoft Azure Data Lake Store Management SDK. @@ -50,12 +50,12 @@ com.microsoft.azure azure-client-runtime - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-resources - 1.0.0-beta2 + 1.0.0-SNAPSHOT test @@ -66,7 +66,7 @@ com.microsoft.azure azure-client-authentication - 1.0.0-beta1 + 1.0.0-SNAPSHOT test diff --git a/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreManagementTestBase.java b/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreManagementTestBase.java index 7b91a0b746a4..ae8c934c769c 100644 --- a/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreManagementTestBase.java +++ b/azure-mgmt-datalake-store/src/test/java/com/microsoft/azure/management/datalake/store/DataLakeStoreManagementTestBase.java @@ -1,6 +1,6 @@ package com.microsoft.azure.management.datalake.store; -import com.microsoft.azure.credentials.AzureEnvironment; +import com.microsoft.azure.AzureEnvironment; import com.microsoft.azure.credentials.UserTokenCredentials; import com.microsoft.azure.management.datalake.store.implementation.DataLakeStoreAccountManagementClientImpl; import com.microsoft.azure.management.datalake.store.implementation.DataLakeStoreFileSystemManagementClientImpl; diff --git a/azure-mgmt-network/pom.xml b/azure-mgmt-network/pom.xml index 0ad2b4225fdf..c18033a48316 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-beta2 + 1.0.0-SNAPSHOT ../pom.xml @@ -49,12 +49,12 @@ com.microsoft.azure azure-client-runtime - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-resources - 1.0.0-beta2 + 1.0.0-SNAPSHOT junit diff --git a/azure-mgmt-resources/pom.xml b/azure-mgmt-resources/pom.xml index 0f6a60b4f6cc..0db2595e294e 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-beta2 + 1.0.0-SNAPSHOT ../pom.xml @@ -49,7 +49,7 @@ com.microsoft.azure azure-client-runtime - 1.0.0-beta2 + 1.0.0-SNAPSHOT junit @@ -59,7 +59,7 @@ com.microsoft.azure azure-client-authentication - 1.0.0-beta1 + 1.0.0-SNAPSHOT test diff --git a/azure-mgmt-storage/pom.xml b/azure-mgmt-storage/pom.xml index 8b2eed1b15c8..6cd45c1659db 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-beta2 + 1.0.0-SNAPSHOT ../pom.xml @@ -49,12 +49,12 @@ com.microsoft.azure azure-client-runtime - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-resources - 1.0.0-beta2 + 1.0.0-SNAPSHOT junit @@ -64,7 +64,7 @@ com.microsoft.azure azure-client-authentication - 1.0.0-beta1 + 1.0.0-SNAPSHOT test diff --git a/azure-mgmt-website/pom.xml b/azure-mgmt-website/pom.xml index 7f5d4e8f1430..9695584bf754 100644 --- a/azure-mgmt-website/pom.xml +++ b/azure-mgmt-website/pom.xml @@ -8,13 +8,13 @@ com.microsoft.azure azure-parent - 1.0.0-beta2 + 1.0.0-SNAPSHOT ../pom.xml azure-mgmt-website jar - 1.0.0-beta1.1 + 1.0.0-SNAPSHOT Microsoft Azure SDK for Website Management This package contains Microsoft Azure Website Management SDK. @@ -50,12 +50,12 @@ com.microsoft.azure azure-client-runtime - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-resources - 1.0.0-beta2 + 1.0.0-SNAPSHOT test diff --git a/azure-samples/pom.xml b/azure-samples/pom.xml index b80c8d4d5498..600911023d7c 100644 --- a/azure-samples/pom.xml +++ b/azure-samples/pom.xml @@ -11,7 +11,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta2 + 1.0.0-SNAPSHOT ../pom.xml @@ -52,27 +52,27 @@ com.microsoft.azure azure - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-resources - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-storage - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-network - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-compute - 1.0.0-beta2 + 1.0.0-SNAPSHOT \ No newline at end of file diff --git a/azure/pom.xml b/azure/pom.xml index 17a43e9d2cab..3695262170a5 100644 --- a/azure/pom.xml +++ b/azure/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure azure-parent - 1.0.0-beta2 + 1.0.0-SNAPSHOT ../pom.xml @@ -49,32 +49,32 @@ com.microsoft.azure azure-client-runtime - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-client-authentication - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-resources - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-storage - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-network - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure azure-mgmt-compute - 1.0.0-beta2 + 1.0.0-SNAPSHOT junit diff --git a/pom.xml b/pom.xml index 114c605ec683..32f6770ed5f5 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 com.microsoft.azure - 1.0.0-beta2 + 1.0.0-SNAPSHOT azure-parent pom @@ -106,7 +106,7 @@ com.microsoft.azure autorest-build-tools - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.puppycrawl.tools diff --git a/runtimes/azure-android-client-authentication/build.gradle b/runtimes/azure-android-client-authentication/build.gradle index c557f363b009..2651d8389383 100644 --- a/runtimes/azure-android-client-authentication/build.gradle +++ b/runtimes/azure-android-client-authentication/build.gradle @@ -18,7 +18,7 @@ android { minSdkVersion 15 targetSdkVersion 23 versionCode 1 - versionName "1.0.0-beta2" + versionName "1.0.0-SNAPSHOT" } buildTypes { @@ -51,7 +51,7 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:23.0.1' compile 'com.microsoft.aad:adal:1.1.11' - compile 'com.microsoft.azure:azure-client-runtime:1.0.0-beta2' + compile 'com.microsoft.azure:azure-client-runtime:1.0.0-SNAPSHOT' testCompile 'junit:junit:4.12' testCompile 'junit:junit-dep:4.11' deployerJars "org.apache.maven.wagon:wagon-ftp:2.10" diff --git a/runtimes/azure-client-authentication/build.gradle b/runtimes/azure-client-authentication/build.gradle index f22be08ed8d0..2b40ada004e0 100644 --- a/runtimes/azure-client-authentication/build.gradle +++ b/runtimes/azure-client-authentication/build.gradle @@ -10,7 +10,7 @@ buildscript { apply plugin: 'java' apply plugin: 'checkstyle' -version = '1.0.0-beta2' +version = '1.0.0-SNAPSHOT' checkstyle { toolVersion = "6.18" @@ -21,7 +21,7 @@ checkstyle { dependencies { compile 'com.microsoft.azure:adal4j:1.1.2' - compile 'com.microsoft.azure:azure-client-runtime:1.0.0-beta2' + compile 'com.microsoft.azure:azure-client-runtime:1.0.0-SNAPSHOT' testCompile 'junit:junit:4.12' testCompile 'junit:junit-dep:4.11' deployerJars "org.apache.maven.wagon:wagon-ftp:2.10" diff --git a/runtimes/azure-client-authentication/pom.xml b/runtimes/azure-client-authentication/pom.xml index ecc305c3eced..47582ca1eaa8 100644 --- a/runtimes/azure-client-authentication/pom.xml +++ b/runtimes/azure-client-authentication/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure autorest-clientruntime-for-java - 1.0.0-beta2 + 1.0.0-SNAPSHOT ../pom.xml @@ -49,7 +49,7 @@ com.microsoft.azure azure-client-runtime - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.microsoft.azure diff --git a/runtimes/azure-client-runtime/build.gradle b/runtimes/azure-client-runtime/build.gradle index a65f3dc196df..5c29359536ab 100644 --- a/runtimes/azure-client-runtime/build.gradle +++ b/runtimes/azure-client-runtime/build.gradle @@ -10,7 +10,7 @@ buildscript { apply plugin: 'java' apply plugin: 'checkstyle' -version = '1.0.0-beta2' +version = '1.0.0-SNAPSHOT' checkstyle { toolVersion = "6.18" @@ -20,7 +20,7 @@ checkstyle { } dependencies { - compile 'com.microsoft.rest:client-runtime:1.0.0-beta2' + compile 'com.microsoft.rest:client-runtime:1.0.0-SNAPSHOT' testCompile 'junit:junit:4.12' testCompile 'junit:junit-dep:4.11' deployerJars "org.apache.maven.wagon:wagon-ftp:2.10" diff --git a/runtimes/azure-client-runtime/pom.xml b/runtimes/azure-client-runtime/pom.xml index 9bc18f1f83d9..98d91b43e802 100644 --- a/runtimes/azure-client-runtime/pom.xml +++ b/runtimes/azure-client-runtime/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure autorest-clientruntime-for-java - 1.0.0-beta2 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/runtimes/build-tools/pom.xml b/runtimes/build-tools/pom.xml index e94e7bf4f6ce..d540f8f5e698 100644 --- a/runtimes/build-tools/pom.xml +++ b/runtimes/build-tools/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure autorest-clientruntime-for-java - 1.0.0-beta2 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/runtimes/client-runtime/build.gradle b/runtimes/client-runtime/build.gradle index a633beff14bc..73750c0d3d93 100644 --- a/runtimes/client-runtime/build.gradle +++ b/runtimes/client-runtime/build.gradle @@ -12,7 +12,7 @@ apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'checkstyle' group = 'com.microsoft.rest' -version = '1.0.0-beta2' +version = '1.0.0-SNAPSHOT' checkstyle { toolVersion = "6.18" diff --git a/runtimes/client-runtime/pom.xml b/runtimes/client-runtime/pom.xml index b8d26493b263..e63a421434b3 100644 --- a/runtimes/client-runtime/pom.xml +++ b/runtimes/client-runtime/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure autorest-clientruntime-for-java - 1.0.0-beta2 + 1.0.0-SNAPSHOT ../pom.xml diff --git a/runtimes/pom.xml b/runtimes/pom.xml index 35c9c37b662c..aa77260c5893 100644 --- a/runtimes/pom.xml +++ b/runtimes/pom.xml @@ -8,7 +8,7 @@ com.microsoft.azure autorest-clientruntime-for-java - 1.0.0-beta2 + 1.0.0-SNAPSHOT pom AutoRest Client Runtimes for Java @@ -140,7 +140,7 @@ com.microsoft.azure autorest-build-tools - 1.0.0-beta2 + 1.0.0-SNAPSHOT com.puppycrawl.tools