Merge pull request #1750 from laurentg/remove-bedatadriven-geojson

Remove bedatadriven geojson
opentripplanner · Feb 19, 2015 · 13aa3a3 · 13aa3a3
2 parents 2c65faf + 84c55fa
commit 13aa3a3
Show file tree

Hide file tree

Showing 10 changed files with 163 additions and 396 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,6 +17,7 @@
 
     <properties>
         <geotools.version>10.5</geotools.version>
+        <jackson.version>2.4.3</jackson.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -434,6 +435,19 @@
             <groupId>de.grundid.opendatalab</groupId>
             <artifactId>geojson-jackson</artifactId>
             <version>1.2</version>
+            <!-- We explicitely exclude jackson-core/databind as we use a more recent
+                 version than the one geojson-jackson depends on, and the two seems to
+                 be somehow incompatible. -->
+            <exclusions>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-databind</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- TESTING -->
@@ -468,17 +482,28 @@
             <version>2.13</version>
         </dependency>
 
+        <!-- Jackson modules. -->
+        <dependency>
+           <groupId>com.fasterxml.jackson.core</groupId>
+           <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+           <groupId>com.fasterxml.jackson.core</groupId>
+           <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
         <!-- Jackson modules to serialize Jersey response objects to JSON. -->
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>2.4.3</version>
+            <version>${jackson.version}</version>
         </dependency>
         <!-- Jackson modules to serialize Jersey response objects to XML. -->
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-xml-provider</artifactId>
-            <version>2.4.3</version>
+            <version>${jackson.version}</version>
         </dependency>
 
         <!-- Asynchronous Websocket-capable client, for message-driven incremental GTFS-RT -->

diff --git a/src/main/java/com/bedatadriven/geojson/GeoJsonModule.java b/src/main/java/com/bedatadriven/geojson/GeoJsonModule.java
diff --git a/src/main/java/com/bedatadriven/geojson/GeometryDeserializer.java b/src/main/java/com/bedatadriven/geojson/GeometryDeserializer.java
diff --git a/src/main/java/com/bedatadriven/geojson/GeometrySerializer.java b/src/main/java/com/bedatadriven/geojson/GeometrySerializer.java