Keep working on new thrid parties.

[gpl/argeo-tp.git] / META-INF / spring / jackson.xml

diff --git a/META-INF/spring/jackson.xml b/META-INF/spring/jackson.xml
index b40da9b6450f9a6a992737cd409d2b871cbb7f46..fef71643b285b303646bfe7be9a1a883478bca8e 100644 (file)
--- a/META-INF/spring/jackson.xml
+++ b/META-INF/spring/jackson.xml
@@ -9,7 +9,7 @@
        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
-       <flow:flow name="jackson" spec="spec.version">
+       <flow:flow name="ws/jackson" spec="spec.version">
                <flow:arg name="version" value="2.10.0" />
                <!-- Jackson Core -->
                <bean id="com.fasterxml.jackson.core.jackson-core"
@@ -40,17 +40,18 @@
                        id="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml"
                        parent="template.jacksonMaven"
                        p:sourceCoords="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:@{version}" />
-               <!-- Jackson JAXRS -->
-               <bean id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base"
-                       parent="template.jacksonMaven"
-                       p:sourceCoords="com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:@{version}" />
+               <!-- Jackson JAXRS <bean id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" 
+                       parent="template.jacksonMaven" p:sourceCoords="com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:@{version}" 
+                       /> <bean id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" parent="template.jacksonMaven" 
+                       p:sourceCoords="com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:@{version}" 
+                       /> <bean id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider" parent="template.jacksonMaven" 
+                       p:sourceCoords="com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider:@{version}" 
+                       /> -->
+               <!-- Jackson modules -->
                <bean
-                       id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"
-                       parent="template.jacksonMaven"
-                       p:sourceCoords="com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:@{version}" />
-               <bean id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider"
+                       id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations"
                        parent="template.jacksonMaven"
-                       p:sourceCoords="com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider:@{version}" />
+                       p:sourceCoords="com.fasterxml.jackson.module:jackson-module-jaxb-annotations:@{version}" />
        </flow:flow>
 
        <bean id="template.jacksonMaven" parent="template.mavenWrapper"