Skip to content

Commit 911fc90

Browse files
committed
Use full qualified name for gpg plugin
1 parent cd91b5c commit 911fc90

3 files changed

Lines changed: 16 additions & 14 deletions

File tree

eng/pipelines/templates/stages/archetype-java-release-batch.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,10 @@ stages:
372372

373373
- template: /eng/pipelines/templates/steps/mvn-linux-repository-settings.yml
374374

375+
# maven-authenticate.yml cannot be used here because it overwrites ~/.m2/settings.xml
376+
# with eng/settings.xml, which would discard the docs-specific repository config
377+
# (e.g. docs-public-packages feed) set up by mvn-linux-repository-settings.yml above.
378+
# Instead, we only run MavenAuthenticate to inject credentials into the existing settings.
375379
- task: MavenAuthenticate@0
376380
displayName: 'Maven Authenticate'
377381
inputs:
@@ -501,6 +505,10 @@ stages:
501505
502506
- template: /eng/pipelines/templates/steps/mvn-linux-repository-settings.yml
503507

508+
# maven-authenticate.yml cannot be used here because it overwrites ~/.m2/settings.xml
509+
# with eng/settings.xml, which would discard the docs-specific repository config
510+
# (e.g. docs-public-packages feed) set up by mvn-linux-repository-settings.yml above.
511+
# Instead, we only run MavenAuthenticate to inject credentials into the existing settings.
504512
- task: MavenAuthenticate@0
505513
displayName: 'Maven Authenticate'
506514
inputs:

eng/repo-docs/docms/daily.update.setting.xml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,6 @@
1616
<activeByDefault>true</activeByDefault>
1717
</activation>
1818
<repositories>
19-
<repository>
20-
<id>azure-sdk-for-java</id>
21-
<url>https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-java/maven/v1</url>
22-
<releases>
23-
<enabled>true</enabled>
24-
</releases>
25-
<snapshots>
26-
<enabled>true</enabled>
27-
</snapshots>
28-
</repository>
2919
<repository>
3020
<id>docs-public-packages</id>
3121
<url>https://docfx.pkgs.visualstudio.com/docfx/_packaging/docs-public-packages/maven/v1</url>

eng/scripts/SignAndHash-MavenPackages.ps1

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,21 +154,25 @@ foreach ($packageDetail in $packageDetails) {
154154
$settingsOption = "--global-settings=$(Join-Path $PSScriptRoot '..' 'maven.publish.settings.xml' -Resolve)"
155155
Write-Host "Settings Option is: $settingsOption"
156156

157+
# Use fully-qualified plugin coordinates to avoid prefix resolution against incomplete
158+
# mirror metadata. This matches the approach used in Publish-MavenPackages.ps1.
159+
$gpgSignAndDeployGoal = "org.apache.maven.plugins:maven-gpg-plugin:3.2.7:sign-and-deploy-file"
160+
157161
Write-Host ""
158162
Write-Host "Signing package"
159163

160164
if ($additionalArtifacts) {
161165
Write-Host @"
162-
mvn gpg:sign-and-deploy-file "--batch-mode" "-Daether.checksums.algorithms=SHA-256,MD5,SHA-1" "$pomOption" "$fileOption" "$javadocOption" "$sourcesOption" "$filesOption" "$classifiersOption" "$typesOption" "$urlOption" "$gpgexeOption" "-DrepositoryId=target-repo" "$settingsOption"
166+
mvn $gpgSignAndDeployGoal "--batch-mode" "-Daether.checksums.algorithms=SHA-256,MD5,SHA-1" "$pomOption" "$fileOption" "$javadocOption" "$sourcesOption" "$filesOption" "$classifiersOption" "$typesOption" "$urlOption" "$gpgexeOption" "-DrepositoryId=target-repo" "$settingsOption"
163167
"@
164-
mvn gpg:sign-and-deploy-file "--batch-mode" "-Daether.checksums.algorithms=SHA-256,MD5,SHA-1" "$pomOption" "$fileOption" "$javadocOption" "$sourcesOption" "$filesOption" "$classifiersOption" "$typesOption" "$urlOption" "$gpgexeOption" "-DrepositoryId=target-repo" "$settingsOption"
168+
mvn $gpgSignAndDeployGoal "--batch-mode" "-Daether.checksums.algorithms=SHA-256,MD5,SHA-1" "$pomOption" "$fileOption" "$javadocOption" "$sourcesOption" "$filesOption" "$classifiersOption" "$typesOption" "$urlOption" "$gpgexeOption" "-DrepositoryId=target-repo" "$settingsOption"
165169
} else {
166170
# Track 1 libraries do not require $filesOption, $classifiersOption and $typesOption variables which
167171
# will only be set if there's a changelog for one or more of the libraries being released
168172
Write-Host @"
169-
mvn gpg:sign-and-deploy-file "--batch-mode" "-Daether.checksums.algorithms=SHA-256,MD5,SHA-1" "$pomOption" "$fileOption" "$javadocOption" "$sourcesOption" "$urlOption" "$gpgexeOption" "-DrepositoryId=target-repo" "$settingsOption"
173+
mvn $gpgSignAndDeployGoal "--batch-mode" "-Daether.checksums.algorithms=SHA-256,MD5,SHA-1" "$pomOption" "$fileOption" "$javadocOption" "$sourcesOption" "$urlOption" "$gpgexeOption" "-DrepositoryId=target-repo" "$settingsOption"
170174
"@
171-
mvn gpg:sign-and-deploy-file "--batch-mode" "-Daether.checksums.algorithms=SHA-256,MD5,SHA-1" "$pomOption" "$fileOption" "$javadocOption" "$sourcesOption" "$urlOption" "$gpgexeOption" "-DrepositoryId=target-repo" "$settingsOption"
175+
mvn $gpgSignAndDeployGoal "--batch-mode" "-Daether.checksums.algorithms=SHA-256,MD5,SHA-1" "$pomOption" "$fileOption" "$javadocOption" "$sourcesOption" "$urlOption" "$gpgexeOption" "-DrepositoryId=target-repo" "$settingsOption"
172176
}
173177

174178
if ($LASTEXITCODE) { exit $LASTEXITCODE }

0 commit comments

Comments
 (0)