[brooklyn-client] 01/03: feature poms include the dependencies the feature uses

[he...@apache.org]

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

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-client.git

commit a8b7dae7d5d29dd18f0ac47cdaebdcd97885f476
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Tue Jun 2 09:39:39 2020 +0100

    feature poms include the dependencies the feature uses
    
        and tidy versions and exclusions for maven/osgi consistency
---
 java/pom.xml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/java/pom.xml b/java/pom.xml
index bb08eda..9b35bd5 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -68,6 +68,11 @@
                     <groupId>org.slf4j</groupId>
                     <artifactId>slf4j-simple</artifactId>
                 </exclusion>
+                <exclusion>
+                    <!-- use newer version, below -->
+                    <groupId>com.github.fge</groupId>
+                    <artifactId>json-patch</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -95,6 +100,36 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
+        
+        <!-- resteasy uses 1.3; but here bump to 1.4 which is Apache licensed -->
+        <dependency>
+            <groupId>com.github.fge</groupId>
+            <artifactId>json-patch</artifactId>
+            <version>1.4</version>
+        </dependency>
+        
+        <!-- ensure use of the right jackson version -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-jaxb-annotations</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>