You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/12/20 10:15:19 UTC
[camel] branch main updated: CAMEL-18831: camel-xstream - Deprecated
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 4a88914fa17 CAMEL-18831: camel-xstream - Deprecated
4a88914fa17 is described below
commit 4a88914fa177b92366b3dfd854a67358afbe5fd2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 20 11:14:57 2022 +0100
CAMEL-18831: camel-xstream - Deprecated
---
.../resources/org/apache/camel/catalog/dataformats/xstream.json | 2 +-
.../generated/resources/org/apache/camel/catalog/models/xstream.json | 2 +-
components/camel-xstream/pom.xml | 2 +-
.../META-INF/services/org/apache/camel/dataformat.properties | 2 +-
.../resources/org/apache/camel/dataformat/xstream/xstream.json | 2 +-
components/camel-xstream/src/main/docs/xstream-dataformat.adoc | 5 +++--
.../resources/org/apache/camel/model/dataformat/xstream.json | 2 +-
.../src/main/java/org/apache/camel/builder/DataFormatClause.java | 2 ++
.../java/org/apache/camel/model/dataformat/XStreamDataFormat.java | 2 ++
9 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xstream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xstream.json
index 709b7da4c30..01841b1cbb8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xstream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dataformats/xstream.json
@@ -4,7 +4,7 @@
"name": "xstream",
"title": "XStream",
"description": "Marshal and unmarshal POJOs to\/from XML using XStream library.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "1.3.0",
"label": "dataformat,transformation,xml,json",
"javaType": "org.apache.camel.dataformat.xstream.XStreamDataFormat",
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xstream.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xstream.json
index 1ec1917e8e3..0ff73355d4e 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xstream.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xstream.json
@@ -4,7 +4,7 @@
"name": "xstream",
"title": "XStream",
"description": "Marshal and unmarshal POJOs to\/from XML using XStream library.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "1.3.0",
"label": "dataformat,transformation,xml,json",
"javaType": "org.apache.camel.model.dataformat.XStreamDataFormat",
diff --git a/components/camel-xstream/pom.xml b/components/camel-xstream/pom.xml
index 619fcea220d..358b5c9040c 100644
--- a/components/camel-xstream/pom.xml
+++ b/components/camel-xstream/pom.xml
@@ -29,7 +29,7 @@
<artifactId>camel-xstream</artifactId>
<packaging>jar</packaging>
- <name>Camel :: XStream</name>
+ <name>Camel :: XStream (deprecated)</name>
<description>Camel XStream support</description>
<properties>
diff --git a/components/camel-xstream/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties b/components/camel-xstream/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
index 64a5638bc53..154363e0076 100644
--- a/components/camel-xstream/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
+++ b/components/camel-xstream/src/generated/resources/META-INF/services/org/apache/camel/dataformat.properties
@@ -3,5 +3,5 @@ dataFormats=xstream xstreamJson
groupId=org.apache.camel
artifactId=camel-xstream
version=3.20.0-SNAPSHOT
-projectName=Camel :: XStream
+projectName=Camel :: XStream (deprecated)
projectDescription=Camel XStream support
diff --git a/components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/xstream.json b/components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/xstream.json
index 709b7da4c30..01841b1cbb8 100644
--- a/components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/xstream.json
+++ b/components/camel-xstream/src/generated/resources/org/apache/camel/dataformat/xstream/xstream.json
@@ -4,7 +4,7 @@
"name": "xstream",
"title": "XStream",
"description": "Marshal and unmarshal POJOs to\/from XML using XStream library.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "1.3.0",
"label": "dataformat,transformation,xml,json",
"javaType": "org.apache.camel.dataformat.xstream.XStreamDataFormat",
diff --git a/components/camel-xstream/src/main/docs/xstream-dataformat.adoc b/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
index 3f318e62ee8..e7bf52bb298 100644
--- a/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
+++ b/components/camel-xstream/src/main/docs/xstream-dataformat.adoc
@@ -1,10 +1,11 @@
-= XStream DataFormat
+= XStream DataFormat (deprecated)
:doctitle: XStream
:shortname: xstream
:artifactid: camel-xstream
:description: Marshal and unmarshal POJOs to/from XML using XStream library.
:since: 1.3
-:supportlevel: Stable
+:supportlevel: Stable-deprecated
+:deprecated: *deprecated*
//Manually maintained attributes
:camel-spring-boot-name: xstream
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xstream.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xstream.json
index 1ec1917e8e3..0ff73355d4e 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xstream.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/dataformat/xstream.json
@@ -4,7 +4,7 @@
"name": "xstream",
"title": "XStream",
"description": "Marshal and unmarshal POJOs to\/from XML using XStream library.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "1.3.0",
"label": "dataformat,transformation,xml,json",
"javaType": "org.apache.camel.model.dataformat.XStreamDataFormat",
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java
index 0bd13efb271..d1687d4e5e7 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -929,6 +929,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
* <p/>
* Favor using {@link #xstream(String)} to pass in a permission
*/
+ @Deprecated
public T xstream() {
return dataFormat(new XStreamDataFormat());
}
@@ -950,6 +951,7 @@ public class DataFormatClause<T extends ProcessorDefinition<?>> {
/**
* Uses the xstream by setting the encoding
*/
+ @Deprecated
public T xstream(String encoding, String permission) {
XStreamDataFormat xdf = new XStreamDataFormat();
xdf.setPermissions(permission);
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
index 4a23715d472..dda69f13b0c 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
@@ -40,6 +40,7 @@ import org.apache.camel.spi.Metadata;
@Metadata(firstVersion = "1.3.0", label = "dataformat,transformation,xml,json", title = "XStream")
@XmlRootElement(name = "xstream")
@XmlAccessorType(XmlAccessType.NONE)
+@Deprecated
public class XStreamDataFormat extends DataFormatDefinition implements ContentTypeHeaderAware {
@XmlAttribute
@@ -315,6 +316,7 @@ public class XStreamDataFormat extends DataFormatDefinition implements ContentTy
* {@code Builder} is a specific builder for {@link XStreamDataFormat}.
*/
@XmlTransient
+ @Deprecated
public static class Builder implements DataFormatBuilder<XStreamDataFormat> {
private String permissions;