Moving JTS 1.13 to unstable, h2database & elasticsearch need changes
JTS 1.13 has been available in experimental for some time now, and I'd
like to move it to unstable soon. We have GEOS 3.5.0 in unstable for
some time too, but JTS 1.13 it's a port of is not in unstable yet.
Because the two libjts-java reverse dependencies are both maintained by
the Java team, I'd like to coordinate the jts transition with the
h2database & elasticsearch maintainers.
The h2database won't need 04-jts-compatibility.patch any more, upstream
already uses JTS 1.13 for its builds.
Because jts (1.13+ds-1~exp1) now uses maven-debian-helper, elasticsearch
doesn't need to install the jar manually any more.
Patches for both are attached.
If we can coordinate the transition on this list we can spare us two RC
bugs when JTS 1.13 is uploaded to unstable.
Kind Regards,
Bas
--
GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
diff --git a/debian/changelog b/debian/changelog
index 9954fb6..cb58f5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+h2database (1.4.185-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Drop 04-jts-compatibility.patch, not needed for JTS 1.13.
+
+ -- Bas Couwenberg <sebastic@debian.org> Sat, 07 Nov 2015 16:41:50 +0100
+
h2database (1.4.185-1) unstable; urgency=low
* Initial release. (Closes: #607891)
diff --git a/debian/patches/04-jts-compatibility.patch b/debian/patches/04-jts-compatibility.patch
deleted file mode 100644
index 85fd79c..0000000
--- a/debian/patches/04-jts-compatibility.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Fix the compatibility with the version of JTS in Debian. To be removed after upgrading to JTS 0.13.
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: not-needed
---- a/src/main/org/h2/value/ValueGeometry.java
-+++ b/src/main/org/h2/value/ValueGeometry.java
-@@ -81,7 +81,7 @@
- private static byte[] convertToWKB(Geometry g) {
- boolean includeSRID = g.getSRID() != 0;
- int dimensionCount = getDimensionCount(g);
-- WKBWriter writer = new WKBWriter(dimensionCount, includeSRID);
-+ WKBWriter writer = new WKBWriter(dimensionCount/*, includeSRID*/);
- return writer.write(g);
- }
-
---- a/src/test/org/h2/test/db/TestSpatial.java
-+++ b/src/test/org/h2/test/db/TestSpatial.java
-@@ -116,11 +116,11 @@
- assertEquals(1, rs.getInt(1));
- assertEquals("POLYGON ((1 1, 1 2, 2 2, 1 1))", rs.getString(2));
- GeometryFactory f = new GeometryFactory();
-- Polygon polygon = f.createPolygon(new Coordinate[] {
-+ Polygon polygon = f.createPolygon(new com.vividsolutions.jts.geom.LinearRing(new com.vividsolutions.jts.geom.impl.CoordinateArraySequence(new Coordinate[] {
- new Coordinate(1, 1),
- new Coordinate(1, 2),
- new Coordinate(2, 2),
-- new Coordinate(1, 1) });
-+ new Coordinate(1, 1) }), f), null);
- assertTrue(polygon.equals(rs.getObject(2)));
-
- rs = stat.executeQuery("select * from test where polygon = " +
diff --git a/debian/patches/series b/debian/patches/series
index 8a7dcc2..b2567b8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
01-use-jar-files-from-debian.patch
02-servlet-api-compatibility.patch
03-osgi-compatibility.patch
-04-jts-compatibility.patch
diff --git a/debian/changelog b/debian/changelog
index e462e11..bdefb53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+elasticsearch (1.6.2+dfsg-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Don't install JTS in local maven repository, not needed for JTS 1.13.
+
+ -- Bas Couwenberg <sebastic@debian.org> Sat, 07 Nov 2015 16:37:29 +0100
+
elasticsearch (1.6.2+dfsg-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/maven.rules b/debian/maven.rules
index d641735..6132052 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -7,7 +7,7 @@ com.github.spullara.mustache.java compiler jar s/.*/debian/ * *
com.spatial4j spatial4j jar s/0\.4.*/0.4.x/ * *
com.tdunning t-digest jar * * *
com.google.guava guava jar * * *
-com.vividsolutions jts jar s/.*/fake/ * *
+com.vividsolutions jts jar s/.*/debian/ * *
log4j apache-log4j-extras jar s/1\.2\..*/1.2.x/ * *
log4j log4j jar s/.*/1.2.x/ * *
org.apache.lucene lucene-* jar s/.*/4.10.x/ * *
diff --git a/debian/rules b/debian/rules
index c678778..009d15b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,14 +31,6 @@ override_dh_auto_configure:
-Dversion=fake \
-Dpackaging=jar
- mvn --offline install:install-file \
- -Dmaven.repo.local=$(CURDIR)/debian/maven-repo \
- -Dfile=/usr/share/java/jts.jar \
- -DgroupId=com.vividsolutions \
- -DartifactId=jts \
- -Dversion=fake \
- -Dpackaging=jar
-
override_dh_auto_install:
mh_installpoms -plibelasticsearch1.6-java
mh_installjar -plibelasticsearch1.6-java -l -s pom.xml target/elasticsearch-*.jar
Reply to: