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

2825 ks smile startup (#3388) 

* bump flyway

* update thymeleaf template from html5 to html

* add UNKNOWN to batch status test
This commit is contained in:
Ken Stevens 2022-02-14 15:06:26 -05:00 committed by GitHub
parent 69a614d823
commit fb342cc2a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/BatchJobHelper.java
View File

@ -20,7 +20,6 @@ package ca.uhn.fhir.test.utilities;
* #L%
*/
import ca.uhn.fhir.util.StopWatch;
import org.awaitility.core.ConditionTimeoutException;
import org.hamcrest.Matchers;
import org.slf4j.Logger;
@ -40,11 +39,7 @@ import java.util.stream.Collectors;
import static org.awaitility.Awaitility.await;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.oneOf;
import static org.hamcrest.Matchers.*;
import static org.junit.jupiter.api.Assertions.fail;
public class BatchJobHelper {
@ -139,10 +134,12 @@ public class BatchJobHelper {
// JM: Adding ABANDONED status because given the description, it s similar to FAILURE, and we need to avoid tests failing because
// of wait timeouts caused by unmatched statuses. Also adding STOPPED because tests were found where this wait timed out
// with jobs keeping that status during the whole wait
// KHS: Adding UNKNOWN
BatchStatus.COMPLETED,
BatchStatus.FAILED,
BatchStatus.ABANDONED,
BatchStatus.STOPPED
BatchStatus.STOPPED,
BatchStatus.UNKNOWN
));
}

16
hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/hapi-fhir-tester-application-context.xml
View File

@ -1,11 +1,11 @@
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tx="http://www.springframework.org/schema/tx" xmlns:context="http://www.springframework.org/schema/context" xmlns:security="http://www.springframework.org/schema/security"
xmlns:oauth="http://www.springframework.org/schema/security/oauth2"
xsi:schemaLocation="http://www.springframework.org/schema/security/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:mvc="http://www.springframework.org/schema/mvc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="/oauth2 http://www.springframework.org/schema/security/spring-security-oauth2-2.0.xsd
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.2.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd
http://www.springframework.org/schema/security
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.2.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.2.xsd">
<mvc:annotation-driven />
@ -22,7 +22,7 @@
<bean id="templateResolver" class="org.thymeleaf.templateresolver.ServletContextTemplateResolver">
<property name="prefix" value="/WEB-INF/templates/" />
<property name="suffix" value=".html" />
<property name="templateMode" value="HTML5" />
<property name="templateMode" value="HTML" />
<property name="characterEncoding" value="UTF-8" />
</bean>
@ -35,4 +35,4 @@
<property name="characterEncoding" value="UTF-8" />
</bean>
</beans>
</beans>

2
pom.xml
View File

@ -810,7 +810,7 @@
<jsr305_version>3.0.2</jsr305_version>
<junit_version>5.8.2</junit_version>
<flexmark_version>0.50.40</flexmark_version>
<flyway_version>8.4.1</flyway_version>
<flyway_version>8.4.4</flyway_version>
<hibernate_version>5.6.2.Final</hibernate_version>
<hibernate_search_version>6.0.3.Final</hibernate_search_version>
<!-- Update lucene version when you update hibernate-search version -->