[archiva-redback-core] branch master updated: Fixing date format

[martin_s]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva-redback-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 54707da  Fixing date format
54707da is described below

commit 54707da343ba94f25f1e762d9bed9e3adbfa3e9c
Author: Martin Stockhammer <marti...@apache.org>
AuthorDate: Tue Jul 7 23:57:08 2020 +0200

    Fixing date format
---
 .../rest/services/interceptors/JacksonJsonConfigurator.java   |  1 +
 .../src/main/resources/META-INF/spring-context.xml            | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git 
a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java
 
b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java
index 61efc74..2551c5a 100644
--- 
a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java
+++ 
b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/interceptors/JacksonJsonConfigurator.java
@@ -54,6 +54,7 @@ public class JacksonJsonConfigurator
         objectMapper.setDateFormat( new SimpleDateFormat( 
"yyyy-MM-dd'T'HH:mm:ss.SSSZ" ) );
 
         xmlMapper.disable( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES );
+        xmlMapper.setAnnotationIntrospector( new JaxbAnnotationIntrospector( 
xmlMapper.getTypeFactory( ) ) );
 
     }
 }
diff --git 
a/redback-integrations/redback-rest/redback-rest-services/src/main/resources/META-INF/spring-context.xml
 
b/redback-integrations/redback-rest/redback-rest-services/src/main/resources/META-INF/spring-context.xml
index d54a4c3..2fd63b1 100644
--- 
a/redback-integrations/redback-rest/redback-rest-services/src/main/resources/META-INF/spring-context.xml
+++ 
b/redback-integrations/redback-rest/redback-rest-services/src/main/resources/META-INF/spring-context.xml
@@ -48,21 +48,10 @@
   </bean>
 
   <bean id="redbackJacksonJsonMapper" 
class="com.fasterxml.jackson.databind.ObjectMapper" >
-    <property name="annotationIntrospector" 
ref="jacksonAnnotationIntrospector"/>
-    <property name="dateFormat">
-      <bean class="java.text.SimpleDateFormat">
-        <constructor-arg type="java.lang.String" 
value="yyyyMMdd'T'HHmmss.SSSZ"/>
-      </bean>
-    </property>
   </bean>
   <bean id="redbackJacksonXMLMapper" 
class="com.fasterxml.jackson.dataformat.xml.XmlMapper" >
-    <property name="annotationIntrospector" 
ref="jacksonAnnotationIntrospector"/>
   </bean>
 
-  <bean id="jacksonAnnotationIntrospector" 
class="com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector" />
-
-
-
   <jaxrs:server name="redbackServices" address="/redbackServices">
 
     <jaxrs:serviceBeans>