diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/OrderLineAggregator.java b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/OrderLineAggregator.java
index 7ab4eb54e0..cc4cf40979 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/OrderLineAggregator.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/samples/file/patternmatching/internal/OrderLineAggregator.java
@@ -27,10 +27,11 @@
  *
  * @author Dave Syer
  * @author Dan Garrette
+ * @author Yanming Zhou
  */
 public class OrderLineAggregator implements LineAggregator<Order> {
 
-	private static final String LINE_SEPARATOR = System.getProperty("line.separator");
+	private static final String LINE_SEPARATOR = System.lineSeparator();
 
 	private Map<String, LineAggregator<Object>> aggregators;
 
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java
index 3be5e8dc46..9325edfa41 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/samples/file/multilineaggregate/MultilineAggregateJobFunctionalTests.java
@@ -47,9 +47,8 @@ class MultilineAggregateJobFunctionalTests {
 	@Test
 	void testJobLaunch() throws Exception {
 		this.jobOperatorTestUtils.startJob();
-		assertEquals(EXPECTED_RESULT,
-				StringUtils.replace(IOUtils.toString(output.getInputStream(), StandardCharsets.UTF_8),
-						System.getProperty("line.separator"), ""));
+		assertEquals(EXPECTED_RESULT, StringUtils
+			.replace(IOUtils.toString(output.getInputStream(), StandardCharsets.UTF_8), System.lineSeparator(), ""));
 	}
 
 }