Resolve a conflict (#8722)

Author: michaelklishin

deps/rabbitmq_mqtt/test/java_SUITE_data/pom.xml

@@ -12,15 +12,12 @@
   <description>Fetches test dependencies only.</description>
   <url>https://www.rabbitmq.com</url>
 
-<<<<<<< HEAD
-=======
   <properties>
-    <paho.v5.version>[1.2.5,)</paho.v5.version>
     <paho.v3.version>[1.2.5,)</paho.v3.version>
     <amqp-client.version>5.18.0</amqp-client.version>
     <junit.version>5.9.3</junit.version>
     <assertj.version>3.24.2</assertj.version>
-    <logback.version>1.2.11</logback.version>
+    <logback.version>1.2.12</logback.version>
     <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
     <groovy-maven-plugin.version>2.1.1</groovy-maven-plugin.version>
     <groovy.version>2.4.21</groovy.version>
@@ -32,7 +29,6 @@
     <groovy-scripts.dir>${basedir}/src/test/scripts</groovy-scripts.dir>
   </properties>
 
->>>>>>> 87d8460751 (Add logback dependency to MQTT Java test project)
   <dependencies>
     <dependency>
       <groupId>org.eclipse.paho</groupId>
@@ -52,8 +48,6 @@
       <version>5.9.1</version>
       <scope>test</scope>
     </dependency>
-<<<<<<< HEAD
-=======
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
@@ -66,16 +60,8 @@
       <version>${logback.version}</version>
       <scope>test</scope>
     </dependency>
-
->>>>>>> 87d8460751 (Add logback dependency to MQTT Java test project)
   </dependencies>
 
-  <properties>
-    <test-keystore.ca>${project.build.directory}/ca.keystore</test-keystore.ca>
-    <test-keystore.password>bunnychow</test-keystore.password>
-    <groovy-scripts.dir>${basedir}/src/test/scripts</groovy-scripts.dir>
-  </properties>
-
   <build>
       <plugins>
         <plugin>