From 5804ff03a531268831ac797ab262638a3119c14f Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Date: Mon, 21 Dec 2020 13:33:13 +0000
Subject: [PATCH] fix!: privatize deprecated constructor (#473)

* privatize deprecated method

* ignore removal of deprecated method

* api not locked down

* fix merge error

* move ignore file to submodule

Co-authored-by: Jeff Ching <chingor@google.com>
---
 oauth2_http/clirr-ignored-differences.xml             | 11 +++++++++++
 .../oauth2/ServiceAccountJwtAccessCredentials.java    |  5 +----
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 oauth2_http/clirr-ignored-differences.xml

diff --git a/oauth2_http/clirr-ignored-differences.xml b/oauth2_http/clirr-ignored-differences.xml
new file mode 100644
index 000000000..76b573848
--- /dev/null
+++ b/oauth2_http/clirr-ignored-differences.xml
@@ -0,0 +1,11 @@
+<?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>
+    <from>public</from>
+    <to>private</to>
+  </difference>
+</differences>
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);
   }