Merge pull request #2656 from novalis/upgrade-jackson

upgrade jackson and commons-compress
opentripplanner · Nov 30, 2018 · 3ed4e5c · 3ed4e5c
2 parents 0cfb77d + f8b1538
commit 3ed4e5c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -79,7 +79,8 @@
 
     <properties>
         <geotools.version>10.5</geotools.version>
-        <jackson.version>2.5.3</jackson.version>
+        <jackson.version>2.9.7</jackson.version>
+        <jersey.version>2.18</jersey.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <aws.version>1.9.39</aws.version>
     </properties>
@@ -594,18 +595,18 @@
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-server</artifactId>
-            <version>2.18</version>
+            <version>${jersey.version}</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.media</groupId>
             <artifactId>jersey-media-multipart</artifactId>
-            <version>2.18</version>
+            <version>${jersey.version}</version>
         </dependency>
         <!-- Deploy Jersey apps in stand-alone Grizzly server instead of a servlet container. -->
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-grizzly2-http</artifactId>
-            <version>2.18</version>
+            <version>${jersey.version}</version>
         </dependency>
 
         <!-- Jackson modules. -->
@@ -711,7 +712,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.17</version>
+            <version>1.18</version>
         </dependency>
         <dependency>
             <groupId>commons-discovery</groupId>

diff --git a/.../java/org/opentripplanner/model/json_serialization/EncodedPolylineJSONSerializerTest.java b/.../java/org/opentripplanner/model/json_serialization/EncodedPolylineJSONSerializerTest.java
@@ -459,5 +459,10 @@ public byte[] getBinaryValue(Base64Variant base64Variant) throws IOException {
         public String getValueAsString(String s) throws IOException {
             return stringProducer.get();
         }
+
+        @Override
+        public boolean hasToken(JsonToken t) {
+            return false;
+        }
     }
-}
+}