From 1aa4ef03aba5ef497d7b29ff9cf83f48eadc922f Mon Sep 17 00:00:00 2001 From: Jody Garnett Date: Wed, 27 Jan 2016 15:30:33 -0800 Subject: [PATCH 1/2] rename to jts-io-commons --- modules/io/{io => common}/lib/json-simple-1.1.1.jar | Bin modules/io/{io => common}/lib/junit-3.7.jar | Bin modules/io/{io => common}/pom.xml | 2 +- .../jts/io/geojson/GeoJsonConstants.java | 0 .../jts/io/geojson/GeoJsonReader.java | 0 .../jts/io/geojson/GeoJsonWriter.java | 0 .../vividsolutions/jts/io/geojson/GeoJsonTest.java | 0 .../jts/io/geojson/GeoJsonWriterTest.java | 0 modules/io/ora/pom.xml | 2 +- modules/io/pom.xml | 2 +- modules/io/sde/pom.xml | 2 +- 11 files changed, 4 insertions(+), 4 deletions(-) rename modules/io/{io => common}/lib/json-simple-1.1.1.jar (100%) rename modules/io/{io => common}/lib/junit-3.7.jar (100%) rename modules/io/{io => common}/pom.xml (96%) rename modules/io/{io => common}/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonConstants.java (100%) rename modules/io/{io => common}/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonReader.java (100%) rename modules/io/{io => common}/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonWriter.java (100%) rename modules/io/{io => common}/src/test/java/com/vividsolutions/jts/io/geojson/GeoJsonTest.java (100%) rename modules/io/{io => common}/src/test/java/com/vividsolutions/jts/io/geojson/GeoJsonWriterTest.java (100%) diff --git a/modules/io/io/lib/json-simple-1.1.1.jar b/modules/io/common/lib/json-simple-1.1.1.jar similarity index 100% rename from modules/io/io/lib/json-simple-1.1.1.jar rename to modules/io/common/lib/json-simple-1.1.1.jar diff --git a/modules/io/io/lib/junit-3.7.jar b/modules/io/common/lib/junit-3.7.jar similarity index 100% rename from modules/io/io/lib/junit-3.7.jar rename to modules/io/common/lib/junit-3.7.jar diff --git a/modules/io/io/pom.xml b/modules/io/common/pom.xml similarity index 96% rename from modules/io/io/pom.xml rename to modules/io/common/pom.xml index 6938308edb..0f41c26052 100644 --- a/modules/io/io/pom.xml +++ b/modules/io/common/pom.xml @@ -7,7 +7,7 @@ 1.15.0 org.locationtech.jts.io - jts-io + jts-io-common ${project.groupId}:${project.artifactId} jar diff --git a/modules/io/io/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonConstants.java b/modules/io/common/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonConstants.java similarity index 100% rename from modules/io/io/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonConstants.java rename to modules/io/common/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonConstants.java diff --git a/modules/io/io/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonReader.java b/modules/io/common/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonReader.java similarity index 100% rename from modules/io/io/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonReader.java rename to modules/io/common/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonReader.java diff --git a/modules/io/io/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonWriter.java b/modules/io/common/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonWriter.java similarity index 100% rename from modules/io/io/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonWriter.java rename to modules/io/common/src/main/java/com/vividsolutions/jts/io/geojson/GeoJsonWriter.java diff --git a/modules/io/io/src/test/java/com/vividsolutions/jts/io/geojson/GeoJsonTest.java b/modules/io/common/src/test/java/com/vividsolutions/jts/io/geojson/GeoJsonTest.java similarity index 100% rename from modules/io/io/src/test/java/com/vividsolutions/jts/io/geojson/GeoJsonTest.java rename to modules/io/common/src/test/java/com/vividsolutions/jts/io/geojson/GeoJsonTest.java diff --git a/modules/io/io/src/test/java/com/vividsolutions/jts/io/geojson/GeoJsonWriterTest.java b/modules/io/common/src/test/java/com/vividsolutions/jts/io/geojson/GeoJsonWriterTest.java similarity index 100% rename from modules/io/io/src/test/java/com/vividsolutions/jts/io/geojson/GeoJsonWriterTest.java rename to modules/io/common/src/test/java/com/vividsolutions/jts/io/geojson/GeoJsonWriterTest.java diff --git a/modules/io/ora/pom.xml b/modules/io/ora/pom.xml index 2b50bcba3f..521d35a216 100644 --- a/modules/io/ora/pom.xml +++ b/modules/io/ora/pom.xml @@ -7,7 +7,7 @@ 1.15.0 org.locationtech.jts.io - jts-ora + jts-io-ora ${project.groupId}:${project.artifactId} jar diff --git a/modules/io/pom.xml b/modules/io/pom.xml index 428e495814..e413a59f0c 100644 --- a/modules/io/pom.xml +++ b/modules/io/pom.xml @@ -40,7 +40,7 @@ - io + common \ No newline at end of file diff --git a/modules/io/sde/pom.xml b/modules/io/sde/pom.xml index aa48df46d6..e5ec205b0e 100644 --- a/modules/io/sde/pom.xml +++ b/modules/io/sde/pom.xml @@ -7,7 +7,7 @@ 1.15.0 org.locationtech.jts.io - jts-sde + jts-io-sde ${project.groupId}:${project.artifactId} jar From b7e284230bdc60029cab12d6ceef0250c0c8abc1 Mon Sep 17 00:00:00 2001 From: Jody Garnett Date: Wed, 27 Jan 2016 15:33:03 -0800 Subject: [PATCH 2/2] depend on jts-io-common --- modules/app/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/app/pom.xml b/modules/app/pom.xml index f9f40a5c13..07468504f2 100644 --- a/modules/app/pom.xml +++ b/modules/app/pom.xml @@ -17,7 +17,7 @@ org.locationtech.jts.io - jts-io + jts-io-common ${project.parent.version}