Skip to content

Commit

Permalink
Prep for 3.2.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
@JPercival
JPercival committed Feb 28, 2024
1 parent 241bd02 commit 13c8a0c
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 86 deletions.
22 changes: 11 additions & 11 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@

<groupId>org.opencds.cqf</groupId>
<artifactId>tooling-parent</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>

<packaging>pom</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<cql.version>3.6.0</cql.version>
<hapi.version>6.10.2</hapi.version>
<core.version>6.1.2.2</core.version>
<cql.version>3.8.0</cql.version>
<hapi.version>7.0.0</hapi.version>
<spring-boot.version>2.1.5.RELEASE</spring-boot.version>
<slf4j.version>2.0.5</slf4j.version>
</properties>
Expand Down Expand Up @@ -113,6 +112,14 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-bom</artifactId>
<version>${hapi.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>

<dependency>
<groupId>info.cqframework</groupId>
<artifactId>engine</artifactId>
Expand Down Expand Up @@ -198,13 +205,11 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.1</version>
</dependency>

<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>2.1.2</version>
</dependency>

<dependency>
Expand All @@ -229,11 +234,6 @@
<artifactId>FastInfoset</artifactId>
<version>1.2.18</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.15.2</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
Expand Down
6 changes: 3 additions & 3 deletions tooling-cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>org.opencds.cqf</groupId>
<artifactId>tooling-parent</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
</parent>

<artifactId>tooling-cli</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
<packaging>jar</packaging>

<description>CQF Tooling CLI</description>
Expand All @@ -19,7 +19,7 @@
<dependency>
<groupId>org.opencds.cqf</groupId>
<artifactId>tooling</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions tooling-ui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>org.opencds.cqf</groupId>
<artifactId>tooling-parent</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
</parent>

<artifactId>tooling-ui</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
<packaging>jar</packaging>

<description>CQF Tooling UI</description>
Expand All @@ -19,7 +19,7 @@
<dependency>
<groupId>org.opencds.cqf</groupId>
<artifactId>tooling</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
Expand Down
82 changes: 17 additions & 65 deletions tooling/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<parent>
<groupId>org.opencds.cqf</groupId>
<artifactId>tooling-parent</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
</parent>

<artifactId>tooling</artifactId>
<version>3.2.0-SNAPSHOT</version>
<version>3.2.0</version>
<packaging>jar</packaging>

<dependencies>
Expand Down Expand Up @@ -75,93 +75,54 @@
<version>1.5.0</version>
</dependency>

<!-- FHIR Core Dependencies -->
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.dstu3</artifactId>
<version>${core.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.r4</artifactId>
<version>${core.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.r5</artifactId>
<version>${core.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.convertors</artifactId>
<version>${core.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/xpp3/xpp3 -->
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.4c</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.validation</artifactId>
<version>${core.version}</version>
<exclusions>
<exclusion>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.utilities</artifactId>
<version>${core.version}</version>
</dependency>

<!-- HAPI STU3 FHIR Structure Definitions -->
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-dstu3</artifactId>
<version>${hapi.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-r4</artifactId>
<version>${hapi.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation-resources-r4</artifactId>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-structures-r5</artifactId>
<version>${hapi.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-base</artifactId>
<version>${hapi.version}</version>
</dependency>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation</artifactId>
<version>${hapi.version}</version>
</dependency>

<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-validation-resources-r4</artifactId>
<version>${hapi.version}</version>
<artifactId>hapi-fhir-converter</artifactId>
</dependency>

<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-converter</artifactId>
<artifactId>hapi-fhir-caching-caffeine</artifactId>
<version>${hapi.version}</version>
</dependency>

<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-client</artifactId>
<version>${hapi.version}</version>
</dependency>

<!-- StructureDef to ModelInfo -->
Expand Down Expand Up @@ -209,27 +170,11 @@
<artifactId>thymeleaf</artifactId>
<version>3.0.14.RELEASE</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.13.4.2</version>
</dependency>
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
<version>2.9.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>2.14.2</version>
<scope>compile</scope>
</dependency>


<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.1</version>
</dependency>

<dependency>
Expand All @@ -252,6 +197,13 @@
<artifactId>org.eclipse.persistence.moxy</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<!-- Update the CQL bom to expose this version -->
<version>2.16.1</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
5 changes: 1 addition & 4 deletions ...ing/src/test/java/org/opencds/cqf/tooling/operation/BundleToTransactionOperationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
package org.opencds.cqf.tooling.operation;

import junit.framework.TestCase;
import org.testng.Assert;
import org.testng.annotations.Test;

import java.io.File;
import java.util.HashSet;
import java.util.Set;

public class BundleToTransactionOperationTest extends TestCase {
public class BundleToTransactionOperationTest {
private final BundleToTransactionOperation bundleToTransactionOperation = new BundleToTransactionOperation();
private final String PATH_ARGUMENT = "-p=";
private final String OUTPUT_PATH_ARGUMENT = "-op=";
Expand Down

0 comments on commit 13c8a0c

Please sign in to comment.