diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 55f72dd5e..78bc8050e 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -89,7 +89,7 @@ org.projectlombok lombok - 1.18.16 + ${lombok_version} provided diff --git a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceRoundTripTests.java b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceRoundTripTests.java index d595577a1..fb69e3597 100644 --- a/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceRoundTripTests.java +++ b/org.hl7.fhir.r4/src/test/java/org/hl7/fhir/r4/test/ResourceRoundTripTests.java @@ -21,7 +21,7 @@ import java.io.*; public class ResourceRoundTripTests { @BeforeAll - public void setUp() throws Exception { + public static void setUp() throws Exception { } @Test diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java index 3eaecbfb6..a3d51ae01 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/npm/FilesystemPackageCacheManager.java @@ -653,6 +653,7 @@ public class FilesystemPackageCacheManager extends BasePackageCacheManager imple http.trustAllhosts(); HTTPResult res = http.get("https://build.fhir.org/ig/qas.json?nocache=" + System.currentTimeMillis()); res.checkThrowException(); + buildInfo = (JsonArray) new com.google.gson.JsonParser().parse(TextFile.bytesToString(res.getContent())); List builds = new ArrayList<>(); diff --git a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java index f31a349b4..82ca542bb 100644 --- a/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java +++ b/org.hl7.fhir.utilities/src/test/java/org/hl7/fhir/utilities/UtilitiesTest.java @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; +import java.nio.file.Paths; import java.util.Random; import static org.junit.jupiter.api.Assertions.*; @@ -29,7 +30,7 @@ class UtilitiesTest { public static final String WIN_JAVA_HOME = System.getenv("JAVA_HOME") + "\\"; public static final String OSX_USER_DIR = System.getProperty("user.home") + "/"; - public static final String OSX_JAVA_HOME = System.getenv("JAVA_HOME"); + public static final String OSX_JAVA_HOME = Paths.get(System.getenv("JAVA_HOME")).normalize().toString() + "/"; @Test @DisplayName("Test Utilities.path maps temp directory correctly") diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index 49dd0a405..714d22567 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -155,7 +155,7 @@ org.projectlombok lombok - 1.18.16 + ${lombok_version} provided diff --git a/pom.xml b/pom.xml index 0700788af..123014416 100644 --- a/pom.xml +++ b/pom.xml @@ -22,9 +22,10 @@ 1.1.74-SNAPSHOT 5.7.1 1.7.1 - 3.0.0-M4 - 0.8.5 + 3.0.0-M5 + 0.8.7 1.5.1 + 1.18.22 HL7 Core Artifacts @@ -195,24 +196,6 @@ - - maven-surefire-plugin - ${maven_surefire_version} - - 1 - true - classes - false - false - - ${argLine} -Xmx4096m - false - - org/hl7/fhir/validation/cli/** - - - org.basepom.maven duplicate-finder-maven-plugin @@ -368,6 +351,66 @@ + + surefire-java-8 + + (,1.8] + + + + + maven-surefire-plugin + ${maven_surefire_version} + + 1 + true + classes + false + false + + + ${argLine} -Xmx4096m -XX:+UseConcMarkSweepGC + false + + org/hl7/fhir/validation/cli/** + + + + + + + + surefire-java-9-plus + + [9,) + + + + + maven-surefire-plugin + ${maven_surefire_version} + + 1 + true + classes + false + false + + ${argLine} -Xmx4096m + false + + org/hl7/fhir/validation/cli/** + + + + + + github-repo diff --git a/pull-request-pipeline-parameterized.yml b/pull-request-pipeline-parameterized.yml index 02e6161d5..672d25181 100644 --- a/pull-request-pipeline-parameterized.yml +++ b/pull-request-pipeline-parameterized.yml @@ -1,15 +1,15 @@ jobs: - - ${{ each imageName in parameters.imageName }}: - - ${{ each jdkVersion in parameters.jdkVersion }}: + - ${{ each image in parameters.images }}: + - ${{ each jdkVersion in image.jdkVersions }}: - job: - displayName: ${{imageName}}_${{jdkVersion}} + displayName: ${{image.name}}_${{jdkVersion}} pool: - vmImage: ${{imageName}} + vmImage: ${{image.name}} variables: - currentImage: ${{imageName}} + currentImage: ${{image.name}} codecov: $(CODECOV_TOKEN) VERSION: diff --git a/pull-request-pipeline.yml b/pull-request-pipeline.yml index aac93bec9..508451c92 100644 --- a/pull-request-pipeline.yml +++ b/pull-request-pipeline.yml @@ -5,59 +5,13 @@ pr: - release # Different users have different machine setups, we run the build three times, on ubuntu, osx, and windows -strategy: - matrix: - linux: - imageName: 'ubuntu-latest' - mac: - imageName: "macos-latest" - windows: - imageName: "windows-2019" - maxParallel: 3 - -pool: - vmImage: $(imageName) - -variables: - currentImage: $(imageName) - codecov: $(CODECOV_TOKEN) - VERSION: - -steps: - # Runs 'mvn clean package' - - task: Maven@3 - inputs: - mavenPomFile: 'pom.xml' - mavenOptions: '-Xmx3072m' - javaHomeOption: 'JDKVersion' - jdkVersionOption: '1.11' - jdkArchitectureOption: 'x64' - publishJUnitResults: true - testResultsFiles: '**/surefire-reports/TEST-*.xml' - goals: 'package' - - - task: Maven@3 - inputs: - mavenPomFile: 'pom.xml' - mavenOptions: '-Xmx3072m' - javaHomeOption: 'JDKVersion' - jdkVersionOption: '1.11' - jdkArchitectureOption: 'x64' - options: '-pl org.hl7.fhir.validation.cli' - publishJUnitResults: false - testResultsFiles: '**/surefire-reports/TEST-*.xml' - goals: 'exec:exec' - - # Upload test results to codecov - - script: bash <(curl https://codecov.io/bash) -t $(codecov) - displayName: 'codecov Bash Uploader' - condition: eq(variables.currentImage, 'ubuntu-latest') - - # Publishes the test results to build artifacts. - - task: PublishCodeCoverageResults@1 - displayName: 'Publish JaCoCo test results' - condition: eq(variables.currentImage, 'ubuntu-latest') - 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/' \ No newline at end of file +jobs: + - template: pull-request-pipeline-parameterized.yml + parameters: + images: + - name: ubuntu-latest + jdkVersions: [ '1.8', '1.11' ] + - name: macos-latest + jdkVersions: [ '1.8', '1.11', '1.17'] + - name: windows-2019 + jdkVersions: [ '1.8', '1.11', '1.17'] \ No newline at end of file diff --git a/test-java-8-11-17-pipeline.yml b/test-java-8-11-17-pipeline.yml deleted file mode 100644 index 3d791362f..000000000 --- a/test-java-8-11-17-pipeline.yml +++ /dev/null @@ -1,11 +0,0 @@ -trigger: none - -pr: -- master -- release - -jobs: -- template: pull-request-pipeline-parameterized.yml - parameters: - imageName: [ 'ubuntu-latest', 'macos-latest', 'windows-2019' ] - jdkVersion: [ '1.8', '1.11', '1.17'] \ No newline at end of file