projects
/
gpl
/
argeo-tp.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work on Jersey packaging.
[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..72824aa1c967378233c31cd4c336fd4bf3b39628 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">
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"
<flow:arg name="version" value="2.10.0" />
<!-- Jackson Core -->
<bean id="com.fasterxml.jackson.core.jackson-core"
@@
-51,6
+51,11
@@
<bean id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider"
parent="template.jacksonMaven"
p:sourceCoords="com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-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.module.jackson-module-jaxb-annotations"
+ parent="template.jacksonMaven"
+ p:sourceCoords="com.fasterxml.jackson.module:jackson-module-jaxb-annotations:@{version}" />
</flow:flow>
<bean id="template.jacksonMaven" parent="template.mavenWrapper"
</flow:flow>
<bean id="template.jacksonMaven" parent="template.mavenWrapper"