Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2018-08-25 10:41:32 -0400
committerMatthias Sohn2018-08-25 10:41:32 -0400
commita3b5049bcd858888affa91c79fcba197e0033ca3 (patch)
tree81121f72a5d1c9a8ed7aff73b19e43b70151a403
parent31f43af24b0a86c93231d629d85f7c64000ed7ff (diff)
parenta6848099f599d91a610b5b6f45ead572a5f9634d (diff)
downloadegit-stable-4.10.tar.gz
egit-stable-4.10.tar.xz
egit-stable-4.10.zip
Merge branch 'stable-4.9' into stable-4.10stable-4.10
* stable-4.9: Update Photon orbit repository to R20180606145124 Change-Id: I4f2e557215d13f1332a574f70bc0ebe011e0f2bb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.target/egit-4.8.target16
-rw-r--r--org.eclipse.egit.target/egit-4.8.tpd2
-rw-r--r--org.eclipse.egit.target/orbit/R20180606145124-Photon.tpd (renamed from org.eclipse.egit.target/orbit/S20170912163609-Photon.tpd)16
3 files changed, 17 insertions, 17 deletions
diff --git a/org.eclipse.egit.target/egit-4.8.target b/org.eclipse.egit.target/egit-4.8.target
index f409322a1..b7f5eed96 100644
--- a/org.eclipse.egit.target/egit-4.8.target
+++ b/org.eclipse.egit.target/egit-4.8.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="egit-4.8" sequenceNumber="1512299021">
+<target name="egit-4.8" sequenceNumber="1535208041">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.client" version="9.4.8.v20171121"/>
@@ -47,21 +47,21 @@
<unit id="org.apache.commons.logging.source" version="1.1.1.v201101211721"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.6.v20170210-0925"/>
- <unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
- <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.2.v20170210-0925"/>
+ <unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20180410-1551"/>
+ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.2.v20180410-1551"/>
<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.33.0.v20160323-2218"/>
<unit id="org.kohsuke.args4j.source" version="2.33.0.v20160323-2218"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
- <unit id="org.hamcrest.core" version="1.3.0.v201303031735"/>
- <unit id="org.hamcrest.core.source" version="1.3.0.v201303031735"/>
+ <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
+ <unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
<unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/>
<unit id="org.hamcrest.generator.source" version="1.3.0.v201305210900"/>
<unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
<unit id="org.hamcrest.integration.source" version="1.3.0.v201305210900"/>
- <unit id="org.hamcrest.library" version="1.3.0.v201505072020"/>
- <unit id="org.hamcrest.library.source" version="1.3.0.v201505072020"/>
+ <unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
+ <unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.text.source" version="1.1.0.v20090501071000"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
@@ -76,7 +76,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.3.0.v201308270617"/>
<unit id="org.tukaani.xz.source" version="1.3.0.v201308270617"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20170912163609/repository/"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
diff --git a/org.eclipse.egit.target/egit-4.8.tpd b/org.eclipse.egit.target/egit-4.8.tpd
index d47a2c11a..8ca431c68 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/R20180606145124-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/R20180606145124-Photon.tpd
index b9bd76d09..a1c646519 100644
--- a/org.eclipse.egit.target/orbit/S20170912163609-Photon.tpd
+++ b/org.eclipse.egit.target/orbit/R20180606145124-Photon.tpd
@@ -1,7 +1,7 @@
-target "S20170912163609-Photon" with source configurePhase
+target "R20180606145124-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/R20180606145124/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]
@@ -20,21 +20,21 @@ location "http://download.eclipse.org/tools/orbit/downloads/drops/S2017091216360
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]
org.apache.httpcomponents.httpcore.source [4.4.6.v20170210-0925,4.4.6.v20170210-0925]
- org.apache.httpcomponents.httpclient [4.5.2.v20170210-0925,4.5.2.v20170210-0925]
- org.apache.httpcomponents.httpclient.source [4.5.2.v20170210-0925,4.5.2.v20170210-0925]
+ org.apache.httpcomponents.httpclient [4.5.2.v20180410-1551,4.5.2.v20180410-1551]
+ org.apache.httpcomponents.httpclient.source [4.5.2.v20180410-1551,4.5.2.v20180410-1551]
org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815]
org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815]
org.kohsuke.args4j [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
org.kohsuke.args4j.source [2.33.0.v20160323-2218,2.33.0.v20160323-2218]
org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000]
- org.hamcrest.core [1.3.0.v201303031735,1.3.0.v201303031735]
- org.hamcrest.core.source [1.3.0.v201303031735,1.3.0.v201303031735]
+ org.hamcrest.core [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
+ org.hamcrest.core.source [1.3.0.v20180420-1519,1.3.0.v20180420-1519]
org.hamcrest.generator [1.3.0.v201305210900,1.3.0.v201305210900]
org.hamcrest.generator.source [1.3.0.v201305210900,1.3.0.v201305210900]
org.hamcrest.integration [1.3.0.v201305210900,1.3.0.v201305210900]
org.hamcrest.integration.source [1.3.0.v201305210900,1.3.0.v201305210900]
- org.hamcrest.library [1.3.0.v201505072020,1.3.0.v201505072020]
- org.hamcrest.library.source [1.3.0.v201505072020,1.3.0.v201505072020]
+ org.hamcrest.library [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
+ org.hamcrest.library.source [1.3.0.v20180524-2246,1.3.0.v20180524-2246]
org.hamcrest.text [1.1.0.v20090501071000,1.1.0.v20090501071000]
org.hamcrest.text.source [1.1.0.v20090501071000,1.1.0.v20090501071000]
org.junit [4.12.0.v201504281640,4.12.0.v201504281640]

Back to the top