diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 000000000..a793f5919
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,8 @@
+coverage:
+ status:
+ project:
+ default:
+ informational: true
+ patch:
+ default:
+ informational: true
\ No newline at end of file
diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml
index 51cdbd3e9..0d1a6fcc8 100644
--- a/org.hl7.fhir.report/pom.xml
+++ b/org.hl7.fhir.report/pom.xml
@@ -90,7 +90,7 @@
org.sonatype.plugins
nexus-staging-maven-plugin
- true
+ true
diff --git a/pull-request-pipeline-parameterized.yml b/pull-request-pipeline-parameterized.yml
index 36086efda..e283de225 100644
--- a/pull-request-pipeline-parameterized.yml
+++ b/pull-request-pipeline-parameterized.yml
@@ -19,18 +19,30 @@ jobs:
inputs:
key: maven | $(Build.BuildId)
path: $(MAVEN_CACHE_FOLDER)
- # Runs 'mvn test'
+ # Runs 'mvn install'
- task: Maven@3
inputs:
mavenPomFile: 'pom.xml'
- options: '-pl "!org.hl7.fhir.validation.cli" -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+ options: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
mavenOptions: '-Xmx3072m'
javaHomeOption: 'JDKVersion'
jdkVersionOption: '${{image.jdkVersion}}'
jdkArchitectureOption: 'x64'
publishJUnitResults: true
testResultsFiles: '**/surefire-reports/TEST-*.xml'
- goals: 'test'
+ goals: 'install'
+
+ - task: Maven@3
+ inputs:
+ mavenPomFile: 'pom.xml'
+ mavenOptions: '-Xmx3072m'
+ javaHomeOption: 'JDKVersion'
+ jdkVersionOption: '${{image.jdkVersion}}'
+ jdkArchitectureOption: 'x64'
+ options: '-pl org.hl7.fhir.validation.cli -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+ publishJUnitResults: false
+ testResultsFiles: '**/surefire-reports/TEST-*.xml'
+ goals: 'exec:exec'
# Upload test results to codecov
- script: bash <(curl https://codecov.io/bash) -t $(codecov)
@@ -46,27 +58,3 @@ jobs:
summaryFileLocation: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.report/target/site/jacoco-aggregate/jacoco.xml'
reportDirectory: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.report/target/site/jacoco-aggregate/'
- # Builds the CLI jar
- - task: Maven@3
- inputs:
- mavenPomFile: 'pom.xml'
- mavenOptions: '-Xmx3072m'
- javaHomeOption: 'JDKVersion'
- jdkVersionOption: '${{image.jdkVersion}}'
- jdkArchitectureOption: 'x64'
- options: '-pl org.hl7.fhir.validation.cli -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
- publishJUnitResults: false
- goals: 'install'
-
- # Executes the CLI jar
- - task: Maven@3
- inputs:
- mavenPomFile: 'pom.xml'
- mavenOptions: '-Xmx3072m'
- javaHomeOption: 'JDKVersion'
- jdkVersionOption: '${{image.jdkVersion}}'
- jdkArchitectureOption: 'x64'
- options: '-pl org.hl7.fhir.validation.cli -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
- publishJUnitResults: false
- goals: 'exec:exec'
-
diff --git a/pull-request-pipeline.yml b/pull-request-pipeline.yml
index ce3630186..c5df1978f 100644
--- a/pull-request-pipeline.yml
+++ b/pull-request-pipeline.yml
@@ -11,7 +11,7 @@ pr:
# Azure doesn't always have the same Java versions on each system, so they are enumerated for each system independently.
jobs:
- job: setup
- displayName: setup-and-cache-build
+ displayName: cache-maven-dependencies
pool:
vmImage: ubuntu-latest
steps:
@@ -28,13 +28,23 @@ jobs:
- task: Maven@3
inputs:
mavenPomFile: 'pom.xml'
+ options: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
mavenOptions: '-Xmx3072m'
- options: '-pl "!org.hl7.fhir.validation.cli" -DskipTests -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.11'
jdkArchitectureOption: 'x64'
publishJUnitResults: false
- goals: 'install'
+ goals: 'dependency:resolve'
+ - task: Maven@3
+ inputs:
+ mavenPomFile: 'pom.xml'
+ options: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+ mavenOptions: '-Xmx3072m'
+ javaHomeOption: 'JDKVersion'
+ jdkVersionOption: '1.11'
+ jdkArchitectureOption: 'x64'
+ publishJUnitResults: false
+ goals: 'dependency:resolve-plugins'
- template: pull-request-pipeline-parameterized.yml
parameters:
images: