From db7a82dad0811c223d02f11ab29090553c631806 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Mon, 16 Nov 2020 17:21:41 -0800 Subject: [PATCH 1/2] Increment package version after release of com.azure azure-security-keyvault-administration (#17600) --- eng/jacoco-test-coverage/pom.xml | 2 +- eng/versioning/version_client.txt | 2 +- .../azure-security-keyvault-administration/CHANGELOG.md | 3 +++ sdk/keyvault/azure-security-keyvault-administration/pom.xml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index 935dbfdc716e..086b7bea1427 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -199,7 +199,7 @@ com.azure azure-security-keyvault-administration - 4.0.0-beta.3 + 4.0.0-beta.4 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index 8afac97e5736..afb793ecfc69 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -78,7 +78,7 @@ com.azure:azure-messaging-servicebus-track1-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-messaging-servicebus-track2-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-search-documents;11.1.2;11.2.0-beta.4 com.azure:azure-search-perf;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-security-keyvault-administration;4.0.0-beta.2;4.0.0-beta.3 +com.azure:azure-security-keyvault-administration;4.0.0-beta.3;4.0.0-beta.4 com.azure:azure-security-keyvault-certificates;4.1.2;4.2.0-beta.3 com.azure:azure-security-keyvault-jca;1.0.0-beta.1;1.0.0-beta.2 com.azure:azure-security-keyvault-keys;4.2.2;4.3.0-beta.3 diff --git a/sdk/keyvault/azure-security-keyvault-administration/CHANGELOG.md b/sdk/keyvault/azure-security-keyvault-administration/CHANGELOG.md index 365d50095f8a..69b843ec7679 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/CHANGELOG.md +++ b/sdk/keyvault/azure-security-keyvault-administration/CHANGELOG.md @@ -1,5 +1,8 @@ # Release History +## 4.0.0-beta.4 (Unreleased) + + ## 4.0.0-beta.3 (2020-11-12) ### New Features diff --git a/sdk/keyvault/azure-security-keyvault-administration/pom.xml b/sdk/keyvault/azure-security-keyvault-administration/pom.xml index 08045b2acf2c..e50a2ca1937a 100644 --- a/sdk/keyvault/azure-security-keyvault-administration/pom.xml +++ b/sdk/keyvault/azure-security-keyvault-administration/pom.xml @@ -13,7 +13,7 @@ com.azure azure-security-keyvault-administration - 4.0.0-beta.3 + 4.0.0-beta.4 Microsoft Azure client library for KeyVault Administration This module contains client library for Microsoft Azure KeyVault Administration. From c952b13873dc182e2b725b25efbd45a336dceb73 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 17 Nov 2020 01:49:28 +0000 Subject: [PATCH 2/2] CodeGen from PR 11670 in Azure/azure-rest-api-specs Merge 2de3a3adf8634151dac517d8fe86bb91dd3915d5 into df1ec28808dc7e317337eec602b399c33ac98d9d --- .../v2019_08_01/implementation/DataBoxEdgeDeviceInner.java | 5 ++--- .../databoxedge/v2019_08_01/implementation/RoleInner.java | 1 - .../databoxedge/v2019_08_01/implementation/TriggerInner.java | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sdk/databoxedge/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/databoxedge/v2019_08_01/implementation/DataBoxEdgeDeviceInner.java b/sdk/databoxedge/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/databoxedge/v2019_08_01/implementation/DataBoxEdgeDeviceInner.java index 58fc1d95a95f..922c0129546e 100644 --- a/sdk/databoxedge/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/databoxedge/v2019_08_01/implementation/DataBoxEdgeDeviceInner.java +++ b/sdk/databoxedge/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/databoxedge/v2019_08_01/implementation/DataBoxEdgeDeviceInner.java @@ -9,20 +9,19 @@ package com.microsoft.azure.management.databoxedge.v2019_08_01.implementation; import java.util.Map; - -import com.microsoft.azure.Resource; import com.microsoft.azure.management.databoxedge.v2019_08_01.DataBoxEdgeDeviceStatus; import com.microsoft.azure.management.databoxedge.v2019_08_01.DeviceType; import java.util.List; import com.microsoft.azure.management.databoxedge.v2019_08_01.RoleTypes; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; +import com.microsoft.azure.management.databoxedge.v2019_08_01.ARMBaseModel; /** * The Data Box Edge/Gateway device. */ @JsonFlatten -public class DataBoxEdgeDeviceInner extends Resource { +public class DataBoxEdgeDeviceInner extends ARMBaseModel { /** * The location of the device. This is a supported and registered Azure * geographical region (for example, West US, East US, or Southeast Asia). diff --git a/sdk/databoxedge/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/databoxedge/v2019_08_01/implementation/RoleInner.java b/sdk/databoxedge/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/databoxedge/v2019_08_01/implementation/RoleInner.java index 97f7b657a4a6..dffb16a5c6de 100644 --- a/sdk/databoxedge/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/databoxedge/v2019_08_01/implementation/RoleInner.java +++ b/sdk/databoxedge/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/databoxedge/v2019_08_01/implementation/RoleInner.java @@ -12,7 +12,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.microsoft.azure.management.databoxedge.v2019_08_01.ARMBaseModel; -import com.microsoft.azure.management.databoxedge.v2019_08_01.IoTRole; /** * Compute role. diff --git a/sdk/databoxedge/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/databoxedge/v2019_08_01/implementation/TriggerInner.java b/sdk/databoxedge/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/databoxedge/v2019_08_01/implementation/TriggerInner.java index 9053fca0621e..4b694a06bf02 100644 --- a/sdk/databoxedge/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/databoxedge/v2019_08_01/implementation/TriggerInner.java +++ b/sdk/databoxedge/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/databoxedge/v2019_08_01/implementation/TriggerInner.java @@ -12,8 +12,6 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.microsoft.azure.management.databoxedge.v2019_08_01.ARMBaseModel; -import com.microsoft.azure.management.databoxedge.v2019_08_01.FileEventTrigger; -import com.microsoft.azure.management.databoxedge.v2019_08_01.PeriodicTimerEventTrigger; /** * Trigger details.