Storage STG101 - pulling relevant main changes pt 2

.github/CODEOWNERS

@@ -144,6 +144,9 @@
 # PRLabel: %azure-spring
 /sdk/spring-experimental/                                          @moarychan @netyyyy @rujche @saragluna @Azure/azure-java-sdk
 
+# PRLabel: %azure-spring
+/docs/spring/                                                      @moarychan @netyyyy @rujche @saragluna @Azure/azure-java-sdk
+
 # PRLabel: %azure-spring
 /sdk/spring/                                                       @moarychan @netyyyy @rujche @saragluna @Azure/azure-java-sdk
 

.github/copilot-instructions.md

@@ -208,4 +208,4 @@ Ask the user for clarification if repository path or configuration file is ambig
 
 ## SDK release
 
-For detailed workflow instructions, see [SDK Release](https://github.com/Azure/azure-sdk-for-java/blob/main/docs/contributor/release-checklist.md).
+For detailed workflow instructions, see [SDK Release](https://github.com/Azure/azure-sdk-for-java/blob/main/.github/skills/azsdk-common-sdk-release/SKILL.md).

.github/workflows/event-processor.yml

@@ -35,7 +35,7 @@ jobs:
         uses: azure/login@v3
         if: ${{ github.event_name == 'issues' && github.event.action == 'opened' }}
         with:
-            client-id: a6dd2dfe-7352-41a7-9020-05301c3bca1a
+            client-id: e4cb9fd5-0875-4ca1-bc43-56196f5dfb8f
             tenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
             allow-no-subscriptions: true
 

.vscode/cspell.json

@@ -111,6 +111,7 @@
     "sdk/cosmos/azure-cosmos-spark_4-1_2-13/**",
     "sdk/cosmos/azure-cosmos-spark-account-data-resolver-sample/**",
     "sdk/cosmos/fabric-cosmos-spark-auth_3/**",
+    "sdk/cosmos/fabric-cosmos-spark-auth_4-0_2-13/**",
     "sdk/cosmos/azure-cosmos-encryption/**",
     "sdk/cosmos/azure-cosmos-spark_3_2-12/**",
     "sdk/spring/azure-spring-data-cosmos/**",
@@ -278,6 +279,7 @@
     "Deserialization",
     "destfile",
     "Dcheckstyle",
+    "Dexec",
     "Dgenerate",
     "Dinclude",
     "Dincludes",
@@ -293,6 +295,7 @@
     "doclinting",
     "doctitle",
     "dlocal",
+    "Dmdep",
     "dtlk",
     "dtlksd",
     "dummyrg",
@@ -314,6 +317,7 @@
     "FOURX",
     "filereports",
     "gapra",
+    "gitmcp",
     "gltf",
     "gmavenplus",
     "gson",
@@ -341,6 +345,7 @@
     "Iscsi",
     "jacksonavro",
     "jacoco",
+    "javac",
     "javadoc",
     "javadocs",
     "Jdbc",

README.md

@@ -84,7 +84,7 @@ Many people all over the world have helped make this project better.  You'll wan
 - [What are some good first issues for new contributors to the repo?](https://github.com/azure/azure-sdk-for-java/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)
 - [How to build and test your change](https://github.com/Azure/azure-sdk-for-java/blob/main/docs/contributor/building.md)
 - [How you can make a change happen!](https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md#pull-requests)
-- Frequently Asked Questions (FAQ) and Conceptual Topics in the detailed [Azure SDK for Java wiki](https://github.com/azure/azure-sdk-for-java/wiki).
+- Frequently Asked Questions (FAQ) and Conceptual Topics in the detailed [Azure SDK for Java wiki](https://github.com/Azure/azure-sdk-for-java/tree/main/docs).
 
 ### Reporting security issues and security bugs
 

docs/spring/Spring-Cloud-Azure-Timeline.md

@@ -15,6 +15,7 @@ This wiki page is used to track the timeline for Spring Cloud Azure. So we can g
 4. In "java - spring - compatibility - tests" pipeline, it will tests versions from sdk/spring/spring-cloud-azure-supported-spring.json file which supportedStatus is `SUPPORTED`, so when the supported version changed, this page should be updated.
 
 ## Timeline
+ - **2026-04-29**: Released spring-cloud-azure-dependencies:6.3.0, which depends on: SpringBoot:3.5.14 and SpringCloud:2025.0.2.
  - **2026-04-17**: Released spring-cloud-azure-dependencies:7.2.0, which depends on: SpringBoot:4.0.5 and SpringCloud:2025.1.1.
  - **2026-03-25**: Released spring-cloud-azure-dependencies:6.2.0, which depends on: SpringBoot:3.5.5 and SpringCloud:2025.0.0.
  - **2026-03-11**: Released spring-cloud-azure-dependencies:7.1.0, which depends on: SpringBoot:4.0.3 and SpringCloud:2025.1.0.

docs/spring/Spring-Versions-Mapping.md

@@ -31,7 +31,7 @@ Table 2: Mapping from **Spring Boot** / **Spring Cloud** version to **Spring Clo
 | Spring Boot version | Spring Cloud version | Spring Cloud Azure version                                                                                                                                                                                    | azure-sdk-bom version                                                                                                                                       |
 |---------------------|----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | 4.0.x               | 2025.1.x             | [7.0.0-beta.1](https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-autoconfigure/7.0.0-beta.1/jar)~[7.2.0](https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-autoconfigure/7.2.0/jar)                                                                           | [1.3.3](https://search.maven.org/artifact/com.azure/azure-sdk-bom/1.3.3/pom)~[1.3.6](https://search.maven.org/artifact/com.azure/azure-sdk-bom/1.3.6/pom) |
-| 3.5.x               | 2025.0.x             | [5.23.0](https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-autoconfigure/5.23.0/jar)~[6.2.0](https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-autoconfigure/6.2.0/jar)                                                                                                        | [1.2.37](https://search.maven.org/artifact/com.azure/azure-sdk-bom/1.2.37/pom)~[1.3.3](https://search.maven.org/artifact/com.azure/azure-sdk-bom/1.3.3/pom) |
+| 3.5.x               | 2025.0.x             | [5.23.0](https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-autoconfigure/5.23.0/jar)~[6.3.0](https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-autoconfigure/6.3.0/jar)                                                                                                        | [1.2.37](https://search.maven.org/artifact/com.azure/azure-sdk-bom/1.2.37/pom)~[1.3.6](https://search.maven.org/artifact/com.azure/azure-sdk-bom/1.3.6/pom) |
 | 3.4.x               | 2024.0.x             | [5.19.0](https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-autoconfigure/5.19.0/jar)~[5.25.0](https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-autoconfigure/5.25.0/jar)                                                                                                        | [1.2.30](https://search.maven.org/artifact/com.azure/azure-sdk-bom/1.2.30/pom)~[1.2.37](https://search.maven.org/artifact/com.azure/azure-sdk-bom/1.2.37/pom) |
 | 3.3.x               | 2023.0.x             | [5.13.0](https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-autoconfigure/5.13.0/jar)~[5.25.0](https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-autoconfigure/5.25.0/jar)                                                                                                        | [1.2.24](https://search.maven.org/artifact/com.azure/azure-sdk-bom/1.2.24/pom)~[1.2.37](https://search.maven.org/artifact/com.azure/azure-sdk-bom/1.2.37/pom) |
 | 3.2.x               | 2023.0.x             | [5.7.0](https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-autoconfigure/5.7.0/jar)~[5.25.0](https://search.maven.org/artifact/com.azure.spring/spring-cloud-azure-autoconfigure/5.25.0/jar)                                                                                                        | [1.2.18](https://search.maven.org/artifact/com.azure/azure-sdk-bom/1.2.18/pom)~[1.2.37](https://search.maven.org/artifact/com.azure/azure-sdk-bom/1.2.37/pom) |
@@ -45,7 +45,7 @@ Table 2: Mapping from **Spring Boot** / **Spring Cloud** version to **Spring Clo
 
 **NOTE**: **Spring Cloud Azure** 7.x now support Spring Boot 4. So if you're using Spring Boot 4, please upgrade to 7.x.
 
-**NOTE**: **Spring Cloud Azure** 4.x.x have all reached end of life status and only support hotfixes of 4.19.0 until June 2025. So if you use Spring Boot 3, please upgrade to 5.x.
+**NOTE**: **Spring Cloud Azure** 4.x.x have all reached end-of-life status, and hotfix support for 4.20.0 ended in June 2025. So if you use Spring Boot 3.5.x, please upgrade to 6.x; if you are using any other version of Spring Boot 3, please upgrade to 5.x.
 
 **NOTE**: **Spring Cloud Azure** 3.x.x have all reached end of life status and are no longer supported. Please upgrade to 4.x. You can refer to [Migration Guide for 4.0](https://learn.microsoft.com/azure/developer/java/spring-framework/migration-guide-for-4.0) to migrate to 4.x.
 

eng/.docsettings.yml

@@ -83,6 +83,7 @@ known_content_issues:
   - ['sdk/cosmos/azure-cosmos-spark_4-1_2-13/README.md', '#3113']
   - ['sdk/cosmos/azure-cosmos-spark-account-data-resolver-sample/README.md', '#3113']
   - ['sdk/cosmos/fabric-cosmos-spark-auth_3/README.md', '#3113']
+  - ['sdk/cosmos/fabric-cosmos-spark-auth_4-0_2-13/README.md', '#3113']
   - ['sdk/cosmos/azure-cosmos-spark_3_2-12/dev/README.md', '#3113']
   - ['sdk/cosmos/azure-cosmos-spark_3_2-12/docs/catalog-api.md', '#3113']
   - ['sdk/cosmos/azure-cosmos-spark_3_2-12/docs/configuration-reference.md', '#3113']

eng/automation/generate_utils.py

@@ -244,6 +244,11 @@ def compare_with_maven_package(
                 version=previous_version,
             )
         )
+        if r.status_code == 404:
+            logging.warning(
+                "[Changelog][Skip] previous version {0} not found on Maven (404)".format(previous_version)
+            )
+            return breaking, changelog, breaking_changes
         r.raise_for_status()
         old_jar_fd, old_jar = tempfile.mkstemp(".jar")
         try:

eng/common/TestResources/New-TestResources.ps1

@@ -311,7 +311,7 @@ try {
     }
 
     # This needs to happen after we set the TenantId but before we use the ResourceGroupName
-    if ($wellKnownTMETenants.Contains($TenantId)) {
+    if ($wellKnownTMETenants.Contains($TenantId) -and !$ResourceGroupName.StartsWith("SSS3PT_", [System.StringComparison]::OrdinalIgnoreCase)) {
         # Add a prefix to the resource group name to avoid flagging the usages of local auth
         # See details at https://eng.ms/docs/products/onecert-certificates-key-vault-and-dsms/key-vault-dsms/certandsecretmngmt/credfreefaqs#how-can-i-disable-s360-reporting-when-testing-customer-facing-3p-features-that-depend-on-use-of-unsafe-local-auth
         $ResourceGroupName = "SSS3PT_" + $ResourceGroupName

eng/common/pipelines/templates/archetype-typespec-emitter.yml

@@ -304,6 +304,11 @@ extends:
         - job: Initialize
           steps:
           - checkout: self
+
+          - template: /eng/common/pipelines/templates/steps/login-to-github.yml
+            parameters:
+              TokenOwners:
+                - Azure
 
           - task: UseNode@1
             displayName: 'Install Node.js'
@@ -355,14 +360,15 @@ extends:
 
           - template: /eng/common/pipelines/templates/steps/git-push-changes.yml
             parameters:
-              BaseRepoOwner: azure-sdk
+              BaseRepoOwner: Azure
               TargetRepoName: $(Build.Repository.Name)
               BaseRepoBranch: $(branchName)
               CommitMsg: Regenerate repository SDK with TypeSpec build $(Build.BuildNumber)
               WorkingDirectory: $(Build.SourcesDirectory)
               ScriptDirectory: $(Build.SourcesDirectory)/eng/common/scripts
               # To accomodate scheduled runs and retries, we want to overwrite any existing changes on the branch
               PushArgs: --force
+              AuthToken: $(GH_TOKEN)
 
           - task: PowerShell@2
             displayName: Get generation job matrix
@@ -390,13 +396,17 @@ extends:
             matrix: $[dependencies.Initialize.outputs['generate_matrix.matrix']]
           variables:
             matrixArtifactsPath: $(Pipeline.Workspace)/matrix_artifacts
-            AzureSdkRepoName: $[format('azure-sdk/{0}', split(variables['Build.Repository.Name'], '/')[1])]
             emitterNpmrcPath: $(Agent.TempDirectory)/${{ parameters.EmitterPackagePath }}/.npmrc
           steps:
           - checkout: self
+
+          - template: /eng/common/pipelines/templates/steps/login-to-github.yml
+            parameters:
+              TokenOwners:
+                - Azure
+
           - pwsh: |
-              git remote add azure-sdk https://github.com/$(AzureSdkRepoName).git
-              git fetch azure-sdk $(branchName)
+              git fetch origin $(branchName)
               git switch $(branchName)
             displayName: 'Checkout PR branch $(branchName)'  
 
@@ -428,12 +438,13 @@ extends:
 
           - template: /eng/common/pipelines/templates/steps/git-push-changes.yml
             parameters:
-              BaseRepoOwner: azure-sdk
+              BaseRepoOwner: Azure
               TargetRepoName: $(Build.Repository.Name)
               BaseRepoBranch: $(branchName)
               CommitMsg: Update SDK code $(JobKey)
               WorkingDirectory: $(Build.SourcesDirectory)
               ScriptDirectory: $(Build.SourcesDirectory)/eng/common/scripts
+              AuthToken: $(GH_TOKEN)
 
         - job: Create_PR
           displayName: Create PR
@@ -447,6 +458,11 @@ extends:
           steps:
           - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
 
+          - template: /eng/common/pipelines/templates/steps/login-to-github.yml
+            parameters:
+              TokenOwners:
+                - Azure
+
           - pwsh: |
               $generateJobResult = '$(generateJobResult)'
               $emitterVersion = '$(emitterVersion)'
@@ -532,9 +548,9 @@ extends:
                 -RepoOwner '$(RepoOwner)'
                 -RepoName '$(RepoName)'
                 -BaseBranch '$(pullRequestTargetBranch)'
-                -PROwner 'azure-sdk'
+                -PROwner 'Azure'
                 -PRBranch '$(branchName)'
-                -AuthToken '$(azuresdk-github-pat)'
+                -AuthToken '$(GH_TOKEN)'
                 -PRTitle '$(PullRequestTitle)'
                 -PRBody '$(PullRequestBody)'
                 -OpenAsDraft $$(OpenAsDraft)

eng/common/pipelines/templates/jobs/prepare-pipelines.yml

@@ -39,6 +39,9 @@ jobs:
     APIReview_AutoCreate_Configurations: 93
 
   steps:
+    - ${{ if endsWith(parameters.Repository, '-pr') }}:
+      - template: /eng/common/pipelines/templates/steps/login-to-github.yml
+
     - template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
       parameters:
         Repositories:
@@ -52,7 +55,7 @@ jobs:
           - '!sdk/**/SessionRecords/*'
           - '!sdk/**/session-records/*'
         ${{ if endsWith(parameters.Repository, '-pr') }}:
-          TokenToUseForAuth: $(azuresdk-github-pat)
+          TokenToUseForAuth: $(GH_TOKEN)
 
     - template: /eng/common/pipelines/templates/steps/install-pipeline-generation.yml
     - template: /eng/common/pipelines/templates/steps/set-default-branch.yml

eng/common/pipelines/templates/steps/check-spelling.yml

@@ -11,6 +11,11 @@
 #                           check for errors which would prevent release (i.e. 
 #                           public API surface).
 #
+# NpmConfigUserConfig - Optional path to a user npm config file to use when invoking
+#                       npm commands in the context of this step. If specified, this
+#                       will be set as the npm_config_userconfig environment variable
+#                       so that npm uses the provided config file instead of the default
+#                       user config.
 # This check recognizes the setting of variable "Skip.SpellCheck"
 # if set to 'true', spellchecking will not be invoked.
 
@@ -24,6 +29,9 @@ parameters:
   - name: ScriptToValidateUpgrade
     type: string
     default: ''
+  - name: NpmConfigUserConfig
+    type: string
+    default: ''
 
 steps:
   - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
@@ -38,6 +46,9 @@ steps:
           -CspellConfigPath ${{ parameters.CspellConfigPath }}
           -ExitWithError:(!$${{ parameters.ContinueOnError }})
         pwsh: true
+      env:
+        ${{ if ne(parameters.NpmConfigUserConfig, '') }}:
+          npm_config_userconfig: ${{ parameters.NpmConfigUserConfig }}
     - ${{ if ne('', parameters.ScriptToValidateUpgrade) }}:
       - pwsh: |
           $changedFiles = ./eng/common/scripts/get-changedfiles.ps1

eng/common/pipelines/templates/steps/create-pull-request.yml

@@ -32,6 +32,7 @@ steps:
   - template: /eng/common/pipelines/templates/steps/login-to-github.yml
     parameters:
       TokenOwners:
+        - ${{ parameters.PROwner }}
         - ${{ parameters.RepoOwner }}
       ScriptDirectory: ${{ parameters.ScriptDirectory }}
 
@@ -46,7 +47,8 @@ steps:
     WorkingDirectory: ${{ parameters.WorkingDirectory }}
     ScriptDirectory: ${{ parameters.ScriptDirectory }}
     SkipCheckingForChanges: ${{ parameters.SkipCheckingForChanges }}
-    AuthToken: ${{ coalesce(parameters.PushAuthToken, parameters.AuthToken, '$(GH_TOKEN)') }}
+    AuthToken: ${{ coalesce(parameters.PushAuthToken, parameters.AuthToken, format('$(GH_TOKEN_{0})', parameters.PROwner)) }}
+
 
 - task: PowerShell@2
   displayName: Create pull request
@@ -61,12 +63,13 @@ steps:
       -BaseBranch "${{ parameters.BaseBranchName }}"
       -PROwner "${{ parameters.PROwner }}"
       -PRBranch "${{ parameters.PRBranchName }}"
-      -AuthToken "${{ coalesce(parameters.AuthToken, '$(GH_TOKEN)') }}"
+      -AuthToken "${{ coalesce(parameters.AuthToken, format('$(GH_TOKEN_{0})', parameters.RepoOwner)) }}"
       -PRTitle "${{ parameters.PRTitle }}"
       -PRBody "${{ coalesce(parameters.PRBody, parameters.CommitMsg, parameters.PRTitle) }}"
       -PRLabels "${{ parameters.PRLabels }}"
       -UserReviewers "${{ parameters.GHReviewers }}"
       -TeamReviewers "${{ parameters.GHTeamReviewers }}"
       -Assignees "${{ parameters.GHAssignees }}"
+      -MaintainerCanModify $${{ eq(parameters.PROwner, parameters.RepoOwner) }}
       -CloseAfterOpenForTesting $${{ coalesce(parameters.CloseAfterOpenForTesting, 'false') }}
       -OpenAsDraft $${{ parameters.OpenAsDraft }}

eng/common/pipelines/templates/steps/git-push-changes.yml

@@ -15,7 +15,7 @@ steps:
   - template: /eng/common/pipelines/templates/steps/login-to-github.yml
     parameters:
       TokenOwners:
-        - ${{ parameters.TargetRepoOwner }}
+        - ${{ parameters.BaseRepoOwner }}
       ScriptDirectory: ${{ parameters.ScriptDirectory }}
 
 - task: PowerShell@2