Your message dated Tue, 14 Aug 2018 11:19:25 +0000
with message-id <[email protected]>
and subject line Bug#902787: fixed in h2database 1.4.197-1
has caused the Debian Bug report #902787,
regarding h2database: Add support for JTS 1.15
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
902787: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902787
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: h2database
Version: 1.4.196-2
Severity: important
Tags: patch
User: [email protected]
Usertags: jts-1.15
Dear Maintainer,
Your packages FTBFS with JTS 1.15 available in expermental.
The attached patch fixes the build failure.
To quote the MIGRATION documentation:
"
JTS Upgrade Guide
=================
The JTS Topology Suite has a long history, and in 2016/2017,
[Vivid Solutions](http://www.vividsolutions.com/) brought the project
to the LocationTech working group of the Eclipse Foundation.
During that transition, the Java package names and Maven GAVs have
changed. For package names (typically used in imports), the change is
reflected below:
| | **JTS 1.14.0 and before** | **JTS 1.15.0 and later** |
|---------------|:--------------------------|:----------------------------|
| Maven GroupId | com.vividsolutions | org.locationtech.jts |
| Package names | com.vividsolutions.jts.* | org.locationtech.jts.* |
To upgrade a Maven project (or another build tool using Maven dependency
management), one can do a find and replace on ```pom.xml``` files (or
similiar build files). In the source code, one could do a find and
replace on the package names. As a concrete example, one could use
these two commands to handle most of the migration.
```
git grep -l com.vividsolutions | grep pom.xml | xargs sed -i
"s/com.vividsolutions/org.locationtech.jts/g"
git grep -l com.vividsolutions | xargs sed -i
"s/com.vividsolutions/org.locationtech/g"
```
## Using JTS with Maven
To include JTS in a Maven project, add a dependency block like the following:
```xml
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>${jts.version}</version>
</dependency>
```
Where ${jts.version} is the released version of JTS one chooses to use.
See the [releases](https://github.com/locationtech/jts/releases) page
for options.
"
https://salsa.debian.org/debian-gis-team/jts/blob/upstream/1.15.1+ds/MIGRATION.md
The severity of this issue will be raised when the jts package is moved
from experimental to unstable.
Please note that JTS is up for adoption (#884537), as it should be better
to maintain the package as part of the Java team where its reverse
dependencies are maintained as well.
Kind Regards,
Bas
diff -Nru h2database-1.4.196/debian/changelog
h2database-1.4.196/debian/changelog
--- h2database-1.4.196/debian/changelog 2017-11-24 12:53:48.000000000 +0100
+++ h2database-1.4.196/debian/changelog 2018-06-30 21:59:29.000000000 +0200
@@ -1,3 +1,10 @@
+h2database (1.4.196-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch for JTS 1.15.
+
+ -- Bas Couwenberg <[email protected]> Sat, 30 Jun 2018 21:59:29 +0200
+
h2database (1.4.196-2) unstable; urgency=medium
* Fixed the build failure when maven-debian-helper is installed
diff -Nru h2database-1.4.196/debian/patches/01-use-jar-files-from-debian.patch
h2database-1.4.196/debian/patches/01-use-jar-files-from-debian.patch
--- h2database-1.4.196/debian/patches/01-use-jar-files-from-debian.patch
2017-06-20 09:48:22.000000000 +0200
+++ h2database-1.4.196/debian/patches/01-use-jar-files-from-debian.patch
2018-06-30 21:59:29.000000000 +0200
@@ -6,7 +6,7 @@
Last-Update: 2011-07-13
--- a/src/tools/org/h2/build/Build.java
+++ b/src/tools/org/h2/build/Build.java
-@@ -202,14 +202,13 @@
+@@ -202,14 +202,13 @@ public class Build extends BuildBase {
switchSource(debugInfo);
clean();
mkdir("temp");
@@ -23,7 +23,7 @@
+ File.pathSeparator + "/usr/share/java/slf4j-api.jar" +
+ File.pathSeparator + "/usr/share/java/org.eclipse.osgi.jar" +
+ File.pathSeparator + "/usr/share/java/osgi.compendium.jar" +
-+ File.pathSeparator + "/usr/share/java/jts.jar" +
++ File.pathSeparator + "/usr/share/java/jts-core.jar" +
File.pathSeparator + javaToolsJar;
FileList files;
if (clientOnly) {
diff -Nru h2database-1.4.196/debian/patches/jts-1.15.patch
h2database-1.4.196/debian/patches/jts-1.15.patch
--- h2database-1.4.196/debian/patches/jts-1.15.patch 1970-01-01
01:00:00.000000000 +0100
+++ h2database-1.4.196/debian/patches/jts-1.15.patch 2018-06-30
21:59:29.000000000 +0200
@@ -0,0 +1,109 @@
+Description: Update for JTS 1.15.
+Author: Bas Couwenberg <[email protected]>
+
+--- a/src/main/org/h2/index/SpatialTreeIndex.java
++++ b/src/main/org/h2/index/SpatialTreeIndex.java
+@@ -23,8 +23,8 @@ import org.h2.table.TableFilter;
+ import org.h2.value.Value;
+ import org.h2.value.ValueGeometry;
+ import org.h2.value.ValueNull;
+-import com.vividsolutions.jts.geom.Envelope;
+-import com.vividsolutions.jts.geom.Geometry;
++import org.locationtech.jts.geom.Envelope;
++import org.locationtech.jts.geom.Geometry;
+
+ /**
+ * This is an index based on a MVR-TreeMap.
+--- a/src/main/org/h2/mvstore/db/MVSpatialIndex.java
++++ b/src/main/org/h2/mvstore/db/MVSpatialIndex.java
+@@ -34,8 +34,8 @@ import org.h2.value.Value;
+ import org.h2.value.ValueGeometry;
+ import org.h2.value.ValueLong;
+ import org.h2.value.ValueNull;
+-import com.vividsolutions.jts.geom.Envelope;
+-import com.vividsolutions.jts.geom.Geometry;
++import org.locationtech.jts.geom.Envelope;
++import org.locationtech.jts.geom.Geometry;
+
+ /**
+ * This is an index based on a MVRTreeMap.
+--- a/src/main/org/h2/value/DataType.java
++++ b/src/main/org/h2/value/DataType.java
+@@ -59,7 +59,7 @@ public class DataType {
+ public static final Class<?> GEOMETRY_CLASS;
+
+ private static final String GEOMETRY_CLASS_NAME =
+- "com.vividsolutions.jts.geom.Geometry";
++ "org.locationtech.jts.geom.Geometry";
+
+ /**
+ * The list of types. An ArrayList so that Tomcat doesn't set it to null
+--- a/src/main/org/h2/value/ValueGeometry.java
++++ b/src/main/org/h2/value/ValueGeometry.java
+@@ -9,19 +9,19 @@ import java.sql.PreparedStatement;
+ import java.sql.SQLException;
+ import java.util.Arrays;
+
+-import com.vividsolutions.jts.geom.CoordinateSequence;
+-import com.vividsolutions.jts.geom.CoordinateSequenceFilter;
+-import com.vividsolutions.jts.geom.PrecisionModel;
++import org.locationtech.jts.geom.CoordinateSequence;
++import org.locationtech.jts.geom.CoordinateSequenceFilter;
++import org.locationtech.jts.geom.PrecisionModel;
+ import org.h2.message.DbException;
+ import org.h2.util.StringUtils;
+-import com.vividsolutions.jts.geom.Envelope;
+-import com.vividsolutions.jts.geom.Geometry;
+-import com.vividsolutions.jts.geom.GeometryFactory;
+-import com.vividsolutions.jts.io.ParseException;
+-import com.vividsolutions.jts.io.WKBReader;
+-import com.vividsolutions.jts.io.WKBWriter;
+-import com.vividsolutions.jts.io.WKTReader;
+-import com.vividsolutions.jts.io.WKTWriter;
++import org.locationtech.jts.geom.Envelope;
++import org.locationtech.jts.geom.Geometry;
++import org.locationtech.jts.geom.GeometryFactory;
++import org.locationtech.jts.io.ParseException;
++import org.locationtech.jts.io.WKBReader;
++import org.locationtech.jts.io.WKBWriter;
++import org.locationtech.jts.io.WKTReader;
++import org.locationtech.jts.io.WKTWriter;
+
+ /**
+ * Implementation of the GEOMETRY data type.
+@@ -66,7 +66,7 @@ public class ValueGeometry extends Value
+ * Get or create a geometry value for the given geometry.
+ *
+ * @param o the geometry object (of type
+- * com.vividsolutions.jts.geom.Geometry)
++ * org.locationtech.jts.geom.Geometry)
+ * @return the value
+ */
+ public static ValueGeometry getFromGeometry(Object o) {
+--- a/src/test/org/h2/test/db/TestSpatial.java
++++ b/src/test/org/h2/test/db/TestSpatial.java
+@@ -19,15 +19,15 @@ import org.h2.tools.SimpleRowSource;
+ import org.h2.value.DataType;
+ import org.h2.value.Value;
+ import org.h2.value.ValueGeometry;
+-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.Point;
+-import com.vividsolutions.jts.geom.Polygon;
+-import com.vividsolutions.jts.geom.util.AffineTransformation;
+-import com.vividsolutions.jts.io.ParseException;
+-import com.vividsolutions.jts.io.WKTReader;
++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.Point;
++import org.locationtech.jts.geom.Polygon;
++import org.locationtech.jts.geom.util.AffineTransformation;
++import org.locationtech.jts.io.ParseException;
++import org.locationtech.jts.io.WKTReader;
+
+ /**
+ * Spatial datatype and index tests.
diff -Nru h2database-1.4.196/debian/patches/series
h2database-1.4.196/debian/patches/series
--- h2database-1.4.196/debian/patches/series 2017-06-20 09:46:54.000000000
+0200
+++ h2database-1.4.196/debian/patches/series 2018-06-30 21:53:41.000000000
+0200
@@ -1,3 +1,4 @@
01-use-jar-files-from-debian.patch
03-osgi-compatibility.patch
04-reproducible-javadoc.patch
+jts-1.15.patch
--- End Message ---
--- Begin Message ---
Source: h2database
Source-Version: 1.4.197-1
We believe that the bug you reported is fixed in the latest version of
h2database, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Markus Koschany <[email protected]> (supplier of updated h2database package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Tue, 14 Aug 2018 12:47:09 +0200
Source: h2database
Binary: libh2-java libh2-java-doc
Architecture: source
Version: 1.4.197-1
Distribution: unstable
Urgency: medium
Maintainer: Debian Java Maintainers
<[email protected]>
Changed-By: Markus Koschany <[email protected]>
Description:
libh2-java - H2 Database Engine
libh2-java-doc - H2 Database Engine (documentation)
Closes: 902787
Changes:
h2database (1.4.197-1) unstable; urgency=medium
.
* Team upload.
* New upstream version 1.4.197
- Fix compatibility issue with JTS 1.15. Thanks to Bas Couwenberg for the
report and patch. (Closes: #902787)
* Fix debian/watch file and use releases instead of tags.
* Refresh 01-use-jar-files-from-debian.patch
* Switch to compat level 11.
* Declare compliance with Debian Policy 4.2.0.
Checksums-Sha1:
a18b49b50290c190a39ed4379a0c9f20df907475 2317 h2database_1.4.197-1.dsc
56da99c098a24385fb66669716e4ee7e3c42e94c 2285716 h2database_1.4.197.orig.tar.xz
ea7159a31a7a994677e9c4036cb88338936eeaa9 12544
h2database_1.4.197-1.debian.tar.xz
2299f10ab671d4226855668cd741e46ae344378d 12019
h2database_1.4.197-1_amd64.buildinfo
Checksums-Sha256:
4b21a7b20c041cc70f8ff7cfcef31d8f8da926acb2d77db7711383f197190d8a 2317
h2database_1.4.197-1.dsc
728b1171cbfd160a84c246463e0df700c08ed6c49ef30a37663b209bba0bf420 2285716
h2database_1.4.197.orig.tar.xz
422077d121afcba6ee2a4abfd8c238e7930916b05e22a9619c49ed3a4c4e2dbb 12544
h2database_1.4.197-1.debian.tar.xz
df70aadf9786c80dcf8ffc34283a83ca7feb63089718d8d2b1e11a7005d3edb5 12019
h2database_1.4.197-1_amd64.buildinfo
Files:
9f63637ebd9a4f534427439e12731991 2317 java optional h2database_1.4.197-1.dsc
2cba84c41b2cefb0b0df2dee824302de 2285716 java optional
h2database_1.4.197.orig.tar.xz
b18ed94a558bdab34215ed0638137145 12544 java optional
h2database_1.4.197-1.debian.tar.xz
e84528d6c0ed1e6a69bcb4be70d4bba7 12019 java optional
h2database_1.4.197-1_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQKjBAEBCgCNFiEErPPQiO8y7e9qGoNf2a0UuVE7UeQFAltytgNfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEFD
RjNEMDg4RUYzMkVERUY2QTFBODM1RkQ5QUQxNEI5NTEzQjUxRTQPHGFwb0BkZWJp
YW4ub3JnAAoJENmtFLlRO1HkcJUQAIB8oHA6+RdPO2q0y1+C0Gh/BzAfTzdaT1g3
1GXikwy0XzvId+smflMSx9DWRZpnygz4AnDpxA/bk4t52A7Qw8mai1EtdHiiwNhx
O6Q0UQR+O1tcBCV4LH9MHfqyf/TpqdiUQMNmAa5xttBDaWBdRDfihTqFq8rQ+0GC
OS/ZxQoJayzDquqmzbPSgeIuIVQPi0Ecv1kPQcL0J5QgoTnxtk6Y7UYNsCLC/h6O
RWYd9yg6uwcRzNxYD3cSBw9P6qhNGMOZc4HOlVVniI08pKeNyfoUkxQBvWtvcwt5
zwwPjiXWWMCJUrcyKjacumWyqmfuyn7d6u2mSl4DvWtJzuVc1Jtt61h3AZStCRm9
mLGOUsPSyCjGsZ9vSO1kjDT2g3rFzfiAJjfv8FFIPRE7h6EPCvcGalbuo48Koh4G
FSfL9hs8qymj5ZGvp+36DJIqZDlLhUPXjx8KZ/uoCxI7THJ5iwTtjn9bPgydri9l
aSTIJzvq44RgYzJangu1IRryyaTj3fkSG09j6hKZ70NP4WjqPOVj/GMU4iYAR2Ri
DgWcaZFFjNKAdQWBOJeOa2r5/+chpFoPJhGp6pHoqoQal84UE4o7MFdy85MgijRU
Fda/DTIPxdm7cI6vkHl8/h64+fboRUmhb43tVZrKq1lnyhPwKPfq+t6u8oLP5uXr
xh35jlfv
=3pNz
-----END PGP SIGNATURE-----
--- End Message ---
__
This is the maintainer address of Debian's Java team
<https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-maintainers>.
Please use
[email protected] for discussions and questions.
