GEODE-6030: Upgrade commons-lang to commons-lang3 (apache#2830)

buildSrc/src/main/groovy/com/pedjak/gradle/plugins/dockerizedtest/DockerizedTestPlugin.groovy

@@ -181,4 +181,4 @@ class DockerizedTestPlugin implements Plugin<Project> {
         }
     }
 
-}
+}

extensions/geode-modules-assembly/build.gradle

@@ -210,7 +210,7 @@ task distAppServer(type: Zip, dependsOn: [':extensions:geode-modules-session:jar
       filter(ReplaceTokens, tokens:['TX_VERSION': project.'javax.transaction-api.version'])
       filter(ReplaceTokens, tokens:['JGROUPS_VERSION': project.'jgroups.version'])
       filter(ReplaceTokens, tokens:['SHIRO_VERSION': project.'shiro.version'])
-      filter(ReplaceTokens, tokens:['COMMONS_LANG_VERSION': project.'commons-lang.version'])
+      filter(ReplaceTokens, tokens:['COMMONS_LANG_VERSION': project.'commons-lang3.version'])
       filter(ReplaceTokens, tokens:['COMMONS_VALIDATOR_VERSION': project.'commons-validator.version'])
     }
   }

extensions/geode-modules-assembly/release/session/bin/modify_war

@@ -268,7 +268,7 @@ OTHER_JARS=(${GEODE}/lib/geode-core-${VERSION}.jar \
     ${GEODE}/lib/fastutil-@[email protected] \
     ${GEODE}/lib/javax.transaction-api-@[email protected] \
     ${GEODE}/lib/jgroups-@[email protected] \
-    ${GEODE}/lib/commons-lang-@[email protected] \
+    ${GEODE}/lib/commons-lang3-@[email protected] \
     ${GEODE}/lib/shiro-core-@[email protected] \
     ${GEODE}/lib/commons-validator-@[email protected] \
     ${LIB_DIR}/geode-modules-${VERSION}.jar \

geode-assembly/build.gradle

@@ -250,7 +250,7 @@ def cp = {
         it.contains('commons-io') ||
         it.contains('classgraph') ||
         it.contains('commons-collections') ||
-        it.contains('commons-lang') ||
+        it.contains('commons-lang3') ||
         it.contains('commons-logging') ||
         it.contains('commons-validator') ||
         it.contains('commons-beanutils') ||

geode-assembly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/ServerContainer.java

@@ -22,7 +22,8 @@
 import java.util.HashMap;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.JavaVersion;
+import org.apache.commons.lang3.SystemUtils;
 import org.apache.logging.log4j.Logger;
 import org.codehaus.cargo.container.ContainerType;
 import org.codehaus.cargo.container.InstalledLocalContainer;
@@ -185,7 +186,7 @@ public void start() {
     config.setProperty(TomcatPropertySet.AJP_PORT, Integer.toString(ports[2]));
     config.setProperty(GeneralPropertySet.PORT_OFFSET, "0");
     String jvmArgs = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=" + ports[3];
-    if (SystemUtils.isJavaVersionAtLeast(900)) {
+    if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)) {
       jvmArgs += " --add-opens java.base/java.lang.module=ALL-UNNAMED" +
           " --add-opens java.base/jdk.internal.module=ALL-UNNAMED" +
           " --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED" +

geode-assembly/src/acceptanceTest/java/org/apache/geode/management/internal/cli/commands/ConnectCommandAcceptanceTest.java

@@ -20,7 +20,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assume.assumeTrue;
 
-import org.apache.commons.lang.SystemUtils;
+import org.apache.commons.lang3.JavaVersion;
+import org.apache.commons.lang3.SystemUtils;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -42,7 +43,7 @@ public class ConnectCommandAcceptanceTest {
   @Test
   public void useCurrentGfshToConnectToOlderLocator() throws Exception {
     // this test can only be run with pre-9 jdk since it needs to run older version of gfsh
-    assumeTrue(!SystemUtils.isJavaVersionAtLeast(900));
+    assumeTrue(!SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9));
     GfshScript.of("start locator").execute(gfsh130);
     GfshExecution connect = GfshScript.of("connect").expectFailure().execute(gfshDefault);
 

geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java

@@ -34,7 +34,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.CloseableHttpResponse;

geode-assembly/src/distributedTest/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java

@@ -54,7 +54,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpGet;

geode-assembly/src/integrationTest/resources/assembly_content.txt

@@ -1190,7 +1190,7 @@ lib/commons-codec-1.10.jar
 lib/commons-collections-3.2.2.jar
 lib/commons-digester-2.1.jar
 lib/commons-io-2.6.jar
-lib/commons-lang-2.6.jar
+lib/commons-lang3-3.8.1.jar
 lib/commons-logging-1.2.jar
 lib/commons-math3-3.2.jar
 lib/commons-modeler-2.0.1.jar

geode-assembly/src/integrationTest/resources/dependency_classpath.txt

@@ -6,7 +6,7 @@ commons-beanutils-1.9.3.jar
 commons-codec-1.10.jar
 commons-collections-3.2.2.jar
 commons-io-2.6.jar
-commons-lang-2.6.jar
+commons-lang3-3.8.1.jar
 commons-logging-1.2.jar
 commons-validator-1.6.jar
 fastutil-8.2.1.jar

geode-connectors/build.gradle

@@ -50,7 +50,7 @@ dependencies {
   }
 
   compile('com.zaxxer:HikariCP:3.2.0')
-  compile('commons-lang:commons-lang:' + project.'commons-lang.version')
+  compile('org.apache.commons:commons-lang3:' + project.'commons-lang3.version')
   compile('javax.xml.bind:jaxb-api:' + project.'jaxb.version')
   compile('org.apache.logging.log4j:log4j-api:' + project.'log4j.version')
   compile('org.apache.logging.log4j:log4j-jcl:' + project.'log4j.version') {

geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcConnectorException.java

@@ -16,7 +16,7 @@
 
 import java.sql.SQLException;
 
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 
 import org.apache.geode.cache.CacheRuntimeException;
 
@@ -44,7 +44,7 @@ public class JdbcConnectorException extends CacheRuntimeException {
   public static JdbcConnectorException createException(Exception e) {
     if (containsNonSerializableException(e)) {
       String message =
-          e.getMessage() + System.lineSeparator() + ExceptionUtils.getFullStackTrace(e);
+          e.getMessage() + System.lineSeparator() + ExceptionUtils.getStackTrace(e);
       return new JdbcConnectorException(message);
     } else {
       return new JdbcConnectorException(e);
@@ -64,7 +64,7 @@ public static JdbcConnectorException createException(Exception e) {
    */
   public static JdbcConnectorException createException(String message, Exception e) {
     if (containsNonSerializableException(e)) {
-      message += e.getMessage() + System.lineSeparator() + ExceptionUtils.getFullStackTrace(e);
+      message += e.getMessage() + System.lineSeparator() + ExceptionUtils.getStackTrace(e);
       return new JdbcConnectorException(message);
     } else {
       return new JdbcConnectorException(message, e);

geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java

@@ -27,7 +27,7 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;

geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java

@@ -24,7 +24,7 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;

geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java

@@ -23,7 +23,7 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;

geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java

@@ -25,7 +25,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.SerializationUtils;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;

geode-connectors/src/test/resources/expected-pom.xml

@@ -54,9 +54,9 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.8.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

geode-core/build.gradle

@@ -167,7 +167,7 @@ dependencies {
   compile('com.sun.xml.bind:jaxb-core:' + project.'jaxb.version')
   compile('com.sun.xml.bind:jaxb-impl:' + project.'jaxb.version')
 
-  compile('commons-lang:commons-lang:' + project.'commons-lang.version')
+  compile('org.apache.commons:commons-lang3:' + project.'commons-lang3.version')
   compile('commons-modeler:commons-modeler:' + project.'commons-modeler.version') {
     exclude module: 'commons-digester'
     exclude module: 'commons-logging-api'

geode-core/src/distributedTest/java/org/apache/geode/internal/cache/TestNonSizerObject.java

@@ -16,7 +16,7 @@
 
 import java.io.Serializable;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Test object which does not implement ObjectSizer, used as Key/Value in put operation.

geode-core/src/distributedTest/java/org/apache/geode/internal/cache/partitioned/fixed/FixedPartitioningTestBase.java

@@ -35,7 +35,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.apache.geode.SystemFailure;
 import org.apache.geode.cache.AttributesFactory;

geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IUM6Bug32345ReJUnitTest.java

@@ -21,7 +21,7 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IndexWithSngleFrmAndMultCondQryJUnitTest.java

@@ -30,7 +30,7 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

geode-core/src/integrationTest/java/org/apache/geode/cache/query/functional/IumMultConditionJUnitTest.java

@@ -28,7 +28,7 @@
 import java.util.Iterator;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

geode-core/src/integrationTest/java/org/apache/geode/distributed/LauncherIntegrationTestCase.java

@@ -35,7 +35,7 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;

geode-core/src/integrationTest/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java

@@ -53,7 +53,7 @@
 import java.util.Properties;
 import java.util.Set;
 
-import org.apache.commons.lang.SerializationException;
+import org.apache.commons.lang3.SerializationException;
 import org.jgroups.Address;
 import org.jgroups.Event;
 import org.jgroups.JChannel;

geode-core/src/integrationTest/java/org/apache/geode/internal/logging/DistributedSystemLogFileIntegrationTest.java

@@ -14,7 +14,7 @@
  */
 package org.apache.geode.internal.logging;
 
-import static org.apache.commons.lang.SystemUtils.LINE_SEPARATOR;
+import static org.apache.commons.lang3.SystemUtils.LINE_SEPARATOR;
 import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
 import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
 import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;

geode-core/src/integrationTest/java/org/apache/geode/internal/process/ControlFileWatchdogIntegrationTest.java

@@ -104,7 +104,7 @@ public void nullFileName_throwsIllegalArgumentException() throws Exception {
     // act/assert
     assertThatThrownBy(
         () -> new ControlFileWatchdog(directory, requestFileName, requestHandler, stopAfterRequest))
-            .isInstanceOf(IllegalArgumentException.class);
+            .isInstanceOf(NullPointerException.class);
   }
 
   @Test
@@ -115,7 +115,7 @@ public void nullDirectory_throwsIllegalArgumentException() throws Exception {
     // act/assert
     assertThatThrownBy(
         () -> new ControlFileWatchdog(directory, requestFileName, requestHandler, stopAfterRequest))
-            .isInstanceOf(IllegalArgumentException.class);
+            .isInstanceOf(NullPointerException.class);
   }
 
   @Test
@@ -126,7 +126,7 @@ public void nullRequestHandler_throwsIllegalArgumentException() throws Exception
     // act/assert
     assertThatThrownBy(
         () -> new ControlFileWatchdog(directory, requestFileName, requestHandler, stopAfterRequest))
-            .isInstanceOf(IllegalArgumentException.class);
+            .isInstanceOf(NullPointerException.class);
   }
 
   @Test

geode-core/src/integrationTest/java/org/apache/geode/internal/process/PidFileIntegrationTest.java

@@ -107,7 +107,7 @@ public void readingNullFileThrowsNullPointerException() throws Exception {
 
     // act/assert
     assertThatThrownBy(() -> new PidFile(pidFile).readPid())
-        .isInstanceOf(IllegalArgumentException.class);
+        .isInstanceOf(NullPointerException.class);
   }
 
   @Test

geode-core/src/integrationTest/java/org/apache/geode/internal/process/ProcessControllerFactoryIntegrationTest.java

@@ -106,7 +106,7 @@ public void createProcessController_nullParameters_throwsNullPointerException()
 
     // act/assert
     assertThatThrownBy(() -> factory.createProcessController(parameters, directory, pidFileName))
-        .isInstanceOf(IllegalArgumentException.class);
+        .isInstanceOf(NullPointerException.class);
   }
 
   @Test
@@ -116,7 +116,7 @@ public void createProcessController_nullDirectory_throwsNullPointerException() t
 
     // act/assert
     assertThatThrownBy(() -> factory.createProcessController(parameters, directory, pidFileName))
-        .isInstanceOf(IllegalArgumentException.class);
+        .isInstanceOf(NullPointerException.class);
   }
 
   @Test
@@ -127,6 +127,6 @@ public void createProcessController_nullPidFileName_throwsNullPointerException()
 
     // act/assert
     assertThatThrownBy(() -> factory.createProcessController(parameters, directory, pidFileName))
-        .isInstanceOf(IllegalArgumentException.class);
+        .isInstanceOf(NullPointerException.class);
   }
 }

geode-core/src/integrationTest/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java

@@ -18,7 +18,7 @@
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.apache.commons.io.FileUtils.moveFileToDirectory;
 import static org.apache.commons.io.FileUtils.sizeOfDirectory;
-import static org.apache.commons.lang.StringUtils.leftPad;
+import static org.apache.commons.lang3.StringUtils.leftPad;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/GfshParserAutoCompletionTest.java

@@ -14,7 +14,7 @@
  */
 package org.apache.geode.management.internal.cli;
 
-import static org.apache.commons.lang.SystemUtils.LINE_SEPARATOR;
+import static org.apache.commons.lang3.SystemUtils.LINE_SEPARATOR;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Collection;

geode-core/src/integrationTest/java/org/apache/geode/redis/HashesJUnitTest.java

@@ -29,7 +29,7 @@
 import java.util.Random;
 import java.util.Set;
 
-import org.apache.commons.lang.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java

@@ -14,7 +14,7 @@
  */
 package org.apache.geode.admin.jmx.internal;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Type-safe definition for ModelMBean managed resources. The class type ({@link #getClassTypeName})

geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java

@@ -14,7 +14,7 @@
  */
 package org.apache.geode.admin.jmx.internal;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Type-safe definition for refresh notifications.

geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientRegionFactoryImpl.java

@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache.client.internal;
 
-import static org.apache.commons.lang.StringUtils.isEmpty;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 
 import java.util.Objects;
 

geode-core/src/main/java/org/apache/geode/cache/client/internal/PoolImpl.java

@@ -14,7 +14,7 @@
  */
 package org.apache.geode.cache.client.internal;
 
-import static org.apache.commons.lang.StringUtils.isEmpty;
+import static org.apache.commons.lang3.StringUtils.isEmpty;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;