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 <svetoslav.ney...@cloudsoftcorp.com>
Authored: Mon Sep 19 16:07:35 2016 +0300
Committer: Svetoslav Neykov <svetoslav.ney...@cloudsoftcorp.com>
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
----------------------------------------------------------------------

Reply via email to