From 55ce4c4dce3fd9f153f7d8f434f65b9ffc891ba9 Mon Sep 17 00:00:00 2001
From: Tadgh <garygrantgraham@gmail.com>
Date: Sun, 5 Nov 2023 12:53:46 -0800
Subject: [PATCH] CVEs for 6.10.0 (#5433)

* Bump jetty

* Bump okio-jvm

* 8.2.0 mysql connector

* Jena and elastic bumps

* Fix test
---
 .../test/java/ca/uhn/fhir/parser/RDFParserR4Test.java  |  6 +++---
 pom.xml                                                | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/RDFParserR4Test.java b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/RDFParserR4Test.java
index 0d20454ddae..ea370b70b12 100644
--- a/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/RDFParserR4Test.java
+++ b/hapi-fhir-structures-r4/src/test/java/ca/uhn/fhir/parser/RDFParserR4Test.java
@@ -55,9 +55,9 @@ public class RDFParserR4Test {
 			@prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
 			   
 			<http://hl7.org/fhir/Patient/123>
-			        rdf:type             fhir:Patient ;
-			        fhir:Patient.active  [ fhir:value  true ] ;
-			        fhir:Resource.id     [ fhir:value  "123" ] ;
+			        rdf:type             fhir:Patient;
+			        fhir:Patient.active  [ fhir:value  true ];
+			        fhir:Resource.id     [ fhir:value  "123" ];
 			        fhir:nodeRole        fhir:treeRoot .
 			""";
 
diff --git a/pom.xml b/pom.xml
index c19c4713059..cb7571cc6fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -934,9 +934,9 @@
 		<jaxb_api_version>2.3.1</jaxb_api_version>
 		<jaxb_core_version>2.3.0.1</jaxb_core_version>
 		<jaxb_runtime_version>3.0.0</jaxb_runtime_version>
-		<jena_version>4.8.0</jena_version>
+		<jena_version>4.9.0</jena_version>
 		<jersey_version>3.0.3</jersey_version>
-		<jetty_version>10.0.14</jetty_version>
+		<jetty_version>10.0.17</jetty_version>
 		<jsr305_version>3.0.2</jsr305_version>
 		<junit_version>5.9.1</junit_version>
 		<flexmark_version>0.64.8</flexmark_version>
@@ -1171,7 +1171,7 @@
 			<dependency>
 				<groupId>com.squareup.okio</groupId>
 				<artifactId>okio-jvm</artifactId>
-				<version>3.2.0</version>
+				<version>3.4.0</version>
 			</dependency>
 
 			<dependency>
@@ -1385,7 +1385,7 @@
 			<dependency>
 				<groupId>com.mysql</groupId>
 				<artifactId>mysql-connector-j</artifactId>
-				<version>8.0.32</version>
+				<version>8.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springdoc</groupId>
@@ -1871,7 +1871,7 @@
 				-->
 				<groupId>org.elasticsearch.client</groupId>
 				<artifactId>elasticsearch-rest-high-level-client</artifactId>
-				<version>7.17.3</version>
+				<version>7.17.13</version>
 				<exclusions>
 					<exclusion>
 						<groupId>com.fasterxml.jackson.dataformat</groupId>