Merge branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core
This commit is contained in:
Grahame Grieve
commit
14652e6e25
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.3.16-SNAPSHOT</version>
|
||||
<version>6.3.17-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.3.16-SNAPSHOT</version>
|
||||
<version>6.3.17-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.3.16-SNAPSHOT</version>
|
||||
<version>6.3.17-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.3.16-SNAPSHOT</version>
|
||||
<version>6.3.17-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.3.16-SNAPSHOT</version>
|
||||
<version>6.3.17-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.3.16-SNAPSHOT</version>
|
||||
<version>6.3.17-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.3.16-SNAPSHOT</version>
|
||||
<version>6.3.17-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.3.16-SNAPSHOT</version>
|
||||
<version>6.3.17-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.3.16-SNAPSHOT</version>
|
||||
<version>6.3.17-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.3.16-SNAPSHOT</version>
|
||||
<version>6.3.17-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.3.16-SNAPSHOT</version>
|
||||
<version>6.3.17-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
|||
|
|
@ -342,6 +342,7 @@ public class ValidationEngine implements IValidatorResourceFetcher, IValidationP
|
|||
@With
|
||||
private boolean THO = true;
|
||||
|
||||
private static final boolean USE_ECOSYSTEM_DEFAULT = true;
|
||||
|
||||
public ValidationEngineBuilder() {
|
||||
terminologyCachePath = null;
|
||||
|
|
@ -352,10 +353,24 @@ public class ValidationEngine implements IValidatorResourceFetcher, IValidationP
|
|||
txVersion = null;
|
||||
timeTracker = null;
|
||||
canRunWithoutTerminologyServer = false;
|
||||
useEcosystem = true;
|
||||
useEcosystem = USE_ECOSYSTEM_DEFAULT;
|
||||
loggingService = new SystemOutLoggingService();
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated This method will be removed in a future release, and should not be used outside of this class.
|
||||
* Use {@link #ValidationEngineBuilder()} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public ValidationEngineBuilder(String terminologyCachePath, String userAgent, String version, String txServer, String txLog, FhirPublication txVersion, TimeTracker timeTracker, boolean canRunWithoutTerminologyServer, ILoggingService loggingService, boolean THO) {
|
||||
this(terminologyCachePath, userAgent, version, txServer, txLog, txVersion, USE_ECOSYSTEM_DEFAULT, timeTracker, canRunWithoutTerminologyServer, loggingService, THO);
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated This method will be made private in a future release, and should not be used outside of this class.
|
||||
* Use {@link #ValidationEngineBuilder()} instead.
|
||||
*/
|
||||
@Deprecated
|
||||
public ValidationEngineBuilder(String terminologyCachePath, String userAgent, String version, String txServer, String txLog, FhirPublication txVersion, boolean useEcosystem, TimeTracker timeTracker, boolean canRunWithoutTerminologyServer, ILoggingService loggingService, boolean THO) {
|
||||
this.terminologyCachePath = terminologyCachePath;
|
||||
this.userAgent = userAgent;
|
||||
|
|
@ -366,7 +381,7 @@ public class ValidationEngine implements IValidatorResourceFetcher, IValidationP
|
|||
this.timeTracker = timeTracker;
|
||||
this.canRunWithoutTerminologyServer = canRunWithoutTerminologyServer;
|
||||
this.loggingService = loggingService;
|
||||
this.useEcosystem = true;
|
||||
this.useEcosystem = useEcosystem;
|
||||
this.THO = THO;
|
||||
}
|
||||
|
||||
|
|
|
|||
6
pom.xml
6
pom.xml
|
|
@ -14,21 +14,21 @@
|
|||
HAPI FHIR
|
||||
-->
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>6.3.16-SNAPSHOT</version>
|
||||
<version>6.3.17-SNAPSHOT</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<properties>
|
||||
<commons_compress_version>1.26.0</commons_compress_version>
|
||||
<guava_version>32.0.1-jre</guava_version>
|
||||
<hapi_fhir_version>6.4.1</hapi_fhir_version>
|
||||
<validator_test_case_version>1.5.15-SNAPSHOT</validator_test_case_version>
|
||||
<validator_test_case_version>1.5.15</validator_test_case_version>
|
||||
<jackson_version>2.17.0</jackson_version>
|
||||
<junit_jupiter_version>5.9.2</junit_jupiter_version>
|
||||
<junit_platform_launcher_version>1.8.2</junit_platform_launcher_version>
|
||||
<maven_surefire_version>3.0.0-M5</maven_surefire_version>
|
||||
<maven_clean_version>3.1.0</maven_clean_version>
|
||||
<okhttp.version>4.11.0</okhttp.version>
|
||||
<jacoco_version>0.8.9</jacoco_version>
|
||||
<jacoco_version>0.8.12</jacoco_version>
|
||||
<lombok_version>1.18.32</lombok_version>
|
||||
<byte_buddy_version>1.14.8</byte_buddy_version>
|
||||
<apache_poi_version>5.2.1</apache_poi_version>
|
||||
|
|
|
|||
|
|
@ -77,6 +77,14 @@ parameters:
|
|||
jdks:
|
||||
- 1.11
|
||||
- 1.17
|
||||
- name: sourceDirectories
|
||||
displayName: Source directories for test coverage reporting
|
||||
type: string
|
||||
default: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.utilities/src/main/java/;$(System.DefaultWorkingDirectory)/org.hl7.fhir.dstu2/src/main/java/;$(System.DefaultWorkingDirectory)/org.hl7.fhir.dstu2016may/src/main/java/;$(System.DefaultWorkingDirectory)/org.hl7.fhir.dstu3/src/main/java/;$(System.DefaultWorkingDirectory)/org.hl7.fhir.r4/src/main/java/;$(System.DefaultWorkingDirectory)/org.hl7.fhir.r4b/src/main/java/;$(System.DefaultWorkingDirectory)/org.hl7.fhir.r5/src/main/java/;$(System.DefaultWorkingDirectory)/org.hl7.fhir.convertors/src/main/java/;$(System.DefaultWorkingDirectory)/org.hl7.fhir.validation/src/main/java/'
|
||||
- name: verboseCoverage
|
||||
displayName: Enable Verbose Coverage Reporting
|
||||
type: boolean
|
||||
default: false
|
||||
|
||||
variables:
|
||||
- group: CODECOV_GROUP
|
||||
|
|
@ -156,15 +164,26 @@ jobs:
|
|||
jdkArchitectureOption: 'x64'
|
||||
goals: 'jacoco:report-aggregate'
|
||||
|
||||
- task: PublishCodeCoverageResults@1
|
||||
displayName: 'Publish JaCoCo test results'
|
||||
|
||||
- task: PublishCodeCoverageResults@2
|
||||
displayName: 'Publish test coverage for Azure'
|
||||
condition: ${{ eq(parameters.verboseCoverage, false) }}
|
||||
inputs:
|
||||
codeCoverageTool: 'JaCoCo'
|
||||
summaryFileLocation: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.report/target/site/jacoco-aggregate/jacoco.xml'
|
||||
reportDirectory: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.report/target/site/jacoco-aggregate/'
|
||||
pathToSources: ${{ parameters.sourceDirectories }}
|
||||
|
||||
- task: reportgenerator@5
|
||||
displayName: 'Publish verbose test coverage for Azure'
|
||||
condition: ${{ eq(parameters.verboseCoverage, true) }}
|
||||
inputs:
|
||||
reports: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.report/target/site/jacoco-aggregate/jacoco.xml'
|
||||
targetdir: '$(System.DefaultWorkingDirectory)/org.hl7.fhir.report/target/site/jacoco-aggregate/'
|
||||
sourcedirs: ${{ parameters.sourceDirectories }}
|
||||
publishCodeCoverageResults: true
|
||||
|
||||
|
||||
- bash: |
|
||||
curl -Os https://uploader.codecov.io/latest/linux/codecov
|
||||
chmod +x codecov
|
||||
./codecov -t $(CODECOV_TOKEN) -R $(System.DefaultWorkingDirectory)/org.hl7.fhir.report/target/site/jacoco-aggregate/
|
||||
displayName: 'codecov'
|
||||
displayName: 'Upload test results to codecov'
|
||||
Loading…
Reference in New Issue