From ed87a0f87a3ab12f78288d30abf2ea60dfa88970 Mon Sep 17 00:00:00 2001
From: David Turanski <dturanski_at_vmware_dot_com>
Date: Wed, 27 Feb 2013 19:01:05 -0500
Subject: [PATCH] fixed maven build issues

---
 .../core/scope/StepScopeIntegrationTests.java |  1 +
 spring-batch-parent/pom.xml                   | 32 +++++++++----------
 spring-batch-samples/pom.xml                  |  2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeIntegrationTests.java
index 30468194a..196953fa5 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeIntegrationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeIntegrationTests.java
@@ -80,6 +80,7 @@ public class StepScopeIntegrationTests {
 		String parent = (String) TestStep.getContext().getAttribute("parent");
 		assertNotNull(parent);
 		assertEquals("bar", parent);
+		System.out.println(TestStep.getContext().getAttribute("parent.class"));
 		assertTrue("Scoped proxy not created", ((String) TestStep.getContext().getAttribute("parent.class"))
 				.matches(PROXY_TO_STRING_REGEX));
 	}
diff --git a/spring-batch-parent/pom.xml b/spring-batch-parent/pom.xml
index c984fbfbc..d68929fe5 100644
--- a/spring-batch-parent/pom.xml
+++ b/spring-batch-parent/pom.xml
@@ -273,21 +273,21 @@
 					<target>1.6</target>
 				</configuration>
 			</plugin>
-<!-- 			<plugin> -->
-<!-- 				<groupId>com.springsource.bundlor</groupId> -->
-<!-- 				<artifactId>com.springsource.bundlor.maven</artifactId> -->
-<!-- 				<version>${bundlor.version}</version> -->
-<!-- 				<inherited>true</inherited> -->
-<!-- 				<executions> -->
-<!-- 					<execution> -->
-<!-- 						<id>bundlor-transform</id> -->
-<!-- 						<phase>compile</phase> -->
-<!-- 						<goals> -->
-<!-- 							<goal>bundlor</goal> -->
-<!-- 						</goals> -->
-<!-- 					</execution> -->
-<!-- 				</executions> -->
-<!-- 			</plugin> -->
+			<plugin>
+				<groupId>com.springsource.bundlor</groupId>
+				<artifactId>com.springsource.bundlor.maven</artifactId>
+				<version>${bundlor.version}</version>
+				<inherited>true</inherited>
+				<executions>
+					<execution>
+						<id>bundlor-transform</id>
+						<phase>compile</phase>
+						<goals>
+							<goal>bundlor</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -715,7 +715,7 @@
 	 		<dependency>
 				<groupId>org.springframework.data</groupId>
 				<artifactId>spring-data-neo4j</artifactId>
-				<version>2.1.0.RELEASE</version>
+				<version>2.2.0.RELEASE</version>
 				<optional>true</optional>
 			</dependency>
 			<dependency>
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 41e050dd2..20f53e65e 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -232,7 +232,7 @@
 		</dependency>
 		<dependency>
 			 <groupId>org.springframework.data</groupId>
-			 <artifactId>spring-data-commons-core</artifactId>
+			 <artifactId>spring-data-commons</artifactId>
 			 <optional>true</optional>
 		</dependency>
   		<dependency>