Merging in master changes

api-specs.json

@@ -223,6 +223,10 @@
     "source": "specification/resources/resource-manager/readme.md",
     "args": "--multiapi --fluent"
   },
+  "servicebus/resource-manager": {
+    "source": "specification/servicebus/resource-manager/readme.md",
+    "args": "--multiapi --fluent"
+  },
   "signalr/resource-manager": {
     "source": "specification/signalr/resource-manager/readme.md",
     "args": "--multiapi --fluent",

appconfiguration/client/pom.xml

@@ -36,10 +36,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.azure</groupId>
-      <artifactId>azure-core-auth</artifactId>
+      <version>1.0.0-preview.1</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -49,6 +46,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-test</artifactId>
+      <version>1.0.0-preview.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

authorization/resource-manager/v2015_06_01/pom.xml

@@ -0,0 +1,133 @@
+<!--
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.microsoft.azure.authorization.v2015_06_01</groupId>
+    <parent>
+        <groupId>com.microsoft.azure</groupId>
+        <artifactId>azure-arm-parent</artifactId>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
+    </parent>
+    <artifactId>azure-mgmt-authorization</artifactId>
+    <version>1.0.0-beta</version>
+    <packaging>jar</packaging>
+    <name>Microsoft Azure SDK for Authorization Management</name>
+    <description>This package contains Microsoft Authorization Management SDK.</description>
+    <url>https://github.com/Azure/azure-sdk-for-java</url>
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>http://opensource.org/licenses/MIT</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
+        <connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
+        <tag>HEAD</tag>
+    </scm>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <legal><![CDATA[[INFO] Any downloads listed may be third party software.  Microsoft grants you no rights for third party software.]]></legal>
+    </properties>
+    <developers>
+        <developer>
+            <id>microsoft</id>
+            <name>Microsoft</name>
+        </developer>
+    </developers>
+    <dependencies>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-client-authentication</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-mgmt-resources</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.microsoft.azure</groupId>
+            <artifactId>azure-arm-client-runtime</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.1</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <annotationProcessors>
+                        <annotationProcessor>
+                            com.microsoft.azure.management.apigeneration.LangDefinitionProcessor
+                        </annotationProcessor>
+                    </annotationProcessors>
+                    <debug>true</debug>
+                    <optimize>true</optimize>
+                    <compilerArguments>
+                        <AaddGeneratedAnnotation>true</AaddGeneratedAnnotation>
+                        <Adebug>true</Adebug>
+                    </compilerArguments>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.8</version>
+                <configuration>
+                    <excludePackageNames>*.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search</excludePackageNames>
+                    <bottom>
+                        <![CDATA[<code>
+                            /**
+                            <br />* Copyright (c) Microsoft Corporation. All rights reserved.
+                            <br />* Licensed under the MIT License. See License.txt in the project root for
+                            <br />* license information.
+                            <br />*/
+                        </code>]]>
+                    </bottom>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

authorization/resource-manager/v2015_06_01/src/main/java/com/microsoft/azure/management/authorization/v2015_06_01/ClassicAdministrator.java

@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.authorization.v2015_06_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.authorization.v2015_06_01.implementation.ClassicAdministratorInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.authorization.v2015_06_01.implementation.AuthorizationManager;
+
+/**
+ * Type representing ClassicAdministrator.
+ */
+public interface ClassicAdministrator extends HasInner<ClassicAdministratorInner>, HasManager<AuthorizationManager> {
+    /**
+     * @return the emailAddress value.
+     */
+    String emailAddress();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the role value.
+     */
+    String role();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}

authorization/resource-manager/v2015_06_01/src/main/java/com/microsoft/azure/management/authorization/v2015_06_01/ClassicAdministrators.java

@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ */
+
+package com.microsoft.azure.management.authorization.v2015_06_01;
+
+import com.microsoft.azure.arm.collection.SupportsListing;
+import com.microsoft.azure.management.authorization.v2015_06_01.implementation.ClassicAdministratorsInner;
+import com.microsoft.azure.arm.model.HasInner;
+
+/**
+ * Type representing ClassicAdministrators.
+ */
+public interface ClassicAdministrators extends SupportsListing<ClassicAdministrator>, HasInner<ClassicAdministratorsInner> {
+}