GEODE-7536 - Break Gfsh out into separate module (apache#4422)

- ManagementUtils is split from CliUtil with non-CLI methods. - Introduce new CommandProcessor interface which is a CacheService. This is implemented by OnlineCommandProcessor and is used in MemberMBeanBridge. - Remove try/catch from ClusterConfigurationStatusRetriever since any exception will be handled at a higher level.
WeijieEST · Dec 6, 2019 · d5a191e · d5a191e
1 parent 49eefca
commit d5a191e
Show file tree

Hide file tree

Showing 730 changed files with 2,008 additions and 1,732 deletions.
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -379,12 +379,6 @@
         <version>2.2.1</version>
         <scope>compile</scope>
       </dependency>
-      <dependency>
-        <groupId>org.fusesource.jansi</groupId>
-        <artifactId>jansi</artifactId>
-        <version>1.17.1</version>
-        <scope>compile</scope>
-      </dependency>
       <dependency>
         <groupId>org.httpunit</groupId>
         <artifactId>httpunit</artifactId>
@@ -829,6 +823,12 @@
         <version>1.12.0-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.geode</groupId>
+        <artifactId>geode-gfsh</artifactId>
+        <version>1.12.0-SNAPSHOT</version>
+        <scope>compile</scope>
+      </dependency>
       <dependency>
         <groupId>org.apache.geode</groupId>
         <artifactId>geode-http-service</artifactId>

diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -141,7 +141,6 @@ class DependencyConstraints implements Plugin<Project> {
         api(group: 'org.eclipse.jetty', name: 'jetty-webapp', version: get('jetty.version'))
         api(group: 'org.eclipse.jetty', name: 'jetty-server', version: get('jetty.version'))
         api(group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1')
-        api(group: 'org.fusesource.jansi', name: 'jansi', version: '1.17.1')
         api(group: 'org.httpunit', name: 'httpunit', version: '1.7.3')
         api(group: 'org.iq80.snappy', name: 'snappy', version: '0.4')
         api(group: 'org.jgroups', name: 'jgroups', version: get('jgroups.version'))

diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
@@ -32,6 +32,7 @@ def dependentProjectNames = [
   ':geode-serialization',
   ':geode-core',
   ':geode-cq',
+  ':geode-gfsh',
   ':geode-log4j',
   ':geode-logging',
   ':geode-lucene',
@@ -162,6 +163,7 @@ dependencies {
   geodeArchives project(':geode-connectors')
   geodeArchives project(':geode-core')
   geodeArchives project(':geode-cq')
+  geodeArchives project(':geode-gfsh')
   geodeArchives project(':geode-log4j')
   geodeArchives project(':geode-logging')
   geodeArchives project(':geode-lucene')
@@ -187,6 +189,7 @@ dependencies {
   javadocOnly project(':geode-experimental-driver')
 
   testCompile(project(':geode-core'))
+  testCompile(project(':geode-gfsh'))
   testCompile(project(':geode-junit')) {
     exclude module: 'geode-core'
   }

diff --git a/.../java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandDUnitTest.java b/.../java/org/apache/geode/management/internal/cli/commands/StartLocatorCommandDUnitTest.java
@@ -14,16 +14,16 @@
  */
 package org.apache.geode.management.internal.cli.commands;
 
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__CONNECT;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__DIR;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__HOSTNAME_FOR_CLIENTS;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__LOCATORS;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__MEMBER_NAME;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__PORT;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__PROPERTIES;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__SECURITY_PROPERTIES;
+import static org.apache.geode.management.internal.i18n.CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__CONNECT;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__DIR;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__HOSTNAME_FOR_CLIENTS;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__LOCATORS;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__MEMBER_NAME;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__PORT;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__PROPERTIES;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__SECURITY_PROPERTIES;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;

diff --git a/...t/java/org/apache/geode/management/internal/cli/commands/StartServerCommandDUnitTest.java b/...t/java/org/apache/geode/management/internal/cli/commands/StartServerCommandDUnitTest.java
@@ -14,25 +14,25 @@
  */
 package org.apache.geode.management.internal.cli.commands;
 
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.CACHE_XML_NOT_FOUND_MESSAGE;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.CREATE_REGION;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.CREATE_REGION__REGION;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.CREATE_REGION__REGIONSHORTCUT;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.GROUP;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__CACHE_XML_FILE;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__DIR;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__FORCE;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__HOSTNAME__FOR__CLIENTS;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__LOCATORS;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__MAXHEAP;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__NAME;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__OFF_HEAP_MEMORY_SIZE;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__PROPERTIES;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__SECURITY_PROPERTIES;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__SERVER_PORT;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__USERNAME;
+import static org.apache.geode.management.internal.i18n.CliStrings.CACHE_XML_NOT_FOUND_MESSAGE;
+import static org.apache.geode.management.internal.i18n.CliStrings.CREATE_REGION;
+import static org.apache.geode.management.internal.i18n.CliStrings.CREATE_REGION__REGION;
+import static org.apache.geode.management.internal.i18n.CliStrings.CREATE_REGION__REGIONSHORTCUT;
+import static org.apache.geode.management.internal.i18n.CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE;
+import static org.apache.geode.management.internal.i18n.CliStrings.GROUP;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER__CACHE_XML_FILE;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER__DIR;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER__FORCE;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER__HOSTNAME__FOR__CLIENTS;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER__LOCATORS;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER__MAXHEAP;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER__NAME;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER__OFF_HEAP_MEMORY_SIZE;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER__PROPERTIES;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER__SECURITY_PROPERTIES;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER__SERVER_PORT;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_SERVER__USERNAME;
 import static org.apache.geode.test.compiler.ClassBuilder.writeJarFromClasses;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.isA;
@@ -65,8 +65,8 @@
 import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.internal.process.ProcessType;
 import org.apache.geode.internal.process.ProcessUtils;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
 import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.management.internal.i18n.CliStrings;
 import org.apache.geode.test.dunit.rules.ClusterStartupRule;
 import org.apache.geode.test.dunit.rules.MemberVM;
 import org.apache.geode.test.dunit.rules.SharedErrorCollector;

diff --git a/...java/org/apache/geode/management/internal/cli/commands/StatusLocatorCommandDunitTest.java b/...java/org/apache/geode/management/internal/cli/commands/StatusLocatorCommandDunitTest.java
@@ -15,7 +15,7 @@
 package org.apache.geode.management.internal.cli.commands;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.STATUS_LOCATOR;
+import static org.apache.geode.management.internal.i18n.CliStrings.STATUS_LOCATOR;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 

diff --git a/...t/java/org/apache/geode/management/internal/cli/commands/StopLocatorCommandDUnitTest.java b/...t/java/org/apache/geode/management/internal/cli/commands/StopLocatorCommandDUnitTest.java
@@ -17,17 +17,17 @@
 import static org.apache.geode.distributed.internal.DistributionConfig.GEMFIRE_PREFIX;
 import static org.apache.geode.management.cli.Result.Status.ERROR;
 import static org.apache.geode.management.cli.Result.Status.OK;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.GROUP;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__DIR;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__J;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__LOCATORS;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__MEMBER_NAME;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_LOCATOR__PORT;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.STOP_LOCATOR;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.STOP_LOCATOR__DIR;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.STOP_LOCATOR__MEMBER;
-import static org.apache.geode.management.internal.cli.i18n.CliStrings.STOP_SERVICE__GFSH_NOT_CONNECTED_ERROR_MESSAGE;
+import static org.apache.geode.management.internal.i18n.CliStrings.GROUP;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__DIR;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__J;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__LOCATORS;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__MEMBER_NAME;
+import static org.apache.geode.management.internal.i18n.CliStrings.START_LOCATOR__PORT;
+import static org.apache.geode.management.internal.i18n.CliStrings.STOP_LOCATOR;
+import static org.apache.geode.management.internal.i18n.CliStrings.STOP_LOCATOR__DIR;
+import static org.apache.geode.management.internal.i18n.CliStrings.STOP_LOCATOR__MEMBER;
+import static org.apache.geode.management.internal.i18n.CliStrings.STOP_SERVICE__GFSH_NOT_CONNECTED_ERROR_MESSAGE;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.io.File;
@@ -55,9 +55,9 @@
 import org.apache.geode.distributed.ConfigurationProperties;
 import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.internal.lang.ObjectUtils;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
 import org.apache.geode.management.internal.cli.result.CommandResult;
 import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.management.internal.i18n.CliStrings;
 import org.apache.geode.test.awaitility.GeodeAwaitility;
 import org.apache.geode.test.dunit.rules.ClusterStartupRule;
 import org.apache.geode.test.dunit.rules.MemberVM;

diff --git a/...embly/src/distributedTest/java/org/apache/geode/session/tests/TomcatClientServerTest.java b/...embly/src/distributedTest/java/org/apache/geode/session/tests/TomcatClientServerTest.java
@@ -21,8 +21,8 @@
 import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
 import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.management.internal.i18n.CliStrings;
 import org.apache.geode.test.dunit.rules.ClusterStartupRule;
 import org.apache.geode.test.junit.rules.GfshCommandRule;
 

diff --git a/...Test/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java b/...Test/java/org/apache/geode/management/internal/cli/commands/GemfireCoreClasspathTest.java
@@ -39,7 +39,7 @@ public void testGemFireCoreClasspath() throws IOException {
     assertTrue(coreDependenciesJar + " is not a file", coreDependenciesJar.isFile());
     Collection<String> expectedJarDependencies =
         Arrays.asList("antlr", "commons-io", "commons-lang", "commons-logging", "geode",
-            "jackson-annotations", "jackson-core", "jackson-databind", "jansi", "jline", "snappy",
+            "jackson-annotations", "jackson-core", "jackson-databind", "jline", "snappy",
             "spring-core", "spring-shell", "jetty-server", "jetty-servlet", "jetty-webapp",
             "jetty-util", "jetty-http", "servlet-api", "jetty-io", "jetty-security", "jetty-xml");
     assertJarFileManifestClassPath(coreDependenciesJar, expectedJarDependencies);

diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -618,11 +618,11 @@ javadoc/org/apache/geode/examples/SimpleSecurityManager.html
 javadoc/org/apache/geode/examples/package-frame.html
 javadoc/org/apache/geode/examples/package-summary.html
 javadoc/org/apache/geode/examples/package-tree.html
+javadoc/org/apache/geode/examples/security/ExampleAnnotationBasedMethodInvocationAuthorizer.html
 javadoc/org/apache/geode/examples/security/ExamplePostProcessor.html
 javadoc/org/apache/geode/examples/security/ExampleSecurityManager.Role.html
 javadoc/org/apache/geode/examples/security/ExampleSecurityManager.User.html
 javadoc/org/apache/geode/examples/security/ExampleSecurityManager.html
-javadoc/org/apache/geode/examples/security/ExampleAnnotationBasedMethodInvocationAuthorizer.html
 javadoc/org/apache/geode/examples/security/package-frame.html
 javadoc/org/apache/geode/examples/security/package-summary.html
 javadoc/org/apache/geode/examples/security/package-tree.html
@@ -965,6 +965,7 @@ lib/geode-connectors-0.0.0.jar
 lib/geode-core-0.0.0.jar
 lib/geode-cq-0.0.0.jar
 lib/geode-dependencies.jar
+lib/geode-gfsh-0.0.0.jar
 lib/geode-http-service-0.0.0.jar
 lib/geode-jca-0.0.0.rar
 lib/geode-log4j-0.0.0.jar
@@ -988,7 +989,6 @@ lib/istack-commons-runtime-2.2.jar
 lib/jackson-annotations-2.10.0.jar
 lib/jackson-core-2.10.0.jar
 lib/jackson-databind-2.10.0.jar
-lib/jansi-1.17.1.jar
 lib/javax.activation-1.2.0.jar
 lib/javax.activation-api-1.2.0.jar
 lib/javax.mail-api-1.6.2.jar

diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -2,7 +2,7 @@ geode-common-0.0.0.jar
 geode-connectors-0.0.0.jar
 geode-core-0.0.0.jar
 geode-cq-0.0.0.jar
-geode-http-service-0.0.0.jar
+geode-gfsh-0.0.0.jar
 geode-log4j-0.0.0.jar
 geode-logging-0.0.0.jar
 geode-lucene-0.0.0.jar
@@ -18,14 +18,12 @@ geode-wan-0.0.0.jar
 jackson-databind-2.10.0.jar
 jackson-annotations-2.10.0.jar
 jackson-core-2.10.0.jar
+geode-http-service-0.0.0.jar
 geode-unsafe-0.0.0.jar
 HikariCP-3.2.0.jar
 commons-lang3-3.8.1.jar
 jaxb-api-2.3.1.jar
 log4j-jcl-2.12.0.jar
-log4j-slf4j-impl-2.12.0.jar
-log4j-core-2.12.0.jar
-log4j-jul-2.12.0.jar
 log4j-api-2.12.0.jar
 spring-shell-1.2.0.RELEASE.jar
 rmiio-2.1.2.jar
@@ -39,8 +37,6 @@ shiro-config-ogdl-1.4.0.jar
 commons-beanutils-1.9.3.jar
 commons-collections-3.2.2.jar
 commons-io-2.6.jar
-spring-core-5.2.1.RELEASE.jar
-spring-jcl-5.2.1.RELEASE.jar
 httpclient-4.5.6.jar
 commons-logging-1.2.jar
 classgraph-4.8.52.jar
@@ -55,7 +51,6 @@ javax.servlet-api-3.1.0.jar
 jna-4.1.0.jar
 jopt-simple-5.0.4.jar
 httpcore-4.4.10.jar
-jansi-1.17.1.jar
 snappy-0.4.jar
 jgroups-3.6.14.Final.jar
 shiro-cache-1.4.0.jar
@@ -67,16 +62,21 @@ shiro-crypto-core-1.4.0.jar
 shiro-lang-1.4.0.jar
 slf4j-api-1.7.25.jar
 swagger-annotations-1.5.20.jar
+spring-core-5.2.1.RELEASE.jar
 javax.activation-api-1.2.0.jar
 jline-2.12.jar
 HdrHistogram-2.1.11.jar
 LatencyUtils-2.0.3.jar
 javax.transaction-api-1.3.jar
+spring-jcl-5.2.1.RELEASE.jar
+commons-codec-1.10.jar
 jetty-xml-9.4.21.v20190926.jar
 jetty-http-9.4.21.v20190926.jar
 jetty-io-9.4.21.v20190926.jar
 jetty-util-9.4.21.v20190926.jar
-commons-codec-1.10.jar
+log4j-slf4j-impl-2.12.0.jar
+log4j-core-2.12.0.jar
+log4j-jul-2.12.0.jar
 lucene-analyzers-phonetic-6.6.2.jar
 lucene-analyzers-common-6.6.2.jar
 lucene-queryparser-6.6.2.jar

diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt b/geode-assembly/src/integrationTest/resources/expected_jars.txt
@@ -34,7 +34,6 @@ j2objc-annotations
 jackson-annotations
 jackson-core
 jackson-databind
-jansi
 javax.activation
 javax.activation-api
 javax.mail-api

diff --git a/...pgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java b/...pgradeTest/java/org/apache/geode/session/tests/Tomcat8ClientServerRollingUpgradeTest.java
@@ -37,8 +37,8 @@
 import org.apache.geode.cache.RegionShortcut;
 import org.apache.geode.internal.UniquePortSupplier;
 import org.apache.geode.internal.serialization.Version;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
 import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.management.internal.i18n.CliStrings;
 import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
 import org.apache.geode.test.junit.rules.gfsh.GfshRule;
 import org.apache.geode.test.junit.rules.gfsh.GfshScript;

diff --git a/...Test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTestBase.java b/...Test/java/org/apache/geode/session/tests/TomcatSessionBackwardsCompatibilityTestBase.java
@@ -32,8 +32,8 @@
 import org.junit.runners.Parameterized;
 
 import org.apache.geode.internal.UniquePortSupplier;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
 import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.management.internal.i18n.CliStrings;
 import org.apache.geode.test.junit.categories.BackwardCompatibilityTest;
 import org.apache.geode.test.junit.rules.GfshCommandRule;
 import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactory;

diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle
@@ -51,6 +51,7 @@ dependencies {
   implementation(project(':geode-logging'))
   implementation(project(':geode-serialization'))
   compile(project(':geode-core'))
+  compile(project(':geode-gfsh'))
   testCompile(project(':geode-junit')) {
     exclude module: 'geode-core'
   }

diff --git a/...est/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java b/...est/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
@@ -61,8 +61,8 @@
 import org.apache.geode.internal.PdxSerializerObject;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.jndi.JNDIInvoker;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
 import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.management.internal.i18n.CliStrings;
 import org.apache.geode.pdx.FieldType;
 import org.apache.geode.pdx.PdxReader;
 import org.apache.geode.pdx.PdxSerializable;

diff --git a/...pache/geode/connectors/jdbc/internal/cli/CreateMappingCommandForProxyRegionDUnitTest.java b/...pache/geode/connectors/jdbc/internal/cli/CreateMappingCommandForProxyRegionDUnitTest.java
@@ -62,8 +62,8 @@
 import org.apache.geode.distributed.internal.InternalLocator;
 import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.internal.jndi.JNDIInvoker;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
 import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.management.internal.i18n.CliStrings;
 import org.apache.geode.pdx.FieldType;
 import org.apache.geode.pdx.PdxReader;
 import org.apache.geode.pdx.PdxSerializable;

diff --git a/...ava/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java b/...ava/org/apache/geode/connectors/jdbc/internal/cli/JDBCConnectorFunctionsSecurityTest.java
@@ -29,7 +29,7 @@
 import org.apache.geode.cache.execute.FunctionService;
 import org.apache.geode.examples.SimpleSecurityManager;
 import org.apache.geode.management.cli.CliFunction;
-import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
+import org.apache.geode.management.internal.functions.CliFunctionResult;
 import org.apache.geode.test.junit.rules.ConnectionConfiguration;
 import org.apache.geode.test.junit.rules.GfshCommandRule;
 import org.apache.geode.test.junit.rules.ServerStarterRule;