From bd8fbf29fa99f65a904a53552daf7683b54c06c4 Mon Sep 17 00:00:00 2001 From: Shawn Fang Date: Tue, 23 Apr 2024 16:39:03 -0700 Subject: [PATCH 1/2] identity fix --- .../azure-identity-extensions/CHANGELOG.md | 2 +- sdk/identity/azure-identity-extensions/ci.yml | 43 +++++++++++++++++++ .../azure-identity-extensions/pom.xml | 2 +- 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 sdk/identity/azure-identity-extensions/ci.yml diff --git a/sdk/identity/azure-identity-extensions/CHANGELOG.md b/sdk/identity/azure-identity-extensions/CHANGELOG.md index 19fd30b0a7d2..b5cea8f5a8b5 100644 --- 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 new file mode 100644 index 000000000000..fd0e21386af5 --- /dev/null +++ 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 index 5534e3a81a3b..73d79359a97a 100644 --- a/sdk/identity/azure-identity-extensions/pom.xml +++ b/sdk/identity/azure-identity-extensions/pom.xml @@ -34,7 +34,7 @@ com.azure azure-identity - 1.13.0-beta.1 + 1.12.0 From 6ccf5616d8480b0c5bbe020aecc3fd3261ed0254 Mon Sep 17 00:00:00 2001 From: Shawn Fang Date: Tue, 23 Apr 2024 16:47:06 -0700 Subject: [PATCH 2/2] pick up changes from PR 39875 --- .../stages/archetype-java-release-patch.yml | 1 + .../steps/mvn-linux-repository-settings.yml | 22 +++++++++++++++++++ eng/scripts/docs/Docs-ToC.ps1 | 4 ++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 eng/pipelines/templates/steps/mvn-linux-repository-settings.yml diff --git a/eng/pipelines/templates/stages/archetype-java-release-patch.yml b/eng/pipelines/templates/stages/archetype-java-release-patch.yml index 1fce6895798d..97041e39ffe6 100644 --- 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 new file mode 100644 index 000000000000..47ba091e3764 --- /dev/null +++ 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 index cfb90e5f53cd..153229377075 100644 --- 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 }