From 2efc4b7a1b8824cac8f248ebfe33af43df60182d Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Mon, 31 Aug 2020 12:16:42 -0400
Subject: [PATCH 1/5] privatize deprecated method

---
 .../auth/oauth2/ServiceAccountJwtAccessCredentials.java      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/oauth2_http/java/com/google/auth/oauth2/ServiceAccountJwtAccessCredentials.java b/oauth2_http/java/com/google/auth/oauth2/ServiceAccountJwtAccessCredentials.java
index 7ae299bb5..6a5805ef4 100644
--- a/oauth2_http/java/com/google/auth/oauth2/ServiceAccountJwtAccessCredentials.java
+++ b/oauth2_http/java/com/google/auth/oauth2/ServiceAccountJwtAccessCredentials.java
@@ -99,11 +99,8 @@ public class ServiceAccountJwtAccessCredentials extends Credentials
    * @param clientEmail Client email address of the service account from the console.
    * @param privateKey RSA private key object for the service account.
    * @param privateKeyId Private key identifier for the service account. May be null.
-   * @deprecated Use {@link #newBuilder()} instead. This constructor will either be deleted or made
-   *     private in a later version.
    */
-  @Deprecated
-  public ServiceAccountJwtAccessCredentials(
+  private ServiceAccountJwtAccessCredentials(
       String clientId, String clientEmail, PrivateKey privateKey, String privateKeyId) {
     this(clientId, clientEmail, privateKey, privateKeyId, null, null);
   }

From 564d455ae68e664927c607232e33a7129fadc4c8 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Mon, 31 Aug 2020 12:50:10 -0400
Subject: [PATCH 2/5] ignore removal of deprecated method

---
 clirr-ignored-differences.xml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 clirr-ignored-differences.xml

diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml
new file mode 100644
index 000000000..cf9dfe84b
--- /dev/null
+++ b/clirr-ignored-differences.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see https://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <difference>
+    <differenceType>7009</differenceType>
+    <className>com/google/auth/oauth2/ServiceAccountJwtAccessCredentials</className>
+    <method>ServiceAccountJwtAccessCredentials(java.lang.String, java.lang.String, java.security.PrivateKey, java.lang.String)</method>
+  </difference>
+</differences>

From ea7cb4a2e417d966254a56ad2ffde64e1dc5983e Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Mon, 31 Aug 2020 13:18:25 -0400
Subject: [PATCH 3/5] api not locked down

---
 clirr-ignored-differences.xml | 3 +++
 pom.xml                       | 1 +
 2 files changed, 4 insertions(+)

diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml
index cf9dfe84b..cc76e5a36 100644
--- a/clirr-ignored-differences.xml
+++ b/clirr-ignored-differences.xml
@@ -4,6 +4,9 @@
   <difference>
     <differenceType>7009</differenceType>
     <className>com/google/auth/oauth2/ServiceAccountJwtAccessCredentials</className>
+    
+    com.google.auth.oauth2.ServiceAccountJwtAccessCredentials <<<<
+    
     <method>ServiceAccountJwtAccessCredentials(java.lang.String, java.lang.String, java.security.PrivateKey, java.lang.String)</method>
   </difference>
 </differences>
diff --git a/pom.xml b/pom.xml
index 32a0877f2..b49bb5d02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -305,6 +305,7 @@
         <configuration>
           <ignoredDifferencesFile>clirr-ignored-differences.xml</ignoredDifferencesFile>
           <logResults>true</logResults>
+          <failOnError>false</failOnError>
         </configuration>
         <executions>
           <execution>

From 0a7e062c6ba71524351e840b4b77e6c0dee5e039 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Thu, 17 Sep 2020 16:01:55 -0400
Subject: [PATCH 4/5] fix merge error

---
 clirr-ignored-differences.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml
index cc76e5a36..cf9dfe84b 100644
--- a/clirr-ignored-differences.xml
+++ b/clirr-ignored-differences.xml
@@ -4,9 +4,6 @@
   <difference>
     <differenceType>7009</differenceType>
     <className>com/google/auth/oauth2/ServiceAccountJwtAccessCredentials</className>
-    
-    com.google.auth.oauth2.ServiceAccountJwtAccessCredentials <<<<
-    
     <method>ServiceAccountJwtAccessCredentials(java.lang.String, java.lang.String, java.security.PrivateKey, java.lang.String)</method>
   </difference>
 </differences>

From d1d977ceec1598cf0bfc783eeb3b19162490a29b Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Thu, 17 Sep 2020 16:10:56 -0400
Subject: [PATCH 5/5] move ignore file to submodule

---
 .../clirr-ignored-differences.xml                               | 2 ++
 pom.xml                                                         | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename clirr-ignored-differences.xml => oauth2_http/clirr-ignored-differences.xml (90%)

diff --git a/clirr-ignored-differences.xml b/oauth2_http/clirr-ignored-differences.xml
similarity index 90%
rename from clirr-ignored-differences.xml
rename to oauth2_http/clirr-ignored-differences.xml
index cf9dfe84b..76b573848 100644
--- a/clirr-ignored-differences.xml
+++ b/oauth2_http/clirr-ignored-differences.xml
@@ -5,5 +5,7 @@
     <differenceType>7009</differenceType>
     <className>com/google/auth/oauth2/ServiceAccountJwtAccessCredentials</className>
     <method>ServiceAccountJwtAccessCredentials(java.lang.String, java.lang.String, java.security.PrivateKey, java.lang.String)</method>
+    <from>public</from>
+    <to>private</to>
   </difference>
 </differences>
diff --git a/pom.xml b/pom.xml
index b49bb5d02..32a0877f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -305,7 +305,6 @@
         <configuration>
           <ignoredDifferencesFile>clirr-ignored-differences.xml</ignoredDifferencesFile>
           <logResults>true</logResults>
-          <failOnError>false</failOnError>
         </configuration>
         <executions>
           <execution>