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 8774d0b2f404079c16bbd946fd6c93f852df6480 Author: Jiri Ondrusek <ondrusek.j...@gmail.com> AuthorDate: Mon Feb 24 10:28:46 2025 +0100 Generated files, fixed drill extension --- extensions-jvm/drill/runtime/pom.xml | 4 ++ pom.xml | 3 +- poms/bom/pom.xml | 35 ++++++++++++ poms/bom/src/main/generated/flattened-full-pom.xml | 35 ++++++++++++ .../src/main/generated/flattened-reduced-pom.xml | 65 ++++++++++++---------- .../generated/flattened-reduced-verbose-pom.xml | 65 ++++++++++++---------- 6 files changed, 146 insertions(+), 61 deletions(-) diff --git a/extensions-jvm/drill/runtime/pom.xml b/extensions-jvm/drill/runtime/pom.xml index c698c9959b..aa524749ea 100644 --- a/extensions-jvm/drill/runtime/pom.xml +++ b/extensions-jvm/drill/runtime/pom.xml @@ -47,6 +47,10 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-drill</artifactId> </dependency> + <dependency> + <groupId>org.apache.drill.exec</groupId> + <artifactId>drill-jdbc-all</artifactId> + </dependency> </dependencies> <build> diff --git a/pom.xml b/pom.xml index 70648bc73e..21923e62e6 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ <quarkiverse-cxf.version>3.19.0</quarkiverse-cxf.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/io/quarkiverse/cxf/quarkus-cxf-parent/ --> <quarkiverse-freemarker.version>1.2.0</quarkiverse-freemarker.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/freemarker/quarkus-freemarker-parent/ --> <quarkiverse-fury.version>0.3.1</quarkiverse-fury.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/fury/quarkus-fury-parent/ --> - <quarkiverse-groovy.version>3.19.1</quarkiverse-groovy.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/groovy/quarkus-groovy-parent/ --> + <quarkiverse-groovy.version>3.19.0</quarkiverse-groovy.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/groovy/quarkus-groovy-parent/ --> <quarkiverse-jackson-jq.version>2.2.0</quarkiverse-jackson-jq.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jackson-jq/quarkus-jackson-jq-parent/ --> <quarkiverse-jgit.version>3.3.3</quarkiverse-jgit.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jgit/quarkus-jgit-parent/ --> <quarkiverse-jsch.version>3.0.13</quarkiverse-jsch.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/jsch/quarkus-jsch-parent/ --> @@ -87,6 +87,7 @@ <commons-collections4.version>${commons-collections4-version}</commons-collections4.version> <commons-exec.version>${commons-exec-version}</commons-exec.version> <commons-validator.version>${commons-validator-version}</commons-validator.version> + <drill-jdbc-all.version>${apache-drill-version}</drill-jdbc-all.version> <dropwizard-metrics.version>${metrics-version}</dropwizard-metrics.version> <eddsa.version>${eddsa-version}</eddsa.version> <eclipse-transformer.version>0.5.0</eclipse-transformer.version> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index c57b03a070..f4d5684a76 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -975,6 +975,10 @@ <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.drill.exec</groupId> + <artifactId>drill-jdbc</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -7268,6 +7272,37 @@ <artifactId>commons-collections4</artifactId> <version>${commons-collections4.version}</version> </dependency> + <dependency> + <groupId>org.apache.drill.exec</groupId> + <artifactId>drill-jdbc-all</artifactId> + <version>${drill-jdbc-all.version}</version> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>listenablefuture</artifactId> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-jackrabbit-api</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index eae4682369..7e56462fff 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -912,6 +912,10 @@ <groupId>xml-apis</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>xml-apis</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </exclusion> + <exclusion> + <groupId>org.apache.drill.exec</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>drill-jdbc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> </exclusions> </dependency> <dependency> @@ -7188,6 +7192,37 @@ <artifactId>commons-collections4</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.4</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>org.apache.drill.exec</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>drill-jdbc-all</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.21.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>logback-classic</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>logback-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>listenablefuture</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jcl-over-slf4j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>oak-jackrabbit-api</artifactId><!-- 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 bec742ce75..47dd816f45 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -912,6 +912,10 @@ <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.drill.exec</groupId> + <artifactId>drill-jdbc</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -6858,11 +6862,6 @@ <artifactId>langchain4j-core</artifactId> <version>1.0.0-alpha1</version> </dependency> - <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-jmx</artifactId> - <version>4.2.30</version> - </dependency> <dependency> <groupId>io.minio</groupId> <artifactId>minio</artifactId> @@ -7133,16 +7132,42 @@ <artifactId>antlr-runtime</artifactId> <version>3.5.2</version> </dependency> - <dependency> - <groupId>org.apache.avro</groupId> - <artifactId>avro-ipc-jetty</artifactId> - <version>1.12.0</version> - </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> <version>4.4</version> </dependency> + <dependency> + <groupId>org.apache.drill.exec</groupId> + <artifactId>drill-jdbc-all</artifactId> + <version>1.21.2</version> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.code.findbugs</groupId> + <artifactId>jsr305</artifactId> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId> + <artifactId>listenablefuture</artifactId> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId> + <artifactId>checker-qual</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-jackrabbit-api</artifactId> @@ -8427,11 +8452,6 @@ <artifactId>jetty-util-ajax</artifactId> <version>12.0.16</version> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-xml</artifactId> - <version>12.0.16</version> - </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId> <artifactId>jetty-websocket-core-common</artifactId> @@ -8615,21 +8635,6 @@ <artifactId>metrics-core</artifactId> <version>4.0.1</version> </dependency> - <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-healthchecks</artifactId> - <version>4.0.1</version> - </dependency> - <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-servlets</artifactId> - <version>4.0.1</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-servlet</artifactId> - <version>9.4.12.v20180830</version> - </dependency> <dependency> <groupId>org.reflections</groupId> <artifactId>reflections</artifactId> 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 4c26037d2c..c35c109b70 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -912,6 +912,10 @@ <groupId>xml-apis</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>xml-apis</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </exclusion> + <exclusion> + <groupId>org.apache.drill.exec</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>drill-jdbc</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> </exclusions> </dependency> <dependency> @@ -6858,11 +6862,6 @@ <artifactId>langchain4j-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>1.0.0-alpha1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>io.dropwizard.metrics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>metrics-jmx</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.2.30</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>io.minio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>minio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7133,16 +7132,42 @@ <artifactId>antlr-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>3.5.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> - <dependency> - <groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>avro-ipc-jetty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.12.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - </dependency> <dependency> <groupId>org.apache.commons</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>commons-collections4</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.4</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>org.apache.drill.exec</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>drill-jdbc-all</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.21.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>logback-classic</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>logback-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>com.google.code.findbugs</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jsr305</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>com.google.guava</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>listenablefuture</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>org.checkerframework</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>checker-qual</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jcl-over-slf4j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>oak-jackrabbit-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -8427,11 +8452,6 @@ <artifactId>jetty-util-ajax</artifactId><!-- org.eclipse.jetty:jetty-bom:12.0.16 --> <version>12.0.16</version><!-- org.eclipse.jetty:jetty-bom:12.0.16 --> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId><!-- org.eclipse.jetty:jetty-bom:12.0.16 --> - <artifactId>jetty-xml</artifactId><!-- org.eclipse.jetty:jetty-bom:12.0.16 --> - <version>12.0.16</version><!-- org.eclipse.jetty:jetty-bom:12.0.16 --> - </dependency> <dependency> <groupId>org.eclipse.jetty.websocket</groupId><!-- org.eclipse.jetty:jetty-bom:12.0.16 --> <artifactId>jetty-websocket-core-common</artifactId><!-- org.eclipse.jetty:jetty-bom:12.0.16 --> @@ -8615,21 +8635,6 @@ <artifactId>metrics-core</artifactId><!-- io.debezium:debezium-bom:3.0.7.Final --> <version>4.0.1</version><!-- io.debezium:debezium-bom:3.0.7.Final --> </dependency> - <dependency> - <groupId>io.dropwizard.metrics</groupId><!-- io.debezium:debezium-bom:3.0.7.Final --> - <artifactId>metrics-healthchecks</artifactId><!-- io.debezium:debezium-bom:3.0.7.Final --> - <version>4.0.1</version><!-- io.debezium:debezium-bom:3.0.7.Final --> - </dependency> - <dependency> - <groupId>io.dropwizard.metrics</groupId><!-- io.debezium:debezium-bom:3.0.7.Final --> - <artifactId>metrics-servlets</artifactId><!-- io.debezium:debezium-bom:3.0.7.Final --> - <version>4.0.1</version><!-- io.debezium:debezium-bom:3.0.7.Final --> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId><!-- io.debezium:debezium-bom:3.0.7.Final --> - <artifactId>jetty-servlet</artifactId><!-- io.debezium:debezium-bom:3.0.7.Final --> - <version>9.4.12.v20180830</version><!-- io.debezium:debezium-bom:3.0.7.Final --> - </dependency> <dependency> <groupId>org.reflections</groupId><!-- io.debezium:debezium-bom:3.0.7.Final --> <artifactId>reflections</artifactId><!-- io.debezium:debezium-bom:3.0.7.Final -->