Update maven task to use.

Azure · Feb 28, 2025 · f387608 · f387608
1 parent 648b8a5
commit f387608
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/ci.yml b/ci.yml
@@ -47,24 +47,26 @@ extends:
                   JavaVersion: '1.11'
 
             steps:
-              - task: Maven@3
+              - task: Maven@4
                 displayName: 'Build and Package'
                 inputs:
                   mavenPomFile: 'pom.xml'
                   goals: 'deploy'
                   options: '$(DefaultOptions) $(ProfileFlag) -T 1C -DskipTests -Dgpg.skip -Dcheckstyle.skip=true -Dspotbugs.skip=true --settings eng/settings.xml -DaltDeploymentRepository="local::default::file:///${project.basedir}/output"'
                   mavenOptions: '$(LoggingOptions) $(MemoryOptions)'
+                  mavenVersionOption: 'Default'
                   javaHomeOption: 'JDKVersion'
                   jdkVersionOption: $(JavaVersion)
                   jdkArchitectureOption: 'x64'
                   publishJUnitResults: false
 
-              - task: Maven@3
+              - task: Maven@4
                 displayName: 'Run SpotBugs, Checkstyle, and Javadoc'
                 inputs:
                     mavenPomFile: pom.xml
                     options: '$(DefaultOptions) --no-transfer-progress -DskipTests -Dgpg.skip'
                     mavenOptions: '$(MemoryOptions)'
+                    mavenVersionOption: 'Default'
                     javaHomeOption: 'JDKVersion'
                     jdkVersionOption: $(JavaVersion)
                     jdkArchitectureOption: 'x64'
@@ -154,6 +156,14 @@ extends:
       - stage: Publish
         dependsOn: Build
         condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'))
+        variables:
+          - name: DefaultOptions
+            value: '--batch-mode --fail-at-end -Dmaven.wagon.http.pool=false'
+          - name: LoggingOptions
+            value: '-Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+          - name: MemoryOptions
+            value: '-Xmx3072m'
+          - template: /eng/templates/image.yml
         jobs:
           - job: 'Publish'
             pool:

diff --git a/eng/templates/test-steps.yml b/eng/templates/test-steps.yml
@@ -1,11 +1,12 @@
 # relies on variable settings set from calling previous build steps
 steps:
-  - task: Maven@3
+  - task: Maven@4
     displayName: 'Run Tests'
     inputs:
       mavenPomFile: 'pom.xml'
       options: '$(DefaultOptions) $(ProfileFlag) --settings eng/settings.xml'
       mavenOptions: '-Xmx3072m $(LoggingOptions)'
+      mavenVersionOption: 'Default'
       javaHomeOption: 'JDKVersion'
       jdkVersionOption: $(JavaVersion)
       jdkArchitectureOption: 'x64'