Prevent JAXRS LinkageError

Pruning the inclusions in modules to prevent linkage errors during health check.

Change-Id: I7b3cb233d0eac2a0a41b15e608d3d295a73573e7
Issue-ID: SO-160
Signed-off-by: Arthur Martella <amartell@research.att.com>

diff --git a/adapters/mso-tenant-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml b/adapters/mso-tenant-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
index 58ddb4a..fb26891 100644 (file)
--- a/adapters/mso-tenant-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
+++ b/adapters/mso-tenant-adapter/WebContent/WEB-INF/jboss-deployment-structure.xml
@@ -5,12 +5,17 @@
                        <module name="org.apache.log4j" />\r
                        <module name="org.slf4j" />\r
                        <module name="org.slf4j.impl" />\r
+                       <module name="org.jboss.resteasy.resteasy-jackson-provider" />\r
+                       <module name="org.jboss.resteasy.resteasy-jettison-provider" />\r
                </exclusions>\r
                <dependencies>\r
                            <module name="org.jboss.jandex" slot="main" />\r
                 <module name="org.javassist" slot="main" />\r
                 <module name="org.antlr" slot="main" />\r
                 <module name="org.dom4j" slot="main" />\r
+                <module name="org.jboss.resteasy.resteasy-jackson2-provider" services="import" />\r
+                <!-- This module contain the ProviderBase class: -->\r
+                <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider" export="true" />\r
                </dependencies>\r
        </deployment>\r
-</jboss-deployment-structure>
\ No newline at end of file
+</jboss-deployment-structure>\r

diff --git a/bpmn/MSOInfrastructureBPMN/pom.xml b/bpmn/MSOInfrastructureBPMN/pom.xml
index 94db041..1891c62 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/pom.xml
+++ b/bpmn/MSOInfrastructureBPMN/pom.xml
@@ -289,11 +289,23 @@
                        <groupId>org.openecomp.so</groupId>\r
                        <artifactId>MSOCommonBPMN</artifactId>\r
                        <version>${project.version}</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.att.nsa</groupId>\r
+                                       <artifactId>dmaapClient</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
            </dependency>\r
                <dependency>\r
                        <groupId>org.openecomp.so</groupId>\r
                        <artifactId>MSOCommonBPMN</artifactId>\r
                        <version>${project.version}</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.att.nsa</groupId>\r
+                                       <artifactId>dmaapClient</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
                        <classifier>tests</classifier>\r
                        <scope>test</scope>\r
                </dependency>\r
@@ -405,6 +417,12 @@
        <groupId>org.jboss.resteasy</groupId>\r
        <artifactId>resteasy-jackson2-provider</artifactId>\r
        <version>3.0.11.Final</version>\r
+                       <exclusions>\r
+                               <exclusion>\r
+                                       <groupId>com.fasterxml.jackson.jaxrs</groupId>\r
+                                       <artifactId>jackson-jaxrs-json-provider</artifactId>\r
+                               </exclusion>\r
+                       </exclusions>\r
     </dependency>\r
 \r
                <dependency>\r