GEOMESA-2982 GeoMesa-Arrow command line tools dependency fixes

Signed-off-by: Jim Hughes <[email protected]>
locationtech · Jan 13, 2021 · 00ef698 · 00ef698
1 parent a64c386
commit 00ef698
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/geomesa-arrow/geomesa-arrow-dist/pom.xml b/geomesa-arrow/geomesa-arrow-dist/pom.xml
@@ -72,6 +72,13 @@
             <groupId>org.scala-lang.modules</groupId>
             <artifactId>scala-xml_${scala.binary.version}</artifactId>
         </dependency>
+        <!-- Here we include Guava since it is the only dependency needed for the GM converter library and
+             we know that it will not conflict. -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>compile</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/geomesa-arrow/geomesa-arrow-dist/src/main/assemblies/component.xml b/geomesa-arrow/geomesa-arrow-dist/src/main/assemblies/component.xml
@@ -81,6 +81,10 @@
             <directoryMode>755</directoryMode>
             <fileMode>0755</fileMode>
             <filtered>true</filtered>
+            <excludes>
+                <!-- arrow has no external dependencies -->
+                <exclude>install-dependencies.sh</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
             <directory>../../geomesa-tools/conf</directory>