From 75fc9a8b57de774676fb6265cafdf0a5347206ea Mon Sep 17 00:00:00 2001 From: dotasek Date: Thu, 29 Aug 2024 11:39:47 -0400 Subject: [PATCH] Update azure maven tasks to version 4 (#1726) * Update azure maven tasks to version 4 * Increase compiler memory * Increment compiler version --- master-branch-pipeline.yml | 6 +++--- pom.xml | 4 ++-- pull-request-pipeline.yml | 2 +- release-branch-pipeline.yml | 4 ++-- setup-and-cache-job-template.yml | 2 +- test-cli-exec-job-template.yml | 2 +- test-unit-jobs-template.yml | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/master-branch-pipeline.yml b/master-branch-pipeline.yml index 6b94ef18d..bdafd4688 100644 --- a/master-branch-pipeline.yml +++ b/master-branch-pipeline.yml @@ -82,7 +82,7 @@ jobs: # Deploy the SNAPSHOT artifact to sonatype nexus. # This is done for the master branch merges only. - - task: Maven@3 + - task: Maven@4 displayName: 'Deploy to Sonatype staging' inputs: mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml' @@ -115,7 +115,7 @@ jobs: # Deploy the SNAPSHOT artifact to GitHub packages. # This is done for the master branch merges only. - - task: Maven@3 + - task: Maven@4 displayName: 'Deploy to GitHub packages' inputs: mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml' @@ -164,7 +164,7 @@ jobs: pip3 install pandas displayName: 'Set up python packages' - - task: Maven@3 + - task: Maven@4 inputs: mavenPomFile: '$(System.DefaultWorkingDirectory)/pom.xml' options: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) -pl org.hl7.fhir.utilities ' diff --git a/pom.xml b/pom.xml index 15f288cc3..23be8b3a6 100644 --- a/pom.xml +++ b/pom.xml @@ -418,7 +418,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.13.0 11 @@ -428,7 +428,7 @@ while if true it will use an executable. --> true 512m - 4000m + 5632m true diff --git a/pull-request-pipeline.yml b/pull-request-pipeline.yml index 2f1a97d58..2ecaa863f 100644 --- a/pull-request-pipeline.yml +++ b/pull-request-pipeline.yml @@ -154,7 +154,7 @@ jobs: sourceFolder: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.${{ module }}_target/' contents: '**' targetFolder: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.${{ module }}/target/' - - task: Maven@3 + - task: Maven@4 inputs: mavenPomFile: 'pom.xml' options: '-P JACOCO' diff --git a/release-branch-pipeline.yml b/release-branch-pipeline.yml index 3ff7caff5..3fcbcdf96 100644 --- a/release-branch-pipeline.yml +++ b/release-branch-pipeline.yml @@ -13,7 +13,7 @@ jobs: - job: check_all_dependencies_are_releases timeoutInMinutes: 5 steps: - - task: Maven@3 + - task: Maven@4 inputs: mavenPomFile: 'pom.xml' options: '-DcheckForSnapshotDependencies' @@ -136,7 +136,7 @@ jobs: version_from_pom: $[ dependencies.get_release_version.outputs['setOutput.version_from_pom'] ] steps: # Runs 'mvn clean package' - - task: Maven@3 + - task: Maven@4 inputs: mavenPomFile: 'pom.xml' mavenOptions: '-Xmx768m -Dmaven.resolver.transport=wagon' diff --git a/setup-and-cache-job-template.yml b/setup-and-cache-job-template.yml index 311b0ce8d..1844f946b 100644 --- a/setup-and-cache-job-template.yml +++ b/setup-and-cache-job-template.yml @@ -21,7 +21,7 @@ jobs: script: mkdir -p $(MAVEN_CACHE_FOLDER); pwd; ls -al $(MAVEN_CACHE_FOLDER) - ${{ if eq(parameters.signArtifacts, true) }}: - template: setup-signing-tasks-template.yml - - task: Maven@3 + - task: Maven@4 inputs: mavenPomFile: 'pom.xml' ${{ if eq(parameters.signArtifacts, true) }}: diff --git a/test-cli-exec-job-template.yml b/test-cli-exec-job-template.yml index 003a4fd4b..4e1516247 100644 --- a/test-cli-exec-job-template.yml +++ b/test-cli-exec-job-template.yml @@ -19,7 +19,7 @@ jobs: modules: - org.hl7.fhir.validation.cli # Runs 'mvn exec' - - task: Maven@3 + - task: Maven@4 inputs: mavenPomFile: 'pom.xml' mavenOptions: '-Xmx768m -Dmaven.resolver.transport=wagon' diff --git a/test-unit-jobs-template.yml b/test-unit-jobs-template.yml index 9a77bbe2b..1b7e47685 100644 --- a/test-unit-jobs-template.yml +++ b/test-unit-jobs-template.yml @@ -24,7 +24,7 @@ jobs: modules: - org.hl7.fhir.${{ value }} # Runs 'mvn install' - - task: Maven@3 + - task: Maven@4 inputs: mavenPomFile: 'pom.xml' options: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) -pl org.hl7.fhir.${{value}} -Djacoco.skip=${{unit.skipJaCoCo}} -P JACOCO'