Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix build on windows

Browse Source
This commit is contained in:
Jimmy Praet
2016-06-05 13:01:21 +02:00
committed by Michael Minella
parent 0506d3793e
commit e4b8dbda15
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -672,12 +672,12 @@ task schemaZip(type: Zip) {
}
subproject.sourceSets.main.resources.find {
it.path.endsWith('META-INF/spring.schemas')
it.path.endsWith("META-INF${File.separator}spring.schemas")
}?.withInputStream { schemas.load(it) }
for (def key : schemas.keySet()) {
File xsdFile = subproject.sourceSets.main.resources.find {
it.path.endsWith(schemas.get(key))
it.path.replaceAll('\\\\', '/').endsWith(schemas.get(key))
}
assert xsdFile != null
into ("batch/${shortName}") {

8
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2009-2012 the original author or authors.
* Copyright 2009-2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -37,8 +37,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.transaction.UnexpectedRollbackException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -343,8 +343,8 @@ public class FaultTolerantExceptionClassesTests implements ApplicationContextAwa
stepsToExecute.add((Step) applicationContext.getBean(stepName));
job.setSteps(stepsToExecute);
JobExecution jobExecution = jobLauncher.run(job, new JobParametersBuilder().addLong("timestamp",
new Date().getTime()).toJobParameters());
JobExecution jobExecution = jobLauncher.run(job, new JobParametersBuilder().addString("uuid",
UUID.randomUUID().toString()).toJobParameters());
return jobExecution.getStepExecutions().iterator().next();
}