Merge branch 'main' into users/merlinbot/1es-pt-auto-baselining-pr

Author: ramsessanchez

.azure-pipelines/ci-build.yml

@@ -77,9 +77,9 @@ extends:
                 displayName: Import GPG signing key
 
               - pwsh: |
-$props = Get-Content local.properties -Raw
-$keyId = ($props | Select-String -Pattern 'signing\.keyId=([^\r\n]+)').Matches.Groups[1].Value.Trim()
-$keyPassword = ($props | Select-String -Pattern 'signing\.password=([^\r\n]+)').Matches.Groups[1].Value.Trim()
+                  $props = Get-Content local.properties -Raw
+                  $keyId = ($props | Select-String -Pattern 'signing\.keyId=([^\r\n]+)').Matches.Groups[1].Value.Trim()
+                  $keyPassword = ($props | Select-String -Pattern 'signing\.password=([^\r\n]+)').Matches.Groups[1].Value.Trim()
                   $settingsXml = @"
                   <settings>
                     <mirrors>

scripts/validatePackageContents.ps1

@@ -26,8 +26,6 @@ $expectedFiles = @(
   "-javadoc.jar.asc",
   "-sources.jar",
   "-sources.jar.asc",
-  ".module",
-  ".module.asc",
   ".pom",
   ".pom.asc",
   ".jar",