Resolved bug introduced in #259 which broke the geospatial queries wi…

…th Elastic Search due to missing dependencies from the geotool suite.
InCadence · Jul 24, 2020 · db1cfa3 · db1cfa3
1 parent 618c97a
commit db1cfa3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/src/Coalesce.Bundles/bundle-geomesa/pom.xml b/src/Coalesce.Bundles/bundle-geomesa/pom.xml
@@ -71,6 +71,12 @@
  			<version>${accumulo.geomesa.version}</version>
  		</dependency>
  		-->
+        <dependency>
+            <groupId>org.locationtech.jts</groupId>
+            <artifactId>jts-core</artifactId>
+            <version>1.16.1</version>
+            <scope>provided</scope>
+        </dependency>
 
 	</dependencies>
 

diff --git a/src/Coalesce.Bundles/bundle-geotools/pom.xml b/src/Coalesce.Bundles/bundle-geotools/pom.xml
@@ -40,6 +40,7 @@
                         </Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
                         <!-- 						<SPI-Consumer>java.util.ServiceLoader#load(java.lang.Class[org.geotools.data.DataStoreFactorySpi])</SPI-Consumer> -->
+                        <_noee>true</_noee>
                     </instructions>
                 </configuration>
 
@@ -101,9 +102,13 @@
             <artifactId>gt-metadata</artifactId>
             <version>${geotools.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-geojson</artifactId>
+            <version>${geotools.version}</version>
+        </dependency>
 
         <!-- Requires Java 1.9 -->
-        <!--
         <dependency>
             <groupId>org.geotools</groupId>
             <artifactId>gt-imagemosaic</artifactId>
@@ -119,19 +124,19 @@
             <artifactId>gt-process-feature</artifactId>
             <version>${geotools.version}</version>
         </dependency>
-        -->
-        <!-- INC version removes the Skunkwords class which is missing the packagename preventing the packages to be bundled into our bundle-geotool package for use within OSGi container using maven-bundle-plugin. -->
-        <dependency>
-            <groupId>org.geotools</groupId>
-            <artifactId>gt-geojson</artifactId>
-            <version>15-INC</version>
-        </dependency>
 
         <dependency>
             <artifactId>joda-time</artifactId>
             <groupId>joda-time</groupId>
             <version>${joda.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.locationtech.jts</groupId>
+            <artifactId>jts-core</artifactId>
+            <version>1.16.1</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 </project>