From 96a09041eea4b11ff4729748c2d78516bd0f9f46 Mon Sep 17 00:00:00 2001
From: Robbie Gemmell <robbie@apache.org>
Date: Tue, 16 Mar 2021 12:39:58 +0000
Subject: [PATCH] ARTEMIS-3183: resolve various immediate warnings at build
 start

- Remove duplicates dependency definition following e7e3c71511770442cbb206cefcae25001566d75b.
- Removes deprecated RELEASE version use, consolidate modules on single paho client version.
- Remove prerequisites entry as per warning, suggested enforcer rule already in place.
---
 artemis-protocols/artemis-amqp-protocol/pom.xml |  8 --------
 artemis-protocols/artemis-mqtt-protocol/pom.xml |  1 -
 pom.xml                                         | 10 ++++++----
 tests/integration-tests/pom.xml                 |  2 --
 tests/smoke-tests/pom.xml                       |  1 -
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/artemis-protocols/artemis-amqp-protocol/pom.xml b/artemis-protocols/artemis-amqp-protocol/pom.xml
index 4e08712fb7..1911f25253 100644
--- a/artemis-protocols/artemis-amqp-protocol/pom.xml
+++ b/artemis-protocols/artemis-amqp-protocol/pom.xml
@@ -78,14 +78,6 @@
           <artifactId>wildfly-common</artifactId>
          <scope>test</scope>
       </dependency>
-
-      <!-- this is for the log assertion -->
-      <dependency>
-         <groupId>org.apache.activemq</groupId>
-         <artifactId>artemis-commons</artifactId>
-         <version>${project.version}</version>
-      </dependency>
-
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging</artifactId>
diff --git a/artemis-protocols/artemis-mqtt-protocol/pom.xml b/artemis-protocols/artemis-mqtt-protocol/pom.xml
index 3cd49284d2..8d5dc9066e 100644
--- a/artemis-protocols/artemis-mqtt-protocol/pom.xml
+++ b/artemis-protocols/artemis-mqtt-protocol/pom.xml
@@ -113,7 +113,6 @@
       <dependency>
          <groupId>org.eclipse.paho</groupId>
          <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-         <version>1.2.0</version>
          <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/pom.xml b/pom.xml
index 8b62bdc36c..2aab82d0f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,10 +70,6 @@
    <name>ActiveMQ Artemis Parent</name>
    <url>http://apache.org/activemq</url>
 
-   <prerequisites>
-      <maven>3.1.0</maven>
-   </prerequisites>
-
    <properties>
       <modular.jdk.surefire.arg />
       <javac.version>9+181-r4173-1</javac.version>
@@ -142,6 +138,7 @@
       <surefire.version>2.22.2</surefire.version>
       <version.jaxb.api>2.3.1</version.jaxb.api>
       <version.jaxb.runtime>2.3.3</version.jaxb.runtime>
+      <paho.client.mqttv3.version>1.2.5</paho.client.mqttv3.version>
       <!-- for JakrtaEE -->
       <version.batavia>1.0.5.Final</version.batavia>
 
@@ -287,6 +284,11 @@
          </dependency>
 
          <!-- ### For MQTT Tests && Examples -->
+	 <dependency>
+           <groupId>org.eclipse.paho</groupId>
+           <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+           <version>${paho.client.mqttv3.version}</version>
+         </dependency>
          <dependency>
             <groupId>org.fusesource.mqtt-client</groupId>
             <artifactId>mqtt-client</artifactId>
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 39a93d0c14..db73ca34a6 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -29,7 +29,6 @@
 
    <properties>
       <activemq.basedir>${project.basedir}/../..</activemq.basedir>
-      <paho.client.mqttv3.version>1.2.2</paho.client.mqttv3.version>
    </properties>
 
    <dependencies>
@@ -202,7 +201,6 @@
       <dependency>
          <groupId>org.eclipse.paho</groupId>
          <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-         <version>${paho.client.mqttv3.version}</version>
       </dependency>
       <dependency>
          <groupId>org.apache.geronimo.specs</groupId>
diff --git a/tests/smoke-tests/pom.xml b/tests/smoke-tests/pom.xml
index 3f82f34048..abd693d997 100644
--- a/tests/smoke-tests/pom.xml
+++ b/tests/smoke-tests/pom.xml
@@ -118,7 +118,6 @@
       <dependency>
          <groupId>org.eclipse.paho</groupId>
          <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-         <version>RELEASE</version>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>