Merge branch 'master' of github.com:jamesagnew/hapi-fhir

hapi-deployable-pom/pom.xml

@@ -111,6 +111,10 @@
 							<groupId>org.jscience</groupId>
 							<artifactId>jscience</artifactId>
 						</dependency>
+						<dependency>
+							<groupId>org.springframework</groupId>
+							<artifactId>spring-jcl</artifactId>
+						</dependency>
 					</ignoredDependencies>
 					<ignoredResources>
 						<ignoredResource>changelog.txt</ignoredResource>

hapi-fhir-jpaserver-base/pom.xml

@@ -105,10 +105,12 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<!--
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
 		</dependency>
+		-->
 
 		<dependency>
 			<groupId>ch.qos.logback</groupId>

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/provider/r4/JpaSystemProviderR4.java

@@ -45,7 +45,7 @@ public class JpaSystemProviderR4 extends BaseJpaSystemProviderDstu2Plus<Bundle,
 	@Qualifier("mySystemDaoR4")
 	private IFhirSystemDao<Bundle, Meta> mySystemDao;
 
-	@Autowired
+	@Autowired(required = false)
 	private IFulltextSearchSvc mySearchDao;
 	
 	//@formatter:off
@@ -175,6 +175,7 @@ public class JpaSystemProviderR4 extends BaseJpaSystemProviderDstu2Plus<Bundle,
 			@OperationParam(name="searchParam", min=1, max=1) String theSearchParam,
 			@OperationParam(name="text", min=1, max=1) String theText
 		) {
+		ca.uhn.fhir.jpa.provider.dstu3.JpaSystemProviderDstu3.validateFulltextSearchEnabled(mySearchDao);
 		
 		if (isBlank(theContext)) {
 			throw new InvalidRequestException("Parameter 'context' must be provided");

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4Test.java

@@ -3150,7 +3150,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 	@Test
 	public void testSearchWithCountSearchResultsUpTo20() throws Exception {
 		mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
-		mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(100);
+		mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(200);
 		myDaoConfig.setCountSearchResultsUpTo(20);
 
 		for (int i =0; i < 10; i++) {
@@ -3174,7 +3174,7 @@ public class ResourceProviderR4Test extends BaseResourceProviderR4Test {
 	@Test
 	public void testSearchWithCountSearchResultsUpTo5() throws Exception {
 		mySearchCoordinatorSvcRaw.setSyncSizeForUnitTests(1);
-		mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(100);
+		mySearchCoordinatorSvcRaw.setLoadingThrottleForUnitTests(200);
 		myDaoConfig.setCountSearchResultsUpTo(5);
 
 		for (int i =0; i < 10; i++) {

hapi-fhir-structures-dstu3/pom.xml

@@ -1,4 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -120,9 +120,8 @@
 		-->
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<optional>true</optional>
+			<artifactId>javax.servlet-api</artifactId>
+			<version>3.0.1</version>
 		</dependency>
 
 		<!--

hapi-fhir-testpage-overlay/src/main/java/ca/uhn/fhir/to/mvc/ToBindingInitializer.java

@@ -7,8 +7,13 @@ import org.springframework.web.context.request.WebRequest;
 public class ToBindingInitializer implements WebBindingInitializer {
 
 	@Override
-	public void initBinder(WebDataBinder theBinder, WebRequest theRequest) {
+	public void initBinder(WebDataBinder theBinder) {
 		theBinder.setFieldMarkerPrefix("__");
 	}
 
+	@Override
+	public void initBinder(WebDataBinder theBinder, WebRequest theRequest) {
+		// nothing
+	}
+
 }

pom.xml

@@ -395,7 +395,7 @@
 		<maven_source_plugin_version>2.4</maven_source_plugin_version>
 		<phloc_schematron_version>2.7.1</phloc_schematron_version>
 		<phloc_commons_version>4.4.11</phloc_commons_version>
-		<spring_version>4.3.10.RELEASE</spring_version>
+		<spring_version>5.0.0.RELEASE</spring_version>
 		<thymeleaf-version>3.0.7.RELEASE</thymeleaf-version>
 
 		<!-- We are aiming to still work on a very old version of SLF4j even though we depend on the newest, just to be nice to users of the API. This version is tested in the hapi-fhir-cobertura. -->

src/changes/changes.xml

@@ -7,6 +7,16 @@
 	</properties>
 	<body>
 		<release version="3.1.0" date="TBD">
+			<action type="add">
+				The version of a few dependencies have been bumped to the
+				latest versions (dependent HAPI modules listed in brackets):
+				<![CDATA[
+					<ul>
+						<li>Spring (JPA): 4.3.10 -&gt; 5.0.0</li>
+					</ul>
+				]]>
+			</action>
+
 			<action type="fix">
 				The Android client module has been restored to working order, and no longer
 				requires a special classifier or an XML parser to be present in order to