svn commit: r1863698 - in /turbine/fulcrum/trunk/json: jackson/pom.xml jackson2/pom.xml jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java

[gk]

Author: gk
Date: Wed Jul 24 15:13:59 2019
New Revision: 1863698

URL: http://svn.apache.org/viewvc?rev=1863698&view=rev
Log:
- add jaxb dependency for jackson2 module as it is not in java12, 
- fix dateformat test

Modified:
    turbine/fulcrum/trunk/json/jackson/pom.xml
    turbine/fulcrum/trunk/json/jackson2/pom.xml
    
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java

Modified: turbine/fulcrum/trunk/json/jackson/pom.xml
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson/pom.xml?rev=1863698&r1=1863697&r2=1863698&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson/pom.xml Wed Jul 24 15:13:59 2019
@@ -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>

Modified: turbine/fulcrum/trunk/json/jackson2/pom.xml
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/pom.xml?rev=1863698&r1=1863697&r2=1863698&view=diff
==============================================================================
--- turbine/fulcrum/trunk/json/jackson2/pom.xml (original)
+++ turbine/fulcrum/trunk/json/jackson2/pom.xml Wed Jul 24 15:13:59 2019
@@ -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>

Modified: 
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java?rev=1863698&r1=1863697&r2=1863698&view=diff
==============================================================================
--- 
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
 (original)
+++ 
turbine/fulcrum/trunk/json/jackson2/src/test/org/apache/fulcrum/json/jackson/JacksonMapperEnabledDefaultTyping_OBJECT_AND_NON_CONCRETE_Test.java
 Wed Jul 24 15:13:59 2019
@@ -176,9 +176,9 @@ public class JacksonMapperEnabledDefault
     // 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);