[Git][debian-gis-team/postgis-java][upstream] New upstream version 2.4.0
Bas Couwenberg
gitlab at salsa.debian.org
Thu Mar 5 04:36:07 GMT 2020
Bas Couwenberg pushed to branch upstream at Debian GIS Project / postgis-java
Commits:
11f640fd by Bas Couwenberg at 2020-03-05T05:23:22+01:00
New upstream version 2.4.0
- - - - -
10 changed files:
- jdbc/pom.xml
- jdbc/src/main/java/org/postgis/DriverWrapper.java
- jdbc_jtsparser/pom.xml
- jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java
- jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java
- pom.xml
- postgis-jdbc-java2d/pom.xml
- postgis-jdbc-java2d/src/main/java/org/postgis/java2d/Java2DWrapper.java
- tools/osgeo-postgis-jdbc-test-util/pom.xml
- tools/pom.xml
Changes:
=====================================
jdbc/pom.xml
=====================================
@@ -5,11 +5,11 @@
<parent>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
</parent>
<artifactId>postgis-jdbc</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
<packaging>jar</packaging>
<name>Postgis JDBC Driver</name>
@@ -27,7 +27,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>9.4.1208.jre7</version>
+ <version>${dependency.postgresql-jdbc.version}</version>
</dependency>
</dependencies>
=====================================
jdbc/src/main/java/org/postgis/DriverWrapper.java
=====================================
@@ -339,7 +339,7 @@ public class DriverWrapper extends Driver {
}
}
- public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ public Logger getParentLogger() {
throw new UnsupportedOperationException("Not supported yet.");
}
}
=====================================
jdbc_jtsparser/pom.xml
=====================================
@@ -5,17 +5,20 @@
<parent>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
</parent>
<artifactId>postgis-jdbc-jtsparser</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
<packaging>jar</packaging>
<name>Postgis JDBC Driver JTS Parser</name>
<description>Parser between JTS and PostGIS geometry formats.</description>
<properties>
+ <!-- Dependency versions -->
+ <dependency.jts-version.version>1.16.1</dependency.jts-version.version>
+
<testWithDatabase>false</testWithDatabase>
<jdbcDriverClassName>org.postgresql.Driver</jdbcDriverClassName>
<jdbcUrl>jdbc:postgres_jts://localhost:5432/postgis1</jdbcUrl>
@@ -27,18 +30,18 @@
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
</dependency>
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts</artifactId>
- <version>1.15.0</version>
+ <version>${dependency.jts-version.version}</version>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
- <version>1.15.0</version>
+ <version>${dependency.jts-version.version}</version>
</dependency>
<dependency>
<groupId>org.locationtech.spatial4j</groupId>
=====================================
jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java
=====================================
@@ -71,8 +71,8 @@ public class JTSShape implements Shape {
}
protected Polygon createRect(double x, double y, double w, double h) {
- double[] arr = { x, y, x + w, y, x + w, y + h, x, y + h, x, y };
- PackedCoordinateSequence shell = new PackedCoordinateSequence.Double(arr, 2);
+ Coordinate[] coords = { new Coordinate(x, y), new Coordinate(x + w, y), new Coordinate(x + w, y + h) ,new Coordinate(x, y + h) ,new Coordinate(x, y) };
+ PackedCoordinateSequence shell = new PackedCoordinateSequence.Double(coords, 2);
Polygon p = fac.createPolygon(fac.createLinearRing(shell), NOSHELLS);
return p;
}
=====================================
jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java
=====================================
@@ -200,7 +200,7 @@ public class JtsBinaryParser {
private CoordinateSequence parseCS(ValueGetter data, boolean haveZ, boolean haveM) {
int count = data.getInt();
int dims = haveZ ? 3 : 2;
- CoordinateSequence cs = new PackedCoordinateSequence.Double(count, dims);
+ CoordinateSequence cs = new PackedCoordinateSequence.Double(count, dims, 0);
for (int i = 0; i < count; i++) {
for (int d = 0; d < dims; d++) {
=====================================
pom.xml
=====================================
@@ -4,7 +4,7 @@
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
<packaging>pom</packaging>
<name>PostGIS Java Project</name>
@@ -78,8 +78,8 @@
<url>https://github.com/postgis/postgis-java</url>
<connection>scm:git:git://github.com/postgis/postgis-java.git</connection>
<developerConnection>scm:git:git at github.com:postgis/postgis-java.git</developerConnection>
- <tag>HEAD</tag>
- </scm>
+ <tag>postgis-java-aggregator-2.4.0</tag>
+ </scm>
<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/postgis/postgis-java/issues</url>
@@ -98,8 +98,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.min.version>1.7</java.min.version>
- <maven.min.version>3.3</maven.min.version>
+ <java.min.version>1.8</java.min.version>
+ <maven.min.version>3.6</maven.min.version>
<maven.test.skip>false</maven.test.skip>
<surefire.forkCount>1</surefire.forkCount>
<surefire.useSystemClassLoader>true</surefire.useSystemClassLoader>
@@ -109,33 +109,34 @@
<!-- Plugin versioning -->
<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
- <download-maven-plugin.version>1.4.0</download-maven-plugin.version>
+ <download-maven-plugin.version>1.5.0</download-maven-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
- <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
+ <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
- <maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
- <maven-dependency-plugin.version>3.1.0</maven-dependency-plugin.version>
+ <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+ <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
- <maven-ear-plugin.version>3.0.0</maven-ear-plugin.version>
- <maven-ejb-plugin.version>3.0.0</maven-ejb-plugin.version>
+ <maven-ear-plugin.version>3.0.2</maven-ear-plugin.version>
+ <maven-ejb-plugin.version>3.0.1</maven-ejb-plugin.version>
<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
- <maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
+ <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
- <maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
- <maven-jarsigner-plugin.version>1.4</maven-jarsigner-plugin.version>
- <maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
- <maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
+ <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+ <maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-plugin.version>
+ <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
+ <maven-jxr-plugin.version>3.0.0</maven-jxr-plugin.version>
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
- <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
- <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
- <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
- <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
- <maven-versions-plugin.version>2.5</maven-versions-plugin.version>
- <maven-war-plugin.version>3.2.0</maven-war-plugin.version>
+ <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
+ <maven-shade-plugin.version>3.2.2</maven-shade-plugin.version>
+ <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
+ <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
+ <maven-versions-plugin.version>2.7</maven-versions-plugin.version>
+ <maven-war-plugin.version>3.2.3</maven-war-plugin.version>
<!-- Dependency versions -->
<dependency.logback.version>1.2.3</dependency.logback.version>
- <dependency.slfj.version>1.7.25</dependency.slfj.version>
+ <dependency.postgresql-jdbc.version>42.2.10</dependency.postgresql-jdbc.version>
+ <dependency.slfj.version>1.7.30</dependency.slfj.version>
<dependency.testng.version>6.14.3</dependency.testng.version>
</properties>
@@ -261,6 +262,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
+ <configuration>
+ <source>${java.min.version}</source>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
=====================================
postgis-jdbc-java2d/pom.xml
=====================================
@@ -5,11 +5,11 @@
<parent>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
</parent>
<artifactId>postgis-jdbc-java2d</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
<packaging>jar</packaging>
<name>postgis-jdbc-java2d</name>
@@ -27,7 +27,7 @@
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
</dependency>
</dependencies>
=====================================
postgis-jdbc-java2d/src/main/java/org/postgis/java2d/Java2DWrapper.java
=====================================
@@ -165,7 +165,7 @@ public class Java2DWrapper extends Driver {
return "Java2DWrapper " + REVISION + ", wrapping " + Driver.getVersion();
}
- public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ public Logger getParentLogger() {
throw new UnsupportedOperationException("Not supported yet.");
}
}
=====================================
tools/osgeo-postgis-jdbc-test-util/pom.xml
=====================================
@@ -5,11 +5,11 @@
<parent>
<artifactId>tools</artifactId>
<groupId>net.postgis</groupId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
</parent>
<artifactId>osgeo-postgis-jdbc-test-util</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
<packaging>jar</packaging>
<name>osgeo-postgis-jdbc-test-util</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
</dependency>
<dependency>
=====================================
tools/pom.xml
=====================================
@@ -5,11 +5,11 @@
<parent>
<artifactId>postgis-java-aggregator</artifactId>
<groupId>net.postgis</groupId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
</parent>
<artifactId>tools</artifactId>
- <version>2.3.1-SNAPSHOT</version>
+ <version>2.4.0</version>
<packaging>pom</packaging>
<name>tools</name>
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis-java/-/commit/11f640fda7af56365338f02c98967d8596381a62
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis-java/-/commit/11f640fda7af56365338f02c98967d8596381a62
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-grass-devel/attachments/20200305/8b34d6b2/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list