From 0e91700c97cf85758d224d1f027027d2e704ed14 Mon Sep 17 00:00:00 2001 From: Fan Jingbo Date: Thu, 10 Dec 2020 15:44:52 +0800 Subject: [PATCH 1/2] Fix the warn of list plugin command --- .../main/java/org/elasticsearch/plugins/ListPluginsCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java index e7463615758cd..2f943445aaa05 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/ListPluginsCommand.java @@ -70,7 +70,7 @@ private void printPlugin(Environment env, Terminal terminal, Path plugin, String "WARNING: plugin [" + info.getName() + "] was built for Elasticsearch version " - + info.getVersion() + + info.getElasticsearchVersion() + " but version " + Version.CURRENT + " is required" From 1268542738570463ffeed18c63e89a45a924a8b4 Mon Sep 17 00:00:00 2001 From: Fan Jingbo Date: Thu, 10 Dec 2020 16:02:34 +0800 Subject: [PATCH 2/2] Fix the test case of list plugin command --- .../java/org/elasticsearch/plugins/ListPluginsCommandTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/ListPluginsCommandTests.java b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/ListPluginsCommandTests.java index c5d2cdb058bd2..54e0950649f22 100644 --- a/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/ListPluginsCommandTests.java +++ b/distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/ListPluginsCommandTests.java @@ -266,7 +266,7 @@ public void testExistingIncompatiblePlugin() throws Exception { buildFakePlugin(env, "fake desc 2", "fake_plugin2", "org.fake2"); MockTerminal terminal = listPlugins(home); - String message = "plugin [fake_plugin1] was built for Elasticsearch version 1.0 but version " + Version.CURRENT + " is required"; + String message = "plugin [fake_plugin1] was built for Elasticsearch version 1.0.0 but version " + Version.CURRENT + " is required"; assertEquals("fake_plugin1\nfake_plugin2\n", terminal.getOutput()); assertEquals("WARNING: " + message + "\n", terminal.getErrorOutput());