Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport 4.2.x] Upgrade springdocs to 1.8.0 and jackson to 2.16.2 #8379

Open
wants to merge 1 commit into
base: 4.2.x
Choose a base branch
from
Open

[Backport 4.2.x] Upgrade springdocs to 1.8.0 and jackson to 2.16.2 #8379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions services/src/main/java/org/fao/geonet/api/tools/i18n/TranslationApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion web-ui/src/main/resources/catalog/components/edit/onlinesrc/partials/linkToMd.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading