boot (1.2.4), spring-core (4.1.6) versions upgraded

codecentric · Jun 18, 2015 · f4e1e91 · f4e1e91
1 parent eeecf31
commit f4e1e91
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>de.codecentric</groupId>
 	<artifactId>spring-boot-starter-batch-web</artifactId>
-	<version>1.3.4-SNAPSHOT</version>
+	<version>1.3.5-SNAPSHOT</version>
 	<name>spring-boot-starter-batch-web</name>
 	<description>Boot starter for batch web applications</description>
 	<packaging>jar</packaging>
@@ -39,8 +39,8 @@
 	</scm>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<spring.boot.version>1.2.1.RELEASE</spring.boot.version>
-		<spring.version>4.1.4.RELEASE</spring.version>
+		<spring.boot.version>1.2.4.RELEASE</spring.boot.version>
+		<spring.version>4.1.6.RELEASE</spring.version>
 		<keystore.password>dev_password</keystore.password>
 		<gpg.passphrase>dev</gpg.passphrase>
 		<passphrase>${gpg.passphrase}</passphrase>

diff --git a/src/main/java/de/codecentric/batch/configuration/Jsr352BatchConfiguration.java b/src/main/java/de/codecentric/batch/configuration/Jsr352BatchConfiguration.java
@@ -15,12 +15,11 @@
  */
 package de.codecentric.batch.configuration;
 
-import javax.sql.DataSource;
-
 import org.springframework.batch.core.jsr.JsrJobParametersConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.PlatformTransactionManager;
 
 import de.codecentric.batch.jsr352.CustomJsrJobOperator;
 
@@ -38,8 +37,8 @@ public class Jsr352BatchConfiguration {
 	private BatchWebAutoConfiguration batchWebAutoConfiguration;
 
 	@Bean
-	public CustomJsrJobOperator jsrJobOperator(DataSource dataSource) throws Exception{
-		CustomJsrJobOperator jsrJobOperator = new CustomJsrJobOperator(baseConfig.jobExplorer(), baseConfig.jobRepository(), jsrJobParametersConverter(), batchWebAutoConfiguration.addListenerToJobService());
+	public CustomJsrJobOperator jsrJobOperator(PlatformTransactionManager transactionManager) throws Exception{
+		CustomJsrJobOperator jsrJobOperator = new CustomJsrJobOperator(baseConfig.jobExplorer(), baseConfig.jobRepository(), jsrJobParametersConverter(), batchWebAutoConfiguration.addListenerToJobService(), transactionManager);
 		jsrJobOperator.setTaskExecutor(baseConfig.taskExecutor());
 		return jsrJobOperator;
 	}

diff --git a/src/main/java/de/codecentric/batch/jsr352/CustomJsrJobOperator.java b/src/main/java/de/codecentric/batch/jsr352/CustomJsrJobOperator.java
@@ -50,6 +50,7 @@
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.task.TaskExecutor;
+import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.util.Assert;
 
 import de.codecentric.batch.listener.AddListenerToJobService;
@@ -79,8 +80,9 @@ public class CustomJsrJobOperator extends JsrJobOperator implements ApplicationC
 	public CustomJsrJobOperator(JobExplorer jobExplorer,
 			JobRepository jobRepository,
 			JobParametersConverter jobParametersConverter,
-			AddListenerToJobService addListenerToJobService) {
-		super(jobExplorer, jobRepository, jobParametersConverter);
+			AddListenerToJobService addListenerToJobService, 
+			PlatformTransactionManager transactionManager) {
+		super(jobExplorer, jobRepository, jobParametersConverter, transactionManager);
 		this.jobRepository = jobRepository;
 		this.jobParametersConverter = jobParametersConverter;
 		this.addListenerToJobService = addListenerToJobService;