From 3314a60e71f3d1fdba6df18280cb8b250536f31a Mon Sep 17 00:00:00 2001
From: pduvvur <pradeepkumar_duvvur@intuit.com>
Date: Tue, 29 Oct 2019 11:10:14 -0700
Subject: [PATCH 1/3] Updated pom.xml to see if it fixes coveralls

---
 payments-api/pom.xml           | 11 +++++++----
 payments-api/testng-devkit.xml | 13 +++++++++++++
 payments-api/testng.xml        |  6 ++++++
 3 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 payments-api/testng-devkit.xml
 create mode 100644 payments-api/testng.xml

diff --git a/payments-api/pom.xml b/payments-api/pom.xml
index 69846b1a..c7cae335 100644
--- a/payments-api/pom.xml
+++ b/payments-api/pom.xml
@@ -35,7 +35,7 @@
 			<artifactId>jackson-module-jaxb-annotations</artifactId>
 			<version>2.9.6</version>
 		</dependency>
-		<!-- 
+		<!--
 		<dependency>
 			<groupId>org.jmockit</groupId>
 			<artifactId>jmockit</artifactId>
@@ -111,16 +111,19 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<!--
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.0.0-M3</version>
 				<configuration>
                     <argLine>
-                        -Djdk.attach.allowAttachSelf 
+                        -Djdk.attach.allowAttachSelf
                     </argLine>
-			</plugin> -->
+					<suiteXmlFiles>
+						<suiteXmlFile>testng-devkit.xml</suiteXmlFile>
+					</suiteXmlFiles>
+				</configuration>
+			</plugin>
 			<plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
diff --git a/payments-api/testng-devkit.xml b/payments-api/testng-devkit.xml
new file mode 100644
index 00000000..022afaec
--- /dev/null
+++ b/payments-api/testng-devkit.xml
@@ -0,0 +1,13 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="Payments" parallel="false">
+    <test name="Payments">
+        <packages>
+            <package name="com.intuit.payment.config" />
+            <package name="com.intuit.payment.data" />
+            <package name="com.intuit.payment.exception" />
+            <package name="com.intuit.payment.http" />
+            <package name="com.intuit.payment.services.base" />
+            <package name="com.intuit.payment.util" />
+        </packages>
+    </test>
+</suite>
\ No newline at end of file
diff --git a/payments-api/testng.xml b/payments-api/testng.xml
new file mode 100644
index 00000000..e64d3f8c
--- /dev/null
+++ b/payments-api/testng.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite name="MainSuite">
+    <suite-files>
+        <suite-file path="testng-devkit.xml" />
+    </suite-files>
+</suite>
\ No newline at end of file

From 68b5991ddea0cb1b9bf2c21c7dff8314a51f146b Mon Sep 17 00:00:00 2001
From: pduvvur <pradeepkumar_duvvur@intuit.com>
Date: Tue, 29 Oct 2019 12:16:49 -0700
Subject: [PATCH 2/3] Fix coveralls for java-devkit

---
 ipp-v3-java-devkit/pom.xml                           |  7 +++++++
 payments-api/pom.xml                                 | 12 +++++++++---
 .../{testng-devkit.xml => testng-payments.xml}       |  0
 payments-api/testng.xml                              |  2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)
 rename payments-api/{testng-devkit.xml => testng-payments.xml} (100%)

diff --git a/ipp-v3-java-devkit/pom.xml b/ipp-v3-java-devkit/pom.xml
index 4fd9d44e..1a084d0e 100755
--- a/ipp-v3-java-devkit/pom.xml
+++ b/ipp-v3-java-devkit/pom.xml
@@ -111,6 +111,13 @@
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
                 <version>4.3.0</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                        <version>2.2.3</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/payments-api/pom.xml b/payments-api/pom.xml
index c7cae335..c23f11c2 100644
--- a/payments-api/pom.xml
+++ b/payments-api/pom.xml
@@ -35,14 +35,13 @@
 			<artifactId>jackson-module-jaxb-annotations</artifactId>
 			<version>2.9.6</version>
 		</dependency>
-		<!--
+
 		<dependency>
 			<groupId>org.jmockit</groupId>
 			<artifactId>jmockit</artifactId>
 			<version>1.25</version>
 			<scope>test</scope>
 		</dependency>
-	-->
 	</dependencies>
 	<build>
 		<testResources>
@@ -61,6 +60,13 @@
                 <groupId>org.eluder.coveralls</groupId>
                 <artifactId>coveralls-maven-plugin</artifactId>
                 <version>4.3.0</version>
+				<dependencies>
+					<dependency>
+						<groupId>javax.xml.bind</groupId>
+						<artifactId>jaxb-api</artifactId>
+						<version>2.2.3</version>
+					</dependency>
+				</dependencies>
         	</plugin>
         	<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -120,7 +126,7 @@
                         -Djdk.attach.allowAttachSelf
                     </argLine>
 					<suiteXmlFiles>
-						<suiteXmlFile>testng-devkit.xml</suiteXmlFile>
+						<suiteXmlFile>testng-payments.xml</suiteXmlFile>
 					</suiteXmlFiles>
 				</configuration>
 			</plugin>
diff --git a/payments-api/testng-devkit.xml b/payments-api/testng-payments.xml
similarity index 100%
rename from payments-api/testng-devkit.xml
rename to payments-api/testng-payments.xml
diff --git a/payments-api/testng.xml b/payments-api/testng.xml
index e64d3f8c..38ea3491 100644
--- a/payments-api/testng.xml
+++ b/payments-api/testng.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="MainSuite">
     <suite-files>
-        <suite-file path="testng-devkit.xml" />
+        <suite-file path="testng-payments.xml" />
     </suite-files>
 </suite>
\ No newline at end of file

From e69e53ab235d3d8302e11cec1657357a0b1c376d Mon Sep 17 00:00:00 2001
From: pduvvur <pradeepkumar_duvvur@intuit.com>
Date: Tue, 29 Oct 2019 13:50:18 -0700
Subject: [PATCH 3/3] Change format of argline

---
 payments-api/pom.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/payments-api/pom.xml b/payments-api/pom.xml
index c23f11c2..3a9558f8 100644
--- a/payments-api/pom.xml
+++ b/payments-api/pom.xml
@@ -122,9 +122,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.0.0-M3</version>
 				<configuration>
-                    <argLine>
-                        -Djdk.attach.allowAttachSelf
-                    </argLine>
+                    <argLine>${argLine} -Djdk.attach.allowAttachSelf </argLine>
 					<suiteXmlFiles>
 						<suiteXmlFile>testng-payments.xml</suiteXmlFile>
 					</suiteXmlFiles>