From 36a85783f3104c2d824310b6482f62aeda2bbf51 Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrn@google.com>
Date: Tue, 14 Jan 2014 15:43:20 +0100
Subject: [PATCH] Update commons-compress to 1.6

Includes various fixes, including
  o Writing TAR PAX headers failed if the generated entry name ended
    with a "/".
    Issue: COMPRESS-203.
which has been happening in the wild (java.io.IOException: request to
write '120' bytes exceeds size in header of '0' bytes for entry
'./PaxHeaders.X/hostsidetests/appsecurity/test-apps/AppAccessData/[...]/').

TODO: update orbit repository URL when new Orbit R-build is available,
see bug 425660

Change-Id: I92a87543a6ace9a06a70a29534399608cee6adb1
Signed-off-by: Jonathan Nieder <jrn@google.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
---
 .../org.eclipse.jgit.target/jgit-4.3.target                   | 4 ++--
 .../org.eclipse.jgit.target/jgit-4.4.target                   | 4 ++--
 pom.xml                                                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
index b0062bdff..2a2669d10 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target
@@ -33,8 +33,8 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20140110212915/repository/"/>
       <unit id="org.apache.ant.source" version="1.8.4.v201303080030"/>
       <unit id="org.apache.ant" version="1.8.4.v201303080030"/>
-      <unit id="org.apache.commons.compress" version="1.4.1.v201301140946"/>
-      <unit id="org.apache.commons.compress.source" version="1.4.1.v201301140946"/>
+      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+      <unit id="org.apache.commons.compress.source" version="1.6.0.v201310281400"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
       <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
index abf9e7cdd..a91997497 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target
@@ -33,8 +33,8 @@
       <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/I20140110212915/repository/"/>
       <unit id="org.apache.ant.source" version="1.9.2.v201307241445"/>
       <unit id="org.apache.ant" version="1.9.2.v201307241445"/>
-      <unit id="org.apache.commons.compress" version="1.4.1.v201301140946"/>
-      <unit id="org.apache.commons.compress.source" version="1.4.1.v201301140946"/>
+      <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+      <unit id="org.apache.commons.compress.source" version="1.6.0.v201310281400"/>
       <unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
       <unit id="org.apache.log4j.source" version="1.2.15.v201012070815"/>
       <unit id="org.kohsuke.args4j" version="2.0.21.v201301150030"/>
diff --git a/pom.xml b/pom.xml
index 950b93ef4..3545a96f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,7 @@
     <junit-version>4.11</junit-version>
     <!-- TODO: update Maven dependency for args4j to 2.0.21 as soon as available on Maven Central -->
     <args4j-version>2.0.12</args4j-version>
-    <commons-compress-version>1.4.1</commons-compress-version>
+    <commons-compress-version>1.6</commons-compress-version>
     <osgi-core-version>4.3.1</osgi-core-version>
     <servlet-api-version>2.5</servlet-api-version>
     <jetty-version>7.6.14.v20131031</jetty-version>