- add jaxb dependency for jackson2 module as it is not in java12,
- fix dateformat test
git-svn-id: https://svn.apache.org/repos/asf/turbine/fulcrum/trunk/json@1863698 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/jackson/pom.xml b/jackson/pom.xml
index a7e2d07..251131a 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -94,4 +94,34 @@
<!-- 1.9.13, released 14-Jul-2013: latest version see https://github.com/FasterXML/jackson -->
<jackson.version>1.9.13</jackson.version>
</properties>
+
+ <profiles>
+ <profile>
+ <id>jkd-12-compile</id>
+ <activation>
+ <jdk>12</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <release>8</release>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <dependencies>
+ <!-- removal of jaxb in java 12: https://docs.oracle.com/en/java/javase/12/migrate/index.html -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/jackson2/pom.xml b/jackson2/pom.xml
index b317b83..7459d82 100644
--- a/jackson2/pom.xml
+++ b/jackson2/pom.xml
@@ -128,4 +128,33 @@
With Jackson 2.8, Java 7 languages features will be allowed -->
<jackson2.version>2.9.9</jackson2.version>
</properties>
+ <profiles>
+ <profile>
+ <id>jkd-12-compile</id>
+ <activation>
+ <jdk>12</jdk>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <release>8</release>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <dependencies>
+ <!-- removal of jaxb in java 12: https://docs.oracle.com/en/java/javase/12/migrate/index.html -->
+ <dependency>
+ <groupId>org.glassfish.jaxb</groupId>
+ <artifactId>jaxb-runtime</artifactId>
+ <version>2.4.0-b180830.0438</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java b/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
index 491184b..38d2cc7 100644
--- a/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
+++ b/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
@@ -176,9 +176,9 @@
// timezone handling example
@Test
public void testDeSerializeTZDate() throws Exception {
- DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm a Z");
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm Z");
sc.setDateFormat(df);
- DateKeyMixin serObject =sc.deSer( "{\"mydate\":[\"java.util.Date\",\"1999-04-10 10:10 PM -0500\"]}"
+ DateKeyMixin serObject =sc.deSer( "{\"mydate\":[\"java.util.Date\",\"1999-04-10 10:10 -0500\"]}"
, DateKeyMixin.class);
assertTrue(serObject.mydate instanceof Date);
