Tests pasing locally

hapi-fhir-cli/hapi-fhir-cli-api/pom.xml

@@ -189,10 +189,6 @@
 			<groupId>com.helger</groupId>
 			<artifactId>ph-commons</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>javax.activation-api</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>

hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProviderDstu3Test.java

@@ -238,11 +238,6 @@ public class AbstractJaxRsResourceProviderDstu3Test {
 		assertEquals("outputValue", ((StringType)outParams.getParameter().get(0).getValue()).getValueAsString());
 	}
 
-	/** Search using other query options */
-	public void testOther() {
-		// missing
-	}
-
 	@Test
 	public void testRead() {
 		when(mock.find(idCaptor.capture())).thenReturn(createPatient(1));

hapi-fhir-jaxrsserver-base/src/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsResourceProviderTest.java

@@ -206,11 +206,6 @@ public class AbstractJaxRsResourceProviderTest {
 		assertEquals("outputValue", ((StringDt) outParams.getParameter().get(0).getValue()).getValueAsString());
 	}
 
-	/** Search using other query options */
-	public void testOther() {
-		// missing
-	}
-
 	@Test
 	public void testRead() {
 		when(mock.find(idCaptor.capture())).thenReturn(createPatient(1));

hapi-fhir-jaxrsserver-example/src/test/java/ca/uhn/fhir/jaxrs/server/example/JaxRsPatientProviderDstu3Test.java

@@ -108,11 +108,6 @@ public class JaxRsPatientProviderDstu3Test {
         }
     }
     
-    /** Search using other query options */
-    public void testOther() {
-        //missing
-    }
-    
     /** */ 
     @Test
     public void testSearchPost() {

hapi-fhir-jaxrsserver-example/src/test/java/ca/uhn/fhir/jaxrs/server/example/JaxRsPatientProviderTest.java

@@ -119,11 +119,6 @@ public class JaxRsPatientProviderTest {
 		}
 	}
 
-	/** Search using other query options */
-	public void testOther() {
-		// missing
-	}
-
 	/** */
 	@Test
 	public void testSearchPost() {

hapi-fhir-jpaserver-base/pom.xml

@@ -212,10 +212,6 @@
 			<groupId>javax.annotation</groupId>
 			<artifactId>javax.annotation-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>javax.activation-api</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
 			<artifactId>jaxb-api</artifactId>
@@ -402,10 +398,10 @@
 			<groupId>com.sun.activation</groupId>
 			<artifactId>javax.activation</artifactId>
 		</dependency>
-		<dependency>
+		<!--<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-		</dependency>
+		</dependency>-->
 		<dependency>
 			<groupId>javax.el</groupId>
 			<artifactId>javax.el-api</artifactId>

hapi-fhir-jpaserver-elasticsearch/src/main/java/ca/uhn/fhir/jpa/search/ElasticsearchMappingProvider.java

@@ -21,7 +21,7 @@ package ca.uhn.fhir.jpa.search;
  */
 
 import org.hibernate.search.elasticsearch.analyzer.definition.ElasticsearchAnalysisDefinitionRegistryBuilder;
-import org.hibernate.search.elasticsearch.analyzer.definition.spi.ElasticsearchAnalysisDefinitionProvider;
+import org.hibernate.search.elasticsearch.analyzer.definition.ElasticsearchAnalysisDefinitionProvider;
 
 public class ElasticsearchMappingProvider implements ElasticsearchAnalysisDefinitionProvider {
 

hapi-fhir-jpaserver-example/src/main/java/ca/uhn/fhir/jpa/demo/elasticsearch/FhirServerConfig.java

@@ -76,7 +76,7 @@ public class FhirServerConfig extends BaseJavaConfigDstu3 {
 		extraProperties.put("hibernate.cache.use_minimal_puts", "false");
 
 		// the belowing properties are used for ElasticSearch integration
-		extraProperties.put(ElasticsearchEnvironment.ANALYZER_DEFINITION_PROVIDER, ElasticsearchMappingProvider.class.getName());
+		extraProperties.put(ElasticsearchEnvironment.ANALYSIS_DEFINITION_PROVIDER, ElasticsearchMappingProvider.class.getName());
 		extraProperties.put("hibernate.search.default.indexmanager", "elasticsearch");
 		extraProperties.put("hibernate.search.default.elasticsearch.host", "http://127.0.0.1:9200");
 		extraProperties.put("hibernate.search.default.elasticsearch.index_schema_management_strategy", "CREATE");

hapi-fhir-testpage-overlay/src/test/java/ca/uhn/fhir/jpa/test/FhirServerConfig.java

@@ -2,12 +2,12 @@ package ca.uhn.fhir.jpa.test;
 
 import java.util.Properties;
 
-import javax.persistence.EntityManagerFactory;
+//import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 
 import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.lang3.time.DateUtils;
-import org.hibernate.jpa.HibernatePersistenceProvider;
+//import org.hibernate.jpa.HibernatePersistenceProvider;
 import org.springframework.beans.factory.annotation.Autowire;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;