chore: fixed merge conflicts

BoykaFramework · Oct 7, 2024 · f70c8cb · f70c8cb
2 parents 6409b7b + 77d283a
commit f70c8cb
Show file tree

Hide file tree

Showing 2 changed files with 187 additions and 139 deletions.
diff --git a/core-java/pom.xml b/core-java/pom.xml
@@ -47,7 +47,7 @@
         <ok2curl.version>0.8.0</ok2curl.version>
         <json-schema-validator.version>1.5.2</json-schema-validator.version>
         <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
-        <maven-javadoc-plugin.version>3.10.0</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.10.1</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
         <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
         <maven-dependency-plugin.version>3.8.0</maven-dependency-plugin.version>
@@ -77,12 +77,12 @@
         <sonar.version>5.14.0.18788</sonar.version>
         <sonar.maven.version>4.0.0.4121</sonar.maven.version>
         <jacoco.version>0.8.12</jacoco.version>
-        <surefire-version>3.5.0</surefire-version>
+        <surefire-version>3.5.1</surefire-version>
         <nexus.version>1.7.0</nexus.version>
         <maven.gpg.version>3.2.7</maven.gpg.version>
         <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
         <allure-testng.version>2.29.0</allure-testng.version>
-        <maven-failsafe.version>3.5.0</maven-failsafe.version>
+        <maven-failsafe.version>3.5.1</maven-failsafe.version>
         <central.sonatype>0.6.0</central.sonatype>
     </properties>