RYA-14 Updated to Java 1.7; Minor geo issue Also fixed a minor geo issue with RYA-13 commit.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/990f1ffe Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/990f1ffe Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/990f1ffe Branch: refs/heads/develop Commit: 990f1ffe272fe13b99367528fb8bb661f8e29f45 Parents: e5e227c Author: Aaron Mihalik <[email protected]> Authored: Fri Dec 4 18:08:53 2015 -0500 Committer: Aaron Mihalik <[email protected]> Committed: Fri Dec 4 18:08:53 2015 -0500 ---------------------------------------------------------------------- .../mvm/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java | 2 +- .../mvm/rya/indexing/accumulo/geo/GeoIndexerTest.java | 3 ++- pom.xml | 10 ++-------- 3 files changed, 5 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/990f1ffe/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java index c8b5b4a..9d01751 100644 --- a/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java +++ b/extras/indexing/src/main/java/mvm/rya/indexing/accumulo/geo/GeoMesaGeoIndexer.java @@ -1,4 +1,4 @@ -package mvm.rya.indexing.accumulo.geo; +package mvm.rya.indexing.accumulo.geo; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/990f1ffe/extras/indexing/src/test/java/mvm/rya/indexing/accumulo/geo/GeoIndexerTest.java ---------------------------------------------------------------------- diff --git a/extras/indexing/src/test/java/mvm/rya/indexing/accumulo/geo/GeoIndexerTest.java b/extras/indexing/src/test/java/mvm/rya/indexing/accumulo/geo/GeoIndexerTest.java index c204f3c..25db123 100644 --- a/extras/indexing/src/test/java/mvm/rya/indexing/accumulo/geo/GeoIndexerTest.java +++ b/extras/indexing/src/test/java/mvm/rya/indexing/accumulo/geo/GeoIndexerTest.java @@ -237,7 +237,8 @@ public class GeoIndexerTest { Assert.assertEquals(Sets.newHashSet(), getSet(f.queryWithin(pOut, EMPTY_CONSTRAINTS))); // test a ring for the whole world and make sure the point is gone - double[] world = { -180, 90, 180, 90, -180, 90, -180, -90, -180, 90 }; + // Geomesa is a little sensitive around lon 180, so we only go to 179 + double[] world = { -180, 90, 179, 90, 179, -90, -180, -90, -180, 90 }; LinearRing rWorld = gf.createLinearRing(new PackedCoordinateSequence.Double(world, 2)); Polygon pWorld = gf.createPolygon(rWorld, new LinearRing[] {}); Assert.assertEquals(Sets.newHashSet(), getSet(f.queryWithin(pWorld, EMPTY_CONSTRAINTS))); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/990f1ffe/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5f2164f..dce799f 100644 --- a/pom.xml +++ b/pom.xml @@ -500,6 +500,8 @@ under the License. <artifactId>maven-compiler-plugin</artifactId> <configuration> <encoding>${project.build.sourceEncoding}</encoding> + <source>1.7</source> + <target>1.7</target> </configuration> </plugin> <plugin> @@ -649,14 +651,6 @@ under the License. </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.6</source> - <target>1.6</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> <executions> <execution>
