Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade SF to version 5.2.0.BUILD-SNAPSHOT and remove Castor tests

Browse Source 
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
This commit is contained in:
Mahmoud Ben Hassine
2019-01-29 21:07:28 +01:00
parent 0ec945614b
commit 3ca4284715
3 changed files with 1 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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'

36
spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/CastorMarshallingTests.java
View File

@@ -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;
}
}

34
spring-batch-infrastructure-tests/src/test/java/org/springframework/batch/item/xml/CastorUnmarshallingTests.java
View File

@@ -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;
}
}