diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InlineItemHandlerParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InlineItemHandlerParserTests.java
index e218838a2..a5a5c6a7e 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InlineItemHandlerParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InlineItemHandlerParserTests.java
@@ -88,8 +88,8 @@ public class InlineItemHandlerParserTests {
 				"org/springframework/batch/core/configuration/xml/InlineItemHandlerWithStepScopeParserTests-context.xml");
 		StepSynchronizationManager.register(new StepExecution("step", new JobExecution(123L)));
 
-		@SuppressWarnings("unchecked")
-		Map<String,ItemReader<?>> readers = context.getBeansOfType(ItemReader.class);
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		Map<String,ItemReader> readers = context.getBeansOfType(ItemReader.class);
 		// Should be 2 each (proxy and target) for the two readers in the steps defined
 		assertEquals(4, readers.size());
 		// System.err.println(readers);
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index c5375d8a1..70b754aac 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -54,10 +54,10 @@
 		<profile>
 			<id>spring3</id>
 			<properties>
-				<spring.framework.version>3.0.5.RELEASE</spring.framework.version>
+				<spring.framework.version>3.0.7.RELEASE</spring.framework.version>
 				<spring.oxm.group>org.springframework</spring.oxm.group>
 				<spring.oxm.artifact>spring-oxm</spring.oxm.artifact>
-				<spring.oxm.version>3.0.5.RELEASE</spring.oxm.version>
+				<spring.oxm.version>3.0.7.RELEASE</spring.oxm.version>
 				<junit.version>4.8.2</junit.version>
 			</properties>
 		</profile>
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/mail/internal/TestMailSender.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/mail/internal/TestMailSender.java
index ef6f7db8f..27cdcf4a7 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/mail/internal/TestMailSender.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/mail/internal/TestMailSender.java
@@ -52,7 +52,7 @@ public class TestMailSender implements MailSender {
 	}
 
 	public void send(SimpleMailMessage[] simpleMessages) throws MailException {
-		Map<SimpleMailMessage, MessagingException> failedMessages = new LinkedHashMap<SimpleMailMessage, MessagingException>();
+		Map<Object, Exception> failedMessages = new LinkedHashMap<Object, Exception>();
 		for (SimpleMailMessage simpleMessage : simpleMessages) {
 			if (subjectsToFail.contains(simpleMessage.getSubject())) {
 				failedMessages.put(simpleMessage, new MessagingException());