Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 705F3200B87 for ; Mon, 19 Sep 2016 15:15:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6EF21160ADC; Mon, 19 Sep 2016 13:15:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AE3F7160ABC for ; Mon, 19 Sep 2016 15:15:24 +0200 (CEST) Received: (qmail 98856 invoked by uid 500); 19 Sep 2016 13:15:23 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 98836 invoked by uid 99); 19 Sep 2016 13:15:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Sep 2016 13:15:23 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9D3D0DFA9D; Mon, 19 Sep 2016 13:15:23 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: svet@apache.org To: commits@brooklyn.apache.org Date: Mon, 19 Sep 2016 13:15:24 -0000 Message-Id: <66a7200a428e4406a8128917769abe95@git.apache.org> In-Reply-To: <369100b6c98c424e891950211cfab8b3@git.apache.org> References: <369100b6c98c424e891950211cfab8b3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] brooklyn-server git commit: Closes #333 archived-at: Mon, 19 Sep 2016 13:15:25 -0000 Closes #333 Revert "Update geoip to latest version" This reverts commit e71b4d0b8d176dd16d1543466316845392e5b6a0. The change relies on jackson 2.7.5, while Brooklyn is still on 2.4.5. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a3193573 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a3193573 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a3193573 Branch: refs/heads/master Commit: a3193573b0e98222bb48190519cbc1c49bf747ea Parents: ad5b475 b4905c3 Author: Svetoslav Neykov Authored: Mon Sep 19 16:07:35 2016 +0300 Committer: Svetoslav Neykov Committed: Mon Sep 19 16:07:35 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/camp/brooklyn/AppYamlTest.java | 2 +- .../apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java | 2 +- .../brooklyn/camp/brooklyn/ConfigInheritanceYamlTest.java | 2 +- .../camp/brooklyn/ConfigLocationInheritanceYamlTest.java | 2 +- .../apache/brooklyn/camp/brooklyn/ConfigParametersYamlTest.java | 2 +- .../java/org/apache/brooklyn/camp/brooklyn/ConfigYamlTest.java | 2 +- .../brooklyn/core/mgmt/persist/XmlMementoSerializerTest.java | 2 +- .../org/apache/brooklyn/util/core/file/ArchiveUtilsTest.java | 2 +- karaf/features/src/main/feature/feature.xml | 1 + launcher/pom.xml | 4 ++++ parent/pom.xml | 5 +++++ pom.xml | 5 +++-- .../apache/brooklyn/rest/resources/LocationResourceTest.java | 2 +- 13 files changed, 22 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a3193573/karaf/features/src/main/feature/feature.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a3193573/pom.xml ----------------------------------------------------------------------