Fix conflicts in pom.xml

Author: acogoluegnes

deps/rabbitmq_stream/test/rabbit_stream_SUITE_data/pom.xml

@@ -26,21 +26,6 @@
     </developers>
 
     <properties>
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <stream-client.version>[0.7.0-SNAPSHOT,)</stream-client.version>
-        <junit.jupiter.version>5.9.0</junit.jupiter.version>
-        <assertj.version>3.23.1</assertj.version>
-        <logback.version>1.2.11</logback.version>
-        <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        <spotless.version>2.24.0</spotless.version>
-<<<<<<< HEAD
-        <google-java-format.version>1.15.0</google-java-format.version>
-=======
-=======
-=======
->>>>>>> da505242d9 (Fix conflicts in pom.xml)
         <stream-client.version>[0.12.0-SNAPSHOT,)</stream-client.version>
         <junit.jupiter.version>5.9.3</junit.jupiter.version>
         <assertj.version>3.24.2</assertj.version>
@@ -49,7 +34,6 @@
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
         <spotless.version>2.37.0</spotless.version>
         <google-java-format.version>1.17.0</google-java-format.version>
->>>>>>> 422be98e73 (Adapt stream Java tests to client 0.12.0 snapshot)
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

deps/rabbitmq_stream_management/test/http_SUITE_data/pom.xml

@@ -26,21 +26,6 @@
     </developers>
 
     <properties>
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <stream-client.version>[0.7.0-SNAPSHOT,)</stream-client.version>
-        <junit.jupiter.version>5.9.0</junit.jupiter.version>
-        <assertj.version>3.23.1</assertj.version>
-        <logback.version>1.2.11</logback.version>
-        <maven.compiler.plugin.version>3.10.1</maven.compiler.plugin.version>
-        <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        <spotless.version>2.24.0</spotless.version>
-<<<<<<< HEAD
-        <google-java-format.version>1.15.0</google-java-format.version>
-=======
-=======
-=======
->>>>>>> da505242d9 (Fix conflicts in pom.xml)
         <stream-client.version>[0.12.0-SNAPSHOT,)</stream-client.version>
         <junit.jupiter.version>5.9.3</junit.jupiter.version>
         <assertj.version>3.24.2</assertj.version>
@@ -49,7 +34,6 @@
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
         <spotless.version>2.37.0</spotless.version>
         <google-java-format.version>1.17.0</google-java-format.version>
->>>>>>> 422be98e73 (Adapt stream Java tests to client 0.12.0 snapshot)
         <okhttp.version>4.9.3</okhttp.version>
         <gson.version>2.8.9</gson.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>