From f1aaeb68ee348900c50326b9984f597d6b76eefa Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Thu, 20 Jul 2017 13:53:30 +0100
Subject: [PATCH 1/3] switched logback to version 1.2.3 to address ARROW-1240

---
 java/pom.xml       | 2 +-
 java/tools/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index 1ec3d561121..f66bff72362 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -520,7 +520,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.0.13</version>
+      <version>1.2.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 53331f2f245..87ca35be030 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-classic</artifactId>
-          <version>1.0.13</version>
+          <version>1.2.3</version>
           <scope>run</scope>
         </dependency>
     </dependencies>

From 2ab0ace1ca4cc5b7b604c4e63e03a2c4b1ea9ca0 Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Thu, 20 Jul 2017 14:25:48 +0100
Subject: [PATCH 2/3] ARROW-1242 - security - upgrade Jackson to 2.8.9

---
 java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index f66bff72362..018a393f2a7 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -33,7 +33,7 @@
     <dep.slf4j.version>1.7.6</dep.slf4j.version>
     <dep.guava.version>18.0</dep.guava.version>
     <forkCount>2</forkCount>
-    <jackson.version>2.7.1</jackson.version>
+    <jackson.version>2.8.9</jackson.version>
     <hadoop.version>2.7.1</hadoop.version>
     <checkstyle.failOnViolation>false</checkstyle.failOnViolation>
   </properties>

From 824268d385f90b1782b67c5415bb11b9a8a16eae Mon Sep 17 00:00:00 2001
From: Matt Darwin <matt.darwin@oracle.com>
Date: Thu, 20 Jul 2017 14:39:06 +0100
Subject: [PATCH 3/3] reverting logback to 1.0.13 for merge to master

---
 java/pom.xml       | 2 +-
 java/tools/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index 018a393f2a7..0bb3c3bb6a5 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -520,7 +520,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.3</version>
+      <version>1.0.13</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/java/tools/pom.xml b/java/tools/pom.xml
index 87ca35be030..53331f2f245 100644
--- a/java/tools/pom.xml
+++ b/java/tools/pom.xml
@@ -48,7 +48,7 @@
         <dependency>
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-classic</artifactId>
-          <version>1.2.3</version>
+          <version>1.0.13</version>
           <scope>run</scope>
         </dependency>
     </dependencies>