Generated files after rebase and conflit issues

apache · Nov 29, 2024 · a20a75b · a20a75b
1 parent e29b414
commit a20a75b
Show file tree

Hide file tree

Showing 6 changed files with 3,897 additions and 3,865 deletions.
diff --git a/docs/antora.yml b/docs/antora.yml
@@ -28,7 +28,7 @@ asciidoc:
     requires: "'util=camel-website-util,quarkus=xref:js/quarkus.js'"
 
     # Project versions
-    camel-version: 4.8.1 # replace ${camel.version}
+    camel-version: 4.9.0-SNAPSHOT # replace ${camel.version}
     camel-docs-version: 4.8.x
     camel-quarkus-version: 3.17.0 # replace ${camel-quarkus.version}
     quarkus-version: 3.17.1 # replace ${quarkus.version}

diff --git a/...re/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java b/...re/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java
@@ -17,6 +17,7 @@
 package org.apache.camel.quarkus.core;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.NamedNode;
@@ -40,4 +41,12 @@ public String dumpBeansAsXml(CamelContext context, List<Object> beans) throws Ex
         throw new UnsupportedOperationException(
                 "Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io-dsl");
     }
+
+    @Override
+    public String dumpDataFormatsAsXml(CamelContext context, Map<String, Object> dataFormats)
+            throws Exception {
+        throw new UnsupportedOperationException(
+                "Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io-dsl");
+    }
+
 }
diff --git a/...e/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToYAMLDumper.java b/...e/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToYAMLDumper.java
@@ -17,6 +17,7 @@
 package org.apache.camel.quarkus.core;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.NamedNode;
@@ -41,4 +42,11 @@ public String dumpModelAsYaml(CamelContext context, NamedNode definition, boolea
         throw new UnsupportedOperationException(
                 "Please add a dependency to camel-quarkus-yaml-io");
     }
+
+    @Override
+    public String dumpDataFormatsAsYaml(CamelContext context, Map<String, Object> dataFormats)
+            throws Exception {
+        throw new UnsupportedOperationException(
+                "Please add a dependency to camel-quarkus-yaml-io");
+    }
 }