undoes merge issues

hapi-fhir-jpaserver-base/pom.xml

@@ -610,11 +610,6 @@
 			<groupId>org.jetbrains</groupId>
 			<artifactId>annotations</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>ca.uhn.hapi.fhir</groupId>
-			<artifactId>hapi-fhir-jpaserver-batch</artifactId>
-			<version>${project.version}</version>
-		</dependency>
 	</dependencies>
 
 

hapi-fhir-jpaserver-empi/src/test/resources/logback-test.xml

@@ -72,27 +72,6 @@
 	</logger>
 
 
-	<!--
-	Configuration for Spring Batch troubleshooting log
-	-->
-	<appender name="BATCH_TROUBLESHOOTING" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<filter class="ch.qos.logback.classic.filter.ThresholdFilter"><level>DEBUG</level></filter>
-		<file>${smile.basedir}/log/batch-troubleshooting.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${smile.basedir}/log/batch-troubleshooting.log.%i.gz</fileNamePattern>
-			<minIndex>1</minIndex>
-			<maxIndex>9</maxIndex>
-		</rollingPolicy>
-		<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<maxFileSize>5MB</maxFileSize>
-		</triggeringPolicy>
-		<encoder>
-			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n${log.stackfilter.pattern}</pattern>
-		</encoder>
-	</appender>
-	<logger name="ca.uhn.fhir.log.batch_troubleshooting" level="TRACE">
-		<appender-ref ref="BATCH_TROUBLESHOOTING"/>
-	</logger>
 
 	<root level="info">
 		<appender-ref ref="STDOUT" />

hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/config/TestJpaConfig.java

@@ -27,6 +27,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.orm.jpa.JpaTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
 
 import javax.persistence.EntityManagerFactory;
 
@@ -45,7 +46,7 @@ public class TestJpaConfig {
 
 	@Bean
 	@Primary
-	public JpaTransactionManager transactionManager(EntityManagerFactory entityManagerFactory) {
+	public PlatformTransactionManager hapiTransactionManager(EntityManagerFactory entityManagerFactory) {
 		JpaTransactionManager retVal = new JpaTransactionManager();
 		retVal.setEntityManagerFactory(entityManagerFactory);
 		return retVal;

hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaR4Test.java

@@ -20,6 +20,9 @@ package ca.uhn.fhir.jpa.test;
  * #L%
  */
 
-public abstract class BaseJpaR4Test extends BaseJpaTest {
+import ca.uhn.fhir.jpa.config.TestJpaR4Config;
+import org.springframework.test.context.ContextConfiguration;
 
+@ContextConfiguration(classes = {TestJpaR4Config.class})
+public abstract class BaseJpaR4Test extends BaseJpaTest {
 }