Update from master

sdk/containerregistry/mgmt-v2019_04_01/pom.xml

@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
-        <relativePath>../../parents/azure-arm-parent</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-containerregistry</artifactId>
-    <version>1.0.0-beta-1</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for ContainerRegistry Management</name>
     <description>This package contains Microsoft ContainerRegistry Management SDK.</description>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>

sdk/containerregistry/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/containerregistry/v2019_04_01/Action.java

@@ -0,0 +1,38 @@
+/**
+ * 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.containerregistry.v2019_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for Action.
+ */
+public final class Action extends ExpandableStringEnum<Action> {
+    /** Static value Allow for Action. */
+    public static final Action ALLOW = fromString("Allow");
+
+    /**
+     * Creates or finds a Action from its string representation.
+     * @param name a name to look for
+     * @return the corresponding Action
+     */
+    @JsonCreator
+    public static Action fromString(String name) {
+        return fromString(name, Action.class);
+    }
+
+    /**
+     * @return known Action values
+     */
+    public static Collection<Action> values() {
+        return values(Action.class);
+    }
+}

sdk/containerregistry/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/containerregistry/v2019_04_01/Actor.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.containerregistry.v2019_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * The agent that initiated the event. For most situations, this could be from
+ * the authorization context of the request.
+ */
+public class Actor {
+    /**
+     * The subject or username associated with the request context that
+     * generated the event.
+     */
+    @JsonProperty(value = "name")
+    private String name;
+
+    /**
+     * Get the subject or username associated with the request context that generated the event.
+     *
+     * @return the name value
+     */
+    public String name() {
+        return this.name;
+    }
+
+    /**
+     * Set the subject or username associated with the request context that generated the event.
+     *
+     * @param name the name value to set
+     * @return the Actor object itself.
+     */
+    public Actor withName(String name) {
+        this.name = name;
+        return this;
+    }
+
+}

sdk/containerregistry/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/containerregistry/v2019_04_01/CallbackConfig.java

@@ -0,0 +1,31 @@
+/**
+ * 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.containerregistry.v2019_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.containerregistry.v2019_04_01.implementation.ContainerRegistryManager;
+import com.microsoft.azure.management.containerregistry.v2019_04_01.implementation.CallbackConfigInner;
+import java.util.Map;
+
+/**
+ * Type representing CallbackConfig.
+ */
+public interface CallbackConfig extends HasInner<CallbackConfigInner>, HasManager<ContainerRegistryManager> {
+    /**
+     * @return the customHeaders value.
+     */
+    Map<String, String> customHeaders();
+
+    /**
+     * @return the serviceUri value.
+     */
+    String serviceUri();
+
+}

sdk/containerregistry/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/containerregistry/v2019_04_01/DefaultAction.java

@@ -0,0 +1,41 @@
+/**
+ * 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.containerregistry.v2019_04_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for DefaultAction.
+ */
+public final class DefaultAction extends ExpandableStringEnum<DefaultAction> {
+    /** Static value Allow for DefaultAction. */
+    public static final DefaultAction ALLOW = fromString("Allow");
+
+    /** Static value Deny for DefaultAction. */
+    public static final DefaultAction DENY = fromString("Deny");
+
+    /**
+     * Creates or finds a DefaultAction from its string representation.
+     * @param name a name to look for
+     * @return the corresponding DefaultAction
+     */
+    @JsonCreator
+    public static DefaultAction fromString(String name) {
+        return fromString(name, DefaultAction.class);
+    }
+
+    /**
+     * @return known DefaultAction values
+     */
+    public static Collection<DefaultAction> values() {
+        return values(DefaultAction.class);
+    }
+}

sdk/containerregistry/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/containerregistry/v2019_04_01/DockerBuildRequest.java

@@ -16,7 +16,7 @@
 /**
  * The parameters for a docker quick build.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = DockerBuildRequest.class)
 @JsonTypeName("DockerBuildRequest")
 public class DockerBuildRequest extends RunRequest {
     /**

sdk/containerregistry/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/containerregistry/v2019_04_01/DockerBuildStep.java

@@ -16,7 +16,7 @@
 /**
  * The Docker build step.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = DockerBuildStep.class)
 @JsonTypeName("Docker")
 public class DockerBuildStep extends TaskStepProperties {
     /**

sdk/containerregistry/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/containerregistry/v2019_04_01/DockerBuildStepUpdateParameters.java

@@ -16,7 +16,7 @@
 /**
  * The properties for updating a docker build step.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = DockerBuildStepUpdateParameters.class)
 @JsonTypeName("Docker")
 public class DockerBuildStepUpdateParameters extends TaskStepUpdateParameters {
     /**

sdk/containerregistry/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/containerregistry/v2019_04_01/EncodedTaskRunRequest.java

@@ -16,7 +16,7 @@
 /**
  * The parameters for a quick task run request.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = EncodedTaskRunRequest.class)
 @JsonTypeName("EncodedTaskRunRequest")
 public class EncodedTaskRunRequest extends RunRequest {
     /**

sdk/containerregistry/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/containerregistry/v2019_04_01/EncodedTaskStep.java

@@ -16,7 +16,7 @@
 /**
  * The properties of a encoded task step.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = EncodedTaskStep.class)
 @JsonTypeName("EncodedTask")
 public class EncodedTaskStep extends TaskStepProperties {
     /**

sdk/containerregistry/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/containerregistry/v2019_04_01/EncodedTaskStepUpdateParameters.java

@@ -16,7 +16,7 @@
 /**
  * The properties for updating encoded task step.
  */
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type", defaultImpl = EncodedTaskStepUpdateParameters.class)
 @JsonTypeName("EncodedTask")
 public class EncodedTaskStepUpdateParameters extends TaskStepUpdateParameters {
     /**

sdk/containerregistry/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/containerregistry/v2019_04_01/Event.java

@@ -0,0 +1,35 @@
+/**
+ * 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.containerregistry.v2019_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.containerregistry.v2019_04_01.implementation.ContainerRegistryManager;
+import com.microsoft.azure.management.containerregistry.v2019_04_01.implementation.EventInner;
+
+/**
+ * Type representing Event.
+ */
+public interface Event extends HasInner<EventInner>, HasManager<ContainerRegistryManager> {
+    /**
+     * @return the eventRequestMessage value.
+     */
+    EventRequestMessage eventRequestMessage();
+
+    /**
+     * @return the eventResponseMessage value.
+     */
+    EventResponseMessage eventResponseMessage();
+
+    /**
+     * @return the id value.
+     */
+    String id();
+
+}