From c52ecafc2757912a1f3ca54d130499c17ff0ac41 Mon Sep 17 00:00:00 2001
From: Timur Sadykov <stim@google.com>
Date: Fri, 7 Apr 2023 00:41:32 -0700
Subject: [PATCH] chore: using full package names to avoid incorrect import
 merge (#1193)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix bogus import error by changing import order

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* exclude ExternalAccount from owl bot

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* disable import order

* change imports again

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* disabling owl bot

* moving import

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* removing owlbot lock file to disable it

* Revert "removing owlbot lock file to disable it"

This reverts commit 59cb9a7244c0302b5911da9652b6f55398396a04.

* Revert "disabling owl bot"

This reverts commit 549806174d1026715cab4a2030617305b872c21d.

* re-enable owlbot and revert poc config changes

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 .github/.OwlBot.yaml                             | 16 ++++++++++++++++
 .../auth/oauth2/ExternalAccountCredentials.java  |  5 ++---
 owlbot.py                                        |  3 +--
 pom.xml                                          |  1 -
 4 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 .github/.OwlBot.yaml

diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml
new file mode 100644
index 000000000..5d9a9d8b5
--- /dev/null
+++ b/.github/.OwlBot.yaml
@@ -0,0 +1,16 @@
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+docker:
+  image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest"
diff --git a/oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java b/oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java
index 096f66b29..227603957 100644
--- a/oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java
+++ b/oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java
@@ -43,7 +43,6 @@
 import com.google.common.base.MoreObjects;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
@@ -69,7 +68,7 @@ public abstract class ExternalAccountCredentials extends GoogleCredentials {
   private static final long serialVersionUID = 8049126194174465023L;
 
   /** Base credential source class. Dictates the retrieval method of the external credential. */
-  abstract static class CredentialSource implements Serializable {
+  abstract static class CredentialSource implements java.io.Serializable {
 
     private static final long serialVersionUID = 8204657811562399944L;
 
@@ -641,7 +640,7 @@ private static boolean isValidUrl(String url) {
    * }
    * </pre>
    */
-  static final class ServiceAccountImpersonationOptions implements Serializable {
+  static final class ServiceAccountImpersonationOptions implements java.io.Serializable {
 
     private static final long serialVersionUID = 4250771921886280953L;
     private static final int DEFAULT_TOKEN_LIFETIME_SECONDS = 3600;
diff --git a/owlbot.py b/owlbot.py
index 8bf9d155d..610e82700 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -36,7 +36,6 @@
         ".kokoro/nightly/integration.cfg",
         ".kokoro/presubmit/integration.cfg",
         ".kokoro/presubmit/graalvm-native.cfg",
-        ".kokoro/presubmit/graalvm-native-17.cfg",
-        "oauth2_http/java/com/google/auth/oauth2/ExternalAccountCredentials.java"
+        ".kokoro/presubmit/graalvm-native-17.cfg"
     ]
 )
diff --git a/pom.xml b/pom.xml
index 45fce5aa3..5a3f652ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -214,7 +214,6 @@
           <version>2.13</version>
           <configuration>
             <verbose>true</verbose>
-            <skipSortingImports>true</skipSortingImports>
           </configuration>
         </plugin>
         <plugin>