Fix Java Dev Feed Publish (#33582)

* Fix Java Dev Feed Publish * move spring and resource manager to ESRP release
Azure · Feb 17, 2023 · 3fabf97 · 3fabf97
1 parent f9fd6f6
commit 3fabf97
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
diff --git a/eng/pipelines/templates/stages/archetype-java-release-batch.yml b/eng/pipelines/templates/stages/archetype-java-release-batch.yml
@@ -224,20 +224,20 @@ stages:
                       parameters:
                         ArtifactName: ${{parameters.ArtifactName}}-mavencentral-$(System.JobAttempt)
                         ArtifactPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
-                    # After publishing to Maven, publish to the azure-sdk-for-java feed. The reason for
-                    # this is that the azure-sdk-for-java feed will have the package available immediately
-                    # whereas Maven can take several hours for the package to become available.
-                    - template: /eng/pipelines/templates/steps/java-publishing.yml
-                      parameters:
-                        ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
-                        RepositoryUrl: https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-java/maven/v1
-                        Target: JavaDevFeed
-                        BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools
-                        JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java
-                    - template: /eng/common/pipelines/templates/steps/publish-artifact.yml
-                      parameters:
-                        ArtifactName: ${{parameters.ArtifactName}}-javadevfeed-$(System.JobAttempt)
-                        ArtifactPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
+                  # After publishing to Maven, publish to the azure-sdk-for-java feed. The reason for
+                  # this is that the azure-sdk-for-java feed will have the package available immediately
+                  # whereas Maven can take several hours for the package to become available.
+                  - template: /eng/pipelines/templates/steps/java-publishing.yml
+                    parameters:
+                      ArtifactDirectory: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
+                      RepositoryUrl: https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-java/maven/v1
+                      Target: JavaDevFeed
+                      BuildToolsPath: $(Pipeline.Workspace)/azure-sdk-build-tools
+                      JavaRepoRoot: $(Pipeline.Workspace)/azure-sdk-for-java
+                  - template: /eng/common/pipelines/templates/steps/publish-artifact.yml
+                    parameters:
+                      ArtifactName: ${{parameters.ArtifactName}}-javadevfeed-$(System.JobAttempt)
+                      ArtifactPath: $(Pipeline.Workspace)/${{parameters.ArtifactName}}-signed
 
         - deployment: UpdatePackageVersion
           displayName: "Update Package Version"

diff --git a/eng/pipelines/templates/steps/java-publishing.yml b/eng/pipelines/templates/steps/java-publishing.yml
@@ -19,8 +19,8 @@ steps:
         filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1
         arguments: >
           -ArtifactDirectory ${{ parameters.ArtifactDirectory }}
-          -GroupIDFilter ${{ parameters.GroupID }}
-          -ArtifactIDFilter ${{ parameters.ArtifactID }}
+          -GroupIDFilter "${{ parameters.GroupID }}"
+          -ArtifactIDFilter "${{ parameters.ArtifactID }}"
           -RepositoryUrl https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-$(Build.BuildID)/maven/v1
           -RepositoryUsername nobody
           -RepositoryPassword $(System.AccessToken)
@@ -37,8 +37,8 @@ steps:
         filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1
         arguments: >
           -ArtifactDirectory ${{ parameters.ArtifactDirectory }}
-          -GroupIDFilter ${{ parameters.GroupID }}
-          -ArtifactIDFilter ${{ parameters.ArtifactID }}
+          -GroupIDFilter "${{ parameters.GroupID }}"
+          -ArtifactIDFilter "${{ parameters.ArtifactID }}"
           -RepositoryUrl ${{ parameters.RepositoryUrl }}
           -RepositoryUsername nobody
           -RepositoryPassword $(System.AccessToken)
@@ -55,8 +55,8 @@ steps:
         filePath: ${{ parameters.JavaRepoRoot }}/eng/scripts/Publish-MavenPackages.ps1
         arguments: >
           -ArtifactDirectory ${{ parameters.ArtifactDirectory }}
-          -GroupIDFilter ${{ parameters.GroupID }}
-          -ArtifactIDFilter ${{ parameters.ArtifactID }}
+          -GroupIDFilter "${{ parameters.GroupID }}"
+          -ArtifactIDFilter "${{ parameters.ArtifactID }}"
           -RepositoryUrl https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-android/maven/v1
           -RepositoryUsername nobody
           -RepositoryPassword $(System.AccessToken)

diff --git a/sdk/resourcemanager/ci.yml b/sdk/resourcemanager/ci.yml
@@ -182,7 +182,6 @@ extends:
   parameters:
     ServiceDirectory: resourcemanager
     EnableBatchRelease: true
-    UseEsrpRelease: false
     Artifacts:
       - name: azure-resourcemanager
         groupId: com.azure.resourcemanager

diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml
@@ -229,7 +229,6 @@ extends:
   parameters:
     ServiceDirectory: spring
     EnableBatchRelease: true
-    UseEsrpRelease: false
     Artifacts:
       - name: spring-cloud-azure-core
         groupId: com.azure.spring