Release/part1/fix identity version (#39884)

* identity fix * pick up changes from PR 39875
Azure · Apr 23, 2024 · 0cd9d2f · 0cd9d2f
1 parent 1030229
commit 0cd9d2f
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 4 deletions.
diff --git a/eng/pipelines/templates/stages/archetype-java-release-patch.yml b/eng/pipelines/templates/stages/archetype-java-release-patch.yml
@@ -258,6 +258,7 @@ stages:
                   - download: current
                     displayName: 'Download Artifact: ${{parameters.ArtifactName}}'
                     artifact: ${{parameters.ArtifactName}}
+                  - template: /eng/pipelines/templates/steps/mvn-linux-repository-settings.yml
                   - template: /eng/common/pipelines/templates/steps/update-docsms-metadata.yml
                     parameters:
                       PackageInfoLocations:

diff --git a/eng/pipelines/templates/steps/mvn-linux-repository-settings.yml b/eng/pipelines/templates/steps/mvn-linux-repository-settings.yml
@@ -0,0 +1,22 @@
+steps:
+  # /eng/repo-docs/docms/daily.update.setting.xml contains two settings
+  # 1. The java dev feed - This is for nightly builds and official builds, both of which publish
+  #    to the dev feed. In the case of official builds, setting this up prevents us from having
+  #    to deal with sonatype which may have a delay before what was just published is available.
+  #    The dev feed does not have the same delay that sonatype does.
+  # 2. The docs-public-packages dev feed. This is where the docs java library, java2docfx is
+  #    published. Nightly builds and official releases are published here and, while official releases
+  #    are also published to sonatype, it's better to hit the public dev feed whenever possible.
+  # Here is maven documentation: https://maven.apache.org/guides/mini/guide-multiple-repositories.html
+  - powershell: |
+      # Linux mvn `setting.xml` is sitting under path `~/.m2/setting.xml`
+      Get-Command mvn
+      if (!(Test-Path '~/.m2/')) {
+        mkdir ~/.m2/
+      }
+      if (Test-Path '~/.m2/setting.xml') {
+        Write-Host "'setting.xml' exists. Overwriting the file to support multiple repositories."
+      }
+      Copy-Item "./eng/repo-docs/docms/daily.update.setting.xml" -Destination "~/.m2/settings.xml"
+    displayName: 'Configure mvn repo settings on linux'
+    workingDirectory: $(Build.SourcesDirectory)
diff --git a/eng/scripts/docs/Docs-ToC.ps1 b/eng/scripts/docs/Docs-ToC.ps1
@@ -138,7 +138,7 @@ function Get-Toc-Children($package, $docRepoLocation) {
         }
     }
     # Sort the array and clean out any dupes (there shouldn't be any but better safe than sorry)
-    $namespaces = $namespaces | Sort-Object -Unique
+    $namespaces = @($namespaces | Sort-Object -Unique)
     # Ensure that this always returns an array, even if there's one item or 0 items
     Write-Output -NoEnumerate $namespaces
 }
@@ -221,7 +221,7 @@ function Fetch-Namespaces-From-Javadoc($package, $groupId, $version) {
         }
     }
 
-    $namespaces = $namespaces | Sort-Object -Unique
+    $namespaces = @($namespaces | Sort-Object -Unique)
     # Make sure this always returns an array
     Write-Output -NoEnumerate $namespaces
 }

diff --git a/sdk/identity/azure-identity-extensions/CHANGELOG.md b/sdk/identity/azure-identity-extensions/CHANGELOG.md
@@ -6,7 +6,7 @@
 
 #### Dependency Updates
 
-- Upgraded `azure-identity` from `1.11.4` to version `1.13.0-beta.1`.
+- Upgraded `azure-identity` from `1.11.4` to version `1.12.0`.
 
 
 ## 1.1.14 (2024-03-20)

diff --git a/sdk/identity/azure-identity-extensions/ci.yml b/sdk/identity/azure-identity-extensions/ci.yml
@@ -0,0 +1,43 @@
+# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
+
+trigger:
+  branches:
+    include:
+      - main
+      - hotfix/*
+      - release/*
+  paths:
+    include:
+      - sdk/identity/azure-identity-extensions/
+    exclude:
+      - sdk/identity/azure-identity-extensions/pom.xml
+
+pr:
+  branches:
+    include:
+      - main
+      - feature/*
+      - hotfix/*
+      - release/*
+  paths:
+    include:
+      - sdk/identity/azure-identity-extensions/
+    exclude:
+      - sdk/identity/azure-identity-extensions/pom.xml
+
+parameters:
+  - name: release_azureidentityextensions
+    displayName: 'azure-identity-extensions'
+    type: boolean
+    default: true
+
+extends:
+  template: /eng/pipelines/templates/stages/archetype-sdk-client.yml
+  parameters:
+    ServiceDirectory: identity
+    EnableBatchRelease: true
+    Artifacts:
+      - name: azure-identity-extensions
+        groupId: com.azure
+        safeName: azureidentityextensions
+        releaseInBatch: ${{ parameters.release_azureidentityextensions }}
diff --git a/sdk/identity/azure-identity-extensions/pom.xml b/sdk/identity/azure-identity-extensions/pom.xml
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.13.0-beta.1</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
+      <version>1.12.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
 
     <!-- test   -->