From 6d72e328f3cc11a09786581d8630f05b4c381dd6 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 28 Jan 2021 09:34:19 +0800 Subject: [PATCH 1/2] add jetty for track1 record run --- sdk/keyvault/mgmt-v2016_10_01/jetty.xml | 21 ++ sdk/keyvault/mgmt-v2016_10_01/pom.xml | 261 ++++++++++++------------ 2 files changed, 157 insertions(+), 125 deletions(-) create mode 100644 sdk/keyvault/mgmt-v2016_10_01/jetty.xml diff --git a/sdk/keyvault/mgmt-v2016_10_01/jetty.xml b/sdk/keyvault/mgmt-v2016_10_01/jetty.xml new file mode 100644 index 000000000000..a63436ef2c07 --- /dev/null +++ b/sdk/keyvault/mgmt-v2016_10_01/jetty.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + 11080 + + + + \ No newline at end of file diff --git a/sdk/keyvault/mgmt-v2016_10_01/pom.xml b/sdk/keyvault/mgmt-v2016_10_01/pom.xml index 00e9feb2b106..670d59bcb348 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/pom.xml +++ b/sdk/keyvault/mgmt-v2016_10_01/pom.xml @@ -6,129 +6,140 @@ * Code generated by Microsoft (R) AutoRest Code Generator. --> - 4.0.0 - com.microsoft.azure.keyvault.v2016_10_01 - - com.microsoft.azure - azure-arm-parent - 1.3.0 - ../../parents/azure-arm-parent - - azure-mgmt-keyvault - 1.0.0-beta-2 - jar - Microsoft Azure SDK for KeyVault Management - This package contains Microsoft KeyVault Management SDK. - https://github.com/Azure/azure-libraries-for-java - - - The MIT License (MIT) - http://opensource.org/licenses/MIT - repo - - - - scm:git:https://github.com/Azure/azure-libraries-for-java - scm:git:git@github.com:Azure/azure-libraries-for-java.git - HEAD - - - UTF-8 - - - - - microsoft - Microsoft - - - - - com.microsoft.azure - azure-client-runtime - - - com.microsoft.azure - azure-arm-client-runtime - - - junit - junit - test - - - com.microsoft.azure - azure-client-authentication - test - - - com.microsoft.azure - azure-mgmt-resources - test - - - com.microsoft.azure - azure-arm-client-runtime - test-jar - test - 1.6.5 - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - com.microsoft.azure.management.apigeneration.LangDefinitionProcessor - - - true - true - - true - true - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - *.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search - - - /** -
* Copyright (c) Microsoft Corporation. All rights reserved. -
* Licensed under the MIT License. See License.txt in the project root for -
* license information. -
*/ - ]]> -
-
-
-
-
+ 4.0.0 + com.microsoft.azure.keyvault.v2016_10_01 + + com.microsoft.azure + azure-arm-parent + 1.3.0 + ../../parents/azure-arm-parent + + azure-mgmt-keyvault + 1.0.0-beta-2 + jar + Microsoft Azure SDK for KeyVault Management + This package contains Microsoft KeyVault Management SDK. + https://github.com/Azure/azure-libraries-for-java + + + The MIT License (MIT) + http://opensource.org/licenses/MIT + repo + + + + scm:git:https://github.com/Azure/azure-libraries-for-java + scm:git:git@github.com:Azure/azure-libraries-for-java.git + HEAD + + + UTF-8 + + + + + microsoft + Microsoft + + + + + com.microsoft.azure + azure-client-runtime + + + com.microsoft.azure + azure-arm-client-runtime + + + junit + junit + test + + + com.microsoft.azure + azure-client-authentication + test + + + com.microsoft.azure + azure-mgmt-resources + test + + + com.microsoft.azure + azure-arm-client-runtime + test-jar + test + 1.6.5 + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + com.microsoft.azure.management.apigeneration.LangDefinitionProcessor + + + true + true + + true + true + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8 + + *.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search + + + /** +
* Copyright (c) Microsoft Corporation. All rights reserved. +
* Licensed under the MIT License. See License.txt in the project root for +
* license information. +
*/ + ]]> +
+
+
+ + org.eclipse.jetty + jetty-maven-plugin + + 0 + 11079 + STOP + false + ${project.basedir}/jetty.xml + + +
+
From adcd42e8fc06824f9599d027d13faaac7134589e Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 28 Jan 2021 09:52:01 +0800 Subject: [PATCH 2/2] fix okhttp v3 --- sdk/keyvault/mgmt-v2016_10_01/pom.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sdk/keyvault/mgmt-v2016_10_01/pom.xml b/sdk/keyvault/mgmt-v2016_10_01/pom.xml index 670d59bcb348..644ecaf71633 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/pom.xml +++ b/sdk/keyvault/mgmt-v2016_10_01/pom.xml @@ -14,11 +14,14 @@ 1.3.0 ../../parents/azure-arm-parent + azure-mgmt-keyvault 1.0.0-beta-2 jar + Microsoft Azure SDK for KeyVault Management This package contains Microsoft KeyVault Management SDK. + https://github.com/Azure/azure-libraries-for-java @@ -27,21 +30,25 @@ repo + scm:git:https://github.com/Azure/azure-libraries-for-java scm:git:git@github.com:Azure/azure-libraries-for-java.git HEAD + UTF-8 + microsoft Microsoft + com.microsoft.azure @@ -73,7 +80,13 @@ test 1.6.5 + + com.squareup.okhttp3 + okhttp + 3.12.12 + + @@ -88,10 +101,12 @@ + org.codehaus.mojo build-helper-maven-plugin + org.apache.maven.plugins maven-compiler-plugin @@ -112,6 +127,7 @@ + org.apache.maven.plugins maven-javadoc-plugin @@ -129,6 +145,7 @@ + org.eclipse.jetty jetty-maven-plugin