From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 27 Oct 2022 16:15:42 +0000 (+0200)
Subject: Bump org.json/json to 20220924
X-Git-Tag: v4.0.3~13
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F04%2F102904%2F2;p=netconf.git

Bump org.json/json to 20220924

This version is in public domain, resolving potential licensing issues
around "do no evil" restriction. Also update other testing frameworks.

Change-Id: I55c4ba72c53bad8a33ba42c712db84e8bfece57c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/restconf/restconf-nb/pom.xml b/restconf/restconf-nb/pom.xml
index 5c0fbd4fe4..77cd5aa3c2 100644
--- a/restconf/restconf-nb/pom.xml
+++ b/restconf/restconf-nb/pom.xml
@@ -257,8 +257,14 @@
     <dependency>
       <groupId>org.skyscreamer</groupId>
       <artifactId>jsonassert</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.vaadin.external.google</groupId>
+          <artifactId>android-json</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa.web</groupId>
@@ -283,13 +289,13 @@
     <dependency>
       <groupId>net.javacrumbs.json-unit</groupId>
       <artifactId>json-unit-assertj</artifactId>
-      <version>2.35.0</version>
+      <version>2.36.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20131018</version>
+      <version>20220924</version>
       <scope>test</scope>
     </dependency>
   </dependencies>