aboutsummaryrefslogtreecommitdiffstats
path: root/pom.xml
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2018-01-15 09:45:38 +0900
committerMatthias Sohn <matthias.sohn@sap.com>2018-01-19 23:43:43 +0100
commit13ba592fff31bd250027e572e9dd9f52190c2187 (patch)
tree5daee9da9509ca23f37f4156c86c7dedc92c5e1a /pom.xml
parentbd96feab2488566f2566bf7075f3a46fe2f2f92b (diff)
downloadjgit-13ba592fff31bd250027e572e9dd9f52190c2187.tar.gz
jgit-13ba592fff31bd250027e572e9dd9f52190c2187.zip
Upgrade commons-compress to 1.15
Also update xz to 1.6 as this is the version commons-compress 1.15 wants. Since xz 1.6 is an optional dependency for commons-compress we need to add a non-optional dependency to xz for org.eclipse.jgit.pgm.test since one of the tests explicitly requires xz. Related change adding commons-compress to Orbit: https://git.eclipse.org/r/#/c/115366/ CQ: 15356 CQ: 15360 Change-Id: I0d61c71bc541cc30464a0fff93775b079dd3ba88 Signed-off-by: David Pursehouse <david.pursehouse@gmail.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index 6fbe3652af..c2741bb4be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,7 @@
<junit-version>4.12</junit-version>
<test-fork-count>1C</test-fork-count>
<args4j-version>2.33</args4j-version>
- <commons-compress-version>1.6</commons-compress-version>
+ <commons-compress-version>1.15</commons-compress-version>
<osgi-core-version>4.3.1</osgi-core-version>
<servlet-api-version>3.1.0</servlet-api-version>
<jetty-version>9.4.8.v20171121</jetty-version>
@@ -667,6 +667,13 @@
</dependency>
<dependency>
+ <groupId>org.tukaani</groupId>
+ <artifactId>xz</artifactId>
+ <version>1.6</version>
+ <optional>true</optional>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty-version}</version>