From 8c333d59e1dd71e5b670c709f150a43a0d6eb879 Mon Sep 17 00:00:00 2001
From: oliverbye <oli.github@mail-filter.com>
Date: Sun, 7 Jan 2018 22:23:42 +0000
Subject: [PATCH 1/3] Upgrade travis

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 420cb1783..0d612aeb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,10 @@ jdk:
 
 env:
 # Travis has slow VMs?
-- blitzerThreads=1 blitzerActions=1 blitzerTimeout=1000
-
-secure: "XBIyEF5RxH/zKjh0gle5ce/FRe9pP5b46LXKNOfwlau5QYvn8WXC41Sb6yYC8VW3vI9S930BnVGZONiDXsSWuylLezdu2g88nwJ2CsTxHU0Yg2GAzKwaorBQqyK/6w2foRRXtz69NJccfdIdPuDZSEhJtTKWSmMMQ7U65KH+zzQ="
-secure: "SSlAKOg8QLEAkZX1ehy9c6FR5R6gMzLhc6u2Smq9tm8JsWVz4EtS6NnTQaosthrNEfLJwVVCfmOh2dzvYZfhtbKAUMdkox45tem4+LZfgkSaQAGjSvsC6geioa4Alo6AKyR8foc5Y7P34f9ujYSZHNyRG9F6E0Qq2zj/hzHhstU="
+  global:
+  - blitzerThreads=1 blitzerActions=1 blitzerTimeout=1000
+  - secure: "XBIyEF5RxH/zKjh0gle5ce/FRe9pP5b46LXKNOfwlau5QYvn8WXC41Sb6yYC8VW3vI9S930BnVGZONiDXsSWuylLezdu2g88nwJ2CsTxHU0Yg2GAzKwaorBQqyK/6w2foRRXtz69NJccfdIdPuDZSEhJtTKWSmMMQ7U65KH+zzQ="
+  - secure: "SSlAKOg8QLEAkZX1ehy9c6FR5R6gMzLhc6u2Smq9tm8JsWVz4EtS6NnTQaosthrNEfLJwVVCfmOh2dzvYZfhtbKAUMdkox45tem4+LZfgkSaQAGjSvsC6geioa4Alo6AKyR8foc5Y7P34f9ujYSZHNyRG9F6E0Qq2zj/hzHhstU="
 
 after_success:
   - mvn deploy --settings settings.xml -DskipTests=true -B

From f3910df2050f7cb2ac0fe3daa5dcf15caf3b4b9d Mon Sep 17 00:00:00 2001
From: oliverbye <oli.github@mail-filter.com>
Date: Tue, 9 Jan 2018 19:41:00 +0000
Subject: [PATCH 2/3] Fix testjar.signing with newer versions of gpg

---
 testjar/pom.xml | 131 ++++++++++++++++++++++++------------------------
 1 file changed, 66 insertions(+), 65 deletions(-)

diff --git a/testjar/pom.xml b/testjar/pom.xml
index 51e9d88fd..ffbb9f019 100644
--- a/testjar/pom.xml
+++ b/testjar/pom.xml
@@ -1,73 +1,74 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-	<modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-	<artifactId>jmock-testjar</artifactId>
-	<packaging>jar</packaging>
-	<name>jMock 2 Test Jar</name>
-	<description>Source for jar files used in jmock core tests</description>
+    <artifactId>jmock-testjar</artifactId>
+    <packaging>jar</packaging>
+    <name>jMock 2 Test Jar</name>
+    <description>Source for jar files used in jmock core tests</description>
 
-	<parent>
-		<groupId>org.jmock</groupId>
-		<artifactId>jmock-parent</artifactId>
-		<version>2.8.4</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
+    <parent>
+        <groupId>org.jmock</groupId>
+        <artifactId>jmock-parent</artifactId>
+        <version>2.8.4</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
 
-	<build>
-		<finalName>signed</finalName>
-		<plugins>
-			<plugin>
-				<!-- Copy jar for unsigned tests -->
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.9</version>
-				<executions>
-					<execution>
-						<id>copy</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>${project.groupId}</groupId>
-									<artifactId>${project.artifactId}</artifactId>
-									<version>${project.version}</version>
-									<type>jar</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}</outputDirectory>
-									<destFileName>unsigned.jar</destFileName>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+    <build>
+        <finalName>signed</finalName>
+        <plugins>
+            <plugin>
+                <!-- Copy jar for unsigned tests -->
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.9</version>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>${project.artifactId}</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <destFileName>unsigned.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-gpg-plugin</artifactId>
-				<version>1.6</version>
-				<executions>
-					<execution>
-						<id>sign-artifacts</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-						<configuration>
-							<keyname>899FD4CB</keyname>
-							<secretKeyring>${basedir}/secring.gpg</secretKeyring>
-							<publicKeyring>${basedir}/pubring.gpg</publicKeyring>
-							<passphrase>secret</passphrase>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <id>sign-artifacts</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                        <configuration>
+                            <keyname>899FD4CB</keyname>
+                            <homedir>${basedir}</homedir>
+                            <passphrase>secret</passphrase>
+                            <defaultKeyring>false</defaultKeyring>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
-		</plugins>
-	</build>
+        </plugins>
+    </build>
 
 </project>

From 96a4207abb99f8ed414fa2416216315fec087ce7 Mon Sep 17 00:00:00 2001
From: oliverbye <oli.github@mail-filter.com>
Date: Tue, 9 Jan 2018 21:11:22 +0000
Subject: [PATCH 3/3] More release chnages

---
 .travis.yml        |  3 ---
 pom.xml            | 41 +++++++++++++++++++++++------------------
 settings.xml       |  1 +
 testjar/.gitignore |  2 ++
 4 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0d612aeb1..b2dfe28f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,3 @@ env:
   - blitzerThreads=1 blitzerActions=1 blitzerTimeout=1000
   - secure: "XBIyEF5RxH/zKjh0gle5ce/FRe9pP5b46LXKNOfwlau5QYvn8WXC41Sb6yYC8VW3vI9S930BnVGZONiDXsSWuylLezdu2g88nwJ2CsTxHU0Yg2GAzKwaorBQqyK/6w2foRRXtz69NJccfdIdPuDZSEhJtTKWSmMMQ7U65KH+zzQ="
   - secure: "SSlAKOg8QLEAkZX1ehy9c6FR5R6gMzLhc6u2Smq9tm8JsWVz4EtS6NnTQaosthrNEfLJwVVCfmOh2dzvYZfhtbKAUMdkox45tem4+LZfgkSaQAGjSvsC6geioa4Alo6AKyR8foc5Y7P34f9ujYSZHNyRG9F6E0Qq2zj/hzHhstU="
-
-after_success:
-  - mvn deploy --settings settings.xml -DskipTests=true -B
diff --git a/pom.xml b/pom.xml
index e0b6a90af..26faebd56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,8 @@
     <packaging>pom</packaging>
     <name>jMock 2 Parent</name>
 
-    <!-- mvn versions:set -DoldVersion=2.8.3 -DnewVersion=2.8.4-SNAPSHOT -DgroupId=org.jmock -->
+    <!-- mvn versions:set -DoldVersion=2.8.3 -DnewVersion=2.8.4-SNAPSHOT 
+        -DgroupId=org.jmock -->
     <!-- find . -name pom.xml.versionsBackup -exec rm {} \; -->
 
     <parent>
@@ -203,25 +204,29 @@
             <id>ossrh</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
+        <repository>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+        </repository>
     </distributionManagement>
-    
+
     <reporting>
-      <plugins>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>versions-maven-plugin</artifactId>
-          <version>2.5</version>
-          <reportSets>
-            <reportSet>
-              <reports>
-                <report>dependency-updates-report</report>
-                <report>plugin-updates-report</report>
-                <report>property-updates-report</report>
-              </reports>
-            </reportSet>
-          </reportSets>
-        </plugin>
-      </plugins>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>versions-maven-plugin</artifactId>
+                <version>2.5</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>dependency-updates-report</report>
+                            <report>plugin-updates-report</report>
+                            <report>property-updates-report</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
     </reporting>
 
     <profiles>
diff --git a/settings.xml b/settings.xml
index 5c24361b9..7f700b222 100644
--- a/settings.xml
+++ b/settings.xml
@@ -1,4 +1,5 @@
 <settings>
+    <!-- http://central.sonatype.org/pages/apache-maven.html -->
     <servers>
         <server>
             <!-- Maven Central Deployment -->
diff --git a/testjar/.gitignore b/testjar/.gitignore
index 7262129d8..827a4ac18 100644
--- a/testjar/.gitignore
+++ b/testjar/.gitignore
@@ -2,3 +2,5 @@
 random_seed
 trustdb.gpg
 *~
+.gpg-v21-migrated
+private-keys-v1.d