Return-Path: 
 <commits-return-1306-apmail-brooklyn-commits-archive=brooklyn.apache.org@brooklyn.incubator.apache.org>
X-Original-To: apmail-brooklyn-commits-archive@minotaur.apache.org
Delivered-To: apmail-brooklyn-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id D755611801
	for <apmail-brooklyn-commits-archive@minotaur.apache.org>;
 Wed,  3 Sep 2014 16:15:53 +0000 (UTC)
Received: (qmail 79507 invoked by uid 500); 3 Sep 2014 16:15:53 -0000
Delivered-To: apmail-brooklyn-commits-archive@brooklyn.apache.org
Received: (qmail 79485 invoked by uid 500); 3 Sep 2014 16:15:53 -0000
Mailing-List: contact commits-help@brooklyn.incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@brooklyn.incubator.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@brooklyn.incubator.apache.org>
List-Post: <mailto:commits@brooklyn.incubator.apache.org>
List-Id: <commits.brooklyn.incubator.apache.org>
Reply-To: dev@brooklyn.incubator.apache.org
Delivered-To: mailing list commits@brooklyn.incubator.apache.org
Received: (qmail 79476 invoked by uid 99); 3 Sep 2014 16:15:53 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2014 16:15:53 +0000
X-ASF-Spam-Status: No, hits=-2001.7 required=5.0
	tests=ALL_TRUSTED,RP_MATCHES_RCVD
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 03 Sep 2014 16:15:31 +0000
Received: (qmail 78341 invoked by uid 99); 3 Sep 2014 16:15:28 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2014 16:15:28 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id A27DCA064D1; Wed,  3 Sep 2014 16:15:28 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: heneveld@apache.org
To: commits@brooklyn.incubator.apache.org
Date: Wed, 03 Sep 2014 16:15:32 -0000
Message-Id: <b00152de41d3495e865401dfcac30d31@git.apache.org>
In-Reply-To: <c902e8c477404257a04fa8212d4cff3d@git.apache.org>
References: <c902e8c477404257a04fa8212d4cff3d@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [05/11] git commit: fix jackson poms following maxmind (databind
 declares slightly different version of core, so don't try to override that)
X-Virus-Checked: Checked by ClamAV on apache.org

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 <alex.heneveld@cloudsoftcorp.com>
Authored: Wed Sep 3 14:26:32 2014 +0100
Committer: Alex Heneveld <alex.heneveld@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>