Return-Path: 
 <commits-return-5027-apmail-tajo-commits-archive=tajo.apache.org@tajo.apache.org>
X-Original-To: apmail-tajo-commits-archive@minotaur.apache.org
Delivered-To: apmail-tajo-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 46DBE179DF
	for <apmail-tajo-commits-archive@minotaur.apache.org>;
 Fri, 22 Jan 2016 08:59:01 +0000 (UTC)
Received: (qmail 39499 invoked by uid 500); 22 Jan 2016 08:59:01 -0000
Delivered-To: apmail-tajo-commits-archive@tajo.apache.org
Received: (qmail 39462 invoked by uid 500); 22 Jan 2016 08:59:01 -0000
Mailing-List: contact commits-help@tajo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@tajo.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@tajo.apache.org>
List-Post: <mailto:commits@tajo.apache.org>
List-Id: <commits.tajo.apache.org>
Reply-To: dev@tajo.apache.org
Delivered-To: mailing list commits@tajo.apache.org
Received: (qmail 39453 invoked by uid 99); 22 Jan 2016 08:59:01 -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; Fri, 22 Jan 2016 08:59:01 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 011D8E0098; Fri, 22 Jan 2016 08:59:00 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jhkim@apache.org
To: commits@tajo.apache.org
Message-Id: <047babdf7a484112aeef47ce19e30fd1@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: tajo git commit: TAJO-2060: Upgrade geoip-api-java library.
Date: Fri, 22 Jan 2016 08:59:01 +0000 (UTC)

Repository: tajo
Updated Branches:
  refs/heads/master b8b7066a2 -> 4c7c71f08


TAJO-2060: Upgrade geoip-api-java library.

Closes #946

Signed-off-by: Jinho Kim <jhkim@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/4c7c71f0
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/4c7c71f0
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/4c7c71f0

Branch: refs/heads/master
Commit: 4c7c71f08a9dd2fc7596907a644c8771ccd70923
Parents: b8b7066
Author: Byunghwa Yun <combine@combineads.co.kr>
Authored: Fri Jan 22 17:57:29 2016 +0900
Committer: Jinho Kim <jhkim@apache.org>
Committed: Fri Jan 22 17:57:29 2016 +0900

----------------------------------------------------------------------
 CHANGES           | 2 ++
 tajo-core/pom.xml | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7c71f0/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 0e7978e..45be663 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,8 @@ Release 0.12.0 - unreleased
 
   IMPROVEMENT
 
+    TAJO-2060: Upgrade geoip-api-java library. (Byunghwa Yun via jinho)
+
     TAJO-2048: QueryMaster and TajoWorker should support the exception
     propagation. (jinho)
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/4c7c71f0/tajo-core/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-core/pom.xml b/tajo-core/pom.xml
index bea3486..f4e1b9e 100644
--- a/tajo-core/pom.xml
+++ b/tajo-core/pom.xml
@@ -262,9 +262,10 @@
       <artifactId>commons-codec</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.dspace.dependencies</groupId>
-      <artifactId>dspace-geoip</artifactId>
-      <version>1.2.3</version>
+      <groupId>com.maxmind.geoip</groupId>
+      <artifactId>geoip-api</artifactId>
+      <version>1.2.15</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>