From 99218e1c30b17176f0af3b64e678dd4aeca8c052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alparslan=20Avc=C4=B1?= Date: Thu, 15 Jul 2021 12:45:11 +0100 Subject: [PATCH] Removed IMDG keyword and enabled Jet by default (#94) --- .github/workflows/integration-tests.yaml | 4 ++-- .github/workflows/release.yml | 6 +++--- README.md | 6 +++--- packages/deb/hazelcast/DEBIAN/control | 2 +- packages/rpm/hazelcast.spec | 4 ++-- .../com/hazelcast/commandline/HazelcastCommandLine.java | 4 ++-- .../java/com/hazelcast/commandline/HazelcastMember.java | 1 + .../java/com/hazelcast/commandline/VersionProvider.java | 2 +- .../java/com/hazelcast/commandline/VersionProviderTest.java | 2 +- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index f3e6dd82..cfea1174 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -36,10 +36,10 @@ jobs: run: | echo "HZ_VERSION=$(grep '' pom.xml | sed "s@.*\(.*\).*@\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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2c35bf71..ffd8033f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 @@ -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 @@ -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 diff --git a/README.md b/README.md index 4816df6b..1a925d29 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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 ``` diff --git a/packages/deb/hazelcast/DEBIAN/control b/packages/deb/hazelcast/DEBIAN/control index ce02fe49..3790e32d 100644 --- a/packages/deb/hazelcast/DEBIAN/control +++ b/packages/deb/hazelcast/DEBIAN/control @@ -6,6 +6,6 @@ Priority: optional Architecture: all Depends: default-jdk | java8-sdk Maintainer: Alparslan Avci -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 diff --git a/packages/rpm/hazelcast.spec b/packages/rpm/hazelcast.spec index 96fef63f..64aeacd0 100644 --- a/packages/rpm/hazelcast.spec +++ b/packages/rpm/hazelcast.spec @@ -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/ @@ -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} diff --git a/src/main/java/com/hazelcast/commandline/HazelcastCommandLine.java b/src/main/java/com/hazelcast/commandline/HazelcastCommandLine.java index d11fdb04..e976db87 100644 --- a/src/main/java/com/hazelcast/commandline/HazelcastCommandLine.java +++ b/src/main/java/com/hazelcast/commandline/HazelcastCommandLine.java @@ -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); } @@ -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 = "", description = "Use for Hazelcast configuration. " + "Accepted formats are XML and YAML. ") diff --git a/src/main/java/com/hazelcast/commandline/HazelcastMember.java b/src/main/java/com/hazelcast/commandline/HazelcastMember.java index 0e39251b..24c14392 100644 --- a/src/main/java/com/hazelcast/commandline/HazelcastMember.java +++ b/src/main/java/com/hazelcast/commandline/HazelcastMember.java @@ -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)); diff --git a/src/main/java/com/hazelcast/commandline/VersionProvider.java b/src/main/java/com/hazelcast/commandline/VersionProvider.java index a95e80f0..923bedee 100644 --- a/src/main/java/com/hazelcast/commandline/VersionProvider.java +++ b/src/main/java/com/hazelcast/commandline/VersionProvider.java @@ -50,7 +50,7 @@ class VersionProvider public String[] getVersion() { return new String[]{"CLI tool: " + toolVersion, - "Hazelcast IMDG: " + hzVersion, + "Hazelcast: " + hzVersion, "Hazelcast Management Center: " + mcVersion}; } diff --git a/src/test/java/com/hazelcast/commandline/VersionProviderTest.java b/src/test/java/com/hazelcast/commandline/VersionProviderTest.java index dc770182..1571f503 100644 --- a/src/test/java/com/hazelcast/commandline/VersionProviderTest.java +++ b/src/test/java/com/hazelcast/commandline/VersionProviderTest.java @@ -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();