Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move the CLI into its own subproject #27114

Merged
merged 24 commits into from
Nov 19, 2017
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c4308ce
Move the CLI into its own subproject
hub-cap Oct 25, 2017
c6cc762
nit cleanup on file
hub-cap Oct 25, 2017
73745ea
Merge branch 'master' of github.com:elastic/elasticsearch into plugin…
hub-cap Oct 31, 2017
7eda8e2
Incorporate changes from review
hub-cap Oct 31, 2017
12dd213
Fixing the concurrent modification error
hub-cap Nov 1, 2017
e248c16
Merge remote-tracking branch 'upstream/master' into plugins/separate_cli
hub-cap Nov 1, 2017
9c61c51
Missed dep in tests
hub-cap Nov 1, 2017
037259c
Missed another, grr
hub-cap Nov 1, 2017
dcdaaf8
Fixing deplicenses for cli
hub-cap Nov 1, 2017
9cd8a89
Skip tests as there are none... should we move them?
hub-cap Nov 1, 2017
62612ac
Merge remote-tracking branch 'upstream/master' into plugins/separate_cli
hub-cap Nov 6, 2017
db9980e
Merge remote-tracking branch 'upstream/master' into plugins/separate_cli
hub-cap Nov 7, 2017
87448d3
Merge remote-tracking branch 'upstream/master' into plugins/separate_cli
hub-cap Nov 13, 2017
b1cfecb
Fixing the jarHell I had gotten myself into with adding the jar and c…
hub-cap Nov 13, 2017
1e0a98c
Funky cleanup with deps in the wrong place. I need to figure out why …
hub-cap Nov 14, 2017
c179020
Cleanup on licenses
hub-cap Nov 15, 2017
75db462
Merge remote-tracking branch 'upstream/master' into plugins/separate_cli
hub-cap Nov 15, 2017
21ed445
Removing jarHell since it does not have access to bootstrap.JarHell
hub-cap Nov 16, 2017
1fb5f1b
Merge remote-tracking branch 'upstream/master' into plugins/separate_cli
hub-cap Nov 16, 2017
94bbb74
PR nits
hub-cap Nov 16, 2017
905546b
package->default as per PR
hub-cap Nov 17, 2017
2ead8d6
Merge remote-tracking branch 'upstream/master' into plugins/separate_cli
hub-cap Nov 17, 2017
529f7f5
Merge remote-tracking branch 'upstream/master' into plugins/separate_cli
hub-cap Nov 18, 2017
2c366c1
Merge remote-tracking branch 'upstream/master' into plugins/separate_cli
hub-cap Nov 19, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/cli/src/main/java/org/elasticsearch/cli/Command.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public final int main(String[] args, Terminal terminal) throws Exception {
* Setup method to be executed before parsing or execution of the command being run. Any exceptions thrown by the
* method will not be cleanly caught by the parser.
*/
protected void beforeExecute() throws Exception {}
protected void beforeExecute() {}

/**
* Executes the command, but all errors are thrown.
Expand Down Expand Up @@ -154,7 +154,7 @@ protected boolean addShutdownHook() {
}

/** Gets the shutdown hook thread if it exists **/
public Thread getShutdownHookThread() {
protected Thread getShutdownHookThread() {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we get away with this being package visible only?

return shutdownHookThread;
}

Expand Down