Commit c91ddd1c75780ddccecc57bb29fc24e34200ebc8 - postgis-java

+134

-5

.gitignore less more

0		# Created by .ignore support plugin (hsz.mobi)
1		.idea/misc.xml
2		.idea/uiDesigner.xml
3		.idea/workspace.xml
4		.idea/dictionaries⏎
	0	.idea
	1	### Linux template
	2	*~
	3
	4	# temporary files which can be created if a process still has a handle open of a deleted file
	5	.fuse_hidden*
	6
	7	# KDE directory preferences
	8	.directory
	9
	10	# Linux trash folder which might appear on any partition or disk
	11	.Trash-*
	12
	13	# .nfs files are created when an open file is removed but is still being accessed
	14	.nfs*
	15	### Windows template
	16	# Windows thumbnail cache files
	17	Thumbs.db
	18	ehthumbs.db
	19	ehthumbs_vista.db
	20
	21	# Dump file
	22	*.stackdump
	23
	24	# Folder config file
	25	[Dd]esktop.ini
	26
	27	# Recycle Bin used on file shares
	28	$RECYCLE.BIN/
	29
	30	# Windows Installer files
	31	*.cab
	32	*.msi
	33	*.msix
	34	*.msm
	35	*.msp
	36
	37	# Windows shortcuts
	38	*.lnk
	39
	40	# CMake
	41	cmake-build-debug/
	42	cmake-build-release/
	43
	44	# File-based project format
	45	*.iws
	46	*.iml
	47
	48	# IntelliJ
	49	out/
	50
	51	# mpeltonen/sbt-idea plugin
	52	.idea_modules/
	53
	54	# JIRA plugin
	55	atlassian-ide-plugin.xml
	56
	57	### Vim template
	58	# Swap
	59	[._]*.s[a-v][a-z]
	60	[._]*.sw[a-p]
	61	[._]s[a-v][a-z]
	62	[._]sw[a-p]
	63
	64	# Session
	65	Session.vim
	66
	67	# Temporary
	68	.netrwhist
	69	# Auto-generated tag files
	70	tags
	71	### Maven template
	72	target/
	73	pom.xml.tag
	74	pom.xml.releaseBackup
	75	pom.xml.versionsBackup
	76	pom.xml.next
	77	release.properties
	78	dependency-reduced-pom.xml
	79	buildNumber.properties
	80	.mvn/timing.properties
	81
	82	### macOS template
	83	# General
	84	.DS_Store
	85	.AppleDouble
	86	.LSOverride
	87
	88	# Icon must end with two \r
	89	Icon
	90
	91	# Thumbnails
	92	._*
	93
	94	# Files that might appear in the root of a volume
	95	.DocumentRevisions-V100
	96	.fseventsd
	97	.Spotlight-V100
	98	.TemporaryItems
	99	.Trashes
	100	.VolumeIcon.icns
	101	.com.apple.timemachine.donotpresent
	102
	103	# Directories potentially created on remote AFP share
	104	.AppleDB
	105	.AppleDesktop
	106	Network Trash Folder
	107	Temporary Items
	108	.apdisk
	109	### Java template
	110	# Compiled class file
	111	*.class
	112
	113	# Log file
	114	*.log
	115
	116	# BlueJ files
	117	*.ctxt
	118
	119	# Mobile Tools for Java (J2ME)
	120	.mtj.tmp/
	121
	122	# Package Files #
	123	*.jar
	124	*.war
	125	*.nar
	126	*.ear
	127	*.zip
	128	*.tar.gz
	129	*.rar
	130
	131	# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
	132	hs_err_pid*
	133

+0

-1

~~.idea/.name~~ less more

0

postgis-aggregator⏎

+0

-41

~~.idea/compiler.xml~~ less more

0		<?xml version="1.0" encoding="UTF-8"?>
1		<project version="4">
2		<component name="CompilerConfiguration">
3		<option name="DEFAULT_COMPILER" value="Javac" />
4		<resourceExtensions />
5		<wildcardResourcePatterns>
6		<entry name="!?*.java" />
7		<entry name="!?*.form" />
8		<entry name="!?*.class" />
9		<entry name="!?*.groovy" />
10		<entry name="!?*.scala" />
11		<entry name="!?*.flex" />
12		<entry name="!?*.kt" />
13		<entry name="!?*.clj" />
14		</wildcardResourcePatterns>
15		<annotationProcessing>
16		<profile default="true" name="Default" enabled="false">
17		<processorPath useClasspath="true" />
18		</profile>
19		<profile default="false" name="Maven default annotation processors profile" enabled="true">
20		<sourceOutputDir name="target/generated-sources/annotations" />
21		<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
22		<outputRelativeToContentRoot value="true" />
23		<processorPath useClasspath="true" />
24		<module name="osgeo-postgis-jdbc-test-util" />
25		<module name="postgis-jdbc" />
26		<module name="postgis-jdbc-java2d" />
27		<module name="postgis-jdbc-jtsparser" />
28		</profile>
29		</annotationProcessing>
30		<bytecodeTargetLevel>
31		<module name="osgeo-postgis-jdbc-test-util" target="1.7" />
32		<module name="postgis-aggregator" target="1.8" />
33		<module name="postgis-java-aggregator" target="1.7" />
34		<module name="postgis-jdbc" target="1.7" />
35		<module name="postgis-jdbc-java2d" target="1.7" />
36		<module name="postgis-jdbc-jtsparser" target="1.7" />
37		<module name="tools" target="1.7" />
38		</bytecodeTargetLevel>
39		</component>
40		</project>⏎

+0

-3

~~.idea/copyright/profiles_settings.xml~~ less more

0		<component name="CopyrightManager">
1		<settings default="" />
2		</component>⏎

+0

-12

~~.idea/encodings.xml~~ less more

0		<?xml version="1.0" encoding="UTF-8"?>
1		<project version="4">
2		<component name="Encoding">
3		<file url="file://$PROJECT_DIR$" charset="UTF-8" />
4		<file url="file://$PROJECT_DIR$/jdbc" charset="UTF-8" />
5		<file url="file://$PROJECT_DIR$/jdbc_jtsparser" charset="UTF-8" />
6		<file url="file://$PROJECT_DIR$/postgis-jdbc-java2d" charset="UTF-8" />
7		<file url="file://$PROJECT_DIR$/tools" charset="UTF-8" />
8		<file url="file://$PROJECT_DIR$/tools/osgeo-postgis-jdbc-test-util" charset="UTF-8" />
9		<file url="PROJECT" charset="UTF-8" />
10		</component>
11		</project>⏎

+0

-13

~~.idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_7.xml~~ less more

0		<component name="libraryTable">
1		<library name="Maven: ch.qos.logback:logback-classic:1.1.7">
2		<CLASSES>
3		<root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7.jar!/" />
4		</CLASSES>
5		<JAVADOC>
6		<root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7-javadoc.jar!/" />
7		</JAVADOC>
8		<SOURCES>
9		<root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-classic/1.1.7/logback-classic-1.1.7-sources.jar!/" />
10		</SOURCES>
11		</library>
12		</component>⏎

+0

-13

~~.idea/libraries/Maven__ch_qos_logback_logback_core_1_1_7.xml~~ less more

0		<component name="libraryTable">
1		<library name="Maven: ch.qos.logback:logback-core:1.1.7">
2		<CLASSES>
3		<root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7.jar!/" />
4		</CLASSES>
5		<JAVADOC>
6		<root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7-javadoc.jar!/" />
7		</JAVADOC>
8		<SOURCES>
9		<root url="jar://$MAVEN_REPOSITORY$/ch/qos/logback/logback-core/1.1.7/logback-core-1.1.7-sources.jar!/" />
10		</SOURCES>
11		</library>
12		</component>⏎

+0

-13

~~.idea/libraries/Maven__com_beust_jcommander_1_48.xml~~ less more

0		<component name="libraryTable">
1		<library name="Maven: com.beust:jcommander:1.48">
2		<CLASSES>
3		<root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.48/jcommander-1.48.jar!/" />
4		</CLASSES>
5		<JAVADOC>
6		<root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.48/jcommander-1.48-javadoc.jar!/" />
7		</JAVADOC>
8		<SOURCES>
9		<root url="jar://$MAVEN_REPOSITORY$/com/beust/jcommander/1.48/jcommander-1.48-sources.jar!/" />
10		</SOURCES>
11		</library>
12		</component>⏎

+0

-13

~~.idea/libraries/Maven__com_vividsolutions_jts_1_12.xml~~ less more

0		<component name="libraryTable">
1		<library name="Maven: com.vividsolutions:jts:1.12">
2		<CLASSES>
3		<root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.12/jts-1.12.jar!/" />
4		</CLASSES>
5		<JAVADOC>
6		<root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.12/jts-1.12-javadoc.jar!/" />
7		</JAVADOC>
8		<SOURCES>
9		<root url="jar://$MAVEN_REPOSITORY$/com/vividsolutions/jts/1.12/jts-1.12-sources.jar!/" />
10		</SOURCES>
11		</library>
12		</component>⏎

+0

-13

~~.idea/libraries/Maven__org_beanshell_bsh_2_0b4.xml~~ less more

0		<component name="libraryTable">
1		<library name="Maven: org.beanshell:bsh:2.0b4">
2		<CLASSES>
3		<root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar!/" />
4		</CLASSES>
5		<JAVADOC>
6		<root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-javadoc.jar!/" />
7		</JAVADOC>
8		<SOURCES>
9		<root url="jar://$MAVEN_REPOSITORY$/org/beanshell/bsh/2.0b4/bsh-2.0b4-sources.jar!/" />
10		</SOURCES>
11		</library>
12		</component>⏎

+0

-13

~~.idea/libraries/Maven__org_postgresql_postgresql_9_4_1209_jre7.xml~~ less more

0		<component name="libraryTable">
1		<library name="Maven: org.postgresql:postgresql:9.4.1209.jre7">
2		<CLASSES>
3		<root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/9.4.1209.jre7/postgresql-9.4.1209.jre7.jar!/" />
4		</CLASSES>
5		<JAVADOC>
6		<root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/9.4.1209.jre7/postgresql-9.4.1209.jre7-javadoc.jar!/" />
7		</JAVADOC>
8		<SOURCES>
9		<root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/9.4.1209.jre7/postgresql-9.4.1209.jre7-sources.jar!/" />
10		</SOURCES>
11		</library>
12		</component>⏎

+0

-13

~~.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_21.xml~~ less more

0		<component name="libraryTable">
1		<library name="Maven: org.slf4j:slf4j-api:1.7.21">
2		<CLASSES>
3		<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar!/" />
4		</CLASSES>
5		<JAVADOC>
6		<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21-javadoc.jar!/" />
7		</JAVADOC>
8		<SOURCES>
9		<root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21-sources.jar!/" />
10		</SOURCES>
11		</library>
12		</component>⏎

+0

-13

~~.idea/libraries/Maven__org_testng_testng_6_9_10.xml~~ less more

0		<component name="libraryTable">
1		<library name="Maven: org.testng:testng:6.9.10">
2		<CLASSES>
3		<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.10/testng-6.9.10.jar!/" />
4		</CLASSES>
5		<JAVADOC>
6		<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.10/testng-6.9.10-javadoc.jar!/" />
7		</JAVADOC>
8		<SOURCES>
9		<root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.10/testng-6.9.10-sources.jar!/" />
10		</SOURCES>
11		</library>
12		</component>⏎

+0

-13

~~.idea/libraries/Maven__xerces_xercesImpl_2_4_0.xml~~ less more

0		<component name="libraryTable">
1		<library name="Maven: xerces:xercesImpl:2.4.0">
2		<CLASSES>
3		<root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0.jar!/" />
4		</CLASSES>
5		<JAVADOC>
6		<root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0-javadoc.jar!/" />
7		</JAVADOC>
8		<SOURCES>
9		<root url="jar://$MAVEN_REPOSITORY$/xerces/xercesImpl/2.4.0/xercesImpl-2.4.0-sources.jar!/" />
10		</SOURCES>
11		</library>
12		</component>⏎

+0

-13

~~.idea/modules.xml~~ less more

0		<?xml version="1.0" encoding="UTF-8"?>
1		<project version="4">
2		<component name="ProjectModuleManager">
3		<modules>
4		<module fileurl="file://$PROJECT_DIR$/tools/osgeo-postgis-jdbc-test-util/osgeo-postgis-jdbc-test-util.iml" filepath="$PROJECT_DIR$/tools/osgeo-postgis-jdbc-test-util/osgeo-postgis-jdbc-test-util.iml" group="tools and modules" />
5		<module fileurl="file://$PROJECT_DIR$/postgis-java-aggregator.iml" filepath="$PROJECT_DIR$/postgis-java-aggregator.iml" />
6		<module fileurl="file://$PROJECT_DIR$/jdbc/postgis-jdbc.iml" filepath="$PROJECT_DIR$/jdbc/postgis-jdbc.iml" />
7		<module fileurl="file://$PROJECT_DIR$/postgis-jdbc-java2d/postgis-jdbc-java2d.iml" filepath="$PROJECT_DIR$/postgis-jdbc-java2d/postgis-jdbc-java2d.iml" />
8		<module fileurl="file://$PROJECT_DIR$/jdbc_jtsparser/postgis-jdbc-jtsparser.iml" filepath="$PROJECT_DIR$/jdbc_jtsparser/postgis-jdbc-jtsparser.iml" />
9		<module fileurl="file://$PROJECT_DIR$/tools/tools.iml" filepath="$PROJECT_DIR$/tools/tools.iml" group="tools and modules" />
10		</modules>
11		</component>
12		</project>⏎

+0

-6

~~.idea/vcs.xml~~ less more

0		<?xml version="1.0" encoding="UTF-8"?>
1		<project version="4">
2		<component name="VcsDirectoryMappings">
3		<mapping directory="$PROJECT_DIR$" vcs="Git" />
4		</component>
5		</project>⏎

+3

-3

jdbc/pom.xml less more

4	4	<parent>
5	5	<groupId>net.postgis</groupId>
6	6	<artifactId>postgis-java-aggregator</artifactId>
7		<version>2.2.2-SNAPSHOT</version>
	7	<version>2.3.1-SNAPSHOT</version>
8	8	</parent>
9	9
10	10	<artifactId>postgis-jdbc</artifactId>
11		<version>2.2.2-SNAPSHOT</version>
	11	<version>2.3.1-SNAPSHOT</version>
12	12	<packaging>jar</packaging>
13	13
14	14	<name>Postgis JDBC Driver</name>

26	26	<dependency>
27	27	<groupId>org.postgresql</groupId>
28	28	<artifactId>postgresql</artifactId>
29		<version>[9.4.1208.jre7,)</version>
	29	<version>9.4.1208.jre7</version>
30	30	</dependency>
31	31	</dependencies>
32	32

+0

-23

~~jdbc/postgis-jdbc.iml~~ less more

0		<?xml version="1.0" encoding="UTF-8"?>
1		<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
2		<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3		<output url="file://$MODULE_DIR$/target/classes" />
4		<output-test url="file://$MODULE_DIR$/target/test-classes" />
5		<content url="file://$MODULE_DIR$">
6		<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7		<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
8		<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9		<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
10		<excludeFolder url="file://$MODULE_DIR$/target" />
11		</content>
12		<orderEntry type="inheritedJdk" />
13		<orderEntry type="sourceFolder" forTests="false" />
14		<orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1209.jre7" level="project" />
15		<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
16		<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
17		<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
18		<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
19		<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
20		<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
21		</component>
22		</module>⏎

+6

-0

jdbc/src/main/java/org/postgis/DriverWrapper.java less more

280	280	public void addGeometries(Connection conn) throws SQLException {
281	281	PGConnection pgconn = (PGConnection) conn;
282	282	pgconn.addDataType("geometry", org.postgis.PGgeometry.class);
	283	pgconn.addDataType("public.geometry", org.postgis.PGgeometry.class);
	284	pgconn.addDataType("\"public\".\"geometry\"", org.postgis.PGgeometry.class);
283	285	}
284	286
285	287	public void addBoxen(Connection conn) throws SQLException {

299	301	public void addGeometries(Connection conn) throws SQLException {
300	302	org.postgresql.PGConnection pgconn = (org.postgresql.PGConnection) conn;
301	303	pgconn.addDataType("geometry", org.postgis.PGgeometry.class);
	304	pgconn.addDataType("public.geometry", org.postgis.PGgeometry.class);
	305	pgconn.addDataType("\"public\".\"geometry\"", org.postgis.PGgeometry.class);
302	306	}
303	307
304	308	public void addBoxen(Connection conn) throws SQLException {

318	322	public void addGeometries(Connection conn) throws SQLException {
319	323	PGConnection pgconn = (PGConnection) conn;
320	324	pgconn.addDataType("geometry", org.postgis.PGgeometry.class);
	325	pgconn.addDataType("public.geometry", org.postgis.PGgeometry.class);
	326	pgconn.addDataType("\"public\".\"geometry\"", org.postgis.PGgeometry.class);
321	327	}
322	328
323	329	public void addBoxen(Connection conn) throws SQLException {

+8

-9

jdbc/src/main/java/org/postgis/PGgeometry.java less more

0	0	/*
1	1	* PGgeometry.java
2		*
	2	*
3	3	* PostGIS extension for PostgreSQL JDBC driver - PGobject Geometry Wrapper
4		*
	4	*
5	5	* (C) 2004 Paul Ramsey, pramsey@refractions.net
6		*
	6	*
7	7	* (C) 2005 Markus Schaber, markus.schaber@logix-tt.com
8		*
	8	*
9	9	* (C) 2015 Phillip Ross, phillip.w.g.ross@gmail.com
10	10	*
11	11	* This library is free software; you can redistribute it and/or

21	21	* You should have received a copy of the GNU Lesser General Public
22	22	* License along with this library; if not, write to the Free Software
23	23	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
24		*
	24	*
25	25	*/
26	26
27	27	package org.postgis;

36	36	private static final long serialVersionUID = 0x100;
37	37
38	38	Geometry geom;
39		BinaryParser bp = new BinaryParser();
40	39
41	40	public PGgeometry() {
42	41	this.setType("geometry");

53	52	}
54	53
55	54	public void setValue(String value) throws SQLException {
56		geom = geomFromString(value, bp);
	55	geom = geomFromString(value, new BinaryParser());
57	56	}
58	57
59	58	public static Geometry geomFromString(String value) throws SQLException {

130	129	public void setGeometry(Geometry newgeom) {
131	130	this.geom = newgeom;
132	131	}
133
	132
134	133	public int getGeoType() {
135	134	return geom.type;
136	135	}

152	151
153	152	/**
154	153	* Splits a String at the first occurrence of border character.
155		*
	154	*
156	155	* Poor man's String.split() replacement, as String.split() was invented at
157	156	* jdk1.4, and the Debian PostGIS Maintainer had problems building the woody
158	157	* backport of his package using DFSG-free compilers. In all the cases we

+8

-0

jdbc/src/test/java/org/postgis/ParserTest.java less more

321	321	}
322	322	}
323	323
	324	/*
	325	// Temporarily removing this check since it breaks between PostGIS v2.4.4 and PostGIS v2.5.0
	326	// Tests performed via psql between mdillon/postgis:9.3 and mdillon/postgis:9.4 shows the breakage
	327	// Test is also broken in mdillon/postgis:11-alpine
	328	// In psql, the sql statement "SELECT ST_AsEWKT(geometry_in('POINT(1e100 1.2345e-100 -2e-5)'));" returns
	329	// "POINT(1e+100 1.2345e-100 -2e-05)" with 9.3 and "POINT(1e+100 0 -0.00002)" with 9.4 and later
	330
324	331	// asEWKT() function is not present on PostGIS 0.X, and the test
325	332	// is pointless as 0.X uses EWKT as canonical rep so the same
326	333	// functionality was already tested above.

329	336	logger.debug("asEWKT: {}", sqlGeom);
330	337	Assert.assertEquals(geom, sqlGeom);
331	338	}
	339	*/
332	340
333	341	// asEWKB() function is not present on PostGIS 0.X.
334	342	if (serverPostgisMajor >= 1) {

+54

-0

jdbc/src/test/java/org/postgis/SerializationTest.java less more

	0	/*
	1	* ServerTest.java
	2	*
	3	* PostGIS extension for PostgreSQL JDBC driver - example and test classes
	4	*
	5	* (C) 2004 Paul Ramsey, pramsey@refractions.net
	6	*
	7	* (C) 2005 Markus Schaber, markus.schaber@logix-tt.com
	8	*
	9	* (C) 2017 Phillip Ross, phillip.w.g.ross@gmail.com
	10	*
	11	* This library is free software; you can redistribute it and/or
	12	* modify it under the terms of the GNU Lesser General Public
	13	* License as published by the Free Software Foundation; either
	14	* version 2.1 of the License, or (at your option) any later version.
	15	*
	16	* This library is distributed in the hope that it will be useful,
	17	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	18	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	19	* Lesser General Public License for more details.
	20	*
	21	* You should have received a copy of the GNU Lesser General Public
	22	* License along with this library; if not, write to the Free Software
	23	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	24	*
	25	*/
	26
	27	package org.postgis;
	28
	29
	30	import org.testng.Assert;
	31	import org.testng.annotations.Test;
	32
	33	import java.io.ByteArrayOutputStream;
	34	import java.io.NotSerializableException;
	35	import java.io.ObjectOutputStream;
	36
	37
	38	public class SerializationTest {
	39
	40
	41	@Test
	42	public void serializationCheckPGgeometry() throws Exception {
	43	try {
	44	new ObjectOutputStream(new ByteArrayOutputStream())
	45	.writeObject(new PGgeometry("MULTIPOLYGON(((1 1,1 2,2 1,1 1)))"));
	46	}
	47	catch (NotSerializableException ex) {
	48	Assert.fail("serialization of PGgeometry failed: " + ex);
	49	}
	50	}
	51
	52
	53	}

+2

-1

jdbc/src/test/resources/testng.xml less more

14	14	<class name="org.postgis.EmptyGeometriesTest"/>
15	15	<class name="org.postgis.ParserTest"/>
16	16	<class name="org.postgis.ServerTest"/>
	17	<class name="org.postgis.SerializationTest"/>
17	18	<class name="org.postgis.TokenizerTest"/>
18	19	<class name="org.postgis.VersionPrinter"/>
19	20	</classes>
20	21	</test>
21	22
22		</suite>⏎
	23	</suite>

+16

-5

jdbc_jtsparser/pom.xml less more

4	4	<parent>
5	5	<groupId>net.postgis</groupId>
6	6	<artifactId>postgis-java-aggregator</artifactId>
7		<version>2.2.2-SNAPSHOT</version>
	7	<version>2.3.1-SNAPSHOT</version>
8	8	</parent>
9	9
10	10	<artifactId>postgis-jdbc-jtsparser</artifactId>
11		<version>2.2.2-SNAPSHOT</version>
	11	<version>2.3.1-SNAPSHOT</version>
12	12	<packaging>jar</packaging>
13	13
14	14	<name>Postgis JDBC Driver JTS Parser</name>

26	26	<dependency>
27	27	<groupId>net.postgis</groupId>
28	28	<artifactId>postgis-jdbc</artifactId>
29		<version>[2.1.0,)</version>
	29	<version>2.3.1-SNAPSHOT</version>
30	30	</dependency>
31	31	<dependency>
32		<groupId>com.vividsolutions</groupId>
	32	<groupId>org.locationtech.jts</groupId>
33	33	<artifactId>jts</artifactId>
34		<version>1.12</version>
	34	<version>1.15.0</version>
	35	<type>pom</type>
	36	</dependency>
	37	<dependency>
	38	<groupId>org.locationtech.jts</groupId>
	39	<artifactId>jts-core</artifactId>
	40	<version>1.15.0</version>
	41	</dependency>
	42	<dependency>
	43	<groupId>org.locationtech.spatial4j</groupId>
	44	<artifactId>spatial4j</artifactId>
	45	<version>0.7</version>
35	46	</dependency>
36	47	</dependencies>
37	48

+0

-25

~~jdbc_jtsparser/postgis-jdbc-jtsparser.iml~~ less more

0		<?xml version="1.0" encoding="UTF-8"?>
1		<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
2		<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3		<output url="file://$MODULE_DIR$/target/classes" />
4		<output-test url="file://$MODULE_DIR$/target/test-classes" />
5		<content url="file://$MODULE_DIR$">
6		<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7		<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8		<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
9		<excludeFolder url="file://$MODULE_DIR$/target" />
10		</content>
11		<orderEntry type="inheritedJdk" />
12		<orderEntry type="sourceFolder" forTests="false" />
13		<orderEntry type="module" module-name="postgis-jdbc" />
14		<orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1209.jre7" level="project" />
15		<orderEntry type="library" name="Maven: com.vividsolutions:jts:1.12" level="project" />
16		<orderEntry type="library" name="Maven: xerces:xercesImpl:2.4.0" level="project" />
17		<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
18		<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
19		<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
20		<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
21		<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
22		<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
23		</component>
24		</module>⏎

+6

-14

jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java less more

24	24
25	25	package org.postgis.jts;
26	26
27		import java.awt.Rectangle;
28		import java.awt.Shape;
	27	import org.locationtech.jts.geom.*;
	28	import org.locationtech.jts.geom.Point;
	29	import org.locationtech.jts.geom.Polygon;
	30	import org.locationtech.jts.geom.impl.PackedCoordinateSequence;
	31
	32	import java.awt.*;
29	33	import java.awt.geom.AffineTransform;
30	34	import java.awt.geom.PathIterator;
31	35	import java.awt.geom.Point2D;
32	36	import java.awt.geom.Rectangle2D;
33
34		import com.vividsolutions.jts.geom.Coordinate;
35		import com.vividsolutions.jts.geom.CoordinateSequence;
36		import com.vividsolutions.jts.geom.Envelope;
37		import com.vividsolutions.jts.geom.Geometry;
38		import com.vividsolutions.jts.geom.GeometryCollection;
39		import com.vividsolutions.jts.geom.GeometryFactory;
40		import com.vividsolutions.jts.geom.LineString;
41		import com.vividsolutions.jts.geom.LinearRing;
42		import com.vividsolutions.jts.geom.Point;
43		import com.vividsolutions.jts.geom.Polygon;
44		import com.vividsolutions.jts.geom.impl.PackedCoordinateSequence;
45	37
46	38	public class JTSShape implements Shape {
47	39	static GeometryFactory fac = new GeometryFactory();

+15

-13

jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java less more

23	23	*/
24	24	package org.postgis.jts;
25	25
	26	import org.locationtech.jts.geom.*;
	27	import org.locationtech.jts.geom.impl.PackedCoordinateSequence;
	28	import org.locationtech.spatial4j.context.jts.JtsSpatialContextFactory;
26	29	import org.postgis.binary.ByteGetter;
27		import org.postgis.binary.ValueGetter;
28	30	import org.postgis.binary.ByteGetter.BinaryByteGetter;
29	31	import org.postgis.binary.ByteGetter.StringByteGetter;
30
31		import com.vividsolutions.jts.geom.*;
32		import com.vividsolutions.jts.geom.impl.PackedCoordinateSequence;
	32	import org.postgis.binary.ValueGetter;
33	33
34	34	/**
35	35	* Parse binary representation of geometries. Currently, only text rep (hexed)

47	47	*
48	48	*/
49	49	public class JtsBinaryParser {
	50
	51	private JtsSpatialContextFactory jtsFactory = new JtsSpatialContextFactory();
50	52
51	53	/**
52	54	* Get the appropriate ValueGetter for my endianness

168	170	Point result;
169	171	if (haveZ) {
170	172	double Z = data.getDouble();
171		result = JtsGeometry.geofac.createPoint(new Coordinate(X, Y, Z));
	173	result = jtsFactory.getGeometryFactory().createPoint(new Coordinate(X, Y, Z));
172	174	} else {
173		result = JtsGeometry.geofac.createPoint(new Coordinate(X, Y));
	175	result = jtsFactory.getGeometryFactory().createPoint(new Coordinate(X, Y));
174	176	}
175	177
176	178	if (haveM) { // skip M value

213	215	private MultiPoint parseMultiPoint(ValueGetter data, int srid) {
214	216	Point[] points = new Point[data.getInt()];
215	217	parseGeometryArray(data, points, srid);
216		return JtsGeometry.geofac.createMultiPoint(points);
	218	return jtsFactory.getGeometryFactory().createMultiPoint(points);
217	219	}
218	220
219	221	private LineString parseLineString(ValueGetter data, boolean haveZ, boolean haveM) {
220		return JtsGeometry.geofac.createLineString(parseCS(data, haveZ, haveM));
	222	return jtsFactory.getGeometryFactory().createLineString(parseCS(data, haveZ, haveM));
221	223	}
222	224
223	225	private LinearRing parseLinearRing(ValueGetter data, boolean haveZ, boolean haveM) {
224		return JtsGeometry.geofac.createLinearRing(parseCS(data, haveZ, haveM));
	226	return jtsFactory.getGeometryFactory().createLinearRing(parseCS(data, haveZ, haveM));
225	227	}
226	228
227	229	private Polygon parsePolygon(ValueGetter data, boolean haveZ, boolean haveM, int srid) {

233	235	rings[i] = parseLinearRing(data, haveZ, haveM);
234	236	rings[i].setSRID(srid);
235	237	}
236		return JtsGeometry.geofac.createPolygon(shell, rings);
	238	return jtsFactory.getGeometryFactory().createPolygon(shell, rings);
237	239	}
238	240
239	241	private MultiLineString parseMultiLineString(ValueGetter data, int srid) {
240	242	int count = data.getInt();
241	243	LineString[] strings = new LineString[count];
242	244	parseGeometryArray(data, strings, srid);
243		return JtsGeometry.geofac.createMultiLineString(strings);
	245	return jtsFactory.getGeometryFactory().createMultiLineString(strings);
244	246	}
245	247
246	248	private MultiPolygon parseMultiPolygon(ValueGetter data, int srid) {
247	249	int count = data.getInt();
248	250	Polygon[] polys = new Polygon[count];
249	251	parseGeometryArray(data, polys, srid);
250		return JtsGeometry.geofac.createMultiPolygon(polys);
	252	return jtsFactory.getGeometryFactory().createMultiPolygon(polys);
251	253	}
252	254
253	255	private GeometryCollection parseCollection(ValueGetter data, int srid) {
254	256	int count = data.getInt();
255	257	Geometry[] geoms = new Geometry[count];
256	258	parseGeometryArray(data, geoms, srid);
257		return JtsGeometry.geofac.createGeometryCollection(geoms);
	259	return jtsFactory.getGeometryFactory().createGeometryCollection(geoms);
258	260	}
259	261	}

+15

-15

jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java less more

23	23	*/
24	24	package org.postgis.jts;
25	25
26		import com.vividsolutions.jts.geom.CoordinateSequence;
27		import com.vividsolutions.jts.geom.Geometry;
28		import com.vividsolutions.jts.geom.GeometryCollection;
29		import com.vividsolutions.jts.geom.LineString;
30		import com.vividsolutions.jts.geom.MultiLineString;
31		import com.vividsolutions.jts.geom.MultiPoint;
32		import com.vividsolutions.jts.geom.MultiPolygon;
33		import com.vividsolutions.jts.geom.Point;
34		import com.vividsolutions.jts.geom.Polygon;
	26	import org.locationtech.jts.geom.CoordinateSequence;
	27	import org.locationtech.jts.geom.Geometry;
	28	import org.locationtech.jts.geom.GeometryCollection;
	29	import org.locationtech.jts.geom.LineString;
	30	import org.locationtech.jts.geom.MultiLineString;
	31	import org.locationtech.jts.geom.MultiPoint;
	32	import org.locationtech.jts.geom.MultiPolygon;
	33	import org.locationtech.jts.geom.Point;
	34	import org.locationtech.jts.geom.Polygon;
35	35
36	36	import org.postgis.binary.ByteSetter;
37	37	import org.postgis.binary.ValueSetter;

183	183	}
184	184
185	185	public static int getWKBType(Geometry geom) {
186		// We always write emtpy geometries as emtpy collections - for OpenGIS
	186	// We always write empty geometries as empty collections - for OpenGIS
187	187	// conformance
188	188	if (geom.isEmpty()) {
189	189	return org.postgis.Geometry.GEOMETRYCOLLECTION;
190	190	} else if (geom instanceof Point) {
191	191	return org.postgis.Geometry.POINT;
192		} else if (geom instanceof com.vividsolutions.jts.geom.LineString) {
	192	} else if (geom instanceof org.locationtech.jts.geom.LineString) {
193	193	return org.postgis.Geometry.LINESTRING;
194		} else if (geom instanceof com.vividsolutions.jts.geom.Polygon) {
	194	} else if (geom instanceof org.locationtech.jts.geom.Polygon) {
195	195	return org.postgis.Geometry.POLYGON;
196	196	} else if (geom instanceof MultiPoint) {
197	197	return org.postgis.Geometry.MULTIPOINT;
198	198	} else if (geom instanceof MultiLineString) {
199	199	return org.postgis.Geometry.MULTILINESTRING;
200		} else if (geom instanceof com.vividsolutions.jts.geom.MultiPolygon) {
	200	} else if (geom instanceof org.locationtech.jts.geom.MultiPolygon) {
201	201	return org.postgis.Geometry.MULTIPOLYGON;
202		} if (geom instanceof com.vividsolutions.jts.geom.GeometryCollection) {
	202	} if (geom instanceof org.locationtech.jts.geom.GeometryCollection) {
203	203	return org.postgis.Geometry.GEOMETRYCOLLECTION;
204	204	} else {
205	205	throw new IllegalArgumentException("Unknown Geometry Type: " + geom.getClass().getName());

215	215	}
216	216
217	217	/**
218		* Write a Coordinatesequence, part of LinearRing and Linestring, but not
	218	* Write a CoordinateSequence, part of LinearRing and Linestring, but not
219	219	* MultiPoint!
220	220	*/
221	221	private void writeCoordinates(CoordinateSequence seq, int dims, ValueSetter dest) {

+8

-8

jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java less more

29	29
30	30	import org.postgresql.util.PGobject;
31	31
32		import com.vividsolutions.jts.geom.CoordinateSequenceFactory;
33		import com.vividsolutions.jts.geom.Geometry;
34		import com.vividsolutions.jts.geom.GeometryCollection;
35		import com.vividsolutions.jts.geom.GeometryFactory;
36		import com.vividsolutions.jts.geom.Polygon;
37		import com.vividsolutions.jts.geom.PrecisionModel;
38		import com.vividsolutions.jts.geom.impl.PackedCoordinateSequenceFactory;
39		import com.vividsolutions.jts.io.WKTReader;
	32	import org.locationtech.jts.geom.CoordinateSequenceFactory;
	33	import org.locationtech.jts.geom.Geometry;
	34	import org.locationtech.jts.geom.GeometryCollection;
	35	import org.locationtech.jts.geom.GeometryFactory;
	36	import org.locationtech.jts.geom.Polygon;
	37	import org.locationtech.jts.geom.PrecisionModel;
	38	import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
	39	import org.locationtech.jts.io.WKTReader;
40	40
41	41	/**
42	42	* JTS Geometry SQL wrapper. Supports PostGIS 1.x (lwgeom hexwkb) for writing

+1

-1

jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java less more

25	25
26	26	import org.postgis.binary.ValueSetter;
27	27
28		import com.vividsolutions.jts.geom.*;
	28	import org.locationtech.jts.geom.*;
29	29	import org.slf4j.Logger;
30	30	import org.slf4j.LoggerFactory;
31	31	import org.testng.Assert;

+21

-17

pom.xml less more

3	3
4	4	<groupId>net.postgis</groupId>
5	5	<artifactId>postgis-java-aggregator</artifactId>
6		<version>2.2.2-SNAPSHOT</version>
	6	<version>2.3.1-SNAPSHOT</version>
7	7	<packaging>pom</packaging>
8	8
9	9	<name>PostGIS Java Project</name>

107	107	<failsafe.useSystemClassLoader>true</failsafe.useSystemClassLoader>
108	108
109	109	<!-- Plugin versioning -->
110		<build-helper-maven-plugin.version>1.12</build-helper-maven-plugin.version>
111		<download-maven-plugin.version>1.3.0</download-maven-plugin.version>
112		<maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
113		<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
114		<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
	110	<build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
	111	<download-maven-plugin.version>1.4.0</download-maven-plugin.version>
	112	<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
	113	<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
	114	<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
	115	<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
	116	<maven-dependency-plugin.version>3.1.0</maven-dependency-plugin.version>
115	117	<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
116		<maven-ear-plugin.version>2.10.1</maven-ear-plugin.version>
	118	<maven-ear-plugin.version>3.0.0</maven-ear-plugin.version>
	119	<maven-ejb-plugin.version>3.0.0</maven-ejb-plugin.version>
117	120	<maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
118		<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
	121	<maven-failsafe-plugin.version>2.21.0</maven-failsafe-plugin.version>
119	122	<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
120	123	<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
121		<maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
	124	<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
122	125	<maven-jarsigner-plugin.version>1.4</maven-jarsigner-plugin.version>
123		<maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
	126	<maven-javadoc-plugin.version>3.0.0</maven-javadoc-plugin.version>
124	127	<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
125	128	<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
126		<maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
127		<maven-shade-plugin.version>2.4.3</maven-shade-plugin.version>
	129	<maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
	130	<maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
128	131	<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
129		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
130		<maven-war-plugin.version>2.6</maven-war-plugin.version>
	132	<maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version>
	133	<maven-versions-plugin.version>2.5</maven-versions-plugin.version>
	134	<maven-war-plugin.version>3.2.0</maven-war-plugin.version>
131	135	<!-- Dependency versions -->
132		<dependency.logback.version>1.1.7</dependency.logback.version>
133		<dependency.slfj.version>1.7.21</dependency.slfj.version>
134		<dependency.testng.version>6.9.10</dependency.testng.version>
	136	<dependency.logback.version>1.2.3</dependency.logback.version>
	137	<dependency.slfj.version>1.7.25</dependency.slfj.version>
	138	<dependency.testng.version>6.14.3</dependency.testng.version>
135	139	</properties>
136	140
137	141	<dependencies>

+0

-18

~~postgis-java-aggregator.iml~~ less more

0		<?xml version="1.0" encoding="UTF-8"?>
1		<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
2		<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3		<output url="file://$MODULE_DIR$/target/classes" />
4		<output-test url="file://$MODULE_DIR$/target/test-classes" />
5		<content url="file://$MODULE_DIR$">
6		<excludeFolder url="file://$MODULE_DIR$/target" />
7		</content>
8		<orderEntry type="inheritedJdk" />
9		<orderEntry type="sourceFolder" forTests="false" />
10		<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
11		<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
12		<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
13		<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
14		<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
15		<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
16		</component>
17		</module>⏎

+3

-3

postgis-jdbc-java2d/pom.xml less more

4	4	<parent>
5	5	<groupId>net.postgis</groupId>
6	6	<artifactId>postgis-java-aggregator</artifactId>
7		<version>2.2.2-SNAPSHOT</version>
	7	<version>2.3.1-SNAPSHOT</version>
8	8	</parent>
9	9
10	10	<artifactId>postgis-jdbc-java2d</artifactId>
11		<version>2.2.2-SNAPSHOT</version>
	11	<version>2.3.1-SNAPSHOT</version>
12	12	<packaging>jar</packaging>
13	13
14	14	<name>postgis-jdbc-java2d</name>

26	26	<dependency>
27	27	<groupId>net.postgis</groupId>
28	28	<artifactId>postgis-jdbc</artifactId>
29		<version>2.2.2-SNAPSHOT</version>
	29	<version>2.3.1-SNAPSHOT</version>
30	30	</dependency>
31	31	</dependencies>
32	32

+0

-23

~~postgis-jdbc-java2d/postgis-jdbc-java2d.iml~~ less more

0		<?xml version="1.0" encoding="UTF-8"?>
1		<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
2		<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3		<output url="file://$MODULE_DIR$/target/classes" />
4		<output-test url="file://$MODULE_DIR$/target/test-classes" />
5		<content url="file://$MODULE_DIR$">
6		<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7		<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
8		<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
9		<excludeFolder url="file://$MODULE_DIR$/target" />
10		</content>
11		<orderEntry type="inheritedJdk" />
12		<orderEntry type="sourceFolder" forTests="false" />
13		<orderEntry type="module" module-name="postgis-jdbc" />
14		<orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1209.jre7" level="project" />
15		<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
16		<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
17		<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
18		<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
19		<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
20		<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
21		</component>
22		</module>⏎

+0

-24

~~tools/osgeo-postgis-jdbc-test-util/osgeo-postgis-jdbc-test-util.iml~~ less more

0		<?xml version="1.0" encoding="UTF-8"?>
1		<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
2		<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3		<output url="file://$MODULE_DIR$/target/classes" />
4		<output-test url="file://$MODULE_DIR$/target/test-classes" />
5		<content url="file://$MODULE_DIR$">
6		<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7		<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
8		<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9		<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
10		<excludeFolder url="file://$MODULE_DIR$/target" />
11		</content>
12		<orderEntry type="inheritedJdk" />
13		<orderEntry type="sourceFolder" forTests="false" />
14		<orderEntry type="module" module-name="postgis-jdbc" />
15		<orderEntry type="library" name="Maven: org.postgresql:postgresql:9.4.1209.jre7" level="project" />
16		<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
17		<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
18		<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
19		<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
20		<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
21		<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
22		</component>
23		</module>⏎

+3

-3

tools/osgeo-postgis-jdbc-test-util/pom.xml less more

4	4	<parent>
5	5	<artifactId>tools</artifactId>
6	6	<groupId>net.postgis</groupId>
7		<version>2.2.2-SNAPSHOT</version>
	7	<version>2.3.1-SNAPSHOT</version>
8	8	</parent>
9	9
10	10	<artifactId>osgeo-postgis-jdbc-test-util</artifactId>
11		<version>2.2.2-SNAPSHOT</version>
	11	<version>2.3.1-SNAPSHOT</version>
12	12	<packaging>jar</packaging>
13	13
14	14	<name>osgeo-postgis-jdbc-test-util</name>

29	29	<dependency>
30	30	<groupId>net.postgis</groupId>
31	31	<artifactId>postgis-jdbc</artifactId>
32		<version>2.2.2-SNAPSHOT</version>
	32	<version>2.3.1-SNAPSHOT</version>
33	33	</dependency>
34	34
35	35	<dependency>

+2

-2

tools/pom.xml less more

4	4	<parent>
5	5	<artifactId>postgis-java-aggregator</artifactId>
6	6	<groupId>net.postgis</groupId>
7		<version>2.2.2-SNAPSHOT</version>
	7	<version>2.3.1-SNAPSHOT</version>
8	8	</parent>
9	9
10	10	<artifactId>tools</artifactId>
11		<version>2.2.2-SNAPSHOT</version>
	11	<version>2.3.1-SNAPSHOT</version>
12	12	<packaging>pom</packaging>
13	13
14	14	<name>tools</name>

+0

-21

~~tools/tools.iml~~ less more

0		<?xml version="1.0" encoding="UTF-8"?>
1		<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
2		<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3		<output url="file://$MODULE_DIR$/target/classes" />
4		<output-test url="file://$MODULE_DIR$/target/test-classes" />
5		<content url="file://$MODULE_DIR$">
6		<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7		<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
8		<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
9		<excludeFolder url="file://$MODULE_DIR$/target" />
10		</content>
11		<orderEntry type="inheritedJdk" />
12		<orderEntry type="sourceFolder" forTests="false" />
13		<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-classic:1.1.7" level="project" />
14		<orderEntry type="library" scope="TEST" name="Maven: ch.qos.logback:logback-core:1.1.7" level="project" />
15		<orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.7.21" level="project" />
16		<orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.10" level="project" />
17		<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
18		<orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
19		</component>
20		</module>⏎