This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new a6680090b38 Fixed build for 3.x
a6680090b38 is described below
commit a6680090b3802d82c8ae0444945328816a825dae
Author: Andrea Cosentino <[email protected]>
AuthorDate: Mon Feb 6 14:23:38 2023 +0100
Fixed build for 3.x
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../main/java/org/apache/camel/component/jackson/JacksonDataFormat.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
index bd5d3b67f75..c352aac64b7 100644
---
a/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
+++
b/components/camel-jackson/src/main/java/org/apache/camel/component/jackson/JacksonDataFormat.java
@@ -25,7 +25,6 @@ import org.apache.camel.spi.annotations.Dataformat;
*/
@Dataformat("jackson")
@Metadata(excludeProperties =
"library,permissions,dropRootNode,dateFormatPattern")
->>>>>>> 3fb33a356f2 (CAMEL-19009: camel-gson - Date Format with GsonBuilder)
public class JacksonDataFormat extends AbstractJacksonDataFormat {
/**
