From 3ca428471518bd2e6f3ce85917c3379e48b290a3 Mon Sep 17 00:00:00 2001
From: Mahmoud Ben Hassine <mbenhassine@pivotal.io>
Date: Tue, 29 Jan 2019 21:07:28 +0100
Subject: [PATCH] Upgrade SF to version 5.2.0.BUILD-SNAPSHOT and remove Castor
 tests

Castor support will be removed in SF v5.2. This commit removes
CastorMarshallingTests and CastorUnmarshallingTests as they do not
compile with SF v5.2.0.BUILD-SNAPSHOT.

Resolves BATCH-2787
---
 build.gradle                                  |  2 +-
 .../item/xml/CastorMarshallingTests.java      | 36 -------------------
 .../item/xml/CastorUnmarshallingTests.java    | 34 ------------------
 3 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/CastorMarshallingTests.java
 delete mode 100644 spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/CastorUnmarshallingTests.java

diff --git a/build.gradle b/build.gradle
index d4a029d42..1c8e63226 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ allprojects {
 
 		environmentProperty = project.hasProperty('environment') ? getProperty('environment') : 'hsql'
 
-		springVersionDefault = '5.1.5.BUILD-SNAPSHOT'
+		springVersionDefault = '5.2.0.BUILD-SNAPSHOT'
 		springVersion = project.hasProperty('springVersion') ? getProperty('springVersion') : springVersionDefault
 		springRetryVersion = '1.2.3.RELEASE'
 		springAmqpVersion = '2.1.4.BUILD-SNAPSHOT'
diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/CastorMarshallingTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/CastorMarshallingTests.java
deleted file mode 100644
index d1d2dd6fe..000000000
--- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/CastorMarshallingTests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2010-2014 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.batch.item.xml;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.oxm.Marshaller;
-
-public class CastorMarshallingTests extends AbstractStaxEventWriterItemWriterTests {
-
-	@Override
-	protected Marshaller getMarshaller() throws Exception {
-
-		@SuppressWarnings("deprecation")
-		org.springframework.oxm.castor.CastorMarshaller marshaller = new org.springframework.oxm.castor.CastorMarshaller();
-		// marshaller.setTargetClass(Trade.class);
-		marshaller.setMappingLocation(new ClassPathResource("mapping-castor.xml", getClass()));
-		// there is no way to call
-		// org.exolab.castor.xml.Marshaller.setSupressXMLDeclaration();
-		marshaller.afterPropertiesSet();
-		return marshaller;
-	}
-
-}
diff --git a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/CastorUnmarshallingTests.java b/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/CastorUnmarshallingTests.java
deleted file mode 100644
index 9c871891c..000000000
--- a/spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/CastorUnmarshallingTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2010-2014 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.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.batch.item.xml;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.oxm.Unmarshaller;
-
-public class CastorUnmarshallingTests extends AbstractStaxEventReaderItemReaderTests {
-
-	@Override
-	protected Unmarshaller getUnmarshaller() throws Exception {
-		@SuppressWarnings("deprecation")
-		org.springframework.oxm.castor.CastorMarshaller unmarshaller = new org.springframework.oxm.castor.CastorMarshaller();
-		unmarshaller.setMappingLocation(new ClassPathResource("mapping-castor.xml", getClass()));
-		// alternatively target class can be set
-		//unmarshaller.setTargetClass(Trade.class);
-		unmarshaller.afterPropertiesSet();
-		return unmarshaller;
-	}
-
-}