Merge pull request #220 from hivemq/4.6.1-release

Release 4.6.1

Author: gitseti

build.gradle

@@ -42,13 +42,13 @@ apply plugin: 'org.owasp.dependencycheck'
 javadoc.options.encoding = 'UTF-8'
 
 group = 'com.hivemq'
-version = '4.6.0' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "")
+version = '4.6.1' + (Boolean.valueOf(System.getProperty("snapshot")) ? "-SNAPSHOT" : "")
 description = 'MQTT CLI is a tool that provides a feature rich command line interface for connecting, ' +
         'publishing, subscribing, unsubscribing and disconnecting ' +
         'various MQTT clients simultaneously and supports  MQTT 5.0 and MQTT 3.1.1 '
 
-def hivemqApiVersion = '4.6.0'
-def hivemqSwarmApiVersion = '4.6.0'
+def hivemqApiVersion = '4.6.1'
+def hivemqSwarmApiVersion = '4.6.1'
 
 application {
     mainClassName = 'com.hivemq.cli.MqttCLIMain'

specs/HiveMQ-4.6.0-OpenAPI-spec.yaml renamed to specs/HiveMQ-4.6.1-OpenAPI-spec.yaml

@@ -40,7 +40,7 @@ info:
     \ client-code for multiple programming languages.\n"
   contact:
     url: https://www.hivemq.com
-  version: 4.6.0
+  version: 4.6.1
   x-logo:
     url: https://www.hivemq.com/img/svg/hivemq-bee.svg
 tags:

specs/HiveMQ-Swarm-4.6.0-OpenAPI-spec.yaml renamed to specs/HiveMQ-Swarm-4.6.1-OpenAPI-spec.yaml

@@ -20,7 +20,7 @@ info:
     \ definition that\ncan be imported into popular API tooling (e.g. Postman) or\
     \ can be used to generate client-code for multiple programming languages.\n"
   title: HiveMQ Swarm REST API
-  version: 4.6.0
+  version: 4.6.1
   x-logo:
     url: https://www.hivemq.com/img/svg/hivemq-bee.svg
 paths:

src/test/java/com/hivemq/cli/commands/swarm/run/SwarmRunStartCommandIT.java

@@ -125,7 +125,7 @@ void startScenario() throws Exception {
 
         publishesLatch.await();
         verify(out, times(1)).println("Uploading scenario from file '" + scenario.getAbsolutePath() + "'.");
-        verify(out, times(1)).println("Successfully uploaded scenario. Scenario-id: 2");
+        verify(out, times(1)).println("Successfully uploaded scenario. Scenario-id: " + 1);
         verify(out, times(1)).println("Run id: 1");
         verify(out, times(1)).println("Run status: STARTING");
     }

src/test/java/com/hivemq/cli/commands/swarm/run/SwarmRunStopCommandIT.java

@@ -142,10 +142,10 @@ void stopRun() throws Exception {
 
         final UploadScenarioRequest uploadScenarioRequest = new UploadScenarioRequest()
                 .scenarioType("XML").scenario(scenarioBase64).scenarioName("my-scenario");
-        scenariosApi.uploadScenario(uploadScenarioRequest);
+        final UploadScenarioResponse uploadScenarioResponse = scenariosApi.uploadScenario(uploadScenarioRequest);
 
         final StartRunRequest startRunRequest = new StartRunRequest();
-        startRunRequest.setScenarioId("2");
+        startRunRequest.setScenarioId(uploadScenarioResponse.getScenarioId().toString());
         runsApi.startRun(startRunRequest);
 
         // the scenario is started