Return-Path: <commits-return-1571-archive-asf-public=cust-asf.ponee.io@arrow.apache.org>
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 BEE2920049C
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Fri, 11 Aug 2017 23:16:33 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id BD14316E0DC; Fri, 11 Aug 2017 21:16:33 +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 0E46F16E0D8
	for <archive-asf-public@cust-asf.ponee.io>; Fri, 11 Aug 2017 23:16:32 +0200 (CEST)
Received: (qmail 69196 invoked by uid 500); 11 Aug 2017 21:16:32 -0000
Mailing-List: contact commits-help@arrow.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@arrow.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@arrow.apache.org>
List-Post: <mailto:commits@arrow.apache.org>
List-Id: <commits.arrow.apache.org>
Reply-To: dev@arrow.apache.org
Delivered-To: mailing list commits@arrow.apache.org
Received: (qmail 69186 invoked by uid 99); 11 Aug 2017 21:16:32 -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, 11 Aug 2017 21:16:32 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 22CF2E96B7; Fri, 11 Aug 2017 21:16:32 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: wesm@apache.org
To: commits@arrow.apache.org
Message-Id: <9efa6e040987499bb007645de31a9762@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: arrow git commit: ARROW-1242: [JAVA] - upgrade jackson to mitigate
 security vulnerabilities (take 2)
Date: Fri, 11 Aug 2017 21:16:32 +0000 (UTC)
archived-at: Fri, 11 Aug 2017 21:16:33 -0000

Repository: arrow
Updated Branches:
  refs/heads/master b795e5cff -> 214334977


ARROW-1242: [JAVA] - upgrade jackson to mitigate security vulnerabilities (take 2)

sorry, PR #929 failed to actually change the Jackson version, since the `jackson.version` variable defined in java/pom.xml is not used in java/vector/pom.xml

That's now fixed in this PR.

Author: Matt Darwin <(none)>
Author: Matt <mattdarwin@yahoo.co.uk>

Closes #957 from mattdarwin/ARROW-1242-upgrade-jackson and squashes the following commits:

ad15e5f [Matt Darwin] Merge branch 'master' into ARROW-1242-upgrade-jackson
ee29d65 [Matt Darwin] Merge branch 'master' of https://github.com/apache/arrow into ARROW-1242-upgrade-jackson
06d7745 [Matt Darwin] upgrading jackson to 2.7.9 PROPERLY this time...
284a4ce [Matt Darwin] Merge branch 'master' of https://github.com/apache/arrow
d059517 [Matt Darwin] 1242 upgraing jackson to 2.7.9
bc3b6a0 [Matt] Merge pull request #1 from apache/master


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

Branch: refs/heads/master
Commit: 214334977823f9cbe495e920eb02fe306517abd3
Parents: b795e5c
Author: Matt Darwin <(none)>
Authored: Fri Aug 11 17:16:25 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Fri Aug 11 17:16:25 2017 -0400

----------------------------------------------------------------------
 java/vector/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/21433497/java/vector/pom.xml
----------------------------------------------------------------------
diff --git a/java/vector/pom.xml b/java/vector/pom.xml
index a81bbd0..09f3d74 100644
--- a/java/vector/pom.xml
+++ b/java/vector/pom.xml
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.7.1</version>
+      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.7.1</version>
+      <version>${jackson.version}</version>
     </dependency>
     <dependency>
       <groupId>com.carrotsearch</groupId>