From 977f8425c46aad37294d7567bca69bc17c079133 Mon Sep 17 00:00:00 2001
From: Dominic Lunanuova <dgl@research.att.com>
Date: Mon, 16 Mar 2020 20:53:18 +0000
Subject: [PATCH] Fix surefire conflict

Removed old surefire plugin section for new one, and now
the codecoverage file in target/site seems to be generated.

Issue-ID: DMAAP-1408
Signed-off-by: Dominic Lunanuova <dgl@research.att.com>
Change-Id: I65cd93a6bf6790dbb0e274c73e1e8cfc957db870
---
 pom.xml | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 79f68a4..2eb84f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,18 +177,6 @@
 				</execution>
 			</executions>
 		</plugin>
- <plugin>
-    <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-surefire-plugin</artifactId>
-    <version>3.0.0-M4</version>
-	<configuration>
-		<useSystemClassLoader>false</useSystemClassLoader>
-		<forkCount>0</forkCount>
-		<argLine>
-			--illegal-access=permit
-		</argLine>
-	</configuration>
-  </plugin>
 
 		 <plugin>
                     <groupId>org.jacoco</groupId>
@@ -212,6 +200,17 @@
                         </execution>
                     </executions>
                 </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.12.4</version>
+				<configuration>
+					<excludes>
+						<!-- exclude until junits updated <exclude>**/DME2*.java</exclude> -->
+					</excludes>
+					<!-- <skipTests>true</skipTests> -->
+				</configuration>
+			</plugin> 
 
 		</plugins>
 		<pluginManagement>
@@ -454,7 +453,7 @@
 		<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
 
 		<!-- for Distribution Management -->
-		<sitePath>/content/sites/site/org/onap/dmaap/buscontroller/${artifact.version}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org/onap/dmaap/dbcapi/${artifact.version}/${project.version}</sitePath>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 	</properties>
 	<description>Data Movement as a Platform (DMaaP) Bus Controller provides a REST API for other DCAE infrastructure components to provision DMaaP resources.  A DMaaP resource is a Data Router Feed or a Message Router Topic, and their associated publishers and subscribers.</description>
-- 
2.16.6