Merge branch 'main' into myao/sync-sb3

# Conflicts: # eng/versioning/version_client.txt # sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml # sdk/spring/spring-cloud-azure-actuator/pom.xml # sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml # sdk/spring/spring-cloud-azure-autoconfigure/pom.xml # sdk/spring/spring-cloud-azure-core/pom.xml # sdk/spring/spring-cloud-azure-service/pom.xml # sdk/spring/spring-cloud-azure-starter-jdbc-mysql/pom.xml # sdk/spring/spring-cloud-azure-starter-jdbc-postgresql/pom.xml # sdk/spring/spring-cloud-azure-starter-keyvault-certificates/pom.xml # sdk/spring/spring-cloud-azure-starter-keyvault-secrets/pom.xml # sdk/spring/spring-cloud-azure-starter-monitor-test/pom.xml # sdk/spring/spring-cloud-azure-starter-monitor/CHANGELOG.md # sdk/spring/spring-cloud-azure-starter-monitor/README.md # sdk/spring/spring-cloud-azure-starter-monitor/pom.xml # sdk/spring/spring-cloud-azure-starter-redis/pom.xml # sdk/spring/spring-cloud-azure-starter-servicebus-jms/pom.xml # sdk/spring/spring-cloud-azure-trace-sleuth/pom.xml # sdk/spring/spring-messaging-azure-servicebus/pom.xml # sdk/spring/spring-messaging-azure-storage-queue/pom.xml
Azure · Dec 8, 2023 · e616166 · e616166
2 parents 28b6d21 + 41243ba
commit e616166
Show file tree

Hide file tree

Showing 787 changed files with 26,004 additions and 7,507 deletions.
diff --git a/.github/CODEOWNERS_baseline_errors.txt b/.github/CODEOWNERS_baseline_errors.txt
diff --git a/.vscode/cspell.json b/.vscode/cspell.json
@@ -867,7 +867,10 @@
     {
       "filename": "sdk/servicebus/azure-messaging-servicebus/**",
       "words": [
+        "anu",
         "Conniey",
+        "liudmila",
+        "Milli",
         "qpid",
         "unretriable"
       ]

diff --git a/common/perf-test-core/pom.xml b/common/perf-test-core/pom.xml
@@ -74,12 +74,12 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.13.10</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
+      <version>1.13.11</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.16</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
+      <version>1.11.17</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
     </dependency>
   </dependencies>
 </project>
diff --git a/common/smoke-tests/pom.xml b/common/smoke-tests/pom.xml
@@ -88,13 +88,13 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.45.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
+      <version>1.45.1</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.13.10</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
+      <version>1.13.11</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
     </dependency>
 
     <dependency>
@@ -106,31 +106,31 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-okhttp</artifactId>
-      <version>1.11.16</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
+      <version>1.11.17</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.13</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
+      <version>2.8.14</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.52.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
+      <version>4.53.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.11.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+      <version>1.11.1</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-security-keyvault-secrets</artifactId>
-      <version>4.7.2</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
+      <version>4.7.3</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
     </dependency>
 
     <dependency>
@@ -148,7 +148,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.25.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
+      <version>12.25.1</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
     </dependency>
 
     <dependency>

diff --git a/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml b/eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml
@@ -146,6 +146,8 @@ the main ServiceBusClientBuilder. -->
   <suppress checks="com.azure.tools.checkstyle.checks.ServiceClientCheck" files="ServiceBusSessionReceiver(Async)?Client.java"/>
 
   <suppress checks="com.azure.tools.checkstyle.checks.UseCaughtExceptionCauseCheck" files="ServiceBusMessageBatch.java"/>
+  <!-- Supress the BufferOverflowException thrown from encodedSize method, this exception is caught, mapped and logged at the callsite  -->
+  <suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLoggerCheck" files="com.azure.messaging.servicebus.ServiceBusMessageBatch.java"/>
 
   <!-- Suppress the long package name in autoconfigure.implementation.redis package  -->
   <suppress checks="PackageName" files="com.azure.spring.cloud.autoconfigure.implementation.redis.*" />

diff --git a/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml b/eng/code-quality-reports/src/main/resources/spotbugs/spotbugs-exclude.xml
@@ -2435,6 +2435,18 @@
     <Bug pattern="SE_BAD_FIELD"/>
   </Match>
 
+    <!--  The returned Disposable can be ignored since Scheduler is closed when Reactor closes. -->
+  <Match>
+    <Class name="com.azure.core.amqp.implementation.ReactorExecutor"/>
+    <Method name="start"/>
+    <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
+  </Match>
+    <Match>
+    <Class name="com.azure.core.amqp.implementation.ReactorExecutor"/>
+    <Method name="run"/>
+    <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
+  </Match>
+
   <!-- For BinaryData, copying array contents degrades performance. The data returned as byte array from BinaryData is expected to be copied by the call if mutability is desired. -->
   <Match>
     <Class name="com.azure.core.implementation.util.ByteArrayContent"/>
@@ -2712,5 +2724,115 @@
     <Bug pattern="BC_UNCONFIRMED_CAST_OF_RETURN_VALUE"/>
   </Match>
 
+  <!-- Field is not initialized in Ctr but necessary safety measures are in place when accessing it -->
+  <Match>
+    <Class name="com.azure.messaging.servicebus.NonSessionProcessor"/>
+    <Field name="rollingMessagePump"/>
+    <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+  </Match>
+  <Match>
+    <Class name="com.azure.messaging.servicebus.SessionProcessor"/>
+    <Field name="rollingSessionsMessagePump"/>
+    <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+  </Match>
+  <Match>
+    <Class name="com.azure.messaging.servicebus.ServiceBusProcessor"/>
+    <Field name="rollingMessagePump"/>
+    <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+  </Match>
+  <!-- False positives -->
+  <Match>
+    <Class name="com.azure.messaging.servicebus.NonSessionProcessor$RollingNonSessionMessagePump"/>
+    <Or>
+      <Field name="builder"/>
+      <Field name="logger"/>
+      <Field name="disposable"/>
+    </Or>
+    <Bug pattern="SE_BAD_FIELD"/>
+  </Match>
+  <Match>
+    <Class name="com.azure.messaging.servicebus.SessionProcessor$RollingSessionsMessagePump"/>
+    <Or>
+      <Field name="builder"/>
+      <Field name="logger"/>
+      <Field name="disposable"/>
+    </Or>
+    <Bug pattern="SE_BAD_FIELD"/>
+  </Match>
+  <Match>
+    <Class name="com.azure.messaging.servicebus.ServiceBusProcessor$RollingMessagePump"/>
+    <Or>
+      <Field name="nonSessionBuilder"/>
+      <Field name="sessionBuilder"/>
+      <Field name="logger"/>
+      <Field name="disposable"/>
+    </Or>
+    <Bug pattern="SE_BAD_FIELD"/>
+  </Match>
+  <!-- The RollingNonSessionMessagePump and RollingSessionsMessagePump doesn't need to be serializable -->
+  <Match>
+    <Class
+      name="com.azure.messaging.servicebus.NonSessionProcessor$RollingNonSessionMessagePump"/>
+    <Bug pattern="SE_NO_SERIALVERSIONID"/>
+  </Match>
+  <Match>
+    <Class
+      name="com.azure.messaging.servicebus.SessionProcessor$RollingSessionsMessagePump"/>
+    <Bug pattern="SE_NO_SERIALVERSIONID"/>
+  </Match>
+  <Match>
+    <Class
+      name="com.azure.messaging.servicebus.ServiceBusProcessor$RollingMessagePump"/>
+    <Bug pattern="SE_NO_SERIALVERSIONID"/>
+  </Match>
+  <!-- False positives -->
+  <Match>
+    <Class
+        name="com.azure.messaging.servicebus.SessionsMessagePump$RollingSessionReceiver"/>
+    <Or>
+      <Field name="instrumentation"/>
+      <Field name="logger"/>
+      <Field name="messageFlux"/>
+      <Field name="receiversTracker"/>
+      <Field name="tracer"/>
+      <Field name="managementNode"/>
+      <Field name="serializer"/>
+      <Field name="workerScheduler"/>
+    </Or>
+    <Bug pattern="SE_BAD_FIELD"/>
+  </Match>
+  <Match>
+    <Class
+        name="com.azure.messaging.servicebus.SessionsMessagePump$RollingSessionReceiver$NextSessionStream"/>
+    <Or>
+      <Field name="newSession"/>
+    </Or>
+    <Bug pattern="SE_BAD_FIELD"/>
+  </Match>
+  <Match>
+    <Class
+        name="com.azure.messaging.servicebus.ServiceBusSingleSessionManager$SessionReceiverStream"/>
+    <Or>
+      <Field name="sessionReceiver"/>
+    </Or>
+    <Bug pattern="SE_BAD_FIELD"/>
+  </Match>
+  <!-- The RollingSessionReceiver, NextSessionStream, $SessionReceiverStream doesn't need to be serializable -->
+  <Match>
+    <Class
+        name="com.azure.messaging.servicebus.SessionsMessagePump$RollingSessionReceiver"/>
+    <Bug pattern="SE_NO_SERIALVERSIONID"/>
+  </Match>
+  <Match>
+    <Class
+        name="com.azure.messaging.servicebus.SessionsMessagePump$RollingSessionReceiver$NextSessionStream"/>
+    <Bug pattern="SE_NO_SERIALVERSIONID"/>
+  </Match>
+  <Match>
+    <Class
+        name="com.azure.messaging.servicebus.ServiceBusSingleSessionManager$SessionReceiverStream"/>
+    <Bug pattern="SE_NO_SERIALVERSIONID"/>
+  </Match>
+
   <!-- Comment to force CI to run Spotbugs against all SDKs -->
 </FindBugsFilter>
diff --git a/eng/common/scripts/Test-SampleMetadata.ps1 b/eng/common/scripts/Test-SampleMetadata.ps1
@@ -104,6 +104,7 @@ begin {
         "azure-active-directory-b2c",
         "azure-active-directory-domain",
         "azure-advisor",
+        "azure-ai-content-safety",
         "azure-analysis-services",
         "azure-anomaly-detector",
         "azure-api-apps",

diff --git a/eng/common/scripts/Verify-Links.ps1 b/eng/common/scripts/Verify-Links.ps1
@@ -25,7 +25,7 @@
   Path to the root of the site for resolving rooted relative links, defaults to host root for http and file directory for local files.
 
   .PARAMETER errorStatusCodes
-  List of http status codes that count as broken links. Defaults to 400, 401, 404, SocketError.HostNotFound = 11001, SocketError.NoData = 11004.
+  List of http status codes that count as broken links. Defaults to 400, 404, SocketError.HostNotFound = 11001, SocketError.NoData = 11004.
 
   .PARAMETER branchReplaceRegex
   Regex to check if the link needs to be replaced. E.g. ^(https://github.com/.*/(?:blob|tree)/)main(/.*)$
@@ -65,7 +65,7 @@ param (
   [switch] $recursive = $true,
   [string] $baseUrl = "",
   [string] $rootUrl = "",
-  [array] $errorStatusCodes = @(400, 401, 404, 11001, 11004),
+  [array] $errorStatusCodes = @(400, 404, 11001, 11004),
   [string] $branchReplaceRegex = "",
   [string] $branchReplacementName = "",
   [bool] $checkLinkGuidance = $false,

diff --git a/eng/emitter-package.json b/eng/emitter-package.json
@@ -1,6 +1,6 @@
 {
   "main": "dist/src/index.js",
   "dependencies": {
-    "@azure-tools/typespec-java": "0.11.2"
+    "@azure-tools/typespec-java": "0.11.3"
   }
 }
diff --git a/eng/pipelines/patch_release_client.txt b/eng/pipelines/patch_release_client.txt
@@ -27,6 +27,7 @@ com.azure:azure-communication-chat # Tests owner: jiminwen
 com.azure:azure-communication-common # Tests owner: AikoBB, maximrytych-ms, mjafferi-msft
 com.azure:azure-communication-email # Tests owner: yogeshmo, kagbakpem
 com.azure:azure-communication-identity # Tests owner: AikoBB, maximrytych-ms, mjafferi-msft
+com.azure:azure-communication-jobrouter # Tests owner: cparisineti
 com.azure:azure-communication-phonenumbers # Tests owner: whisper6284, miguhern, danielortega-msft
 com.azure:azure-communication-sms # Tests owner: besh2014, DimaKolomiiets
 com.azure:azure-communication-rooms # Tests owner: minnieliu, Mrayyan
@@ -37,6 +38,7 @@ com.azure:azure-data-schemaregistry-apacheavro # Tests owner: conniey
 com.azure:azure-data-tables # Tests owner: jairmyree
 com.azure:azure-developer-loadtesting # Tests owner: Harshan01, prativen
 com.azure:azure-digitaltwins-core # Tests owner: sjiherzig
+com.azure:azure-identity-broker # Tests owner: billwert, vigera
 com.azure:azure-identity-extensions # Tests owner: saragluna, backwind1233
 com.azure:azure-iot-deviceupdate # Tests owner: leolie, ryzhan
 com.azure:azure-messaging-eventgrid # Tests owner: billwert

diff --git a/eng/scripts/Set-JavaVersion.ps1 b/eng/scripts/Set-JavaVersion.ps1
@@ -25,6 +25,7 @@ if ("" -eq $JdkPath) {
     $registryBase = "HKLM:\SOFTWARE"
     $azulJdks = "$registryBase\Azul Systems\Zulu"
     $eclipseJdks = "$registryBase\Eclipse Adoptium\JDK"
+    $eclipseFoundationJdks = "$registryBase\Eclipse Foundation\JDK"
     $microsoftJdks = "$registryBase\Microsoft\JDK"
 
     # Collect all available JDK installations in the following format
@@ -93,6 +94,16 @@ if ("" -eq $JdkPath) {
             $choiceNumber++
         }
     }
+    if (Test-Path -Path $eclipseFoundationJdks) {
+        foreach ($jdk in Get-ChildItem -Path $eclipseFoundationJdks) {
+            $jdkHKeyPath = $jdk.Name
+            $jdkFullVersion = $jdk.PSChildName
+            $jdkChoicePath = (Get-ItemProperty -Path "Registry::$jdkHKeyPath\hotspot\MSI").Path
+
+            [void]$jdkOptions.Rows.Add($choiceNumber, "Eclipse", $jdkFullVersion.split(".")[0], $jdkFullVersion, $jdkChoicePath)
+            $choiceNumber++
+        }
+    }
 
     # Microsoft uses a registry key pattern of
     #

diff --git a/eng/versioning/external_dependencies.txt b/eng/versioning/external_dependencies.txt
@@ -7,7 +7,7 @@
 
 # Format;
 # groupId:artifactId;dependency-version
-ch.qos.logback:logback-classic;1.2.12
+ch.qos.logback:logback-classic;1.3.12
 com.azure.tools:azure-autorest-customization;1.0.0-beta.8
 com.fasterxml.jackson.core:jackson-annotations;2.13.5
 com.fasterxml.jackson.core:jackson-core;2.13.5