diff options
author | Matthias Sohn | 2018-12-03 02:01:54 +0000 |
---|---|---|
committer | Matthias Sohn | 2018-12-03 02:01:54 +0000 |
commit | c64c2abb7461b50c032d605c2bcf0478ce3c4280 (patch) | |
tree | 6e6d8a49ed5c6b8473f1eb10091bd09740fccebb | |
parent | fde41b3e9907290e37255dc294fc3322026c08d5 (diff) | |
parent | 436c5ca52a378f0d035e3293c20444b85c7fbb83 (diff) | |
download | egit-github-c64c2abb7461b50c032d605c2bcf0478ce3c4280.tar.gz egit-github-c64c2abb7461b50c032d605c2bcf0478ce3c4280.tar.xz egit-github-c64c2abb7461b50c032d605c2bcf0478ce3c4280.zip |
Merge branch 'stable-5.2'
* stable-5.2:
Update Orbit to S20181128170323 for 2018-12 RC1
Change-Id: Ib166bd8fe12b638c94c6d0147333dfb4b4bc886b
-rw-r--r-- | org.eclipse.mylyn.github.target/github.target | 4 | ||||
-rw-r--r-- | org.eclipse.mylyn.github.target/github.tpd | 2 | ||||
-rw-r--r-- | org.eclipse.mylyn.github.target/orbit/S20181128170323-2018-12.tpd (renamed from org.eclipse.mylyn.github.target/orbit/S20181120221132-2018-12.tpd) | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.mylyn.github.target/github.target b/org.eclipse.mylyn.github.target/github.target index 13826ec6..1ba844cc 100644 --- a/org.eclipse.mylyn.github.target/github.target +++ b/org.eclipse.mylyn.github.target/github.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde?> <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl --> -<target name="github" sequenceNumber="1542892371"> +<target name="github" sequenceNumber="1543802340"> <locations> <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit"> <unit id="org.eclipse.jetty.client" version="9.4.11.v20180605"/> @@ -91,7 +91,7 @@ <unit id="org.apache.sshd.core.source" version="2.0.0.v20181102-1323"/> <unit id="org.apache.sshd.sftp" version="2.0.0.v20181102-1323"/> <unit id="org.apache.sshd.sftp.source" version="2.0.0.v20181102-1323"/> - <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository"/> + <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20181128170323/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.mylyn.github.target/github.tpd b/org.eclipse.mylyn.github.target/github.tpd index fa598d55..9c168ec6 100644 --- a/org.eclipse.mylyn.github.target/github.tpd +++ b/org.eclipse.mylyn.github.target/github.tpd @@ -2,5 +2,5 @@ target "github" with source configurePhase include "projects/jetty-9.4.11.tpd" include "projects/swtbot-snapshot.tpd" -include "orbit/S20181120221132-2018-12.tpd" +include "orbit/S20181128170323-2018-12.tpd" include "releasetrain/4.7-oxygen.tpd"
\ No newline at end of file diff --git a/org.eclipse.mylyn.github.target/orbit/S20181120221132-2018-12.tpd b/org.eclipse.mylyn.github.target/orbit/S20181128170323-2018-12.tpd index 19643261..8771309a 100644 --- a/org.eclipse.mylyn.github.target/orbit/S20181120221132-2018-12.tpd +++ b/org.eclipse.mylyn.github.target/orbit/S20181128170323-2018-12.tpd @@ -1,7 +1,7 @@ -target "S20181120221132-2018-12" with source configurePhase +target "S20181128170323-2018-12" with source configurePhase // see http://download.eclipse.org/tools/orbit/downloads/ -location "http://download.eclipse.org/tools/orbit/downloads/drops/S20181120221132/repository" { +location "http://download.eclipse.org/tools/orbit/downloads/drops/S20181128170323/repository" { com.google.gson [2.8.2.v20180104-1110,2.8.2.v20180104-1110] com.google.gson.source [2.8.2.v20180104-1110,2.8.2.v20180104-1110] com.jcraft.jsch [0.1.54.v20170116-1932,0.1.54.v20170116-1932] |