[archiva] branch master updated: Updating dependencies

[martin_s]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git


The following commit(s) were added to refs/heads/master by this push:
     new bc55f75  Updating dependencies
bc55f75 is described below

commit bc55f752baa4e1c86643b5c810279e1323c71ba8
Author: Martin Stockhammer <marti...@apache.org>
AuthorDate: Fri Jun 5 18:15:14 2020 +0200

    Updating dependencies
---
 archiva-modules/archiva-maven/archiva-maven-model/pom.xml | 10 +++++-----
 pom.xml                                                   | 10 ++++++++++
 status-dep.txt                                            |  1 +
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/archiva-modules/archiva-maven/archiva-maven-model/pom.xml 
b/archiva-modules/archiva-maven/archiva-maven-model/pom.xml
index 882edce..adeb235 100644
--- a/archiva-modules/archiva-maven/archiva-maven-model/pom.xml
+++ b/archiva-modules/archiva-maven/archiva-maven-model/pom.xml
@@ -36,6 +36,11 @@
   <dependencies>
 
     <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
       <version>${jackson.version}</version>
@@ -47,11 +52,6 @@
       <version>${jackson.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-      <version>20190722</version>
-    </dependency>
     <!--
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/pom.xml b/pom.xml
index 391535c..7719c8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1807,6 +1807,15 @@
         <scope>test</scope>
       </dependency>
 
+      <dependency>
+        <groupId>org.json</groupId>
+        <artifactId>json</artifactId>
+        <version>20200518</version>
+        <scope>test</scope>
+      </dependency>
+
+     
+
     </dependencies>
   </dependencyManagement>
 
@@ -1840,6 +1849,7 @@
       <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
+    
 
     <!--
     <dependency>
diff --git a/status-dep.txt b/status-dep.txt
index fa9a0d0..d49898b 100644
--- a/status-dep.txt
+++ b/status-dep.txt
@@ -42,6 +42,7 @@ archiva-modules
     archiva-maven-common
     archiva-maven-model
     archiva-maven-metadata
+    archiva-maven-model