From ebd0dc3882d319d8fcc77fba8360a0e459d2ecc4 Mon Sep 17 00:00:00 2001
From: Ian Allen <ianwallen@hotmail.com>
Date: Wed, 27 Mar 2024 09:20:41 -0300
Subject: [PATCH] [Backport 4.2.x] Update springdoc to 1.8.0 which required
 upgrade of jackson.version to version 2.16.2 Fix springdocs HashMap mapping
 in /db/translations using new additionalPropertiesSchema

Backport of https://github.com/geonetwork/core-geonetwork/pull/7905
---
 pom.xml                                                     | 4 ++--
 .../java/org/fao/geonet/api/tools/i18n/TranslationApi.java  | 6 +++---
 .../components/edit/onlinesrc/partials/linkToMd.html        | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 93e59b89408..48aeaacab7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1584,7 +1584,7 @@
     <spring.security.version>5.7.12</spring.security.version>
     <spring.jpa.version>2.2.13.RELEASE</spring.jpa.version>
     <springboot.version>2.7.0</springboot.version>
-    <springdoc.version>1.7.0</springdoc.version>
+    <springdoc.version>1.8.0</springdoc.version>
 
     <metrics.version>2.2.0</metrics.version>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH'\:'mm'\:'ssZ</maven.build.timestamp.format>
@@ -1596,7 +1596,7 @@
     <node.version>v8.11.1</node.version>
     <npm.version>5.8.0</npm.version>
     <xmlunit.version>2.1.1</xmlunit.version>
-    <jackson.version>2.10.5</jackson.version>
+    <jackson.version>2.16.2</jackson.version>
     <flying-saucer>9.1.22</flying-saucer>
     <camel.version>2.25.1</camel.version>
     <log4j2.version>2.17.2</log4j2.version>
diff --git a/services/src/main/java/org/fao/geonet/api/tools/i18n/TranslationApi.java b/services/src/main/java/org/fao/geonet/api/tools/i18n/TranslationApi.java
index 1d667c47d1f..eb75955591d 100644
--- a/services/src/main/java/org/fao/geonet/api/tools/i18n/TranslationApi.java
+++ b/services/src/main/java/org/fao/geonet/api/tools/i18n/TranslationApi.java
@@ -275,7 +275,6 @@ public void deleteTranslations(
         }
     }
 
-
     @io.swagger.v3.oas.annotations.Operation(
         summary = "List database translations (used to overrides client application translations).")
     @GetMapping(value = "/db/translations",
@@ -289,10 +288,11 @@ public void deleteTranslations(
                 "{" +
                     "  \"translationKey1\": \"Translated Key One\",\n" +
                     "  \"translationKey2\": \"Translated Key Two\",\n" +
-                    "  \"translationKey3\": \"Translated Key Two\"\n" +
+                    "  \"translationKey3\": \"Translated Key Three\"\n" +
                     "}")
-        }, schema = @Schema(type = "{ < * >: string }"))
+        }, schema = @Schema(type = "object", additionalPropertiesSchema = String.class))
     )
+    @ResponseStatus(OK)
     @ResponseBody
     public Map<String, String> getDbTranslations(
         ServletRequest request
diff --git a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/linkToMd.html b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/linkToMd.html
index 4bad40267dc..5810ffd316d 100644
--- a/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/linkToMd.html
+++ b/web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/linkToMd.html
@@ -38,7 +38,8 @@
         ng-disabled="(selectRecords.length < 1)"
       >
         <i class="fa gn-icon-{{mode}}"></i>
-        <i class="icon-external-link"></i>&nbsp; {{btn.label || ('saveLinkToSibling' | translate)}}
+        <i class="icon-external-link"></i>&nbsp; {{btn.label || ('saveLinkToSibling' |
+        translate)}}
       </button>
       <div data-gn-need-help="linking-records" class="pull-right"></div>
     </div>