You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2024/10/15 14:27:41 UTC
(camel-karaf) branch essobedo/452/no-longer-use-jdbc-all created (now ad8912c73)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch essobedo/452/no-longer-use-jdbc-all
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
at ad8912c73 Ref #452: No longer depend on drill-jdbc-all
This branch includes the following new commits:
new ad8912c73 Ref #452: No longer depend on drill-jdbc-all
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(camel-karaf) 01/01: Ref #452: No longer depend on drill-jdbc-all
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch essobedo/452/no-longer-use-jdbc-all
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit ad8912c733e4de3fdbf708f486d4739212a7f352
Author: Nicolas Filotto <ni...@qlik.com>
AuthorDate: Tue Oct 15 16:27:24 2024 +0200
Ref #452: No longer depend on drill-jdbc-all
---
components/camel-drill/pom.xml | 56 +++++++++++++++++++++-
features/src/main/feature/camel-features.xml | 12 +++--
.../karaf/camel/test/CamelDrillRouteSupplier.java | 2 +-
3 files changed, 64 insertions(+), 6 deletions(-)
diff --git a/components/camel-drill/pom.xml b/components/camel-drill/pom.xml
index 93f6279e1..ab0c47706 100644
--- a/components/camel-drill/pom.xml
+++ b/components/camel-drill/pom.xml
@@ -34,10 +34,23 @@
<properties>
<camel.osgi.export>
- org.apache.camel*;version=${camel-version}
+ org.apache.camel*;version=${camel-version},
+ org.apache.drill*;version=${apache-drill-version},
</camel.osgi.export>
+ <camel.osgi.private>
+ com.google.protobuf*,
+ com.google.common*,
+ io.netty*,
+ org.apache.calcite.avatica*,
+ </camel.osgi.private>
<camel.osgi.import>
- *
+ javassist*,
+ com.typesafe.config*,
+ org.reflections*,
+ com.codahale.metrics,
+ com.codahale.metrics.jmx,
+ com.codahale.metrics.jvm,
+ *;resolution:=optional
</camel.osgi.import>
</properties>
@@ -51,8 +64,22 @@
<groupId>org.apache.camel</groupId>
<artifactId>*</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.drill.exec</groupId>
+ <artifactId>drill-jdbc-all</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.drill.exec</groupId>
+ <artifactId>drill-jdbc</artifactId>
+ <version>${apache-drill-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.drill.exec</groupId>
+ <artifactId>drill-java-exec</artifactId>
+ <version>${apache-drill-version}</version>
+ </dependency>
</dependencies>
<build>
@@ -70,8 +97,33 @@
<artifactSet>
<includes>
<include>org.apache.camel:camel-drill</include>
+ <include>org.apache.drill:drill-common</include>
+ <include>org.apache.drill:drill-protocol</include>
+ <include>org.apache.drill:drill-logical</include>
+ <include>org.apache.drill:drill-shaded-guava</include>
+ <include>org.apache.drill.exec:drill-jdbc</include>
+ <include>org.apache.drill.exec:drill-rpc</include>
+ <include>org.apache.drill.exec:drill-java-exec</include>
+ <include>org.apache.drill.exec:vector</include>
+ <include>org.apache.drill.memory:drill-memory-base</include>
</includes>
</artifactSet>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+ <resource>drill-module.conf</resource>
+ </transformer>
+ </transformers>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>bootstrap-storage-plugins.json</exclude>
+ <exclude>codegen/**</exclude>
+ <exclude>**/*.java</exclude>
+ <exclude>org/apache/parquet/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
</execution>
</executions>
diff --git a/features/src/main/feature/camel-features.xml b/features/src/main/feature/camel-features.xml
index 8df27b5ff..45cd2e540 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -1010,9 +1010,15 @@
<feature name='camel-drill' version='${project.version}' start-level='50'>
<feature version='${camel-osgi-version-range}'>camel-core</feature>
<feature version='${camel-osgi-spring-version}'>spring-jdbc</feature>
- <!-- force SPI-Provider to a single value because it's not needed = * causes class not found exceptions,
- the bundled jar does not contain all necessary jersey dependencies -->
- <bundle dependency='true'>wrap:mvn:org.apache.drill.exec/drill-jdbc-all/${apache-drill-version}$Export-Package=org.apache.drill.jdbc.*;version=${apache-drill-version}&SPI-Provider=java.sql.Driver</bundle>
+ <feature version='${camel-osgi-jackson2-version}'>jackson</feature>
+ <bundle dependency='true'>mvn:com.typesafe/config/${auto-detect-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:org.reflections/reflections/${auto-detect-version}</bundle>
+ <bundle dependency='true'>mvn:org.javassist/javassist/${javassist-version}</bundle>
+ <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${metrics-version}</bundle>
+ <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-jmx/${metrics-version}</bundle>
+ <bundle dependency='true'>mvn:io.dropwizard.metrics/metrics-jvm/${metrics-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.commons/commons-text/${commons-text-version}</bundle>
+ <bundle dependency='true'>wrap:mvn:com.carrotsearch/hppc/${auto-detect-version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-drill/${project.version}</bundle>
</feature>
<feature name='camel-dropbox' version='${project.version}' start-level='50'>
diff --git a/tests/features/camel-drill/src/main/java/org/apache/karaf/camel/test/CamelDrillRouteSupplier.java b/tests/features/camel-drill/src/main/java/org/apache/karaf/camel/test/CamelDrillRouteSupplier.java
index 3bfddb295..ba663535c 100644
--- a/tests/features/camel-drill/src/main/java/org/apache/karaf/camel/test/CamelDrillRouteSupplier.java
+++ b/tests/features/camel-drill/src/main/java/org/apache/karaf/camel/test/CamelDrillRouteSupplier.java
@@ -28,7 +28,7 @@ import org.osgi.service.component.annotations.Component;
)
public class CamelDrillRouteSupplier extends AbstractCamelSingleFeatureResultMockBasedRouteSupplier {
- private final static String SELECT_QUERY = "select * from cp.`employee.json` limit 3";
+ private static final String SELECT_QUERY = "select * from cp.`employee.json` limit 3";
@Override
protected boolean consumerEnabled() {