From 0ff9ac90f987d9cffe9d90469542c58fdc750ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Luis=20Rodr=C3=ADguez=20Ponce?= Date: Thu, 8 Feb 2024 11:36:59 +0100 Subject: [PATCH] [Backport 4.2.x] Bump org.json:json from 20140107 to 20240205 (#7724) * Bump org.json:json from 20140107 to 20240205 Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20140107 to 20240205. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md) - [Commits](https://github.com/douglascrockford/JSON-java/commits) --- updated-dependencies: - dependency-name: org.json:json dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * [Backport 4.2.x] Add org.json:json to dependency management Remove the version from common/pom.xml and add the dependency to dependencyManagement section of root pom.xml. Backport #7701. * Automatic JS formatting --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- common/pom.xml | 2 -- pom.xml | 6 ++++++ .../catalog/components/metadatamanager/EditorService.js | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 47746946225..ccc521be938 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -171,8 +171,6 @@ org.json json - 20140107 - compile org.bitbucket.cowwoc diff --git a/pom.xml b/pom.xml index c2072c78681..f9d0185b263 100644 --- a/pom.xml +++ b/pom.xml @@ -1210,6 +1210,12 @@ diff-match-patch 1.2 + + + org.json + json + 20240205 + diff --git a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js index 407b5b46077..0351c77dd96 100644 --- a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js +++ b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js @@ -390,7 +390,9 @@ // and is depending on each schema. If emtpy an empty array is set. var getLayerConfiguration = function () { var configuration = angular.fromJson(getInputValue("layerConfig")) || []; - return Array.isArray(configuration) ? configuration : [configuration.resource]; + return Array.isArray(configuration) + ? configuration + : [configuration.resource]; }; var extent = [],