diff --git a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java index 85eafbce4..194d2cc96 100644 --- a/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java +++ b/support/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java @@ -436,6 +436,13 @@ private void processComponents(org.apache.camel.catalog.CamelCatalog catalog, Ma .build()); }); + // override avro version, as defined in camel-k-runtime-bom/pom.xml + boolean avroArtifact = "camel-quarkus-jackson-avro".equals(definition.getArtifactId()) || "camel-quarkus-avro".equals(definition.getArtifactId()) + || "camel-quarkus-avro-rpc".equals(definition.getArtifactId()); + if ("org.apache.camel.quarkus".equals(definition.getGroupId()) && avroArtifact) { + builder.addDependency("org.apache.avro", "avro"); + } + return builder.build(); }); } @@ -477,6 +484,13 @@ private void processDataFormats(org.apache.camel.catalog.CamelCatalog catalog, M artifacts.compute(definition.getArtifactId(), (key, artifact) -> { CamelArtifact.Builder builder = artifactBuilder(artifact, definition); + + // override avro version, as defined in camel-k-runtime-bom/pom.xml + boolean avroArtifact = "camel-quarkus-jackson-avro".equals(definition.getArtifactId()) || "camel-quarkus-avro".equals(definition.getArtifactId()) + || "camel-quarkus-avro-rpc".equals(definition.getArtifactId()); + if ("org.apache.camel.quarkus".equals(definition.getGroupId()) && avroArtifact) { + builder.addDependency("org.apache.avro", "avro"); + } builder.addDataformat(definition.getName()); builder.addJavaType(definition.getJavaType()); diff --git a/support/camel-k-runtime-bom/pom.xml b/support/camel-k-runtime-bom/pom.xml index 04513320c..84ad42402 100644 --- a/support/camel-k-runtime-bom/pom.xml +++ b/support/camel-k-runtime-bom/pom.xml @@ -33,7 +33,8 @@ pom - + 1695367183 1.7.1 @@ -43,6 +44,10 @@ 2.13.9.SP2 2.13.9.SP2 + 2.13.3 + + + 1.11.4 @@ -234,108 +239,140 @@ - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven-enforcer-plugin-version} - - - enforce-maven - - enforce - - - - - ${maven-version} - - - - - - - - - - - - release - - - release - - - - - - - true - org.apache.maven.plugins - maven-deploy-plugin - 3.0.0 - - - org.apache.maven.plugins - maven-source-plugin - 3.2.1 - - - attach-sources - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.1 - - - attach-javadocs - - jar - - - - - ${javadoc.opts} - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.0.1 - - ${gpg.passphrase} - ${gpg.useagent} - - - - - sign - - - - - - - - - doclint-java8-disable - - [1.8,) - - - -Xdoclint:none - - - - + + + + org.apache.camel.quarkus + camel-quarkus-jackson-avro + ${camel-quarkus-version} + + + org.apache.avro + avro + + + + + org.apache.camel.quarkus + camel-quarkus-avro + ${camel-quarkus-version} + + + org.apache.avro + avro + + + + + + org.apache.avro + avro + ${avro-version} + + + + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven-enforcer-plugin-version} + + + enforce-maven + + enforce + + + + + ${maven-version} + + + + + + + + + + + + release + + + release + + + + + + + true + org.apache.maven.plugins + maven-deploy-plugin + 3.0.0 + + + org.apache.maven.plugins + maven-source-plugin + 3.2.1 + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.4.1 + + + attach-javadocs + + jar + + + + + ${javadoc.opts} + + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.0.1 + + ${gpg.passphrase} + ${gpg.useagent} + + + + + sign + + + + + + + + + doclint-java8-disable + + [1.8,) + + + -Xdoclint:none + + + + \ No newline at end of file