honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump jetty_version from 12.0.3 to 12.0.9 (#6022) 

* jetty_version from 12.0.3 to 12.0.9

* Changelog

* Try to resolve test issue

---------

Co-authored-by: James Agnew <jamesagnew@gmail.com>
This commit is contained in:
dotasek 2024-07-02 11:22:18 -04:00 committed by GitHub
parent 34da5c1b34
commit 724339c886
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/6021-spring-boot-not-compatible-with-jetty-version.yaml Normal file
View File

@ -0,0 +1,5 @@
---
type: fix
issue: 6021
title: "The updated Spring Boot was not compatible with jetty version 12.0.3.
Jetty has been updated to 12.0.9, fixing this issue."

10
hapi-fhir-testpage-overlay/src/test/java/ca/uhn/fhir/jpa/test/WebTest.java
View File

@ -18,6 +18,9 @@ import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
import org.eclipse.jetty.ee10.servlet.ServletHandler;
import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.resource.PathResource;
import org.eclipse.jetty.util.resource.PathResourceFactory;
import org.eclipse.jetty.util.resource.Resource;
import org.hl7.fhir.instance.model.api.IIdType;
import org.hl7.fhir.r4.model.Bundle;
import org.hl7.fhir.r4.model.Composition;
@ -59,6 +62,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.List;
import java.util.Optional;
@ -110,7 +114,11 @@ public class WebTest {
ServletContextHandler contextHandler = new MyServletContextHandler();
contextHandler.setAllowNullPathInContext(true);
contextHandler.setServletHandler(servletHandler);
contextHandler.setBaseResourceAsString("hapi-fhir-testpage-overlay/src/main/webapp");
Resource base = new PathResourceFactory().newResource("hapi-fhir-testpage-overlay/src/main/webapp");
if (!base.exists()) {
base = new PathResourceFactory().newResource("src/main/webapp");
}
contextHandler.setBaseResource(base);
ourOverlayServer = new Server(0);
ourOverlayServer.setHandler(contextHandler);

2
pom.xml
View File

@ -982,7 +982,7 @@
<jaxb_runtime_version>4.0.4</jaxb_runtime_version>
<jena_version>4.9.0</jena_version>
<jersey_version>3.0.3</jersey_version>
<jetty_version>12.0.3</jetty_version>
<jetty_version>12.0.9</jetty_version>
<jsr305_version>3.0.2</jsr305_version>
<junit_version>5.10.1</junit_version>
<flexmark_version>0.64.8</flexmark_version>