Sync main branch after cosmos moving to sdk/spring

.github/workflows/event-processor.yml

@@ -11,8 +11,6 @@ on:
   # pull request merged is the closed event with github.event.pull_request.merged = true
   pull_request_target:
     types: [closed, labeled, opened, reopened, review_requested, synchronize, unlabeled]
-  pull_request_review:
-    types: [submitted]
 
 # This removes all unnecessary permissions, the ones needed will be set below.
 # https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token
@@ -57,7 +55,7 @@ jobs:
         run: >
           dotnet tool install
           Azure.Sdk.Tools.GitHubEventProcessor
-          --version 1.0.0-dev.20230422.1
+          --version 1.0.0-dev.20230505.2
           --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
           --global
         shell: bash

.github/workflows/scheduled-event-processor.yml

@@ -34,7 +34,7 @@ jobs:
         run: >
           dotnet tool install
           Azure.Sdk.Tools.GitHubEventProcessor
-          --version 1.0.0-dev.20230422.1
+          --version 1.0.0-dev.20230505.2
           --add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
           --global
         shell: bash

.vscode/cspell.json

@@ -132,9 +132,9 @@
     "sdk/cosmos/azure-cosmos-spark_3-3_2-12/**",
     "sdk/core/azure-core-test/**",
     "sdk/cosmos/azure-cosmos-encryption/**",
-    "sdk/cosmos/azure-spring-data-cosmos-test/**",
+    "sdk/spring/azure-spring-data-cosmos-test/**",
     "sdk/cosmos/azure-cosmos-spark_3_2-12/**",
-    "sdk/cosmos/azure-spring-data-cosmos/**",
+    "sdk/spring/azure-spring-data-cosmos/**",
     "sdk/core/azure-json/**",
     "sdk/deviceupdate/azure-iot-deviceupdate/**",
     "sdk/e2e/src/**",

common/perf-test-core/pom.xml

@@ -74,12 +74,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.13.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
+      <version>1.13.3</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-okhttp</artifactId>
-      <version>1.11.8</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
+      <version>1.11.9</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
     </dependency>
   </dependencies>
 </project>

common/smoke-tests/pom.xml

@@ -88,31 +88,31 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.38.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
+      <version>1.39.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.13.2</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
+      <version>1.13.3</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-tracing-opentelemetry</artifactId>
-      <version>1.0.0-beta.34</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
+      <version>1.0.0-beta.35</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-okhttp</artifactId>
-      <version>1.11.8</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
+      <version>1.11.9</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-amqp</artifactId>
-      <version>2.8.4</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
+      <version>2.8.5</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
     </dependency>
 
     <dependency>

eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml

@@ -901,6 +901,13 @@
     <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE,REC_CATCH_EXCEPTION"/>
   </Match>
 
+  <!-- Exception needs to be caught here.-->
+  <Match>
+    <Class name="~com\.azure\.identity\.implementation\.IdentitySyncClient"/>
+    <Method name="authenticateWithWorkloadIdentityConfidentialClient"/>
+    <Bug pattern="REC_CATCH_EXCEPTION"/>
+  </Match>
+
   <!-- ClassLoader::getResourceAsStream can return null, ref: https://docs.oracle.com/javase/8/docs/technotes/guides/lang/resources.html -->
   <Match>
     <Class name="com.azure.cosmos.implementation.directconnectivity.RntbdTransportClient$Options$Builder"/>

eng/common/pipelines/templates/steps/eng-common-workflow-enforcer.yml

@@ -19,5 +19,15 @@ steps:
             exit 1
           }
         }
-      displayName: Prevent changes to eng/common outside of azure-sdk-tools repo
+        if ((!"$(System.PullRequest.SourceBranch)".StartsWith("sync-.github/workflows")) -and "$(System.PullRequest.TargetBranch)" -match "^(refs/heads/)?$(DefaultBranch)$")
+        {
+          $filesInCommonDir  = & "eng/common/scripts/get-changedfiles.ps1" -DiffPath '.github/workflows/*'
+          if (($LASTEXITCODE -eq 0) -and ($filesInCommonDir.Count -gt 0))
+          {
+            Write-Host "##vso[task.LogIssue type=error;]Changes to files under '.github/workflows' directory should not be made in this Repo`n${filesInCommonDir}"
+            Write-Host "##vso[task.LogIssue type=error;]Please follow workflow at https://github.com/Azure/azure-sdk-tools/blob/main/doc/workflows/engsys_workflows.md"
+            exit 1
+          }
+        }
+      displayName: Prevent changes to eng/common and .github/workflows outside of azure-sdk-tools repo
       condition: and(succeeded(), ne(variables['Skip.EngCommonWorkflowEnforcer'], 'true'), not(endsWith(variables['Build.Repository.Name'], '-pr')))

eng/common/scripts/Delete-RemoteBranches.ps1

@@ -10,6 +10,7 @@ param(
   $CentralRepoId,
   # We start from the sync PRs, use the branch name to get the PR number of central repo. E.g. sync-eng/common-(<branchName>)-(<PrNumber>). Have group name on PR number.
   # For sync-eng/common work, we use regex as "^sync-eng/common.*-(?<PrNumber>\d+).*$".
+  # For sync-.github/workflows work, we use regex as "^sync-.github/workflows.*-(?<PrNumber>\d+).*$".
   $BranchRegex,
   # Date format: e.g. Tuesday, April 12, 2022 1:36:02 PM. Allow to use other date format.
   [AllowNull()]
@@ -69,7 +70,7 @@ foreach ($res in $responses)
       LogError "No PR number found in the branch name. Please check the branch name [ $branchName ]. Skipping..."
       continue
     }
-      
+
     try {
       $centralPR = Get-GitHubPullRequest -RepoId $CentralRepoId -PullRequestNumber $pullRequestNumber -AuthToken $AuthToken
       LogDebug "Found central PR pull request: $($centralPR.html_url)"
@@ -78,7 +79,7 @@ foreach ($res in $responses)
         continue
       }
     }
-    catch 
+    catch
     {
       # If there is no central PR for the PR number, log error and skip.
       LogError "Get-GitHubPullRequests failed with exception:`n$_"
@@ -107,15 +108,15 @@ foreach ($res in $responses)
         LogDebug "The branch $branch last commit date [ $commitDate ] is newer than the date $LastCommitOlderThan. Skipping."
         continue
       }
-      
+
       LogDebug "Branch [ $branchName ] in repo [ $RepoId ] has a last commit date [ $commitDate ] that is older than $LastCommitOlderThan. "
     }
     catch {
       LogError "Get-GithubReferenceCommitDate failed with exception:`n$_"
       exit 1
     }
-  } 
-  
+  }
+
   try {
     if ($PSCmdlet.ShouldProcess("[ $branchName ] in [ $RepoId ]", "Deleting branches on cleanup script")) {
       Remove-GitHubSourceReferences -RepoId $RepoId -Ref $branch -AuthToken $AuthToken

eng/common/testproxy/transition-scripts/README.md

@@ -46,7 +46,7 @@ To utilize this methodology, the user must set input argument `TestProxyExe` to
 
 Other requirements:
 
-- [x] Install [docker](https://docs.docker.com/engine/install/) or [podman](https://podman.io/getting-started/installation.html)
+- [x] Install [docker](https://docs.docker.com/engine/install/) or [podman](https://podman.io/)
 - [x] Set the environment variable `GIT_TOKEN` a valid token representing YOUR user
 
 ## Permissions

eng/jacoco-test-coverage/pom.xml

@@ -103,7 +103,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-containers-containerregistry</artifactId>
-      <version>1.1.0-beta.5</version> <!-- {x-version-update;com.azure:azure-containers-containerregistry;current} -->
+      <version>1.1.0</version> <!-- {x-version-update;com.azure:azure-containers-containerregistry;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -123,7 +123,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.39.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
+      <version>1.40.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -138,12 +138,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-experimental</artifactId>
-      <version>1.0.0-beta.39</version> <!-- {x-version-update;com.azure:azure-core-experimental;current} -->
+      <version>1.0.0-beta.40</version> <!-- {x-version-update;com.azure:azure-core-experimental;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-jdk-httpclient</artifactId>
-      <version>1.0.0-beta.2</version> <!-- {x-version-update;com.azure:azure-core-http-jdk-httpclient;current} -->
+      <version>1.0.0-beta.3</version> <!-- {x-version-update;com.azure:azure-core-http-jdk-httpclient;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -163,22 +163,22 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-serializer-avro-apache</artifactId>
-      <version>1.0.0-beta.35</version> <!-- {x-version-update;com.azure:azure-core-serializer-avro-apache;current} -->
+      <version>1.0.0-beta.36</version> <!-- {x-version-update;com.azure:azure-core-serializer-avro-apache;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-serializer-json-gson</artifactId>
-      <version>1.2.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-serializer-json-gson;current} -->
+      <version>1.3.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-serializer-json-gson;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-serializer-json-jackson</artifactId>
-      <version>1.4.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-serializer-json-jackson;current} -->
+      <version>1.5.0-beta.1</version> <!-- {x-version-update;com.azure:azure-core-serializer-json-jackson;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-tracing-opentelemetry</artifactId>
-      <version>1.0.0-beta.35</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;current} -->
+      <version>1.0.0-beta.36</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>
@@ -213,7 +213,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.9.0-beta.4</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
+      <version>1.9.0</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

eng/versioning/external_dependencies.txt

@@ -22,7 +22,7 @@ com.fasterxml.woodstox:woodstox-core;6.4.0
 com.github.spotbugs:spotbugs;4.2.2
 com.github.spotbugs:spotbugs-annotations;4.2.2
 com.github.spotbugs:spotbugs-maven-plugin;4.2.2
-com.google.code.gson:gson;2.9.1
+com.google.code.gson:gson;2.10
 com.google.guava:guava;30.1.1-jre
 com.h3xstream.findsecbugs:findsecbugs-plugin;1.9.0
 com.microsoft.azure:applicationinsights-core;3.4.1
@@ -71,13 +71,10 @@ io.projectreactor.netty:reactor-netty-http;1.1.5
 io.projectreactor:reactor-core;3.5.4
 io.vertx:vertx-codegen;4.3.7
 io.vertx:vertx-core;4.3.7
-jakarta.servlet:jakarta.servlet-api;6.0.0
 jakarta.validation:jakarta.validation-api;3.0.2
-jakarta.xml.bind:jakarta.xml.bind-api;4.0.0
 javax.annotation:javax.annotation-api;1.3.2
 javax.json:javax.json-api;1.1.4
 javax.servlet:javax.servlet-api;4.0.1
-javax.validation:validation-api;2.0.1.Final
 javax.websocket:javax.websocket-api;1.1
 org.apache.avro:avro;1.11.0
 org.apache.avro:avro-maven-plugin;1.11.0
@@ -131,7 +128,6 @@ org.springframework.boot:spring-boot-starter-aop;3.0.5
 org.springframework.boot:spring-boot-starter-cache;3.0.5
 org.springframework.boot:spring-boot-starter-data-redis;3.0.5
 org.springframework.boot:spring-boot-starter-integration;3.0.5
-org.springframework.boot:spring-boot-starter-log4j2;3.0.5
 org.springframework.boot:spring-boot-starter-logging;3.0.5
 org.springframework.boot:spring-boot-starter-test;3.0.5
 org.springframework.boot:spring-boot-starter-validation;3.0.5
@@ -176,9 +172,14 @@ org.springframework.cloud:spring-cloud-context;4.0.2
 org.springframework.cloud:spring-cloud-sleuth-api;3.1.5
 org.springframework.cloud:spring-cloud-starter-sleuth;3.1.5
 org.springframework.cloud:spring-cloud-starter-stream-kafka;4.0.2
-org.springframework.cloud:spring-cloud-stream-test-binder;4.0.2
 org.springframework.cloud:spring-cloud-stream;4.0.2
 
+# Spring Boot 3 dependency versions
+jakarta.servlet:jakarta.servlet-api;6.0.0
+jakarta.xml.bind:jakarta.xml.bind-api;4.0.0
+org.springframework.boot:spring-boot-starter-log4j2;3.0.5
+org.springframework.cloud:spring-cloud-stream-test-binder;4.0.2
+
 pl.pragmatists:JUnitParams;1.1.1
 
 ## Test dependency versions
@@ -299,8 +300,8 @@ org.eclipse.m2e:lifecycle-mapping;1.0.0
 org.hdrhistogram:HdrHistogram;2.1.12
 org.jacoco:jacoco-maven-plugin;0.8.9
 org.jacoco:org.jacoco.agent;0.8.9
-org.mockito:mockito-core;4.8.1
-org.mockito:mockito-inline;4.8.1
+org.mockito:mockito-core;4.11.0
+org.mockito:mockito-inline;4.11.0
 org.moditect:moditect-maven-plugin;1.0.0.RC1
 org.ow2.asm:asm;9.5
 org.revapi:revapi;0.14.4

eng/versioning/version_client.txt

@@ -71,25 +71,25 @@ com.azure:azure-communication-phonenumbers;1.1.1;1.2.0-beta.1
 com.azure:azure-communication-networktraversal;1.1.0-beta.2;1.1.0-beta.3
 com.azure:azure-communication-jobrouter;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-communication-rooms;1.0.0-beta.2;1.0.0-beta.3
-com.azure:azure-containers-containerregistry;1.0.14;1.1.0-beta.5
+com.azure:azure-containers-containerregistry;1.0.14;1.1.0
 com.azure:azure-containers-containerregistry-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-core;1.38.0;1.39.0-beta.1
-com.azure:azure-core-amqp;2.8.4;2.9.0-beta.1
+com.azure:azure-core;1.39.0;1.40.0-beta.1
+com.azure:azure-core-amqp;2.8.5;2.9.0-beta.1
 com.azure:azure-core-amqp-experimental;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-core-experimental;1.0.0-beta.38;1.0.0-beta.39
-com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.1;1.0.0-beta.2
-com.azure:azure-core-http-netty;1.13.2;1.14.0-beta.1
-com.azure:azure-core-http-okhttp;1.11.8;1.12.0-beta.1
-com.azure:azure-core-http-vertx;1.0.0-beta.6;1.0.0-beta.7
-com.azure:azure-core-management;1.11.0;1.12.0-beta.1
-com.azure:azure-core-metrics-opentelemetry;1.0.0-beta.7;1.0.0-beta.8
+com.azure:azure-core-experimental;1.0.0-beta.39;1.0.0-beta.40
+com.azure:azure-core-http-jdk-httpclient;1.0.0-beta.2;1.0.0-beta.3
+com.azure:azure-core-http-netty;1.13.3;1.14.0-beta.1
+com.azure:azure-core-http-okhttp;1.11.9;1.12.0-beta.1
+com.azure:azure-core-http-vertx;1.0.0-beta.7;1.0.0-beta.8
+com.azure:azure-core-management;1.11.1;1.12.0-beta.1
+com.azure:azure-core-metrics-opentelemetry;1.0.0-beta.8;1.0.0-beta.9
 com.azure:azure-core-perf;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-core-serializer-avro-apache;1.0.0-beta.34;1.0.0-beta.35
+com.azure:azure-core-serializer-avro-apache;1.0.0-beta.35;1.0.0-beta.36
 com.azure:azure-core-serializer-avro-jackson;1.0.0-beta.1;1.0.0-beta.2
-com.azure:azure-core-serializer-json-gson;1.1.26;1.2.0-beta.1
-com.azure:azure-core-serializer-json-jackson;1.3.1;1.4.0-beta.1
-com.azure:azure-core-test;1.16.2;1.17.0-beta.1
-com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.34;1.0.0-beta.35
+com.azure:azure-core-serializer-json-gson;1.2.0;1.3.0-beta.1
+com.azure:azure-core-serializer-json-jackson;1.4.0;1.5.0-beta.1
+com.azure:azure-core-test;1.17.0;1.18.0-beta.1
+com.azure:azure-core-tracing-opentelemetry;1.0.0-beta.35;1.0.0-beta.36
 com.azure:azure-core-tracing-opentelemetry-samples;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-core-version-tests;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-cosmos;4.44.0;4.45.0-beta.1
@@ -113,7 +113,7 @@ com.azure:azure-developer-devcenter;1.0.0-beta.2;1.0.0-beta.3
 com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-health-insights-clinicalmatching;1.0.0-beta.1;1.0.0-beta.2
 com.azure:azure-health-insights-cancerprofiling;1.0.0-beta.1;1.0.0-beta.2
-com.azure:azure-identity;1.8.3;1.9.0-beta.4
+com.azure:azure-identity;1.8.3;1.9.0
 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-iot-deviceupdate;1.0.6;1.1.0-beta.1
 com.azure:azure-iot-modelsrepository;1.0.0-beta.1;1.0.0-beta.2
@@ -125,7 +125,7 @@ com.azure:azure-maps-geolocation;1.0.0-beta.1;1.0.0-beta.2
 com.azure:azure-maps-render;1.0.0-beta.1;1.0.0-beta.2
 com.azure:azure-maps-route;1.0.0-beta.1;1.0.0-beta.2
 com.azure:azure-maps-search;1.0.0-beta.1;1.0.0-beta.2
-com.azure:azure-json;1.0.0;1.1.0-beta.1
+com.azure:azure-json;1.0.1;1.1.0-beta.1
 com.azure:azure-json-gson;1.0.0-beta.3;1.0.0-beta.4
 com.azure:azure-json-reflect;1.0.0-beta.2;1.0.0-beta.3
 com.azure:azure-messaging-eventgrid;4.15.1;4.16.0-beta.1
@@ -417,9 +417,6 @@ com.azure.tools:azure-sdk-build-tool;1.0.0-beta.1;1.0.0-beta.2
 # note: The unreleased dependencies will not be manipulated with the automatic PR creation code.
 # In the pom, the version update tag after the version should name the unreleased package and the dependency version:
 # <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
-unreleased_com.azure:azure-core;1.39.0-beta.1
-unreleased_com.azure:azure-core-http-okhttp;1.12.0-beta.1
-unreleased_com.azure:azure-core-amqp;2.9.0-beta.1
 
 # Released Beta dependencies: Copy the entry from above, prepend "beta_", remove the current
 # version and set the version to the released beta. Released beta dependencies are only valid