Repository: incubator-rya Updated Branches: refs/heads/master f0b11e2cd -> d4b2e7eb8
RYA-221 Upgraded to Geomesa 1.3.0-m1 Closes #119 Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/d4b2e7eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/d4b2e7eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/d4b2e7eb Branch: refs/heads/master Commit: d4b2e7eb87ea753357840cb0ed2ba2db054cc03b Parents: f0b11e2 Author: Aaron Mihalik <[email protected]> Authored: Tue Nov 1 13:57:42 2016 -0400 Committer: Aaron Mihalik <[email protected]> Committed: Wed Nov 2 06:22:07 2016 -0400 ---------------------------------------------------------------------- extras/rya.geoindexing/pom.xml | 2 +- .../apache/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java | 2 +- pom.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/d4b2e7eb/extras/rya.geoindexing/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/pom.xml b/extras/rya.geoindexing/pom.xml index ce595c8..4e81808 100644 --- a/extras/rya.geoindexing/pom.xml +++ b/extras/rya.geoindexing/pom.xml @@ -87,7 +87,7 @@ <!-- Geo Indexing --> <dependency> <groupId>org.locationtech.geomesa</groupId> - <artifactId>geomesa-accumulo-datastore</artifactId> + <artifactId>geomesa-accumulo-datastore_2.11</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/d4b2e7eb/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java ---------------------------------------------------------------------- diff --git a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java index 90dd134..0b7a7d0 100644 --- a/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java +++ b/extras/rya.geoindexing/src/main/java/org/apache/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java @@ -222,7 +222,7 @@ public class GeoMesaGeoIndexer extends AbstractAccumuloIndexer implements GeoInd + PREDICATE_ATTRIBUTE + ":String," // + OBJECT_ATTRIBUTE + ":String," // + CONTEXT_ATTRIBUTE + ":String," // - + Constants.SF_PROPERTY_GEOMETRY + ":Geometry:srid=4326"; + + Constants.SF_PROPERTY_GEOMETRY + ":Geometry:srid=4326;geomesa.mixed.geometries='true'"; featureType = SimpleFeatureTypes.createType(FEATURE_NAME, featureSchema); dataStore.createSchema(featureType); } http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/d4b2e7eb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 20756ad..053a692 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ under the License. <pig.version>0.9.2</pig.version> <!-- Newest: 0.15.0 --> - <geomesa.version>1.2.0</geomesa.version> <!-- Newest: 1.2.0 --> + <geomesa.version>1.3.0-m1</geomesa.version> <!-- Newest: 1.3.0-m1 --> <lucene.version>3.6.2</lucene.version> <!-- Newest: 5.3.1 --> <joda-time.version>2.1</joda-time.version> <!-- Newest: 2.9.1 --> @@ -459,12 +459,12 @@ under the License. <!-- Geo Indexing --> <dependency> <groupId>org.locationtech.geomesa</groupId> - <artifactId>geomesa-accumulo-datastore</artifactId> + <artifactId>geomesa-accumulo-datastore_2.11</artifactId> <version>${geomesa.version}</version> </dependency> <dependency> <groupId>org.locationtech.geomesa</groupId> - <artifactId>geomesa-accumulo-distributed-runtime</artifactId> + <artifactId>geomesa-accumulo-distributed-runtime_2.11</artifactId> <version>${geomesa.version}</version> </dependency> <dependency>
