Fix batch test

azure-pipelines.yml

@@ -25,23 +25,23 @@ jobs:
         inputs:
           targetType: 'inline'
           script: mkdir -p $(MAVEN_CACHE_FOLDER); pwd; ls -al $(MAVEN_CACHE_FOLDER)
-      - task: Maven@3
+          #      - task: Maven@3
-        env:
+          #env:
-           JAVA_HOME_11_X64: /usr/local/openjdk-11
+          #   JAVA_HOME_11_X64: /usr/local/openjdk-11
-        inputs:
+          # inputs:
-           goals: 'dependency:go-offline'
+          #    goals: 'dependency:go-offline'
-           # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy
+          #    # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy
-           options: '-P ALLMODULES,JACOCO,CI,ERRORPRONE -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+          #    options: '-P ALLMODULES,JACOCO,CI,ERRORPRONE -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
-           # These are JVM options (and don't show up in the build logs)
+          #    # These are JVM options (and don't show up in the build logs)
-           mavenOptions: '-Xmx1024m $(MAVEN_OPTS) -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto'
+          #    mavenOptions: '-Xmx1024m $(MAVEN_OPTS) -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto'
-           jdkVersionOption: 1.11
+          #    jdkVersionOption: 1.11
       - task: Maven@3
         env:
           JAVA_HOME_11_X64: /usr/local/openjdk-11
         inputs:
           goals: 'clean install'
           # These are Maven CLI options (and show up in the build logs) - "-nsu"=Don't update snapshots. We can remove this when Maven OSS is more healthy
-          options: '-P ALLMODULES,JACOCO,CI,ERRORPRONE -e -B -Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
+          options: '-P ALLMODULES,JACOCO,CI,ERRORPRONE -e -B #-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER)'
           # These are JVM options (and don't show up in the build logs)
           mavenOptions: '-Xmx1024m $(MAVEN_OPTS) -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS -Duser.timezone=America/Toronto'
           jdkVersionOption: 1.11

hapi-fhir-jpaserver-batch/src/test/java/ca/uhn/fhir/jpa/batch/BaseBatchR4Test.java

@@ -9,7 +9,6 @@ import org.springframework.batch.core.launch.JobLauncher;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.transaction.PlatformTransactionManager;
 
 import static org.slf4j.LoggerFactory.getLogger;
 
@@ -18,8 +17,6 @@ import static org.slf4j.LoggerFactory.getLogger;
 abstract public class BaseBatchR4Test {
  	private static final Logger ourLog = getLogger(BaseBatchR4Test.class);
 
- 	@Autowired
-	protected PlatformTransactionManager myPlatformTransactionManager;
 	@Autowired
 	protected JobLauncher myJobLauncher;
 	@Autowired

hapi-fhir-jpaserver-batch/src/test/java/ca/uhn/fhir/jpa/batch/config/TestBatchConfig.java

@@ -2,12 +2,19 @@ package ca.uhn.fhir.jpa.batch.config;
 
 import org.springframework.batch.core.configuration.annotation.BatchConfigurer;
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
+import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.PlatformTransactionManager;
 
 @Configuration
 @EnableBatchProcessing
 public class TestBatchConfig {
+
+	@Bean
+	public PlatformTransactionManager hapiTransactionManager() {
+		return new ResourcelessTransactionManager();
+	}
 	@Bean
 	public BatchConfigurer batchConfigurer() {
 		return new NonPersistedBatchConfigurer();