Skip to content

Commit

Permalink
Merge branch 'main' into myao/sync-sb3
Browse files Browse the repository at this point in the history 
# Conflicts:
#	.vscode/cspell.json
#	common/perf-test-core/pom.xml
#	eng/versioning/external_dependencies.txt
#	eng/versioning/version_client.txt
#	sdk/appconfiguration/azure-data-appconfiguration/pom.xml
#	sdk/communication/azure-communication-callautomation/pom.xml
#	sdk/communication/azure-communication-callingserver/pom.xml
#	sdk/communication/azure-communication-common/pom.xml
#	sdk/communication/azure-communication-identity/pom.xml
#	sdk/communication/azure-communication-jobrouter/pom.xml
#	sdk/communication/azure-communication-networktraversal/pom.xml
#	sdk/communication/azure-communication-phonenumbers/pom.xml
#	sdk/communication/azure-communication-rooms/pom.xml
#	sdk/communication/azure-communication-sms/pom.xml
#	sdk/containerregistry/azure-containers-containerregistry/pom.xml
#	sdk/core/azure-core-amqp-experimental/pom.xml
#	sdk/core/azure-core-amqp/pom.xml
#	sdk/core/azure-core-experimental/pom.xml
#	sdk/core/azure-core-http-jdk-httpclient/pom.xml
#	sdk/core/azure-core-http-netty/pom.xml
#	sdk/core/azure-core-http-okhttp/pom.xml
#	sdk/core/azure-core-http-vertx/pom.xml
#	sdk/core/azure-core-management/pom.xml
#	sdk/core/azure-core-perf/pom.xml
#	sdk/core/azure-core-serializer-avro-apache/pom.xml
#	sdk/core/azure-core-serializer-avro-jackson/pom.xml
#	sdk/core/azure-core-serializer-json-gson/pom.xml
#	sdk/core/azure-core-serializer-json-jackson/pom.xml
#	sdk/core/azure-core-test/pom.xml
#	sdk/core/azure-core-version-tests/pom.xml
#	sdk/core/azure-core/pom.xml
#	sdk/cosmos/azure-cosmos-encryption/pom.xml
#	sdk/cosmos/azure-cosmos-spark_3-4_2-12/pom.xml
#	sdk/cosmos/azure-cosmos-spark_3_2-12/pom.xml
#	sdk/cosmos/azure-cosmos-tests/pom.xml
#	sdk/e2e/pom.xml
#	sdk/eventgrid/azure-messaging-eventgrid/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-jedis/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs/docs/pom.xml
#	sdk/eventhubs/azure-messaging-eventhubs/pom.xml
#	sdk/identity/azure-identity/pom.xml
#	sdk/keyvault/azure-security-keyvault-administration/pom.xml
#	sdk/keyvault/azure-security-keyvault-certificates/pom.xml
#	sdk/keyvault/azure-security-keyvault-keys/pom.xml
#	sdk/keyvault/azure-security-keyvault-secrets/pom.xml
#	sdk/maps/azure-maps-elevation/pom.xml
#	sdk/maps/azure-maps-geolocation/pom.xml
#	sdk/maps/azure-maps-render/pom.xml
#	sdk/maps/azure-maps-route/pom.xml
#	sdk/maps/azure-maps-search/pom.xml
#	sdk/maps/azure-maps-timezone/pom.xml
#	sdk/maps/azure-maps-traffic/pom.xml
#	sdk/maps/azure-maps-weather/pom.xml
#	sdk/mixedreality/azure-mixedreality-authentication/pom.xml
#	sdk/monitor/azure-monitor-ingestion/pom.xml
#	sdk/remoterendering/azure-mixedreality-remoterendering/pom.xml
#	sdk/resourcemanager/azure-resourcemanager-resources/pom.xml
#	sdk/resourcemanagerhybrid/azure-resourcemanager-resources/pom.xml
#	sdk/schemaregistry/azure-data-schemaregistry-apacheavro/pom.xml
#	sdk/schemaregistry/azure-data-schemaregistry-jsonschema/pom.xml
#	sdk/schemaregistry/azure-data-schemaregistry/pom.xml
#	sdk/search/azure-search-documents/pom.xml
#	sdk/servicebus/azure-messaging-servicebus/pom.xml
#	sdk/spring/azure-spring-data-cosmos/pom.xml
#	sdk/spring/pipeline/spring-cloud-azure-supported-spring.json
#	sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml
#	sdk/spring/spring-cloud-azure-feature-management/pom.xml
#	sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml
#	sdk/spring/spring-cloud-azure-starter-monitor-test/src/test/java/com/azure/SpringMonitorTest.java
#	sdk/spring/spring-cloud-azure-starter-monitor/README.md
#	sdk/spring/spring-cloud-azure-starter-monitor/pom.xml
#	sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/monitor/applicationinsights/spring/OpenTelemetryVersionCheckRunner.java
#	sdk/spring/spring-cloud-azure-starter-monitor/src/main/java/com/azure/monitor/applicationinsights/spring/PropertiesPostProcessor.java
#	sdk/spring/spring-cloud-azure-starter-monitor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	sdk/spring/spring-cloud-azure-starter-redis/pom.xml
#	sdk/spring/spring-messaging-azure-eventhubs/pom.xml
#	sdk/storage/azure-storage-blob-batch/pom.xml
#	sdk/storage/azure-storage-blob-changefeed/pom.xml
#	sdk/storage/azure-storage-blob-nio/pom.xml
#	sdk/storage/azure-storage-blob/pom.xml
#	sdk/storage/azure-storage-common/pom.xml
#	sdk/storage/azure-storage-file-datalake/pom.xml
#	sdk/storage/azure-storage-file-share/pom.xml
#	sdk/storage/azure-storage-internal-avro/pom.xml
#	sdk/storage/azure-storage-queue/pom.xml
#	sdk/tables/azure-data-tables/pom.xml
#	sdk/webpubsub/azure-messaging-webpubsub/pom.xml
  • Loading branch information
@Netyyyy
Netyyyy committed Dec 8, 2023
2 parents 1630db9 + f0a4d3d commit 28b6d21
Show file tree
Hide file tree
Showing 6,047 changed files with 300,666 additions and 257,755 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 4 additions & 4 deletions common/perf-test-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
<configuration>
<rules>
<bannedDependencies>
<includes combine.children="append">
<include>com.fasterxml.jackson.core:jackson-databind:[2.15.3]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.13.5]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->

<!-- Special allowance for performance libraries as they aren't shipped. -->
<include>com.beust:jcommander:[1.78]</include> <!-- {x-include-update;com.beust:jcommander;external_dependency} -->

<include>io.projectreactor:reactor-core:[3.5.11]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
<include>io.projectreactor:reactor-core:[3.4.34]</include> <!-- {x-include-update;io.projectreactor:reactor-core;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand All @@ -64,7 +64,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.15.3</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
</dependency>
<dependency>
<groupId>com.beust</groupId>
Expand Down
12 changes: 6 additions & 6 deletions common/smoke-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
<version>3.10.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
<configuration>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -62,7 +62,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
<version>3.10.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
<configuration>
<source>${java.vm.specification.version}</source>
<target>${java.vm.specification.version}</target>
Expand Down Expand Up @@ -130,19 +130,19 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.7.1</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
<version>4.7.2</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs</artifactId>
<version>5.16.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
<version>5.17.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
</dependency>

<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
<version>1.17.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
<version>1.18.0</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
</dependency>

<dependency>
Expand All @@ -163,7 +163,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
<version>3.10.1</version> <!-- {x-version-update;org.apache.maven.plugins:maven-compiler-plugin;external_dependency} -->
</plugin>
</plugins>
</build>
Expand Down
2 changes: 1 addition & 1 deletion eng/bomgenerator/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.15.3</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
<version>2.13.5</version> <!-- {x-version-update;com.fasterxml.jackson.dataformat:jackson-dataformat-xml;external_dependency} -->
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion eng/code-quality-reports/src/main/resources/revapi/revapi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@
{
"regex": true,
"code": "java\\.annotation\\.removed",
"old": ".*? (com\\.azure\\.containers\\.containerregistry\\.models.*|com\\.azure\\.search\\.documents(\\.indexes)?\\.models.*|com\\.azure\\.security\\.keyvault\\.(administration|certificates)\\.models.*)",
"old": ".*? (com\\.azure\\.containers\\.containerregistry\\.models.*|com\\.azure\\.search\\.documents(\\.indexes)?\\.models.*|com\\.azure\\.security\\.keyvault\\.(administration|certificates|keys|keys\\.cryptography)\\.models.*)",
"description": ".*com.fasterxml.jackson.*",
"justification": "Removing Jackson annotations from ACR, KeyVault, and Search in transition to stream-style."
},
Expand Down
18 changes: 9 additions & 9 deletions eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,6 @@
<Class name="com.microsoft.azure.servicebus.Utils"/>
<Method name="getDataFromMessageBody"/>
</And>
<And>
<Class name="com.azure.security.keyvault.keys.implementation.Base64UrlJsonDeserializer"/>
<Method name="deserialize"/>
</And>
<And>
<Class name="com.azure.security.keyvault.keys.implementation.ByteExtensions"/>
<Method name="clone"/>
</And>
<And>
<Class name="com.azure.security.keyvault.keys.models.KeyProperties"/>
<Method name="decode"/>
Expand Down Expand Up @@ -185,6 +177,15 @@
<Class name="com.azure.core.serializer.json.jackson.implementation.JacksonJsonReader"/>
<Method name="getBinary"/>
</And>
<Class name="com.azure.security.keyvault.keys.implementation.models.BackupKeyResult"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.JsonWebKey"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.KeyOperationResult"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.KeyOperationsParameters"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.KeyReleasePolicy"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.KeyRestoreParameters"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.KeySignParameters"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.KeyVerifyParameters"/>
<Class name="com.azure.security.keyvault.keys.implementation.models.RandomBytes"/>
</Or>
<Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/>
</Match>
Expand Down Expand Up @@ -636,7 +637,6 @@
<Class name="com.azure.security.keyvault.secrets.models.KeyVaultSecret"/>
<Class name="com.azure.security.keyvault.secrets.models.SecretProperties"/>
<Class name="com.azure.security.keyvault.keys.models.DeletedKey"/>
<Class name="com.azure.security.keyvault.keys.cryptography.implementation.SecretKey"/>
<Class name="com.azure.security.keyvault.keys.models.KeyVaultKey"/>
<Class name="com.azure.security.keyvault.keys.models.KeyProperties"/>
<Class name="com.azure.security.keyvault.keys.models.KeyRotationPolicy"/>
Expand Down
9 changes: 8 additions & 1 deletion eng/common/TestResources/New-TestResources.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,14 @@ function BuildDeploymentOutputs([string]$serviceName, [object]$azContext, [objec
}
}

return $deploymentOutputs
# Force capitalization of all keys to avoid Azure Pipelines confusion with
# variable auto-capitalization and OS env var capitalization differences
$capitalized = @{}
foreach ($item in $deploymentOutputs.GetEnumerator()) {
$capitalized[$item.Name.ToUpperInvariant()] = $item.Value
}

return $capitalized
}

function SetDeploymentOutputs(
Expand Down
2 changes: 1 addition & 1 deletion eng/common/pipelines/codeowners-linter.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ stages:
vmImage: ubuntu-22.04

variables:
CodeownersLinterVersion: '1.0.0-dev.20231107.2'
CodeownersLinterVersion: '1.0.0-dev.20231120.3'
DotNetDevOpsFeed: "https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json"
RepoLabelUri: "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-write-teams/repository-labels-blob"
TeamUserUri: "https://azuresdkartifacts.blob.core.windows.net/azure-sdk-write-teams/azure-sdk-write-teams-blob"
Expand Down
4 changes: 2 additions & 2 deletions eng/common/scripts/Cadl-Project-Generate.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ param (
[ValidateNotNullOrEmpty()]
[string] $ProjectDirectory,
[Parameter(Position=1)]
[string] $CadlAdditionalOptions ## addtional cadl emitter options, separated by semicolon if more than one, e.g. option1=value1;option2=value2
[string] $CadlAdditionalOptions ## additional cadl emitter options, separated by semicolon if more than one, e.g. option1=value1;option2=value2
)

$ErrorActionPreference = "Stop"
Expand Down Expand Up @@ -98,4 +98,4 @@ finally {
$shouldCleanUp = $configuration["cleanup"] ?? $true
if ($shouldCleanUp) {
Remove-Item $tempFolder -Recurse -Force
}
}
Loading

0 comments on commit 28b6d21

Please sign in to comment.