Merge branch '2.10'

Author: cowtowncoder

.travis.yml

@@ -3,6 +3,7 @@ language: java
 # Jackson 3.x requires Java8
 jdk:
   - openjdk8
+  - openjdk11
 
 # no need to build all branches
 branches:

pom.xml

@@ -54,17 +54,12 @@ Joda (http://joda-time.sourceforge.net/) data types.
         <artifactId>joda-time</artifactId>
         <!-- Baseline was 2.2 for Jackson 2.4: no new functionality used from laster
              versions but gradually increasing baseline to get bugfixes etc
-          -->
-        <version>2.7</version>
-    </dependency>
 
-    <!-- and junit for testing -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+             2.7 for Jackson 2.9
+             2.9[.9] for Jackson 2.10+
+          -->
+        <version>2.9.9</version>
     </dependency>
-
   </dependencies>
 
   <build>
@@ -80,6 +75,13 @@ Joda (http://joda-time.sourceforge.net/) data types.
           </execution>
         </executions>
       </plugin>
+      <!--  19-Mar-2019, tatu: Add rudimentary JDK9+ module info. To build with JDK 8
+             will have to use `moduleInfoFile` as anything else requires JDK 9+
+        -->
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+      </plugin>
     </plugins>
   </build>
 

release-notes/VERSION-2.x

@@ -6,6 +6,8 @@ Project: jackson-datatype-joda
 
 2.10.0 (not yet released)
 
+- Add JDK9 `module-info.class` using Moditect plugin
+
 2.9.8 (15-Dec-2018)
 
 No changes since 2.9.7

src/moditect/module-info.java

@@ -0,0 +1,17 @@
+
+// Generated 27-Mar-2019 using Moditect maven plugin
+module com.fasterxml.jackson.datatype.joda {
+    requires com.fasterxml.jackson.annotation;
+    requires com.fasterxml.jackson.core;
+    requires com.fasterxml.jackson.databind;
+    requires joda.time;
+
+    exports com.fasterxml.jackson.datatype.joda;
+    exports com.fasterxml.jackson.datatype.joda.cfg;
+    exports com.fasterxml.jackson.datatype.joda.deser;
+    exports com.fasterxml.jackson.datatype.joda.deser.key;
+    exports com.fasterxml.jackson.datatype.joda.ser;
+
+    provides com.fasterxml.jackson.databind.Module with
+        com.fasterxml.jackson.datatype.joda.JodaModule;
+}

src/test/java/com/fasterxml/jackson/datatype/joda/deser/DurationDeserializationTest.java

@@ -72,7 +72,7 @@ public void testDurationDeserFromIntWithTypeInfo() throws IOException
     public void testDurationKeyDeserialize() throws IOException
     {
         final String json = "{" + quote("PT60s") + ":0}";
-        final Map<Duration, Long> map = MAPPER.readValue(json,
+        final Map<Duration,?> map = MAPPER.readValue(json,
                 new TypeReference<Map<Duration, String>>() { });
         assertNotNull(map);
         assertTrue(map.containsKey(Duration.standardMinutes(1L)));
@@ -98,7 +98,7 @@ public void testDurationAltFromString() throws IOException
     public void testDurationAltKeyDeserialize() throws IOException
     {
         final String json = "{" + quote("PT4H30M") + ":0}";
-        final Map<Duration, Long> map = MAPPER.readValue(json,
+        final Map<Duration,?> map = MAPPER.readValue(json,
                 new TypeReference<Map<Duration, String>>() { });
         assertNotNull(map);
         assertTrue(map.containsKey(Duration.standardMinutes(4 * 60 + 30)));

src/test/java/com/fasterxml/jackson/datatype/joda/deser/KeyDeserTest.java

@@ -31,7 +31,7 @@ public class KeyDeserTest extends JodaTestBase
     public void testDateTimeKeyDeserialize() throws IOException {
 
         final String json = "{" + quote("1970-01-01T00:00:00.000Z") + ":0}";
-        final Map<DateTime, Long> map = MAPPER.readValue(json, new TypeReference<Map<DateTime, String>>() { });
+        final Map<DateTime,?> map = MAPPER.readValue(json, new TypeReference<Map<DateTime, String>>() { });
 
         assertNotNull(map);
         assertTrue(map.containsKey(DateTime.parse("1970-01-01T00:00:00.000Z")));
@@ -40,7 +40,7 @@ public void testDateTimeKeyDeserialize() throws IOException {
     public void testLocalDateKeyDeserialize() throws IOException {
 
         final String json = "{" + quote("2014-05-23") + ":0}";
-        final Map<LocalDate, Long> map = MAPPER.readValue(json, new TypeReference<Map<LocalDate, String>>() { });
+        final Map<LocalDate,?> map = MAPPER.readValue(json, new TypeReference<Map<LocalDate, String>>() { });
 
         assertNotNull(map);
         assertTrue(map.containsKey(LocalDate.parse("2014-05-23")));
@@ -49,14 +49,14 @@ public void testLocalDateKeyDeserialize() throws IOException {
     public void testLocalTimeKeyDeserialize() throws IOException {
 
         final String json = "{" + quote("00:00:00.000") + ":0}";
-        final Map<LocalTime, Long> map = MAPPER.readValue(json, new TypeReference<Map<LocalTime, String>>() { });
+        final Map<LocalTime,?> map = MAPPER.readValue(json, new TypeReference<Map<LocalTime, String>>() { });
         assertNotNull(map);
         assertTrue(map.containsKey(LocalTime.parse("00:00:00.000")));
     }
     public void testLocalDateTimeKeyDeserialize() throws IOException {
 
         final String json = "{" + quote("2014-05-23T00:00:00.000") + ":0}";
-        final Map<LocalDateTime, Long> map = MAPPER.readValue(json, new TypeReference<Map<LocalDateTime, String>>() { });
+        final Map<LocalDateTime,?> map = MAPPER.readValue(json, new TypeReference<Map<LocalDateTime, String>>() { });
         assertNotNull(map);
         assertTrue(map.containsKey(LocalDateTime.parse("2014-05-23T00:00:00.000")));
     }

src/test/java/com/fasterxml/jackson/datatype/joda/deser/PeriodDeserializationTest.java

@@ -73,7 +73,7 @@ public void testPeriodDeserWithTypeInfo() throws IOException
     public void testPeriodKeyDeserialize() throws IOException {
 
         final String json = "{" + quote("PT1H2M3.004S") + ":0}";
-        final Map<Period, Long> map = MAPPER.readValue(json, new TypeReference<Map<Period, String>>() { });
+        final Map<Period,Long> map = MAPPER.readValue(json, new TypeReference<Map<Period, Long>>() { });
         assertNotNull(map);
         assertTrue(map.containsKey(new Period(1, 2, 3, 4)));
     }