diff --git a/azure-mgmt-compute/pom.xml b/azure-mgmt-compute/pom.xml
index b3256d8590ec..bd2f1265d645 100644
--- a/azure-mgmt-compute/pom.xml
+++ b/azure-mgmt-compute/pom.xml
@@ -21,8 +21,8 @@
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ The MIT License (MIT)
+ http://opensource.org/licenses/MIT
repo
@@ -91,6 +91,16 @@
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
org.apache.maven.plugins
maven-javadoc-plugin
diff --git a/azure-mgmt-network/pom.xml b/azure-mgmt-network/pom.xml
index 8211da317a57..72026008f329 100644
--- a/azure-mgmt-network/pom.xml
+++ b/azure-mgmt-network/pom.xml
@@ -21,8 +21,8 @@
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ The MIT License (MIT)
+ http://opensource.org/licenses/MIT
repo
@@ -91,6 +91,16 @@
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
org.apache.maven.plugins
maven-javadoc-plugin
diff --git a/azure-mgmt-resources/pom.xml b/azure-mgmt-resources/pom.xml
index b520cbdd3eae..d99fe9b7ab9e 100644
--- a/azure-mgmt-resources/pom.xml
+++ b/azure-mgmt-resources/pom.xml
@@ -21,8 +21,8 @@
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ The MIT License (MIT)
+ http://opensource.org/licenses/MIT
repo
@@ -45,18 +45,6 @@
-
-
- adx-snapshots
- Azure ADX Snapshots
- http://adxsnapshots.azurewebsites.net/
- default
-
- true
-
-
-
-
com.microsoft.azure
@@ -102,6 +90,16 @@
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
org.apache.maven.plugins
maven-javadoc-plugin
diff --git a/azure-mgmt-storage/pom.xml b/azure-mgmt-storage/pom.xml
index 8288a2f98958..2b3fb0a54863 100644
--- a/azure-mgmt-storage/pom.xml
+++ b/azure-mgmt-storage/pom.xml
@@ -21,8 +21,8 @@
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ The MIT License (MIT)
+ http://opensource.org/licenses/MIT
repo
@@ -86,6 +86,16 @@
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
org.apache.maven.plugins
maven-compiler-plugin
diff --git a/azure-mgmt-website/pom.xml b/azure-mgmt-website/pom.xml
index 474b3a3c61dd..35939cae5bc4 100644
--- a/azure-mgmt-website/pom.xml
+++ b/azure-mgmt-website/pom.xml
@@ -21,8 +21,8 @@
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ The MIT License (MIT)
+ http://opensource.org/licenses/MIT
repo
@@ -91,6 +91,16 @@
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
org.apache.maven.plugins
maven-javadoc-plugin
diff --git a/azure/pom.xml b/azure/pom.xml
index 5365d41325ac..fba16b5eb8ef 100644
--- a/azure/pom.xml
+++ b/azure/pom.xml
@@ -20,8 +20,8 @@
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ The MIT License (MIT)
+ http://opensource.org/licenses/MIT
repo
@@ -49,10 +49,11 @@
adx-snapshots
Azure ADX Snapshots
- http://adxsnapshots.azurewebsites.net/
+ http://adxsnapshots.azurewebsites.net
default
true
+ always
@@ -61,7 +62,7 @@
adx-snapshots
Azure ADX Snapshots
- ftp://waws-prod-bay-005.ftp.azurewebsites.windows.net/site/wwwroot/
+ ftp://waws-prod-bay-005.ftp.azurewebsites.windows.net/site/wwwroot
true
default
@@ -145,6 +146,7 @@
*/]]>
+
org.apache.maven.plugins
maven-release-plugin
@@ -158,11 +160,13 @@
maven-checkstyle-plugin
2.17
+
org.apache.maven.plugins
maven-resources-plugin
2.4.3
+
org.apache.maven.plugins
maven-surefire-plugin
@@ -179,11 +183,60 @@
+
org.apache.maven.plugins
maven-release-plugin
2.5.2
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 1.8
+
+
+ package
+
+
+
+
+
+
+
+ Azure/azure-sdk-for-java#
+ ${git.revision}
+
+
+
+ run
+
+
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+ 1.10
+
+
+ attach-artifacts
+ package
+
+ attach-artifact
+
+
+
+
+ target/.gitrevision
+ gitrevision
+
+
+
+
+
+
diff --git a/examples/AzureResourceRunner/app/build.gradle b/examples/AzureResourceRunner/app/build.gradle
index e912a520aa56..1b76cb129803 100644
--- a/examples/AzureResourceRunner/app/build.gradle
+++ b/examples/AzureResourceRunner/app/build.gradle
@@ -64,11 +64,11 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:multidex:1.0.1'
- compile 'com.microsoft.azure:azure-mgmt-resources:1.0.0-SNAPSHOT'
- compile 'com.microsoft.azure:azure-mgmt-storage:1.0.0-SNAPSHOT'
- compile 'com.microsoft.azure:azure-mgmt-compute:1.0.0-SNAPSHOT'
- compile 'com.microsoft.azure:azure-client-runtime:1.0.0-SNAPSHOT'
- compile 'com.microsoft.azure:azure-android-client-authentication:1.0.0-SNAPSHOT'
+ compile 'com.microsoft.azure:azure-mgmt-resources:1.0.0-beta1'
+ compile 'com.microsoft.azure:azure-mgmt-storage:1.0.0-beta1'
+ compile 'com.microsoft.azure:azure-mgmt-compute:1.0.0-beta1'
+ compile 'com.microsoft.azure:azure-client-runtime:1.0.0-beta1'
+ compile 'com.microsoft.azure:azure-android-client-authentication:1.0.0-beta1'
compile 'com.android.support:design:23.1.1'
compile 'com.android.support:support-v4:23.1.1'
}
\ No newline at end of file
diff --git a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/ResourceOperator.java b/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/ResourceOperator.java
index 950f9330da91..b7d56dc21fbd 100644
--- a/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/ResourceOperator.java
+++ b/examples/AzureResourceRunner/app/src/main/java/com/example/jianghlu/azureresourcerunner/ResourceOperator.java
@@ -12,7 +12,6 @@
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
-import android.view.View;
import com.microsoft.azure.credentials.UserTokenCredentials;
import com.microsoft.azure.management.compute.ComputeManagementClient;
@@ -24,8 +23,7 @@
public class ResourceOperator extends AppCompatActivity
implements NavigationView.OnNavigationItemSelectedListener,
- ResourceFragment.OnFragmentInteractionListener,
- StorageFragment.OnFragmentInteractionListener {
+ ResourceFragment.OnFragmentInteractionListener {
SubscriptionInfo subscription;
ResourceManagementClient rClient;
StorageManagementClient sClient;
@@ -121,20 +119,20 @@ public boolean onNavigationItemSelected(MenuItem item) {
setTitle(this.getTitle() + " - Resources");
drawer.closeDrawer(navigationView);
} else if (id == R.id.nav_storage) {
- StorageFragment fragment = new StorageFragment();
- fragment.setRetainInstance(true);
- fragment.setStorageManagementClient(sClient);
- FragmentManager fragmentManager = getFragmentManager();
- fragmentManager.beginTransaction()
- .replace(R.id.resource_operator_main_content, fragment)
- .commit();
-
- // Highlight the selected item, update the title, and close the drawer
- DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
- NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
- navigationView.setCheckedItem(0);
- setTitle(this.getTitle() + " - Storage");
- drawer.closeDrawer(navigationView);
+// StorageFragment fragment = new StorageFragment();
+// fragment.setRetainInstance(true);
+// fragment.setStorageManagementClient(sClient);
+// FragmentManager fragmentManager = getFragmentManager();
+// fragmentManager.beginTransaction()
+// .replace(R.id.resource_operator_main_content, fragment)
+// .commit();
+//
+// // Highlight the selected item, update the title, and close the drawer
+// DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+// NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+// navigationView.setCheckedItem(0);
+// setTitle(this.getTitle() + " - Storage");
+// drawer.closeDrawer(navigationView);
} else if (id == R.id.nav_compute) {
} else if (id == R.id.nav_share) {
diff --git a/examples/VMCreateGuide/pom.xml b/examples/VMCreateGuide/pom.xml
index 4f9d53e9ca61..a1598ee3020c 100644
--- a/examples/VMCreateGuide/pom.xml
+++ b/examples/VMCreateGuide/pom.xml
@@ -29,27 +29,27 @@
com.microsoft.azure
azure-mgmt-resources
- 1.0.0-SNAPSHOT
+ 1.0.0-beta1
com.microsoft.azure
azure-mgmt-storage
- 1.0.0-SNAPSHOT
+ 1.0.0-beta1
com.microsoft.azure
azure-mgmt-network
- 1.0.0-SNAPSHOT
+ 1.0.0-beta1
com.microsoft.azure
azure-mgmt-compute
- 1.0.0-SNAPSHOT
+ 1.0.0-beta1
com.microsoft.azure
azure-client-authentication
- 1.0.0-SNAPSHOT
+ 1.0.0-beta1
com.fasterxml.jackson.core
diff --git a/examples/VMCreateGuide/src/main/java/VMCreateGuide.java b/examples/VMCreateGuide/src/main/java/VMCreateGuide.java
index f0b2798b1792..35f73e5a6401 100644
--- a/examples/VMCreateGuide/src/main/java/VMCreateGuide.java
+++ b/examples/VMCreateGuide/src/main/java/VMCreateGuide.java
@@ -8,7 +8,7 @@
* regenerated.
*/
-import com.microsoft.azure.Page;
+import com.microsoft.azure.ListOperationCallback;
import com.microsoft.azure.credentials.ApplicationTokenCredentials;
import com.microsoft.azure.credentials.AzureEnvironment;
import com.microsoft.azure.management.compute.ComputeManagementClient;
@@ -29,6 +29,7 @@
import com.microsoft.azure.management.network.models.DhcpOptions;
import com.microsoft.azure.management.network.models.NetworkInterface;
import com.microsoft.azure.management.network.models.NetworkInterfaceIPConfiguration;
+import com.microsoft.azure.management.network.models.NetworkSecurityGroup;
import com.microsoft.azure.management.network.models.PublicIPAddress;
import com.microsoft.azure.management.network.models.PublicIPAddressDnsSettings;
import com.microsoft.azure.management.network.models.Subnet;
@@ -44,10 +45,17 @@
import com.microsoft.azure.management.storage.models.AccountType;
import com.microsoft.azure.management.storage.models.StorageAccount;
import com.microsoft.azure.management.storage.models.StorageAccountCreateParameters;
+import com.microsoft.rest.ServiceResponse;
+import okhttp3.OkHttpClient;
+import okhttp3.logging.HttpLoggingInterceptor;
+import retrofit2.Retrofit;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Scanner;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
public class VMCreateGuide {
private static Scanner in = new Scanner(System.in);
@@ -68,6 +76,7 @@ public static void main(String argv[]) throws Exception {
String publicIPName = "sample_pip";
String networkInterfaceName = "sample_nic";
String ipConfigName = "sample_crpip";
+ String securityGroupName = "sample_sgn";
String domainNameLabel = "nouppercase";
String osDiskName = "sample_osdisk";
@@ -88,7 +97,7 @@ public static void main(String argv[]) throws Exception {
ResourceManagementClient resourceManagementClient;
StorageManagementClient storageManagementClient;
NetworkManagementClient networkManagementClient;
- ComputeManagementClient computeManagementClient;
+ final ComputeManagementClient computeManagementClient;
// Credential
ApplicationTokenCredentials credentials = new ApplicationTokenCredentials(
@@ -97,7 +106,7 @@ public static void main(String argv[]) throws Exception {
// Subscriptions
SubscriptionClient client = new SubscriptionClientImpl(credentials);
- Page subscriptions = client.getSubscriptions().list().getBody();
+ List subscriptions = client.getSubscriptionsOperations().list().getBody();
String subscription = selectSubscription(subscriptions);
// Client creation
@@ -109,19 +118,18 @@ public static void main(String argv[]) throws Exception {
networkManagementClient.setSubscriptionId(subscription);
computeManagementClient = new ComputeManagementClientImpl(credentials);
computeManagementClient.setSubscriptionId(subscription);
-
// Create resource group
ResourceGroup resourceGroupParameters = new ResourceGroup();
resourceGroupParameters.setLocation(location);
System.out.println("Creating resource group...");
- resourceManagementClient.getResourceGroups().createOrUpdate(resourceGroupName, resourceGroupParameters);
- while (!resourceManagementClient.getResourceGroups().checkExistence(resourceGroupName).getBody()) {
+ resourceManagementClient.getResourceGroupsOperations().createOrUpdate(resourceGroupName, resourceGroupParameters);
+ while (!resourceManagementClient.getResourceGroupsOperations().checkExistence(resourceGroupName).getBody()) {
Thread.sleep(5000);
}
// Create Storage account
boolean found = false;
- List accounts = storageManagementClient.getStorageAccounts().listByResourceGroup(resourceGroupName).getBody().getValue();
+ List accounts = storageManagementClient.getStorageAccountsOperations().listByResourceGroup(resourceGroupName).getBody();
for (StorageAccount account : accounts) {
if (account.getName().equals(storageAccountName)) {
found = true;
@@ -133,7 +141,7 @@ public static void main(String argv[]) throws Exception {
storageParameters.setLocation(location);
storageParameters.setAccountType(AccountType.STANDARD_GRS);
System.out.println("Creating storage account...");
- storageManagementClient.getStorageAccounts().create(resourceGroupName, storageAccountName, storageParameters);
+ storageManagementClient.getStorageAccountsOperations().create(resourceGroupName, storageAccountName, storageParameters);
}
// Create VNET
@@ -152,8 +160,8 @@ public static void main(String argv[]) throws Exception {
subnet.setAddressPrefix("10.0.0.0/24");
vnet.getSubnets().add(subnet);
System.out.println("Creating vnet...");
- networkManagementClient.getVirtualNetworks().createOrUpdate(resourceGroupName, vnetName, vnet);
- subnet = networkManagementClient.getSubnets().get(resourceGroupName, vnetName, subnetName, null).getBody();
+ networkManagementClient.getVirtualNetworksOperations().createOrUpdate(resourceGroupName, vnetName, vnet);
+ subnet = networkManagementClient.getSubnetsOperations().get(resourceGroupName, vnetName, subnetName, null).getBody();
// Create public IP
PublicIPAddress publicIPAddress = new PublicIPAddress();
@@ -163,8 +171,8 @@ public static void main(String argv[]) throws Exception {
publicIPAddress.getDnsSettings().setDomainNameLabel(domainNameLabel);
System.out.println("Creating public IP...");
- networkManagementClient.getPublicIPAddresses().createOrUpdate(resourceGroupName, publicIPName, publicIPAddress);
- publicIPAddress = networkManagementClient.getPublicIPAddresses().get(resourceGroupName, publicIPName, null).getBody();
+ networkManagementClient.getPublicIPAddressesOperations().createOrUpdate(resourceGroupName, publicIPName, publicIPAddress);
+ publicIPAddress = networkManagementClient.getPublicIPAddressesOperations().get(resourceGroupName, publicIPName, null).getBody();
// Create Network interface
NetworkInterface nic = new NetworkInterface();
@@ -176,13 +184,18 @@ public static void main(String argv[]) throws Exception {
configuration.setSubnet(subnet);
configuration.setPublicIPAddress(publicIPAddress);
nic.getIpConfigurations().add(configuration);
+ NetworkSecurityGroup networkSecurityGroup = new NetworkSecurityGroup();
+ networkSecurityGroup.setLocation(location);
+ networkSecurityGroup.setSubnets(networkManagementClient.getSubnetsOperations().list(resourceGroupName, vnetName).getBody());
+ System.out.println("Creating network security group...");
+ networkSecurityGroup = networkManagementClient.getNetworkSecurityGroupsOperations().createOrUpdate(resourceGroupName, securityGroupName, networkSecurityGroup).getBody();
+ nic.setNetworkSecurityGroup(networkSecurityGroup);
System.out.println("Creating network interface...");
- networkManagementClient.getNetworkInterfaces().createOrUpdate(resourceGroupName, networkInterfaceName, nic);
- nic = networkManagementClient.getNetworkInterfaces().get(resourceGroupName, networkInterfaceName, null).getBody();
+ networkManagementClient.getNetworkInterfacesOperations().createOrUpdate(resourceGroupName, networkInterfaceName, nic);
+ nic = networkManagementClient.getNetworkInterfacesOperations().get(resourceGroupName, networkInterfaceName, null).getBody();
// Get VM Image
- VirtualMachineImageResource virtualMachineImageResource = new VirtualMachineImageResource();
- String name = computeManagementClient.getVirtualMachineImages().list(location, publisher, offer, sku, null, 1, null).getBody().get(0).getName();
+ String name = computeManagementClient.getVirtualMachineImagesOperations().list(location, publisher, offer, sku, null, 1, null).getBody().get(0).getName();
ImageReference imageReference = new ImageReference();
imageReference.setOffer(offer);
imageReference.setPublisher(publisher);
@@ -214,8 +227,8 @@ public static void main(String argv[]) throws Exception {
nir.setId(nic.getId());
request.getNetworkProfile().getNetworkInterfaces().add(nir);
System.out.println("Creating VM...");
- VirtualMachine vm = computeManagementClient.getVirtualMachines().createOrUpdate(resourceGroupName, vmName, request).getBody();
- nic = networkManagementClient.getNetworkInterfaces().get(resourceGroupName, networkInterfaceName, null).getBody();
+ VirtualMachine vm = computeManagementClient.getVirtualMachinesOperations().createOrUpdate(resourceGroupName, vmName, request).getBody();
+ nic = networkManagementClient.getNetworkInterfacesOperations().get(resourceGroupName, networkInterfaceName, null).getBody();
// Print results
System.out.println("__ ____ __ ___ _ _");
@@ -227,15 +240,15 @@ public static void main(String argv[]) throws Exception {
System.out.println(String.format("System: %s - %s - %s", publisher, offer, sku));
}
- private static String selectSubscription(Page subscriptions) {
+ private static String selectSubscription(List subscriptions) {
System.out.println("Here are your subscriptions:");
int i = 0;
- for (; i != subscriptions.getItems().size(); i ++) {
- Subscription subscription = subscriptions.getItems().get(i);
+ for (; i != subscriptions.size(); i ++) {
+ Subscription subscription = subscriptions.get(i);
System.out.println(String.format("%d) %s (%s)", i + 1, subscription.getDisplayName(), subscription.getSubscriptionId()));
}
System.out.print("Select the number before the subscription name: ");
- return subscriptions.getItems().get(in.nextInt() - 1).getSubscriptionId();
+ return subscriptions.get(in.nextInt() - 1).getSubscriptionId();
}
private static String getVMNameFromPrompt() {
diff --git a/pom.xml b/pom.xml
index 8c3dbd954acd..2b0ede701858 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,8 @@
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ The MIT License (MIT)
+ http://opensource.org/licenses/MIT
repo