[archiva] branch master updated: Fixing dependency problem with jackson

[ma...@apache.org]

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 fdc99c9  Fixing dependency problem with jackson
fdc99c9 is described below

commit fdc99c99a74fc48f1354da1a3b55293bfa919ef8
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Mon Dec 14 23:16:37 2020 +0100

    Fixing dependency problem with jackson
---
 .../metadata-store-provider/metadata-store-cassandra/pom.xml      | 8 ++++++++
 pom.xml                                                           | 6 ++++++
 2 files changed, 14 insertions(+)

diff --git a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
index 5c6c4bd..0a5e7cb 100644
--- a/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/metadata/metadata-store-provider/metadata-store-cassandra/pom.xml
@@ -157,6 +157,10 @@
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
           </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+        </exclusion>
 
 
       </exclusions>
@@ -230,6 +234,10 @@
       <artifactId>netty-all</artifactId>
       <version>${netty.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
 
     <!-- Is a dependency of cassandra -> hibernate-validator and replaced by new version -->
     <dependency>
diff --git a/pom.xml b/pom.xml
index d21517a..307466d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -806,6 +806,12 @@
 
 
       <!-- START SNIPPET: rest-dependencies -->
+      
+      <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.jaxrs</groupId>
         <artifactId>jackson-jaxrs-json-provider</artifactId>