From 13ba592fff31bd250027e572e9dd9f52190c2187 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 15 Jan 2018 09:45:38 +0900 Subject: [PATCH] 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 Signed-off-by: Matthias Sohn --- WORKSPACE | 8 ++++---- .../org.eclipse.jgit.target/jgit-4.5.target | 12 ++++++------ .../org.eclipse.jgit.target/jgit-4.5.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.6.target | 12 ++++++------ .../org.eclipse.jgit.target/jgit-4.6.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.7.target | 12 ++++++------ .../org.eclipse.jgit.target/jgit-4.7.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.8.target | 12 ++++++------ .../org.eclipse.jgit.target/jgit-4.8.tpd | 2 +- ...2163609-Photon.tpd => S20180119201206-Photon.tpd} | 12 ++++++------ org.eclipse.jgit.pgm.test/pom.xml | 5 +++++ pom.xml | 9 ++++++++- 12 files changed, 51 insertions(+), 39 deletions(-) rename org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/{S20170912163609-Photon.tpd => S20180119201206-Photon.tpd} (87%) diff --git a/WORKSPACE b/WORKSPACE index 205d467f7..ca775dbb6 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -71,14 +71,14 @@ maven_jar( maven_jar( name = "commons_compress", - artifact = "org.apache.commons:commons-compress:1.6", - sha1 = "c7d9b580aff9e9f1998361f16578e63e5c064699", + artifact = "org.apache.commons:commons-compress:1.15", + sha1 = "b686cd04abaef1ea7bc5e143c080563668eec17e", ) maven_jar( name = "tukaani_xz", - artifact = "org.tukaani:xz:1.3", - sha1 = "66db21c8484120cb6a51b5b3ea47b6f383942bec", + artifact = "org.tukaani:xz:1.6", + sha1 = "05b6f921f1810bdf90e25471968f741f87168b64", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target index cbfe7d6f7..20f1d43f5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target @@ -1,7 +1,7 @@ - + @@ -27,8 +27,8 @@ - - + + @@ -56,15 +56,15 @@ - - + + - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd index 75101f66a..192640378 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd @@ -1,7 +1,7 @@ target "jgit-4.5" with source configurePhase include "projects/jetty-9.4.8.tpd" -include "orbit/R20170919201930-Oxygen.tpd" +include "orbit/S20180119201206-Photon.tpd" location "http://download.eclipse.org/releases/mars/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target index 6ee6f0497..c092a7cbd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target @@ -1,7 +1,7 @@ - + @@ -27,8 +27,8 @@ - - + + @@ -56,15 +56,15 @@ - - + + - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd index 7de58709f..b5de3b408 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.tpd @@ -1,7 +1,7 @@ target "jgit-4.6" with source configurePhase include "projects/jetty-9.4.8.tpd" -include "orbit/R20170919201930-Oxygen.tpd" +include "orbit/S20180119201206-Photon.tpd" location "http://download.eclipse.org/releases/neon/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target index 898429fb6..4ac47fd6b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target @@ -1,7 +1,7 @@ - + @@ -27,8 +27,8 @@ - - + + @@ -56,15 +56,15 @@ - - + + - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd index 1def86c6a..abe169c9a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.tpd @@ -1,7 +1,7 @@ target "jgit-4.7" with source configurePhase include "projects/jetty-9.4.8.tpd" -include "orbit/R20170919201930-Oxygen.tpd" +include "orbit/S20180119201206-Photon.tpd" location "http://download.eclipse.org/releases/oxygen/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target index 8c4925cf5..3c07e1811 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target @@ -1,7 +1,7 @@ - + @@ -27,8 +27,8 @@ - - + + @@ -56,15 +56,15 @@ - - + + - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd index 6da22ae51..9faf56643 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd @@ -1,7 +1,7 @@ target "jgit-4.8" with source configurePhase include "projects/jetty-9.4.8.tpd" -include "orbit/S20170912163609-Photon.tpd" +include "orbit/S20180119201206-Photon.tpd" location "http://download.eclipse.org/releases/oxygen/" { org.eclipse.osgi lazy diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20170912163609-Photon.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20180119201206-Photon.tpd similarity index 87% rename from org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20170912163609-Photon.tpd rename to org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20180119201206-Photon.tpd index 6fefc4e3d..f0990d770 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20170912163609-Photon.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20180119201206-Photon.tpd @@ -1,13 +1,13 @@ -target "S20170912163609-Photon" with source configurePhase +target "S20180119201206-Photon" with source configurePhase // see http://download.eclipse.org/tools/orbit/downloads/ -location "http://download.eclipse.org/tools/orbit/downloads/drops/S20170912163609/repository" { +location "http://download.eclipse.org/tools/orbit/downloads/drops/S20180119201206/repository" { org.apache.ant [1.9.6.v201510161327,1.9.6.v201510161327] org.apache.ant.source [1.9.6.v201510161327,1.9.6.v201510161327] org.apache.commons.codec [1.9.0.v20170208-1614,1.9.0.v20170208-1614] org.apache.commons.codec.source [1.9.0.v20170208-1614,1.9.0.v20170208-1614] - org.apache.commons.compress [1.6.0.v201310281400,1.6.0.v201310281400] - org.apache.commons.compress.source [1.6.0.v201310281400,1.6.0.v201310281400] + org.apache.commons.compress [1.15.0.v20180119-1613,1.15.0.v20180119-1613] + org.apache.commons.compress.source [1.15.0.v20180119-1613,1.15.0.v20180119-1613s] org.apache.commons.logging [1.1.1.v201101211721,1.1.1.v201101211721] org.apache.commons.logging.source [1.1.1.v201101211721,1.1.1.v201101211721] org.apache.httpcomponents.httpcore [4.4.6.v20170210-0925,4.4.6.v20170210-0925] @@ -35,8 +35,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/S2017091216360 org.junit.source [4.12.0.v201504281640,4.12.0.v201504281640] javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800] - org.tukaani.xz [1.3.0.v201308270617,1.3.0.v201308270617] - org.tukaani.xz.source [1.3.0.v201308270617,1.3.0.v201308270617] + org.tukaani.xz [1.6.0.v20170629-1752,1.6.0.v20170629-1752] + org.tukaani.xz.source [1.6.0.v20170629-1752,1.6.0.v20170629-1752] org.slf4j.api [1.7.2.v20121108-1250,1.7.2.v20121108-1250] org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250] org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200] diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 3a6dad4ae..dada5670c 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -84,6 +84,11 @@ ${project.version} + + org.tukaani + xz + true + diff --git a/pom.xml b/pom.xml index 6fbe3652a..c2741bb4b 100644 --- a/pom.xml +++ b/pom.xml @@ -204,7 +204,7 @@ 4.12 1C 2.33 - 1.6 + 1.15 4.3.1 3.1.0 9.4.8.v20171121 @@ -666,6 +666,13 @@ ${commons-compress-version} + + org.tukaani + xz + 1.6 + true + + org.eclipse.jetty jetty-servlet