You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ji...@apache.org on 2023/10/05 13:59:57 UTC
[camel-quarkus] 02/45: Generated files + workaround for kamelets
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 5d3dae425e8c62d63b8a51f3b66a313cfa05ff94
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Mon Aug 28 15:32:29 2023 +0200
Generated files + workaround for kamelets
---
.../apache/camel/quarkus/core/DisabledModelToXMLDumper.java | 10 +++++++++-
.../camel/quarkus/core/DisabledModelToYAMLDumper.java | 13 +++++++++++--
.../component/kamelet/deployment/KameletProcessor.java | 7 ++++++-
pom.xml | 2 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +-
.../src/main/generated/flattened-reduced-verbose-pom.xml | 2 +-
7 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java
index 7c97ade1b8..1b485382f8 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToXMLDumper.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.quarkus.core;
+import java.util.List;
+
import org.apache.camel.CamelContext;
import org.apache.camel.NamedNode;
import org.apache.camel.spi.ModelToXMLDumper;
@@ -27,9 +29,15 @@ public class DisabledModelToXMLDumper implements ModelToXMLDumper {
}
@Override
- public String dumpModelAsXml(CamelContext context, NamedNode definition, boolean resolvePlaceholders)
+ public String dumpModelAsXml(CamelContext context, NamedNode definition, boolean resolvePlaceholders, boolean generatedIds)
throws Exception {
throw new UnsupportedOperationException(
"Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io-dsl");
}
+
+ @Override
+ public String dumpBeansAsXml(CamelContext context, List<Object> beans) throws Exception {
+ throw new UnsupportedOperationException(
+ "Please add a dependency to camel-quarkus-xml-jaxb or camel-quarkus-xml-io-dsl");
+ }
}
diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToYAMLDumper.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToYAMLDumper.java
index 96c67ebf15..d3c916bfff 100644
--- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToYAMLDumper.java
+++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/DisabledModelToYAMLDumper.java
@@ -16,19 +16,28 @@
*/
package org.apache.camel.quarkus.core;
+import java.util.List;
+
import org.apache.camel.CamelContext;
import org.apache.camel.NamedNode;
import org.apache.camel.spi.ModelToYAMLDumper;
public class DisabledModelToYAMLDumper implements ModelToYAMLDumper {
+
@Override
- public String dumpModelAsYaml(CamelContext context, NamedNode definition) throws Exception {
+ public String dumpBeansAsYaml(CamelContext context, List<Object> beans) throws Exception {
throw new UnsupportedOperationException("Please add a dependency to camel-quarkus-yaml-io");
}
+ @Override
+ public String dumpModelAsYaml(CamelContext context, NamedNode definition) throws Exception {
+ throw new UnsupportedOperationException(
+ "Please add a dependency to camel-quarkus-yaml-io");
+ }
+
@Override
public String dumpModelAsYaml(CamelContext context, NamedNode definition, boolean resolvePlaceholders,
- boolean uriAsParameters) throws Exception {
+ boolean uriAsParameters, boolean generatedIds) throws Exception {
throw new UnsupportedOperationException(
"Please add a dependency to camel-quarkus-yaml-io");
}
diff --git a/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java b/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
index 64ad0826a2..ad307b8936 100644
--- a/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
+++ b/extensions/kamelet/deployment/src/main/java/org/apache/camel/quarkus/component/kamelet/deployment/KameletProcessor.java
@@ -119,6 +119,11 @@ class KameletProcessor {
}
}
- return new CamelContextCustomizerBuildItem(recorder.createTemplateLoaderCustomizer(definitions));
+ //quick workaround for #5230
+ //remove references to Resources, because the list is serialized; resources are loaded later in the recorder
+ definitions.stream().forEach(rd -> rd.setResource(null));
+
+ return new CamelContextCustomizerBuildItem(
+ recorder.createTemplateLoaderCustomizer(definitions));
}
}
diff --git a/pom.xml b/pom.xml
index a8f682b63c..7894b12d41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
<xalan.version>2.7.2</xalan.version><!-- Xalan should be removed as is in Camel, but it is not possible. https://github.com/apache/camel-quarkus/issues/4065-->
<xchange.version>${xchange-version}</xchange.version>
<xerces.version>${xerces-version}</xerces.version>
- <xmlgraphics-commons.version>2.8</xmlgraphics-commons.version><!-- @sync org.apache.xmlgraphics:fop-parent:${fop-version} prop:xmlgraphics.commons.version -->
+ <xmlgraphics-commons.version>2.9</xmlgraphics-commons.version><!-- @sync org.apache.xmlgraphics:fop-parent:${fop-version} prop:xmlgraphics.commons.version -->
<web3j.version>${web3j-version}</web3j.version>
<web3j.quorum.version>${web3j-quorum-version}</web3j.quorum.version>
<zookeeper.version>${zookeeper-version}</zookeeper.version>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 4df8fbfac9..6fa78ad68a 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6476,7 +6476,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>xmlgraphics-commons</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>commons-logging</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 0459497724..f52fa6c9fd 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6431,7 +6431,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index f6c895ec3c..a867ecb91e 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6431,7 +6431,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>xmlgraphics-commons</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.8</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.9</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>commons-logging</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->