Skip to content

Commit 5938ca9

Browse files
committed
Deprecate JiBX marshaller
Resolves #22249
1 parent 89a7e75 commit 5938ca9

File tree

5 files changed

+12
-6
lines changed

5 files changed

+12
-6
lines changed

spring-oxm/src/main/java/org/springframework/oxm/config/JibxMarshallerBeanDefinitionParser.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2013 the original author or authors.
2+
* Copyright 2002-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,7 +25,9 @@
2525
*
2626
* @author Arjen Poutsma
2727
* @since 3.0
28+
* @deprecated as of Spring Framework 5.1.5, due to the lack of activity on the JiBX project
2829
*/
30+
@Deprecated
2931
class JibxMarshallerBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser {
3032

3133
@Override

spring-oxm/src/main/java/org/springframework/oxm/jibx/JibxMarshaller.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 the original author or authors.
2+
* Copyright 2002-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -81,7 +81,9 @@
8181
* @since 3.0
8282
* @see org.jibx.runtime.IMarshallingContext
8383
* @see org.jibx.runtime.IUnmarshallingContext
84+
* @deprecated as of Spring Framework 5.1.5, due to the lack of activity on the JiBX project
8485
*/
86+
@Deprecated
8587
public class JibxMarshaller extends AbstractMarshaller implements InitializingBean {
8688

8789
private static final String DEFAULT_BINDING_NAME = "binding";

spring-oxm/src/main/resources/org/springframework/oxm/config/spring-oxm.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<xsd:complexType>
5151
<xsd:annotation>
5252
<xsd:documentation source="java:org.springframework.oxm.jibx.JibxMarshaller">
53-
Defines a JiBX Marshaller.
53+
Defines a JiBX Marshaller. Deprecated as of Spring Framework 5.1.5!
5454
</xsd:documentation>
5555
<xsd:appinfo>
5656
<tool:annotation>

spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxMarshallerTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
2626
import org.springframework.oxm.AbstractMarshallerTests;
2727

2828
import static org.junit.Assert.*;
29-
import static org.xmlunit.matchers.CompareMatcher.*;
29+
import static org.xmlunit.matchers.CompareMatcher.isSimilarTo;
3030

3131
/**
3232
* NOTE: These tests fail under Eclipse/IDEA because JiBX binding does not occur by
@@ -35,6 +35,7 @@
3535
* @author Arjen Poutsma
3636
* @author Sam Brannen
3737
*/
38+
@Deprecated
3839
public class JibxMarshallerTests extends AbstractMarshallerTests<JibxMarshaller> {
3940

4041
@BeforeClass

spring-oxm/src/test/java/org/springframework/oxm/jibx/JibxUnmarshallerTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 the original author or authors.
2+
* Copyright 2002-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
3434
* @author Arjen Poutsma
3535
* @author Sam Brannen
3636
*/
37+
@Deprecated
3738
public class JibxUnmarshallerTests extends AbstractUnmarshallerTests<JibxMarshaller> {
3839

3940
protected static final String INPUT_STRING_WITH_SPECIAL_CHARACTERS =

0 commit comments

Comments
 (0)