From 0002a8b3bd4006ff885256161a45ed5edd7c3c59 Mon Sep 17 00:00:00 2001 From: Jonathan Percival Date: Fri, 1 Sep 2023 14:27:08 -0600 Subject: [PATCH 1/3] Rev to version 3.0.0-PRE6 --- cqf-fhir-api/pom.xml | 4 ++-- cqf-fhir-benchmark/pom.xml | 12 ++++++------ cqf-fhir-bom/pom.xml | 20 ++++++++++---------- cqf-fhir-cql/pom.xml | 12 ++++++------ cqf-fhir-cr-cli/pom.xml | 12 ++++++------ cqf-fhir-cr-spring/pom.xml | 6 +++--- cqf-fhir-cr/pom.xml | 14 +++++++------- cqf-fhir-jackson/pom.xml | 4 ++-- cqf-fhir-jaxb/pom.xml | 4 ++-- cqf-fhir-test/pom.xml | 8 ++++---- cqf-fhir-utility/pom.xml | 6 +++--- docs/pom.xml | 6 +++--- pom.xml | 2 +- 13 files changed, 55 insertions(+), 55 deletions(-) diff --git a/cqf-fhir-api/pom.xml b/cqf-fhir-api/pom.xml index 569ef8fbd..f867b073a 100644 --- a/cqf-fhir-api/pom.xml +++ b/cqf-fhir-api/pom.xml @@ -5,14 +5,14 @@ org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 FHIR Clinical Reasoning (APIs) FHIR Repository APIs used by this project. Implement these to incorporate clinical reasoning on your platform org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 diff --git a/cqf-fhir-benchmark/pom.xml b/cqf-fhir-benchmark/pom.xml index ea8b9a1ad..2fe73dd3e 100644 --- a/cqf-fhir-benchmark/pom.xml +++ b/cqf-fhir-benchmark/pom.xml @@ -5,31 +5,31 @@ org.opencds.cqf.fhir cqf-fhir-benchmark - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 FHIR Clinical Reasoning (Benchmarks) Tests validating performance of FHIR Clinical Reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-cr - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-test - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-cr - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 test-jar @@ -40,7 +40,7 @@ org.opencds.cqf.fhir cqf-fhir-jackson - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 pom test diff --git a/cqf-fhir-bom/pom.xml b/cqf-fhir-bom/pom.xml index e536e0257..9dd22afa1 100644 --- a/cqf-fhir-bom/pom.xml +++ b/cqf-fhir-bom/pom.xml @@ -5,7 +5,7 @@ org.opencds.cqf.fhir cqf-fhir-bom - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 pom FHIR Clinical Reasoning (Bill Of Materials) This bom can be used to simplify dependency management when using this project @@ -13,7 +13,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 @@ -21,44 +21,44 @@ org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-test - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-utility - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-cql - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-jackson - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 pom org.opencds.cqf.fhir cqf-fhir-jaxb - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 pom org.opencds.cqf.fhir cqf-fhir-cr - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-cr-cli - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 diff --git a/cqf-fhir-cql/pom.xml b/cqf-fhir-cql/pom.xml index db753f393..c55b3ecbc 100644 --- a/cqf-fhir-cql/pom.xml +++ b/cqf-fhir-cql/pom.xml @@ -5,26 +5,26 @@ org.opencds.cqf.fhir cqf-fhir-cql - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 FHIR Clinical Reasoning (CQL) Tools, utilities, code gen to support CQL in FHIR Clinical Reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-utility - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 info.cqframework @@ -57,13 +57,13 @@ org.opencds.cqf.fhir cqf-fhir-test - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 test org.opencds.cqf.fhir cqf-fhir-jackson - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 pom test diff --git a/cqf-fhir-cr-cli/pom.xml b/cqf-fhir-cr-cli/pom.xml index cb425ddc9..18994f36c 100644 --- a/cqf-fhir-cr-cli/pom.xml +++ b/cqf-fhir-cr-cli/pom.xml @@ -5,36 +5,36 @@ org.opencds.cqf.fhir cqf-fhir-cr-cli - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 FHIR Clinical Reasoning (CLI) CLI for running FHIR Clincial Reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-utility - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-cql - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-jackson - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 pom diff --git a/cqf-fhir-cr-spring/pom.xml b/cqf-fhir-cr-spring/pom.xml index 2a86eb13f..51ca68027 100644 --- a/cqf-fhir-cr-spring/pom.xml +++ b/cqf-fhir-cr-spring/pom.xml @@ -6,21 +6,21 @@ org.opencds.cqf.fhir cqf-fhir-cr-spring - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 FHIR Clinical Reasoning (Spring) Spring configurations for FHIR Clinical Reasoning org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-cr - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.springframework diff --git a/cqf-fhir-cr/pom.xml b/cqf-fhir-cr/pom.xml index c9afc56f8..00c775031 100644 --- a/cqf-fhir-cr/pom.xml +++ b/cqf-fhir-cr/pom.xml @@ -5,45 +5,45 @@ org.opencds.cqf.fhir cqf-fhir-cr - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 FHIR Clinical Reasoning (Operations) Implementations of clinical reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-cql - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-utility - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-jackson - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 pom test org.opencds.cqf.fhir cqf-fhir-test - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 test diff --git a/cqf-fhir-jackson/pom.xml b/cqf-fhir-jackson/pom.xml index cbf0b7343..0cd908a29 100644 --- a/cqf-fhir-jackson/pom.xml +++ b/cqf-fhir-jackson/pom.xml @@ -5,7 +5,7 @@ org.opencds.cqf.fhir cqf-fhir-jackson - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 pom FHIR Clinical Reasoning (Jackson) Aggregator module for Jackson dependencies @@ -13,7 +13,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 diff --git a/cqf-fhir-jaxb/pom.xml b/cqf-fhir-jaxb/pom.xml index 64365d487..f3b96c0d9 100644 --- a/cqf-fhir-jaxb/pom.xml +++ b/cqf-fhir-jaxb/pom.xml @@ -5,7 +5,7 @@ org.opencds.cqf.fhir cqf-fhir-jaxb - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 pom FHIR Clinical Reasoning (JAXB) Aggregator module for JAXB dependencies @@ -13,7 +13,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 diff --git a/cqf-fhir-test/pom.xml b/cqf-fhir-test/pom.xml index 09baa6a06..739f5accb 100644 --- a/cqf-fhir-test/pom.xml +++ b/cqf-fhir-test/pom.xml @@ -5,26 +5,26 @@ org.opencds.cqf.fhir cqf-fhir-test - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 FHIR Clinical Reasoning (Test Utilities) Utilities to support unit testing clinical reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-utility - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.skyscreamer diff --git a/cqf-fhir-utility/pom.xml b/cqf-fhir-utility/pom.xml index 61c1f526a..07d3c4cee 100644 --- a/cqf-fhir-utility/pom.xml +++ b/cqf-fhir-utility/pom.xml @@ -5,21 +5,21 @@ org.opencds.cqf.fhir cqf-fhir-utility - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 FHIR Clinical Reasoning (Utilities) Utilities to help develop clinical reasoning operations org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 org.opencds.cqf.fhir cqf-fhir-api - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 info.cqframework diff --git a/docs/pom.xml b/docs/pom.xml index 8756e1fef..40368f3fb 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -5,7 +5,7 @@ org.opencds.cqf.fhir docs - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 FHIR Clinical Reasoning (Documentation) Documentation website for FHIR Clinical Reasoning @@ -13,7 +13,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 @@ -24,7 +24,7 @@ cqf-fhir-bom pom import - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 diff --git a/pom.xml b/pom.xml index edf461756..2d833df5d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.opencds.cqf.fhir cqf-fhir - 3.0.0-PRE6-SNAPSHOT + 3.0.0-PRE6 pom FHIR Clinical Reasoning FHIR Clinical Reasoning Implementations From fd5cd465d04064d0f8e4d5213f129a558571eeed Mon Sep 17 00:00:00 2001 From: Jonathan Percival Date: Fri, 1 Sep 2023 14:30:14 -0600 Subject: [PATCH 2/3] Fix CI scripts --- .github/workflows/check-pr.yaml | 6 +++--- .github/workflows/spotless.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-pr.yaml b/.github/workflows/check-pr.yaml index 37d313314..65fef866c 100644 --- a/.github/workflows/check-pr.yaml +++ b/.github/workflows/check-pr.yaml @@ -15,11 +15,11 @@ jobs: distribution: temurin java-version: 17 - name: Compile - run: mvn --batch-mode --no-transfer-progress --update-snapshots -T 4 compile + run: ./mvnw --batch-mode --no-transfer-progress --update-snapshots -T 4 compile - name: Compile tests - run: mvn --batch-mode --no-transfer-progress --update-snapshots -T 4 test-compile + run: ./mvnw --batch-mode --no-transfer-progress --update-snapshots -T 4 test-compile - name: Tests and additional checks - run: mvn --batch-mode --no-transfer-progress -T 4 verify -Ppackage + run: ./mvnw --batch-mode --no-transfer-progress -T 4 verify -Ppackage - name: Publish test report uses: mikepenz/action-junit-report@v3 if: success() || failure() # always run even if the previous step fails diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml index f13f8fc70..618c9a6e3 100644 --- a/.github/workflows/spotless.yml +++ b/.github/workflows/spotless.yml @@ -17,7 +17,7 @@ jobs: java-version: "17" distribution: "temurin" - name: spotless:check - run: mvnw spotless:check + run: ./mvnw spotless:check - uses: mshick/add-pr-comment@v2 if: always() with: From a0c62ba4ba9b0468f46a6e9a5e573d7fdc1f955c Mon Sep 17 00:00:00 2001 From: Jonathan Percival Date: Fri, 1 Sep 2023 14:35:18 -0600 Subject: [PATCH 3/3] Fix test-jar dependency --- cqf-fhir-benchmark/pom.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cqf-fhir-benchmark/pom.xml b/cqf-fhir-benchmark/pom.xml index 2fe73dd3e..782669920 100644 --- a/cqf-fhir-benchmark/pom.xml +++ b/cqf-fhir-benchmark/pom.xml @@ -26,17 +26,18 @@ cqf-fhir-test 3.0.0-PRE6 + + org.openjdk.jmh + jmh-core + + org.opencds.cqf.fhir cqf-fhir-cr 3.0.0-PRE6 test-jar + test - - org.openjdk.jmh - jmh-core - - org.opencds.cqf.fhir cqf-fhir-jackson