Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Grahame Grieve committed Aug 16, 2023
2 parents e6ef357 + 96497d2 commit 3beb0c7
Show file tree
Hide file tree
Showing 9 changed files with 133 additions and 12 deletions.
10 changes: 10 additions & 0 deletions org.hl7.fhir.dstu3/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,16 @@
<artifactId>okhttp</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
<optional>true</optional>
</dependency>

<!-- Apache POI -->
<dependency>
Expand Down
12 changes: 12 additions & 0 deletions org.hl7.fhir.r4/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,23 @@
<artifactId>httpclient</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.hl7.fhir.testcases</groupId>
<artifactId>fhir-test-cases</artifactId>
Expand Down
12 changes: 11 additions & 1 deletion org.hl7.fhir.r4b/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,17 @@
<optional>true</optional>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
<optional>true</optional>
</dependency>

<!-- Apache POI -->
<dependency>
<groupId>org.apache.poi</groupId>
Expand Down
10 changes: 10 additions & 0 deletions org.hl7.fhir.r5/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,16 @@
<artifactId>logging-interceptor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
Expand Down
12 changes: 12 additions & 0 deletions org.hl7.fhir.utilities/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand Down
22 changes: 22 additions & 0 deletions org.hl7.fhir.validation.cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,14 @@
<scope>compile</scope>
</dependency>

<!--
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
<version>3.1.2.RELEASE</version>
<scope>compile</scope>
</dependency>-->

<dependency>
<groupId>org.everit.json</groupId>
<artifactId>org.everit.json.schema</artifactId>
Expand All @@ -234,6 +242,20 @@
<scope>compile</scope>
</dependency>

<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<optional>false</optional>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
<optional>false</optional>
<scope>compile</scope>
</dependency>

<dependency>
<groupId>org.antlr</groupId>
<artifactId>ST4</artifactId>
Expand Down
20 changes: 18 additions & 2 deletions org.hl7.fhir.validation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,18 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
<optional>true</optional>
</dependency>

<!-- Lombok Until I get Around to Rewriting Everything in Kotlin -->
<dependency>
<groupId>org.projectlombok</groupId>
Expand All @@ -194,7 +206,12 @@
<optional>true</optional>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.atlassian.commonmark</groupId>
<artifactId>commonmark-ext-gfm-tables</artifactId>
<optional>true</optional>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -211,7 +228,6 @@
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
<version>3.1.1.RELEASE</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand Down
4 changes: 2 additions & 2 deletions org.hl7.fhir.validation/src/test/java/org/hl7/fhir/comparison/tests/ComparisonTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;

import java.util.stream.Stream;

import org.apache.commons.io.IOUtils;
Expand Down Expand Up @@ -68,7 +68,7 @@
import org.hl7.fhir.utilities.validation.ValidationMessage;
import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity;
import org.hl7.fhir.utilities.xhtml.XhtmlComposer;
import org.hl7.fhir.utilities.xhtml.XhtmlNode;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
Expand Down
43 changes: 36 additions & 7 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<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.10.0</okhttp.version>
<okhttp.version>4.11.0</okhttp.version>
<jacoco_version>0.8.9</jacoco_version>
<lombok_version>1.18.22</lombok_version>
<byte_buddy_version>1.12.14</byte_buddy_version>
Expand Down Expand Up @@ -165,11 +165,11 @@
<version>${saxon_he_version}</version>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.30</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.30</version>
</dependency>

<!-- Apache POI -->
<dependency>
Expand Down Expand Up @@ -206,15 +206,38 @@
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
</exclusion>
<!-- Excluding brotli impl until https://github.com/square/okhttp/issues/7738 is resolved -->
<exclusion>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp-brotli</artifactId>
</exclusion>
<exclusion>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- Included because okttp3 used a vulnerable version -->
<!-- Included because okttp3 used vulnerable versions -->
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>16.0.1</version>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>3.4.0</version>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
<version>3.4.0</version>
</dependency>

<dependency>
<groupId>com.squareup.okhttp3</groupId>
Expand Down Expand Up @@ -244,6 +267,12 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson_version}</version>
</dependency>

<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
<version>3.1.2.RELEASE</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down

0 comments on commit 3beb0c7

Please sign in to comment.