Updating libraries

Author: madduci

hapi-fhir-android/.gitignore

@@ -0,0 +1 @@
+

hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/BaseCommand.java

@@ -55,7 +55,6 @@
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.Base64Utils;
 
 import java.io.BufferedReader;
 import java.io.Console;
@@ -68,6 +67,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -363,7 +363,7 @@ protected String getAndParseOptionBasicAuthHeader(CommandLine theCommandLine, St
 			}
 
 			byte[] basicAuth = optionValue.getBytes();
-			String base64EncodedBasicAuth = Base64Utils.encodeToString(basicAuth);
+			String base64EncodedBasicAuth = Base64.getEncoder().encodeToString(basicAuth);
 			basicAuthHeaderValue = Constants.HEADER_AUTHORIZATION_VALPREFIX_BASIC + base64EncodedBasicAuth;
 		}
 		return basicAuthHeaderValue;

hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/config/HapiFhirLocalContainerEntityManagerFactoryBean.java

@@ -90,9 +90,6 @@ public Map<String, Object> getJpaPropertyMap() {
 			retVal.put(BatchSettings.ORDER_UPDATES, "true");
 		}
 
-		if (!retVal.containsKey(BatchSettings.BATCH_VERSIONED_DATA)) {
-			retVal.put(BatchSettings.BATCH_VERSIONED_DATA, "true");
-		}
 		// Why is this here, you ask? LocalContainerEntityManagerFactoryBean actually clobbers the setting hibernate
 		// needs in order to be able to resolve beans, so we add it back in manually here
 		if (!retVal.containsKey(ManagedBeanSettings.BEAN_CONTAINER)) {

hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirDerbyDialect.java

@@ -20,7 +20,7 @@
 package ca.uhn.fhir.jpa.model.dialect;
 
 import ca.uhn.fhir.jpa.migrate.DriverTypeEnum;
-import org.hibernate.dialect.DerbyDialect;
+import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
 
 /**

hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/sched/BaseHapiScheduler.java

@@ -280,7 +280,7 @@ private static class NonConcurrentJobDetailImpl extends JobDetailImpl {
 
 		// All HAPI FHIR jobs shouldn't allow concurrent execution
 		@Override
-		public boolean isConcurrentExectionDisallowed() {
+		public boolean isConcurrentExecutionDisallowed() {
 			return true;
 		}
 	}

hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/util/DerbyTenSevenHapiFhirDialect.java

@@ -19,7 +19,7 @@
  */
 package ca.uhn.fhir.jpa.util;
 
-import org.hibernate.dialect.DerbyDialect;
+import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.exception.spi.TemplatedViolatedConstraintNameExtractor;
 import org.hibernate.exception.spi.ViolatedConstraintNameExtractor;
 import org.slf4j.Logger;