Skip to content

Commit

Permalink
Removed IMDG keyword and enabled Jet by default (#94)
Browse files Browse the repository at this point in the history
  • Loading branch information
alparslanavci authored Jul 15, 2021
1 parent 3320b53 commit 99218e1
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
run: |
echo "HZ_VERSION=$(grep '<hazelcast.version>' pom.xml | sed "s@.*<hazelcast.version>\(.*\)</hazelcast.version>.*@\1@")" >> $GITHUB_ENV
- name: Run CLI for IMDG
- name: Run CLI for Hazelcast
run: distro/build/dist/hazelcast-${{ env.HZ_VERSION }}/bin/hz start -c src/test/resources/integration-test-hazelcast.yaml &

- name: Check IMDG health
- name: Check Hazelcast health
run: |
attempts=0
max_attempts=10
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ jobs:
sudo apt update && sudo apt install hazelcast=${{ needs.build.outputs.release }}
hz start -c src/test/resources/integration-test-hazelcast.yaml &
- name: Check IMDG health
- name: Check Hazelcast health
run: |
attempts=0
max_attempts=10
Expand Down Expand Up @@ -196,7 +196,7 @@ jobs:
yum install -y hazelcast-${{ needs.build.outputs.release }}
hz start -c src/test/resources/integration-test-hazelcast.yaml &
- name: Check IMDG health
- name: Check Hazelcast health
run: |
attempts=0
max_attempts=10
Expand Down Expand Up @@ -225,7 +225,7 @@ jobs:
- name: Run CLI
run: hz start -c src/test/resources/integration-test-hazelcast.yaml &

- name: Check IMDG health
- name: Check Hazelcast health
run: |
attempts=0
max_attempts=10
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Hazelcast Command Line

Hazelcast Command Line is a tool which allows users to install & run Hazelcast IMDG and Management Center on local environment.
Hazelcast Command Line is a tool which allows users to install & run Hazelcast and Management Center on local environment.

## Table of Contents

Expand Down Expand Up @@ -159,12 +159,12 @@ For all other available options, refer to `hz mc start --help`.

### How to print version information

This command prints Hazelcast IMDG, Management Center and the tool's version information to the console output:
This command prints Hazelcast, Management Center and the tool's version information to the console output:

```
$ hz -V
CLI tool: 4.2020.12
Hazelcast IMDG: 4.1.1
Hazelcast: 4.1.1
Hazelcast Management Center: 4.2020.12
```

Expand Down
2 changes: 1 addition & 1 deletion packages/deb/hazelcast/DEBIAN/control
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ Priority: optional
Architecture: all
Depends: default-jdk | java8-sdk
Maintainer: Alparslan Avci <[email protected]>
Description: A tool that allows users to install & run Hazelcast IMDG and Management Center on the local environment
Description: A tool that allows users to install & run Hazelcast and Management Center on the local environment
Homepage: https://hazelcast.org/
License: ASL 2.0
4 changes: 2 additions & 2 deletions packages/rpm/hazelcast.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Name: hazelcast
Version: 4.2020.10
Release: 1
Summary: A tool that allows users to install & run Hazelcast IMDG and Management Center on the local environment
Summary: A tool that allows users to install & run Hazelcast and Management Center on the local environment

License: ASL 2.0
URL: https://hazelcast.org/
Expand All @@ -15,7 +15,7 @@ Requires: java-1.8.0-devel
BuildArch: noarch

%description
A tool that allows users to install & run Hazelcast IMDG and Management Center on the local environment
A tool that allows users to install & run Hazelcast and Management Center on the local environment

%prep
%setup -c %{name}-%{hzversion}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private static void runCommandLine(String[] args)
cmd.execute(args);

String version = getBuildInfo().getVersion();
cmd.getCommandSpec().usageMessage().header("Hazelcast IMDG " + version);
cmd.getCommandSpec().usageMessage().header("Hazelcast " + version);
if (args.length == 0) {
cmd.usage(out);
}
Expand All @@ -75,7 +75,7 @@ private static PrintWriter createPrintWriter(PrintStream printStream) {
public void run() {
}

@Command(description = "Starts a new Hazelcast IMDG member", mixinStandardHelpOptions = true, sortOptions = false)
@Command(description = "Starts a new Hazelcast member", mixinStandardHelpOptions = true, sortOptions = false)
void start(
@Option(names = {"-c", "--config"}, paramLabel = "<file>", description = "Use <file> for Hazelcast configuration. "
+ "Accepted formats are XML and YAML. ")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ static Config config()
} else {
config = Config.load();
}
config.getJetConfig().setEnabled(true);
String port = System.getProperty("network.port");
if (!port.equalsIgnoreCase("null")) {
config.getNetworkConfig().setPort(Integer.parseInt(port));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class VersionProvider

public String[] getVersion() {
return new String[]{"CLI tool: " + toolVersion,
"Hazelcast IMDG: " + hzVersion,
"Hazelcast: " + hzVersion,
"Hazelcast Management Center: " + mcVersion};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void test_gerVersion() {
String hzVersion = "hzVersion";
String mcVersion = "mcVersion";
String[] expected = {"CLI tool: " + toolVersion,
"Hazelcast IMDG: " + hzVersion,
"Hazelcast: " + hzVersion,
"Hazelcast Management Center: " + mcVersion};
// when
String[] version = new VersionProvider(toolVersion, hzVersion, mcVersion).getVersion();
Expand Down

0 comments on commit 99218e1

Please sign in to comment.