diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java index 20be49ceceb..17e03f586b5 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMappingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2017 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. @@ -23,7 +23,9 @@ import org.springframework.oxm.XmlMappingException; * * @author Juergen Hoeller * @since 3.0 + * @deprecated as of Spring Framework 4.3.13, due to the lack of activity on the Castor project */ +@Deprecated @SuppressWarnings("serial") public class CastorMappingException extends XmlMappingException { diff --git a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java index 2dc5bed95e4..88c682d5333 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/castor/CastorMarshaller.java @@ -74,8 +74,8 @@ import org.springframework.util.xml.StaxUtils; * can only be used to unmarshal XML that represents that specific class. If you want to unmarshal * multiple classes, you have to provide a mapping file using {@code setMappingLocations}. * - *
Due to limitations of Castor's API, it is required to set the encoding used for - * writing to output streams. It defaults to {@code UTF-8}. + *
Due to limitations of Castor's API, it is required to set the encoding used for writing
+ * to output streams. It defaults to {@code UTF-8}.
*
* @author Arjen Poutsma
* @author Jakub Narloch
@@ -86,7 +86,9 @@ import org.springframework.util.xml.StaxUtils;
* @see #setTargetPackages(String[])
* @see #setMappingLocation(Resource)
* @see #setMappingLocations(Resource[])
+ * @deprecated as of Spring Framework 4.3.13, due to the lack of activity on the Castor project
*/
+@Deprecated
public class CastorMarshaller extends AbstractMarshaller implements InitializingBean, BeanClassLoaderAware {
/**
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java b/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
index 36cd4bfff32..8bb23d0bca4 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/CastorMarshallerBeanDefinitionParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -25,8 +25,10 @@ import org.springframework.beans.factory.xml.AbstractSimpleBeanDefinitionParser;
*
* @author Jakub Narloch
* @since 3.1
+ * @deprecated as of Spring Framework 4.3.13, due to the lack of activity on the Castor project
*/
-public class CastorMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
+@Deprecated
+class CastorMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
@Override
protected String getBeanClassName(Element element) {
diff --git a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
index a8978a2f2e8..93fd3c61b35 100644
--- a/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
+++ b/spring-oxm/src/main/java/org/springframework/oxm/config/OxmNamespaceHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -27,6 +27,7 @@ import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
*/
public class OxmNamespaceHandler extends NamespaceHandlerSupport {
+ @SuppressWarnings("deprecation")
@Override
public void init() {
registerBeanDefinitionParser("jaxb2-marshaller", new Jaxb2MarshallerBeanDefinitionParser());
diff --git a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.xsd b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.xsd
index 6549841fb58..2152a14ebd3 100644
--- a/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.xsd
+++ b/spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.xsd
@@ -85,7 +85,7 @@