From b49638690d66548a285114687b7c413a0d3de58f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 19 Jan 2018 23:49:15 +0100 Subject: [PATCH] Upgrade commons-compress to 1.15 (used by JGit) 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: If49b5de905a18d16cd66288aaafdc07e92196bb4 Signed-off-by: Matthias Sohn --- org.eclipse.egit.target/egit-4.5.target | 12 ++++++------ org.eclipse.egit.target/egit-4.5.tpd | 2 +- org.eclipse.egit.target/egit-4.6.target | 12 ++++++------ org.eclipse.egit.target/egit-4.6.tpd | 2 +- org.eclipse.egit.target/egit-4.7.target | 12 ++++++------ org.eclipse.egit.target/egit-4.7.tpd | 2 +- org.eclipse.egit.target/egit-4.8-staging.target | 12 ++++++------ org.eclipse.egit.target/egit-4.8-staging.tpd | 2 +- org.eclipse.egit.target/egit-4.8.target | 12 ++++++------ org.eclipse.egit.target/egit-4.8.tpd | 2 +- ...S20170912163609-Photon.tpd => S20180119201206-Photon.tpd} | 12 ++++++------ 11 files changed, 41 insertions(+), 41 deletions(-) rename org.eclipse.egit.target/orbit/{S20170912163609-Photon.tpd => S20180119201206-Photon.tpd} (89%) diff --git a/org.eclipse.egit.target/egit-4.5.target b/org.eclipse.egit.target/egit-4.5.target index 8c485f9c4..e5c2a000c 100644 --- a/org.eclipse.egit.target/egit-4.5.target +++ b/org.eclipse.egit.target/egit-4.5.target @@ -1,7 +1,7 @@ - + @@ -41,8 +41,8 @@ - - + + @@ -74,11 +74,11 @@ - - + + - + diff --git a/org.eclipse.egit.target/egit-4.5.tpd b/org.eclipse.egit.target/egit-4.5.tpd index e98fee7ab..c2e39a426 100644 --- a/org.eclipse.egit.target/egit-4.5.tpd +++ b/org.eclipse.egit.target/egit-4.5.tpd @@ -2,5 +2,5 @@ target "egit-4.5" with source configurePhase include "projects/jetty-9.4.8.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/R20170919201930-Oxygen.tpd" +include "orbit/S20180119201206-Photon.tpd" include "releasetrain/4.5-mars.tpd" diff --git a/org.eclipse.egit.target/egit-4.6.target b/org.eclipse.egit.target/egit-4.6.target index 14f3feccd..ec6ee95cf 100644 --- a/org.eclipse.egit.target/egit-4.6.target +++ b/org.eclipse.egit.target/egit-4.6.target @@ -1,7 +1,7 @@ - + @@ -41,8 +41,8 @@ - - + + @@ -74,11 +74,11 @@ - - + + - + diff --git a/org.eclipse.egit.target/egit-4.6.tpd b/org.eclipse.egit.target/egit-4.6.tpd index 331132c61..d37de1274 100644 --- a/org.eclipse.egit.target/egit-4.6.tpd +++ b/org.eclipse.egit.target/egit-4.6.tpd @@ -2,5 +2,5 @@ target "egit-4.6" with source configurePhase include "projects/jetty-9.4.8.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/R20170919201930-Oxygen.tpd" +include "orbit/S20180119201206-Photon.tpd" include "releasetrain/4.6-neon.tpd" diff --git a/org.eclipse.egit.target/egit-4.7.target b/org.eclipse.egit.target/egit-4.7.target index 04dadbca5..e8744d17f 100644 --- a/org.eclipse.egit.target/egit-4.7.target +++ b/org.eclipse.egit.target/egit-4.7.target @@ -1,7 +1,7 @@ - + @@ -41,8 +41,8 @@ - - + + @@ -74,11 +74,11 @@ - - + + - + diff --git a/org.eclipse.egit.target/egit-4.7.tpd b/org.eclipse.egit.target/egit-4.7.tpd index 9e056238d..5ff35b075 100644 --- a/org.eclipse.egit.target/egit-4.7.tpd +++ b/org.eclipse.egit.target/egit-4.7.tpd @@ -2,5 +2,5 @@ target "egit-4.7" with source configurePhase include "projects/jetty-9.4.8.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/R20170919201930-Oxygen.tpd" +include "orbit/S20180119201206-Photon.tpd" include "releasetrain/4.7-oxygen.tpd" diff --git a/org.eclipse.egit.target/egit-4.8-staging.target b/org.eclipse.egit.target/egit-4.8-staging.target index 75df8a037..c56beb875 100644 --- a/org.eclipse.egit.target/egit-4.8-staging.target +++ b/org.eclipse.egit.target/egit-4.8-staging.target @@ -1,7 +1,7 @@ - + @@ -41,8 +41,8 @@ - - + + @@ -74,11 +74,11 @@ - - + + - + diff --git a/org.eclipse.egit.target/egit-4.8-staging.tpd b/org.eclipse.egit.target/egit-4.8-staging.tpd index 892a83a3b..b6bef54f4 100644 --- a/org.eclipse.egit.target/egit-4.8-staging.tpd +++ b/org.eclipse.egit.target/egit-4.8-staging.tpd @@ -2,5 +2,5 @@ target "egit-4.8-staging" with source configurePhase include "projects/jetty-9.4.8.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/R20170919201930-Oxygen.tpd" +include "orbit/S20180119201206-Photon.tpd" include "releasetrain/staging.tpd" diff --git a/org.eclipse.egit.target/egit-4.8.target b/org.eclipse.egit.target/egit-4.8.target index d762e923e..b90f73681 100644 --- a/org.eclipse.egit.target/egit-4.8.target +++ b/org.eclipse.egit.target/egit-4.8.target @@ -1,7 +1,7 @@ - + @@ -41,8 +41,8 @@ - - + + @@ -74,11 +74,11 @@ - - + + - + diff --git a/org.eclipse.egit.target/egit-4.8.tpd b/org.eclipse.egit.target/egit-4.8.tpd index d47a2c11a..63d8686a6 100644 --- a/org.eclipse.egit.target/egit-4.8.tpd +++ b/org.eclipse.egit.target/egit-4.8.tpd @@ -2,5 +2,5 @@ target "egit-4.8" with source configurePhase include "projects/jetty-9.4.8.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/S20170912163609-Photon.tpd" +include "orbit/S20180119201206-Photon.tpd" include "releasetrain/4.8-photon.tpd" diff --git a/org.eclipse.egit.target/orbit/S20170912163609-Photon.tpd b/org.eclipse.egit.target/orbit/S20180119201206-Photon.tpd similarity index 89% rename from org.eclipse.egit.target/orbit/S20170912163609-Photon.tpd rename to org.eclipse.egit.target/orbit/S20180119201206-Photon.tpd index 434746496..a7c4edf42 100644 --- a/org.eclipse.egit.target/orbit/S20170912163609-Photon.tpd +++ b/org.eclipse.egit.target/orbit/S20180119201206-Photon.tpd @@ -1,7 +1,7 @@ -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" { com.google.gson [2.2.4.v201311231704,2.2.4.v201311231704] com.google.gson.source [2.2.4.v201311231704,2.2.4.v201311231704] com.jcraft.jsch [0.1.54.v20170116-1932,0.1.54.v20170116-1932] @@ -14,8 +14,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/S2017091216360 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] @@ -47,8 +47,8 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/S2017091216360 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] org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200] - 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] com.jcraft.jzlib [1.1.1.v201205102305,1.1.1.v201205102305] com.jcraft.jzlib.source [1.1.1.v201205102305,1.1.1.v201205102305] } \ No newline at end of file -- 2.11.4.GIT