diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java
index 21decea49..486168c44 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java
@@ -31,6 +31,7 @@ import org.apache.commons.logging.LogFactory;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.batch.core.BatchStatus;
+import org.springframework.batch.core.ExitStatus;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.JobParameters;
 import org.springframework.batch.core.JobParametersBuilder;
@@ -45,6 +46,7 @@ import org.springframework.batch.core.repository.dao.MapStepExecutionDao;
 import org.springframework.batch.core.repository.support.SimpleJobRepository;
 import org.springframework.batch.core.step.AbstractStep;
 import org.springframework.batch.item.ExecutionContext;
+import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
@@ -123,6 +125,135 @@ public class FaultTolerantStepFactoryBeanRetryTests {
 		assertTrue(factory.getObject() instanceof Step);
 	}
 
+	@Test
+	public void testProcessAllItemsWhenErrorInWriterTransformation() throws Exception{
+		FaultTolerantStepFactoryBean<String, Integer> factory = new FaultTolerantStepFactoryBean<String, Integer>();
+		factory.setBeanName("step");
+
+		factory.setItemReader(new ListItemReader<String>(new ArrayList<String>()));
+		factory.setJobRepository(repository);
+		factory.setTransactionManager(new ResourcelessTransactionManager());
+		@SuppressWarnings("unchecked")
+		Map<Class<? extends Throwable>, Boolean> exceptionMap = getExceptionMap(Exception.class);
+		factory.setRetryableExceptionClasses(exceptionMap);
+		ItemWriter<Integer> failingWriter = new ItemWriter<Integer>() {
+			public void write(List<? extends Integer> data) throws Exception {
+				int count = 0;
+				for (Integer item : data) {
+					if (count++ == 2) {
+						throw new Exception("Planned failure in writer");
+					}
+					written.add(item);
+				}
+			}};
+			
+			ItemProcessor<String, Integer> processor = new ItemProcessor<String, Integer>() {
+				public Integer process(String item) throws Exception {
+					processed.add(item);
+					return Integer.parseInt(item);
+				}
+			};
+			ItemReader<String> reader = new ListItemReader<String>(Arrays.asList("1", "2", "3"));
+			factory.setCommitInterval(3);
+			factory.setRetryLimit(3);
+			factory.setSkippableExceptionClasses(new HashMap<Class<? extends Throwable>, Boolean>());
+			factory.setItemReader(reader);
+			factory.setItemProcessor(processor);
+			factory.setItemWriter(failingWriter);
+			Step step = (Step) factory.getObject();
+			
+			StepExecution stepExecution = new StepExecution(step.getName(), jobExecution);
+			repository.add(stepExecution);
+			step.execute(stepExecution);
+//			System.out.println(stepExecution.getWriteCount());
+//			System.out.println(processed.size());
+//			System.out.println(processed);
+//			System.out.println(written);
+			assertEquals((1+3)*3, processed.size()); //(Initial try + retry limit)*item count
+	}
+
+	@Test
+	public void testProcessAllItemsWhenErrorInWriter() throws Exception {
+		final int RETRY_LIMIT = 3;
+		final List<String> ITEM_LIST = Arrays.asList("a", " b", "c");
+		ItemWriter<String> failingWriter = new ItemWriter<String>() {
+			public void write(List<? extends String> data) throws Exception {
+				int count = 0;
+				for (String item : data) {
+					if (count++ == 2) {
+						throw new Exception("Planned failure in writer");
+					}
+					written.add(item);
+				}
+			}
+		};
+
+		ItemProcessor<String, String> processor = new ItemProcessor<String, String>() {
+			public String process(String item) throws Exception {
+				processed.add(item);
+				return item;
+			}
+		};
+		ItemReader<String> reader = new ListItemReader<String>(ITEM_LIST);
+		factory.setCommitInterval(3);
+		factory.setRetryLimit(RETRY_LIMIT);
+		factory.setSkipLimit(1);
+		@SuppressWarnings("unchecked")
+		Map<Class<? extends Throwable>, Boolean> exceptionMap = getExceptionMap(Exception.class);
+		factory.setSkippableExceptionClasses(exceptionMap);
+		factory.setItemReader(reader);
+		factory.setItemProcessor(processor);
+		factory.setItemWriter(failingWriter);
+		Step step = (Step) factory.getObject();
+
+		StepExecution stepExecution = new StepExecution(step.getName(), jobExecution);
+		repository.add(stepExecution);
+		step.execute(stepExecution);
+//		System.out.println(processed);
+		assertEquals(ExitStatus.COMPLETED.getExitCode(), stepExecution.getExitStatus().getExitCode());
+		assertEquals((1 + RETRY_LIMIT) * ITEM_LIST.size(), processed.size());
+	}
+
+	@Test
+	public void testNoItemsReprocessedWhenErrorInWriterAndProcessorNotTransactional() throws Exception{
+		ItemWriter<String> failingWriter = new ItemWriter<String>() {
+			public void write(List<? extends String> data) throws Exception {
+				int count = 0;
+				for (String item : data) {
+					if (count++ == 2) {
+						throw new Exception("Planned failure in writer");
+					}
+					written.add(item);
+				}
+			}};
+			
+			ItemProcessor<String, String> processor = new ItemProcessor<String, String>() {
+				public String process(String item) throws Exception {
+					processed.add(item);
+					return item;
+				}
+			};
+			ItemReader<String> reader = new ListItemReader<String>(Arrays.asList("a", "b", "c"));
+			factory.setProcessorTransactional(false);
+			factory.setCommitInterval(3);
+			factory.setRetryLimit(3);
+			factory.setSkippableExceptionClasses(new HashMap<Class<? extends Throwable>, Boolean>());
+			factory.setItemReader(reader);
+			factory.setItemProcessor(processor);
+			factory.setItemWriter(failingWriter);
+			Step step = (Step) factory.getObject();
+			
+			StepExecution stepExecution = new StepExecution(step.getName(), jobExecution);
+			repository.add(stepExecution);
+			step.execute(stepExecution);
+			System.out.println(stepExecution.getWriteCount());
+			System.out.println(processed.size());
+			System.out.println(processed);
+			System.out.println(written);
+			assertEquals(3, processed.size()); //(Initial try + retry limit)*item count
+	}
+	
+
 	/**
 	 * N.B. this doesn't really test retry, since the retry is only on write
 	 * failures, but it does test that read errors are re-presented for another
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index 424fe167c..3ae382078 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -184,6 +184,45 @@
 		</extensions>
 		<pluginManagement>
 			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
+					only. It has no influence on the Maven build itself. -->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>com.springsource.bundlor</groupId>
+										<artifactId>com.springsource.bundlor.maven</artifactId>
+										<versionRange>[1.0,)</versionRange>
+										<goals>
+											<goal>bundlor</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.apache.maven.plugins</groupId>
+										<artifactId>maven-antrun-plugin</artifactId>
+										<versionRange>[1.0,)</versionRange>
+										<goals>
+											<goal>run</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
 					<version>2.0</version>