From 9c00f4c8c9adc4f353f2ca091b4b7e5e5bf16b36 Mon Sep 17 00:00:00 2001
From: Nicolas Filotto <essobedo@users.noreply.github.com>
Date: Tue, 15 Oct 2024 20:59:27 +0200
Subject: [PATCH] Ref #452: No longer depend on drill-jdbc-all (#524)

---
 components/camel-drill/pom.xml                | 57 ++++++++++++++++++-
 features/src/main/feature/camel-features.xml  | 13 ++++-
 .../camel/test/CamelDrillRouteSupplier.java   |  2 +-
 3 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/components/camel-drill/pom.xml b/components/camel-drill/pom.xml
index 93f6279e1..a6b0047c5 100644
--- a/components/camel-drill/pom.xml
+++ b/components/camel-drill/pom.xml
@@ -34,10 +34,24 @@
 
     <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,
+            org.apache.commons.text*,
+            *;resolution:=optional
         </camel.osgi.import>
     </properties>
 
@@ -51,8 +65,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 +98,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..780d838a3 100644
--- a/features/src/main/feature/camel-features.xml
+++ b/features/src/main/feature/camel-features.xml
@@ -1010,9 +1010,16 @@
     <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}&amp;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'>mvn:org.apache.commons/commons-lang3/${commons-lang3-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 @@
 )
 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() {