From 43d2e53a2aee2747cbcd7b21e2b1815d79285a34 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@users.noreply.github.com>
Date: Wed, 6 Jan 2021 18:05:44 +0000
Subject: [PATCH] alts: Remove dependency on Apache commons lang

---
 alts/BUILD.bazel                                         | 1 -
 alts/build.gradle                                        | 1 -
 alts/src/main/java/io/grpc/alts/CheckGcpEnvironment.java | 9 +++++----
 build.gradle                                             | 1 -
 repositories.bzl                                         | 1 -
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/alts/BUILD.bazel b/alts/BUILD.bazel
index cf67059fa0..b4468c89c5 100644
--- a/alts/BUILD.bazel
+++ b/alts/BUILD.bazel
@@ -47,7 +47,6 @@ java_library(
         "@io_netty_netty_common//jar",
         "@io_netty_netty_handler//jar",
         "@io_netty_netty_transport//jar",
-        "@org_apache_commons_commons_lang3//jar",
     ],
 )
 
diff --git a/alts/build.gradle b/alts/build.gradle
index 7b59d3692f..683f7d6cf0 100644
--- a/alts/build.gradle
+++ b/alts/build.gradle
@@ -18,7 +18,6 @@ dependencies {
             project(':grpc-grpclb'),
             project(':grpc-protobuf'),
             project(':grpc-stub'),
-            libraries.lang,
             libraries.protobuf,
             libraries.conscrypt
     def nettyDependency = implementation project(':grpc-netty')
diff --git a/alts/src/main/java/io/grpc/alts/CheckGcpEnvironment.java b/alts/src/main/java/io/grpc/alts/CheckGcpEnvironment.java
index 1533415f6b..238152d2eb 100644
--- a/alts/src/main/java/io/grpc/alts/CheckGcpEnvironment.java
+++ b/alts/src/main/java/io/grpc/alts/CheckGcpEnvironment.java
@@ -24,9 +24,9 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.apache.commons.lang3.SystemUtils;
 
 /** Class for checking if the system is running on Google Cloud Platform (GCP). */
 final class CheckGcpEnvironment {
@@ -63,13 +63,14 @@ final class CheckGcpEnvironment {
     }
     return false;
   }
-
+  
   private static boolean isRunningOnGcp() {
+    String osName = System.getProperty("os.name").toLowerCase(Locale.ENGLISH);
     try {
-      if (SystemUtils.IS_OS_LINUX) {
+      if (osName.startsWith("linux")) {
         // Checks GCE residency on Linux platform.
         return checkProductNameOnLinux(Files.newBufferedReader(Paths.get(DMI_PRODUCT_NAME), UTF_8));
-      } else if (SystemUtils.IS_OS_WINDOWS) {
+      } else if (osName.startsWith("windows")) {
         // Checks GCE residency on Windows platform.
         Process p =
             new ProcessBuilder()
diff --git a/build.gradle b/build.gradle
index f45b94aa1b..bab2ae0400 100644
--- a/build.gradle
+++ b/build.gradle
@@ -164,7 +164,6 @@ subprojects {
             protobuf: "com.google.protobuf:protobuf-java:${protobufVersion}",
             protobuf_lite: "com.google.protobuf:protobuf-javalite:${protobufVersion}",
             protobuf_util: "com.google.protobuf:protobuf-java-util:${protobufVersion}",
-            lang: "org.apache.commons:commons-lang3:3.11",
 
             netty: "io.netty:netty-codec-http2:[${nettyVersion}]",
             netty_epoll: "io.netty:netty-transport-native-epoll:${nettyVersion}:linux-x86_64",
diff --git a/repositories.bzl b/repositories.bzl
index 7b8001f7af..3ed5291a88 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -39,7 +39,6 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "io.opencensus:opencensus-contrib-grpc-metrics:0.24.0",
     "io.perfmark:perfmark-api:0.23.0",
     "junit:junit:4.12",
-    "org.apache.commons:commons-lang3:3.11",
     "org.apache.tomcat:annotations-api:6.0.53",
     "org.codehaus.mojo:animal-sniffer-annotations:1.19",
 ]