You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/09/03 18:15:32 UTC

[05/11] git commit: fix jackson poms following maxmind (databind declares slightly different version of core, so don't try to override that)

fix jackson poms following maxmind (databind declares slightly different version of core, so don't try to override that)


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b8287341
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b8287341
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b8287341

Branch: refs/heads/master
Commit: b8287341ec5c1380380d702ec00a460a6750396c
Parents: a64e283
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Sep 3 14:26:32 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Sep 3 14:27:39 2014 +0100

----------------------------------------------------------------------
 camp/camp-server/pom.xml |  9 +--------
 pom.xml                  | 10 ----------
 usage/camp/pom.xml       |  6 ------
 3 files changed, 1 insertion(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b8287341/camp/camp-server/pom.xml
----------------------------------------------------------------------
diff --git a/camp/camp-server/pom.xml b/camp/camp-server/pom.xml
index 9459833..1473baf 100644
--- a/camp/camp-server/pom.xml
+++ b/camp/camp-server/pom.xml
@@ -70,20 +70,13 @@
         
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
+            <!-- jackson-core and jackson-annotations are pulled in from this, with the right version -->
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
         
         <dependency>
             <groupId>com.sun.jersey</groupId>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b8287341/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index db4af47..c2432af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -322,16 +322,6 @@
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-core</artifactId>
-                <version>${fasterxml.jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-                <version>${fasterxml.jackson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
                 <version>${fasterxml.jackson.version}</version>
             </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b8287341/usage/camp/pom.xml
----------------------------------------------------------------------
diff --git a/usage/camp/pom.xml b/usage/camp/pom.xml
index 89ebcd4..a066c14 100644
--- a/usage/camp/pom.xml
+++ b/usage/camp/pom.xml
@@ -90,12 +90,6 @@
             <optional>true</optional>
         </dependency>
         
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-
-        
         <!-- demo and tests -->
         <dependency>
             <groupId>io.brooklyn</groupId>