From 18dc9cb8f003786a5ce26b3342d0a4d798857415 Mon Sep 17 00:00:00 2001
From: John Bergqvist <31512273+JohnLBergqvist@users.noreply.github.com>
Date: Thu, 10 Oct 2019 09:12:50 +0100
Subject: [PATCH 1/7] Add shaded jar omitting keys & de-scope provided
 dependencies

---
 pom.xml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pom.xml b/pom.xml
index c97c49a..863254e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,32 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.2.1</version>
+        <configuration>
+          <outputFile>target/${project.artifactId}-${project.version}-with-dependencies.jar</outputFile>
+          <filters>
+            <filter>
+              <artifact>*:*</artifact>
+              <excludes>
+                <exclude>META-INF/*.SF</exclude>
+                <exclude>META-INF/*.DSA</exclude>
+                <exclude>META-INF/*.RSA</exclude>
+              </excludes>
+            </filter>
+          </filters>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

From 4c4c9f46d8081a29001b9783b6a50672e572816c Mon Sep 17 00:00:00 2001
From: John Bergqvist <31512273+JohnLBergqvist@users.noreply.github.com>
Date: Thu, 10 Oct 2019 09:13:46 +0100
Subject: [PATCH 2/7] Add Diffblue dependencies

---
 pom.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pom.xml b/pom.xml
index 863254e..23d006b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,6 +37,30 @@
       <artifactId>commons-codec</artifactId>
       <version>1.11</version>
     </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+      <version>1.6.6</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.6.6</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-all</artifactId>
+      <version>1.10.19</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.diffblue</groupId>
+      <artifactId>deeptestutils</artifactId>
+      <version>1.9.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

From c1cd009d892a622a44e9018ec23c5a59fb2ab47c Mon Sep 17 00:00:00 2001
From: John Bergqvist <31512273+JohnLBergqvist@users.noreply.github.com>
Date: Thu, 10 Oct 2019 09:16:57 +0100
Subject: [PATCH 3/7] Add JaCoCo configuration with Surefire in parallel

---
 pom.xml | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 75 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 23d006b..6a77e9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,13 @@
       <version>1.9.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.jacoco</groupId>
+      <artifactId>org.jacoco.agent</artifactId>
+      <version>0.8.4</version>
+      <scope>test</scope>
+      <classifier>runtime</classifier>
+    </dependency>
   </dependencies>
 
   <build>
@@ -77,9 +84,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.1</version>
+        <version>3.0.0-M3</version>
         <configuration>
-          <useSystemClassLoader>false</useSystemClassLoader>
+          <argLine>-Djacoco-agent.destfile=${project.build.directory}/jacoco.exec</argLine>
+          <forkCount>0.5C</forkCount>
+          <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
+          <reuseForks>false</reuseForks>
+          <testFailureIgnore>true</testFailureIgnore>
         </configuration>
       </plugin>
       <plugin>
@@ -130,6 +141,68 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.4</version>
+        <executions>
+          <execution>
+            <id>instrument</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>instrument</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>restore-instrumented-classes</id>
+            <phase>test</phase>
+            <goals>
+              <goal>restore-instrumented-classes</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+        <version>3.0.0</version>
+        <reportSets>
+          <reportSet/>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>3.0.0-M3</version>
+        <configuration>
+          <linkXRef>false</linkXRef>
+          <showSuccess>false</showSuccess>
+        </configuration>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.4</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>

From 42667e14d001720b802cca21a0eb71a1dcfa224d Mon Sep 17 00:00:00 2001
From: John Bergqvist <31512273+JohnLBergqvist@users.noreply.github.com>
Date: Thu, 10 Oct 2019 09:18:59 +0100
Subject: [PATCH 4/7] Delete unused YML file

---
 diffblue.yml | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 diffblue.yml

diff --git a/diffblue.yml b/diffblue.yml
deleted file mode 100644
index 107ecbc..0000000
--- a/diffblue.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-ignoreExistingCoverage: true
-cbmcArguments:
-  # Because tic-tac-toe has 9 squares, we need to unwind the loops 10 times
-  # This will be auto-detected in a future version
-  max-nondet-array-length: 10

From b2abf153b5e2975ca0eb128a627736f5333d7d47 Mon Sep 17 00:00:00 2001
From: Owen <owen.mansel-chan@diffblue.com>
Date: Fri, 27 Sep 2019 15:28:24 +0100
Subject: [PATCH 5/7] Update settings to load fat jar but not analyse
 dependencies

With all dependencies on the classpath but "context-excluded", we expect
the coverage to be the same as before after this change, and the
analysis time should not be much longer.
---
 diffblue-base.json | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 diffblue-base.json

diff --git a/diffblue-base.json b/diffblue-base.json
new file mode 100644
index 0000000..173e016
--- /dev/null
+++ b/diffblue-base.json
@@ -0,0 +1,21 @@
+{
+  "phaseBase": {
+    "preferDepsJar": true,
+    "context-include": [
+      "com.diffblue.javademo.",
+      "com.diffblue.annotation.",
+      "java.",
+      "org.cprover.",
+      "org.slf4j.helpers.MarkerIgnoringBase",
+      "org.slf4j.helpers.NamedLoggerBase",
+      "org.slf4j.helpers.NOPLogger",
+      "org.slf4j.ILoggerFactory",
+      "org.slf4j.Logger",
+      "org.slf4j.LoggerFactory",
+      "org.slf4j.Marker",
+      "sun.misc.",
+      "sun.nio.cs.",
+      "sun.util."
+    ]
+  }
+}

From d36c61eb9e0c3f6b2b235011d5cf3c831cb20210 Mon Sep 17 00:00:00 2001
From: Peter Schrammel <peter.schrammel@diffblue.com>
Date: Fri, 31 Jan 2020 10:10:55 +0000
Subject: [PATCH 6/7] Remove powermock

---
 pom.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6a77e9a..490f39d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,18 +37,6 @@
       <artifactId>commons-codec</artifactId>
       <version>1.11</version>
     </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito</artifactId>
-      <version>1.6.6</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <version>1.6.6</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>

From 0115a9fcad6424a9109fd8c05f162db3d5097937 Mon Sep 17 00:00:00 2001
From: Peter Schrammel <peter.schrammel@diffblue.com>
Date: Fri, 31 Jan 2020 10:11:32 +0000
Subject: [PATCH 7/7] Remove deeptestutils

---
 pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 490f39d..b5ad077 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,12 +43,6 @@
       <version>1.10.19</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.diffblue</groupId>
-      <artifactId>deeptestutils</artifactId>
-      <version>1.9.0</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jacoco</groupId>
       <artifactId>org.jacoco.agent</artifactId>