From: Arthur Martella <amartell@research.att.com>
Date: Tue, 3 Oct 2017 03:00:21 +0000 (-0400)
Subject: Prevent JAXRS LinkageError
X-Git-Tag: v1.1.0~211^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3590470cd6941f6e7d54861f92e5c62a00c99c5c;p=so.git

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 58ddb4a08f..fb268917f2 100644
--- 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" />
 			<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>
\ No newline at end of file
+</jboss-deployment-structure>
diff --git a/bpmn/MSOInfrastructureBPMN/pom.xml b/bpmn/MSOInfrastructureBPMN/pom.xml
index 94db04195d..1891c62f4a 100644
--- a/bpmn/MSOInfrastructureBPMN/pom.xml
+++ b/bpmn/MSOInfrastructureBPMN/pom.xml
@@ -289,11 +289,23 @@
 			<groupId>org.openecomp.so</groupId>
 			<artifactId>MSOCommonBPMN</artifactId>
 			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.att.nsa</groupId>
+					<artifactId>dmaapClient</artifactId>
+				</exclusion>
+			</exclusions>
 	    </dependency>
 		<dependency>
 			<groupId>org.openecomp.so</groupId>
 			<artifactId>MSOCommonBPMN</artifactId>
 			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.att.nsa</groupId>
+					<artifactId>dmaapClient</artifactId>
+				</exclusion>
+			</exclusions>
 			<classifier>tests</classifier>
 			<scope>test</scope>
 		</dependency>
@@ -405,6 +417,12 @@
        <groupId>org.jboss.resteasy</groupId>
        <artifactId>resteasy-jackson2-provider</artifactId>
        <version>3.0.11.Final</version>
+			<exclusions>
+				<exclusion>
+					<groupId>com.fasterxml.jackson.jaxrs</groupId>
+					<artifactId>jackson-jaxrs-json-provider</artifactId>
+				</exclusion>
+			</exclusions>
     </dependency>
 
 		<dependency>