[Git][java-team/spatial4j-0.4][master] 6 commits: Switch to compat level 11.
Markus Koschany
gitlab at salsa.debian.org
Thu Aug 23 10:26:55 BST 2018
Markus Koschany pushed to branch master at Debian Java Maintainers / spatial4j-0.4
Commits:
c0339172 by Markus Koschany at 2018-08-23T09:17:07Z
Switch to compat level 11.
- - - - -
6724df75 by Markus Koschany at 2018-08-23T09:17:22Z
Declare compliance with Debian Policy 4.2.0.
- - - - -
9d92772e by Markus Koschany at 2018-08-23T09:18:59Z
Remove --has-package-version flag.
- - - - -
a5356546 by Markus Koschany at 2018-08-23T09:19:16Z
Use https for Format field.
- - - - -
800eb271 by Markus Koschany at 2018-08-23T09:19:53Z
Add support for JTS 1.15.
Thanks: Bas Couwenberg for the report and patch.
Closes: #902789
- - - - -
1f5143f5 by Markus Koschany at 2018-08-23T09:21:01Z
Update changelog
- - - - -
8 changed files:
- debian/changelog
- debian/compat
- debian/control
- debian/copyright
- debian/libspatial4j-0.4-java.poms
- debian/maven.rules
- + debian/patches/jts-1.15.patch
- + debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+spatial4j-0.4 (0.4.1-5) unstable; urgency=medium
+
+ * Team upload.
+ * Switch to compat level 11.
+ * Declare compliance with Debian Policy 4.2.0.
+ * Add support for JTS 1.15.
+ Thanks to Bas Couwenberg for the report and patch. (Closes: #902789)
+
+ -- Markus Koschany <apo at debian.org> Thu, 23 Aug 2018 11:20:45 +0200
+
spatial4j-0.4 (0.4.1-4) unstable; urgency=medium
* Team upload.
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Hilko Bengen <bengen at debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11),
default-jdk,
junit4,
libcarrotsearch-randomizedtesting-java,
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 9),
libmaven-install-plugin-java,
libslf4j-java,
maven-debian-helper (>= 1.6.5)
-Standards-Version: 3.9.7
+Standards-Version: 4.2.0
Vcs-Git: git://anonscm.debian.org/pkg-java/spatial4j-0.4.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/spatial4j-0.4.git
Homepage: https://github.com/locationtech/spatial4j
=====================================
debian/copyright
=====================================
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Spatial4J
Source: https://github.com/locationtech/spatial4j
=====================================
debian/libspatial4j-0.4-java.poms
=====================================
--- a/debian/libspatial4j-0.4-java.poms
+++ b/debian/libspatial4j-0.4-java.poms
@@ -25,4 +25,4 @@
# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
# Empty by default. [mh_install]
#
-pom.xml --no-parent --has-package-version --no-usj-versionless
+pom.xml --no-parent --no-usj-versionless
=====================================
debian/maven.rules
=====================================
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,3 +1,4 @@
com.spatial4j spatial4j * s/.*/0.4.x/ * *
junit junit * s/.*/4.x/ * *
+s/com.vividsolutions/org.locationtech.jts/ s/jts/jts-core/ * s/.*/debian/ * *
=====================================
debian/patches/jts-1.15.patch
=====================================
--- /dev/null
+++ b/debian/patches/jts-1.15.patch
@@ -0,0 +1,374 @@
+Description: Update for JTS 1.15.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -103,10 +103,10 @@
+
+ <!-- JTS is essentially only used for polygons. -->
+ <dependency>
+- <groupId>com.vividsolutions</groupId>
+- <artifactId>jts</artifactId>
++ <groupId>org.locationtech.jts</groupId>
++ <artifactId>jts-core</artifactId>
+ <!-- last I checked, it still works with 1.12 -->
+- <version>1.13</version>
++ <version>1.15</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+--- a/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContext.java
++++ b/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContext.java
+@@ -25,8 +25,8 @@ import com.spatial4j.core.shape.Rectangl
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+ import com.spatial4j.core.shape.jts.JtsPoint;
+-import com.vividsolutions.jts.geom.*;
+-import com.vividsolutions.jts.util.GeometricShapeFactory;
++import org.locationtech.jts.geom.*;
++import org.locationtech.jts.util.GeometricShapeFactory;
+
+ import java.util.ArrayList;
+ import java.util.Collection;
+@@ -190,7 +190,7 @@ public class JtsSpatialContext extends S
+
+ /**
+ * INTERNAL
+- * @see #makeShape(com.vividsolutions.jts.geom.Geometry)
++ * @see #makeShape(org.locationtech.jts.geom.Geometry)
+ *
+ * @param geom Non-null
+ * @param dateline180Check if both this is true and {@link #isGeo()}, then JtsGeometry will check
+--- a/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContextFactory.java
++++ b/src/main/java/com/spatial4j/core/context/jts/JtsSpatialContextFactory.java
+@@ -20,10 +20,10 @@ package com.spatial4j.core.context.jts;
+ import com.spatial4j.core.context.SpatialContextFactory;
+ import com.spatial4j.core.io.jts.JtsBinaryCodec;
+ import com.spatial4j.core.io.jts.JtsWktShapeParser;
+-import com.vividsolutions.jts.geom.CoordinateSequenceFactory;
+-import com.vividsolutions.jts.geom.GeometryFactory;
+-import com.vividsolutions.jts.geom.PrecisionModel;
+-import com.vividsolutions.jts.geom.impl.CoordinateArraySequenceFactory;
++import org.locationtech.jts.geom.CoordinateSequenceFactory;
++import org.locationtech.jts.geom.GeometryFactory;
++import org.locationtech.jts.geom.PrecisionModel;
++import org.locationtech.jts.geom.impl.CoordinateArraySequenceFactory;
+
+ import java.util.Map;
+
+@@ -45,9 +45,9 @@ import java.util.Map;
+ * <DD>true|false(default) -- see {@link JtsSpatialContext#isAllowMultiOverlap()}</DD>
+ * <DT>precisionModel</DT>
+ * <DD>floating(default) | floating_single | fixed
+- * -- see {@link com.vividsolutions.jts.geom.PrecisionModel}.
++ * -- see {@link org.locationtech.jts.geom.PrecisionModel}.
+ * If {@code fixed} then you must also provide {@code precisionScale}
+- * -- see {@link com.vividsolutions.jts.geom.PrecisionModel#getScale()}</DD>
++ * -- see {@link org.locationtech.jts.geom.PrecisionModel#getScale()}</DD>
+ * </DL>
+ */
+ public class JtsSpatialContextFactory extends SpatialContextFactory {
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsBinaryCodec.java
+@@ -22,14 +22,14 @@ import com.spatial4j.core.context.jts.Jt
+ import com.spatial4j.core.exception.InvalidShapeException;
+ import com.spatial4j.core.io.BinaryCodec;
+ import com.spatial4j.core.shape.Shape;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.PrecisionModel;
+-import com.vividsolutions.jts.io.InStream;
+-import com.vividsolutions.jts.io.OutStream;
+-import com.vividsolutions.jts.io.ParseException;
+-import com.vividsolutions.jts.io.WKBConstants;
+-import com.vividsolutions.jts.io.WKBReader;
+-import com.vividsolutions.jts.io.WKBWriter;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.PrecisionModel;
++import org.locationtech.jts.io.InStream;
++import org.locationtech.jts.io.OutStream;
++import org.locationtech.jts.io.ParseException;
++import org.locationtech.jts.io.WKBConstants;
++import org.locationtech.jts.io.WKBReader;
++import org.locationtech.jts.io.WKBWriter;
+
+ import java.io.DataInput;
+ import java.io.DataOutput;
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsWKTReaderShapeParser.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsWKTReaderShapeParser.java
+@@ -23,19 +23,19 @@ import com.spatial4j.core.distance.Dista
+ import com.spatial4j.core.exception.InvalidShapeException;
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsPoint;
+-import com.vividsolutions.jts.geom.CoordinateSequence;
+-import com.vividsolutions.jts.geom.CoordinateSequenceFilter;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.io.WKTReader;
++import org.locationtech.jts.geom.CoordinateSequence;
++import org.locationtech.jts.geom.CoordinateSequenceFilter;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.io.WKTReader;
+
+ import java.text.ParseException;
+
+ /**
+ * This is an extension of {@link JtsWktShapeParser} that processes the entire
+- * string with JTS's {@link com.vividsolutions.jts.io.WKTReader}. Some differences:
++ * string with JTS's {@link org.locationtech.jts.io.WKTReader}. Some differences:
+ * <ul>
+ * <li>No support for ENVELOPE and BUFFER</li>
+- * <li>MULTI* shapes use JTS's {@link com.vividsolutions.jts.geom.GeometryCollection} subclasses,
++ * <li>MULTI* shapes use JTS's {@link org.locationtech.jts.geom.GeometryCollection} subclasses,
+ * not {@link com.spatial4j.core.shape.ShapeCollection}</li>
+ * <li>'Z' coordinates are saved into the geometry</li>
+ * </ul>
+@@ -55,7 +55,7 @@ public class JtsWKTReaderShapeParser ext
+ }
+
+ /**
+- * Reads WKT from the {@code str} via JTS's {@link com.vividsolutions.jts.io.WKTReader}.
++ * Reads WKT from the {@code str} via JTS's {@link org.locationtech.jts.io.WKTReader}.
+ * @param str
+ * @param reader <pre>new WKTReader(ctx.getGeometryFactory()))</pre>
+ * @return Non-Null
+@@ -67,8 +67,8 @@ public class JtsWKTReaderShapeParser ext
+ //Normalizes & verifies coordinates
+ checkCoordinates(geom);
+
+- if (geom instanceof com.vividsolutions.jts.geom.Point) {
+- com.vividsolutions.jts.geom.Point ptGeom = (com.vividsolutions.jts.geom.Point) geom;
++ if (geom instanceof org.locationtech.jts.geom.Point) {
++ org.locationtech.jts.geom.Point ptGeom = (org.locationtech.jts.geom.Point) geom;
+ if (ctx.useJtsPoint())
+ return new JtsPoint(ptGeom, ctx);
+ else
+--- a/src/main/java/com/spatial4j/core/io/jts/JtsWktShapeParser.java
++++ b/src/main/java/com/spatial4j/core/io/jts/JtsWktShapeParser.java
+@@ -24,13 +24,13 @@ import com.spatial4j.core.shape.Point;
+ import com.spatial4j.core.shape.Rectangle;
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.algorithm.CGAlgorithms;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.Envelope;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.GeometryFactory;
+-import com.vividsolutions.jts.geom.LinearRing;
+-import com.vividsolutions.jts.geom.Polygon;
++import org.locationtech.jts.algorithm.CGAlgorithms;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.Envelope;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.GeometryFactory;
++import org.locationtech.jts.geom.LinearRing;
++import org.locationtech.jts.geom.Polygon;
+
+ import java.text.ParseException;
+ import java.util.ArrayList;
+@@ -226,7 +226,7 @@ public class JtsWktShapeParser extends W
+ }
+
+ /**
+- * Reads a {@link com.vividsolutions.jts.geom.Coordinate} from the current position.
++ * Reads a {@link org.locationtech.jts.geom.Coordinate} from the current position.
+ * It's akin to {@link #point(com.spatial4j.core.io.WktShapeParser.State)} but for
+ * a JTS Coordinate. Only the first 2 numbers are parsed; any remaining are ignored.
+ */
+@@ -298,7 +298,7 @@ public class JtsWktShapeParser extends W
+ /** Geometries will not be validated (because it's kinda expensive to calculate). You may or may
+ * not ultimately get an error at some point; results are undefined. However, note that
+ * coordinates will still be validated for falling within the world boundaries.
+- * @see com.vividsolutions.jts.geom.Geometry#isValid(). */
++ * @see org.locationtech.jts.geom.Geometry#isValid(). */
+ none,
+
+ /** Geometries will be explicitly validated on creation, possibly resulting in an exception:
+@@ -307,7 +307,7 @@ public class JtsWktShapeParser extends W
+
+ /** Invalid Geometries are repaired by taking the convex hull. The result will very likely be a
+ * larger shape that matches false-positives, but no false-negatives.
+- * See {@link com.vividsolutions.jts.geom.Geometry#convexHull()}. */
++ * See {@link org.locationtech.jts.geom.Geometry#convexHull()}. */
+ repairConvexHull,
+
+ /** Invalid polygons are repaired using the {@code buffer(0)} technique. From the <a
+--- a/src/main/java/com/spatial4j/core/shape/jts/JtsGeometry.java
++++ b/src/main/java/com/spatial4j/core/shape/jts/JtsGeometry.java
+@@ -29,23 +29,23 @@ import com.spatial4j.core.shape.impl.Buf
+ import com.spatial4j.core.shape.impl.PointImpl;
+ import com.spatial4j.core.shape.impl.Range;
+ import com.spatial4j.core.shape.impl.RectangleImpl;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.CoordinateSequence;
+-import com.vividsolutions.jts.geom.CoordinateSequenceFilter;
+-import com.vividsolutions.jts.geom.Envelope;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.GeometryCollection;
+-import com.vividsolutions.jts.geom.GeometryFilter;
+-import com.vividsolutions.jts.geom.IntersectionMatrix;
+-import com.vividsolutions.jts.geom.LineString;
+-import com.vividsolutions.jts.geom.Lineal;
+-import com.vividsolutions.jts.geom.LinearRing;
+-import com.vividsolutions.jts.geom.Polygon;
+-import com.vividsolutions.jts.geom.Puntal;
+-import com.vividsolutions.jts.geom.prep.PreparedGeometry;
+-import com.vividsolutions.jts.geom.prep.PreparedGeometryFactory;
+-import com.vividsolutions.jts.operation.union.UnaryUnionOp;
+-import com.vividsolutions.jts.operation.valid.IsValidOp;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.CoordinateSequence;
++import org.locationtech.jts.geom.CoordinateSequenceFilter;
++import org.locationtech.jts.geom.Envelope;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.GeometryCollection;
++import org.locationtech.jts.geom.GeometryFilter;
++import org.locationtech.jts.geom.IntersectionMatrix;
++import org.locationtech.jts.geom.LineString;
++import org.locationtech.jts.geom.Lineal;
++import org.locationtech.jts.geom.LinearRing;
++import org.locationtech.jts.geom.Polygon;
++import org.locationtech.jts.geom.Puntal;
++import org.locationtech.jts.geom.prep.PreparedGeometry;
++import org.locationtech.jts.geom.prep.PreparedGeometryFactory;
++import org.locationtech.jts.operation.union.UnaryUnionOp;
++import org.locationtech.jts.operation.valid.IsValidOp;
+
+ import java.util.ArrayList;
+ import java.util.List;
+@@ -129,7 +129,7 @@ public class JtsGeometry implements Shap
+
+ /**
+ * Adds an index to this class internally to compute spatial relations faster. In JTS this
+- * is called a {@link com.vividsolutions.jts.geom.prep.PreparedGeometry}. This
++ * is called a {@link org.locationtech.jts.geom.prep.PreparedGeometry}. This
+ * isn't done by default because it takes some time to do the optimization, and it uses more
+ * memory. Calling this method isn't thread-safe so be careful when this is done. If it was
+ * already indexed then nothing happens.
+@@ -276,7 +276,7 @@ public class JtsGeometry implements Shap
+
+ protected SpatialRelation relate(Geometry oGeom) {
+ //see http://docs.geotools.org/latest/userguide/library/jts/dim9.html#preparedgeometry
+- if (oGeom instanceof com.vividsolutions.jts.geom.Point) {
++ if (oGeom instanceof org.locationtech.jts.geom.Point) {
+ if (preparedGeometry != null)
+ return preparedGeometry.disjoint(oGeom) ? SpatialRelation.DISJOINT : SpatialRelation.CONTAINS;
+ return geom.disjoint(oGeom) ? SpatialRelation.DISJOINT : SpatialRelation.CONTAINS;
+@@ -331,7 +331,7 @@ public class JtsGeometry implements Shap
+ * If <code>geom</code> spans the dateline, then this modifies it to be a
+ * valid JTS geometry that extends to the right of the standard -180 to +180
+ * width such that some points are greater than +180 but some remain less.
+- * Takes care to invoke {@link com.vividsolutions.jts.geom.Geometry#geometryChanged()}
++ * Takes care to invoke {@link org.locationtech.jts.geom.Geometry#geometryChanged()}
+ * if needed.
+ *
+ * @return The number of times the geometry spans the dateline. >= 0
+--- a/src/main/java/com/spatial4j/core/shape/jts/JtsPoint.java
++++ b/src/main/java/com/spatial4j/core/shape/jts/JtsPoint.java
+@@ -25,23 +25,23 @@ import com.spatial4j.core.shape.Rectangl
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.SpatialRelation;
+ import com.spatial4j.core.shape.impl.PointImpl;
+-import com.vividsolutions.jts.geom.CoordinateSequence;
++import org.locationtech.jts.geom.CoordinateSequence;
+
+-/** Wraps a {@link com.vividsolutions.jts.geom.Point}. */
++/** Wraps a {@link org.locationtech.jts.geom.Point}. */
+ public class JtsPoint implements Point {
+
+ private final SpatialContext ctx;
+- private com.vividsolutions.jts.geom.Point pointGeom;
++ private org.locationtech.jts.geom.Point pointGeom;
+ private final boolean empty;//cached
+
+ /** A simple constructor without normalization / validation. */
+- public JtsPoint(com.vividsolutions.jts.geom.Point pointGeom, SpatialContext ctx) {
++ public JtsPoint(org.locationtech.jts.geom.Point pointGeom, SpatialContext ctx) {
+ this.ctx = ctx;
+ this.pointGeom = pointGeom;
+ this.empty = pointGeom.isEmpty();
+ }
+
+- public com.vividsolutions.jts.geom.Point getGeom() {
++ public org.locationtech.jts.geom.Point getGeom() {
+ return pointGeom;
+ }
+
+--- a/src/test/java/com/spatial4j/core/io/JtsBinaryCodecTest.java
++++ b/src/test/java/com/spatial4j/core/io/JtsBinaryCodecTest.java
+@@ -21,10 +21,10 @@ import com.carrotsearch.randomizedtestin
+ import com.spatial4j.core.context.jts.JtsSpatialContext;
+ import com.spatial4j.core.context.jts.JtsSpatialContextFactory;
+ import com.spatial4j.core.shape.Shape;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.PrecisionModel;
+-import com.vividsolutions.jts.util.GeometricShapeFactory;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.PrecisionModel;
++import org.locationtech.jts.util.GeometricShapeFactory;
+ import org.junit.Test;
+
+ import java.util.Arrays;
+--- a/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
++++ b/src/test/java/com/spatial4j/core/io/JtsWktShapeParserTest.java
+@@ -24,8 +24,8 @@ import com.spatial4j.core.shape.Rectangl
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.SpatialRelation;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.GeometryFactory;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.GeometryFactory;
+ import org.junit.Test;
+
+ import java.text.ParseException;
+--- a/src/test/java/com/spatial4j/core/io/PolygonBuilder.java
++++ b/src/test/java/com/spatial4j/core/io/PolygonBuilder.java
+@@ -20,9 +20,9 @@ package com.spatial4j.core.io;
+ import com.spatial4j.core.context.jts.JtsSpatialContext;
+ import com.spatial4j.core.shape.Shape;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.LinearRing;
+-import com.vividsolutions.jts.geom.Polygon;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.LinearRing;
++import org.locationtech.jts.geom.Polygon;
+
+ import java.util.ArrayList;
+ import java.util.List;
+@@ -82,7 +82,7 @@ public class PolygonBuilder {
+ }
+
+ /**
+- * Creates the raw {@link com.vividsolutions.jts.geom.Polygon}
++ * Creates the raw {@link org.locationtech.jts.geom.Polygon}
+ *
+ * @return Built polygon
+ */
+@@ -93,7 +93,7 @@ public class PolygonBuilder {
+ }
+
+ /**
+- * Builder for defining a hole in a {@link com.vividsolutions.jts.geom.Polygon}
++ * Builder for defining a hole in a {@link org.locationtech.jts.geom.Polygon}
+ */
+ public class PolygonHoleBuilder {
+
+--- a/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
++++ b/src/test/java/com/spatial4j/core/shape/JtsGeometryTest.java
+@@ -24,10 +24,10 @@ import com.spatial4j.core.context.jts.Jt
+ import com.spatial4j.core.io.jts.JtsWktShapeParser;
+ import com.spatial4j.core.shape.impl.PointImpl;
+ import com.spatial4j.core.shape.jts.JtsGeometry;
+-import com.vividsolutions.jts.geom.Coordinate;
+-import com.vividsolutions.jts.geom.CoordinateFilter;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.IntersectionMatrix;
++import org.locationtech.jts.geom.Coordinate;
++import org.locationtech.jts.geom.CoordinateFilter;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.IntersectionMatrix;
+ import org.junit.Test;
+
+ import java.io.BufferedReader;
=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+jts-1.15.patch
View it on GitLab: https://salsa.debian.org/java-team/spatial4j-0.4/compare/88155fe19177b8f9e8502760586f434f7e67e66c...1f5143f53c18230ada4b8e3538ac9d4e2e1d3601
--
View it on GitLab: https://salsa.debian.org/java-team/spatial4j-0.4/compare/88155fe19177b8f9e8502760586f434f7e67e66c...1f5143f53c18230ada4b8e3538ac9d4e2e1d3601
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180823/f96964aa/attachment.html>
More information about the pkg-java-commits
mailing list