Skip to content

Commit

Permalink
[Backport 4.2.x] Bump org.json:json from 20140107 to 20240205 (#7724)
Browse files Browse the repository at this point in the history
* 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] <[email protected]>

* [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] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
juanluisrp and dependabot[bot] authored Feb 8, 2024
1 parent 1a3a2df commit 0ff9ac9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 0 additions & 2 deletions common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20140107</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bitbucket.cowwoc</groupId>
Expand Down
6 changes: 6 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,12 @@
<artifactId>diff-match-patch</artifactId>
<version>1.2</version>
</dependency>

<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20240205</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [],
Expand Down

0 comments on commit 0ff9ac9

Please sign in to comment.