diff options
| author |   Arthur Martella <amartell@research.att.com> | 2017-09-08 13:27:46 -0400 |
|---|---|---|
| committer | Arthur Martella <amartell@research.att.com> | 2017-09-08 13:32:24 -0400 |
| commit | 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 (patch) | |
| tree | 68c0c53c9156f5aa3c6b3599ac940770f986633d /asdc-controller/WebContent | |
| parent | fa1a211d28a912892fcd888569df033900eb01ee (diff) | |
1710 Rebase - Second Attempt
This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400
Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000
Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>
Diffstat (limited to 'asdc-controller/WebContent')
| -rw-r--r-- | asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml b/asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml index 9a24bfc509..f6cef8a2ce 100644 --- a/asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml +++ b/asdc-controller/WebContent/WEB-INF/jboss-deployment-structure.xml @@ -5,12 +5,17 @@ <module name="org.apache.log4j" /> <module name="org.slf4j" /> <module name="org.slf4j.impl" /> + <module name="org.jboss.resteasy.resteasy-jackson-provider" /> + <module name="org.jboss.resteasy.resteasy-jettison-provider" /> </exclusions> <dependencies> <module name="org.jboss.jandex" slot="main" /> <module name="org.javassist" slot="main" /> <module name="org.antlr" slot="main" /> <module name="org.dom4j" slot="main" /> + <module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" /> + <!-- This module contain the ProviderBase class: --> + <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true" /> </dependencies> </deployment> </jboss-deployment-structure> |