chore(deps): upgrade json-smart to 2.4.11

This brings a fix netplex/json-smart-v2#133 https://gravitee.atlassian.net/browse/APIM-2049 (cherry picked from commit 6e85760) # Conflicts: # pom.xml
gravitee-io · Jun 21, 2023 · fd45c35 · fd45c35
1 parent 3a75ce6
commit fd45c35
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/pom.xml b/pom.xml
@@ -109,8 +109,13 @@
         <jsonassert.version>1.5.0</jsonassert.version>
         <json-patch.version>1.13</json-patch.version>
         <json-path.version>2.6.0</json-path.version>
+<<<<<<< HEAD
         <json-smart.version>2.4.9</json-smart.version>
         <jsoup.version>1.15.3</jsoup.version>
+=======
+        <json-smart.version>2.4.11</json-smart.version>
+        <jsoup.version>1.14.3</jsoup.version>
+>>>>>>> 6e857606ae (chore(deps): upgrade json-smart to 2.4.11)
         <lucene.version>7.7.3</lucene.version>
         <!-- mockito version to remove when https://github.com/gravitee-io/issues/issues/8257 will be completed -->
         <mockito-inline.version>3.11.2</mockito-inline.version>