Skip to content

Commit

Permalink
Merge branch 'master' into #552-parameter-validation
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schuler
c-schuler committed Sep 29, 2022
2 parents daa5a99 + 9116c9b commit c2517bd
Show file tree
Hide file tree
Showing 18 changed files with 49 additions and 48 deletions.
4 changes: 2 additions & 2 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-core</artifactId>
Expand All @@ -13,7 +13,7 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-external</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<relativePath>../</relativePath>
</parent>

Expand Down Expand Up @@ -35,7 +35,7 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-core</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand All @@ -50,7 +50,7 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-test</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion external/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-external</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions plugin/case-reporting/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-case-reporting</artifactId>
<dependencies>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cql</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>

</dependencies>
Expand Down
10 changes: 5 additions & 5 deletions plugin/cds-hooks/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-cds-hooks</artifactId>
<dependencies>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cql</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cr</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-security</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cpg</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>
</dependencies>
</project>
4 changes: 2 additions & 2 deletions plugin/cpg/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-cpg</artifactId>
<dependencies>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cql</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion plugin/cql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-cql</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion plugin/cql/src/main/java/org/opencds/cqf/ruler/cql/CqlConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.cqframework.cql.cql2elm.LibraryManager;
import org.cqframework.cql.cql2elm.LibrarySourceProvider;
import org.cqframework.cql.cql2elm.ModelManager;
import org.cqframework.cql.cql2elm.fhir.r4.FhirLibrarySourceProvider;
import org.cqframework.cql.cql2elm.quick.FhirLibrarySourceProvider;
import org.hl7.fhir.instance.model.api.IBaseBundle;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.instance.model.api.ICompositeType;
Expand Down
4 changes: 2 additions & 2 deletions plugin/cr/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>
<artifactId>cqf-ruler-cr</artifactId>
<dependencies>
Expand All @@ -23,7 +23,7 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cql</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>
</dependencies>
</project>
3 changes: 2 additions & 1 deletion plugin/cr/src/test/java/org/opencds/cqf/ruler/cr/CqlBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
import org.cqframework.cql.cql2elm.CqlTranslator;
import org.cqframework.cql.cql2elm.LibraryManager;
import org.cqframework.cql.cql2elm.ModelManager;
import org.cqframework.cql.cql2elm.fhir.r4.FhirLibrarySourceProvider;

import org.cqframework.cql.cql2elm.quick.FhirLibrarySourceProvider;
import org.opencds.cqf.ruler.cql.utility.Translators;

public class CqlBuilder {
Expand Down
2 changes: 1 addition & 1 deletion plugin/dev-tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-dev-tools</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-plugin</artifactId>
Expand All @@ -25,12 +25,12 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-core</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-external</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>

<dependency>
Expand All @@ -50,7 +50,7 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-test</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions plugin/ra/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-ra</artifactId>
<dependencies>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cr</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion plugin/sdc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-sdc</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions plugin/security/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-plugin</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-security</artifactId>
<dependencies>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-dev-tools</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<packaging>pom</packaging>

<name>cqf-ruler</name>
Expand Down Expand Up @@ -90,9 +90,9 @@
<cqf-tooling.version>2.0.0</cqf-tooling.version>

<!-- CQL Support -->
<cqframework.version>2.2.0-SNAPSHOT</cqframework.version>
<cql-engine.version>2.1.0-SNAPSHOT</cql-engine.version>
<cql-evaluator.version>2.1.0-SNAPSHOT</cql-evaluator.version>
<cqframework.version>2.2.0</cqframework.version>
<cql-engine.version>2.1.0</cql-engine.version>
<cql-evaluator.version>2.1.0</cql-evaluator.version>

<!-- Dependency Versions -->
<fhir_core_version>5.6.36</fhir_core_version>
Expand Down
22 changes: 11 additions & 11 deletions server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-server</artifactId>
Expand Down Expand Up @@ -58,7 +58,7 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-core</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -224,57 +224,57 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-case-reporting</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cds-hooks</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cpg</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cql</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-cr</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-dev-tools</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<scope>runtime</scope>
</dependency>

<!-- runtime only dependencies for developing plugins -->
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-ra</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-sdc</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-security</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Expand Down
6 changes: 3 additions & 3 deletions test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</parent>

<artifactId>cqf-ruler-test</artifactId>
Expand Down Expand Up @@ -102,12 +102,12 @@
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-core</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>
<dependency>
<groupId>org.opencds.cqf.ruler</groupId>
<artifactId>cqf-ruler-external</artifactId>
<version>0.7.0-SNAPSHOT</version>
<version>0.7.0</version>
</dependency>

<dependency>
Expand Down

0 comments on commit c2517bd

Please sign in to comment.