Merge branch '4.x.x-stable' into 5.1.x-stable

Author: acogoluegnes

src/main/resources/rabbitmq-ampq-client.properties renamed to src/main/resources/rabbitmq-amqp-client.properties

@@ -54,7 +54,8 @@
     ChannelAsyncCompletableFutureTest.class,
     RecoveryDelayHandlerTest.class,
     FrameBuilderTest.class,
-    PropertyFileInitialisationTest.class
+    PropertyFileInitialisationTest.class,
+    ClientVersionTest.class
 })
 public class ClientTests {
 

src/test/java/com/rabbitmq/client/test/ClientTests.java

@@ -0,0 +1,32 @@
+// Copyright (c) 2017-Present Pivotal Software, Inc.  All rights reserved.
+//
+// This software, the RabbitMQ Java client library, is triple-licensed under the
+// Mozilla Public License 1.1 ("MPL"), the GNU General Public License version 2
+// ("GPL") and the Apache License version 2 ("ASL"). For the MPL, please see
+// LICENSE-MPL-RabbitMQ. For the GPL, please see LICENSE-GPL2.  For the ASL,
+// please see LICENSE-APACHE2.
+//
+// This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND,
+// either express or implied. See the LICENSE file for specific language governing
+// rights and limitations of this software.
+//
+// If you have any questions regarding licensing, please contact us at
+// info@rabbitmq.com.
+
+package com.rabbitmq.client.test;
+
+import com.rabbitmq.client.impl.ClientVersion;
+import org.junit.Test;
+
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+public class ClientVersionTest {
+
+    @Test
+    public void clientVersion() {
+        assertThat(ClientVersion.VERSION, notNullValue());
+        assertThat(ClientVersion.VERSION, not("0.0.0"));
+    }
+}