Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2018-12-14 05:04:37 -0500
committerThomas Wolf2018-12-14 05:04:37 -0500
commit25146a4a310ad6206ff517841afba78d58134746 (patch)
treef6ed4ae6e15c63a935f22ad72abcc4b58c199c3a
parentbd7d72206b1e62f73420b0f809a7a4116a9bcc9b (diff)
parent9fcad1b4fa5d7efb51c86dcf6dc07fc4f7afb755 (diff)
downloadegit-github-25146a4a310ad6206ff517841afba78d58134746.tar.gz
egit-github-25146a4a310ad6206ff517841afba78d58134746.tar.xz
egit-github-25146a4a310ad6206ff517841afba78d58134746.zip
Merge branch 'stable-5.2'
* stable-5.2: Prepare 5.2.1-SNAPSHOT builds EGit Mylyn Github Connector v5.2.0.201812061821-r Update Orbit to R20181128170323 for 2018-12 Change-Id: Ieb6e42ec6fe5f59b464ff5d24c116e07a82eb765 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
-rw-r--r--org.eclipse.mylyn.github.target/MANIFEST.MF2
-rw-r--r--org.eclipse.mylyn.github.target/github.target4
-rw-r--r--org.eclipse.mylyn.github.target/github.tpd2
-rw-r--r--org.eclipse.mylyn.github.target/orbit/R20181128170323-2018-12.tpd (renamed from org.eclipse.mylyn.github.target/orbit/S20181128170323-2018-12.tpd)4
4 files changed, 6 insertions, 6 deletions
diff --git a/org.eclipse.mylyn.github.target/MANIFEST.MF b/org.eclipse.mylyn.github.target/MANIFEST.MF
index 3a79bd12..12bc5cd5 100644
--- a/org.eclipse.mylyn.github.target/MANIFEST.MF
+++ b/org.eclipse.mylyn.github.target/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: EGit Mylyn Github Target Platform Bundle
Bundle-SymbolicName: org.eclipse.mylyn.github.target
-Bundle-Version: 5.2.0.qualifier
+Bundle-Version: 5.3.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/org.eclipse.mylyn.github.target/github.target b/org.eclipse.mylyn.github.target/github.target
index 1ba844cc..6059610f 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="1543802340">
+<target name="github" sequenceNumber="1544020137">
<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/S20181128170323/repository"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/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 9c168ec6..dff0027f 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/S20181128170323-2018-12.tpd"
+include "orbit/R20181128170323-2018-12.tpd"
include "releasetrain/4.7-oxygen.tpd" \ No newline at end of file
diff --git a/org.eclipse.mylyn.github.target/orbit/S20181128170323-2018-12.tpd b/org.eclipse.mylyn.github.target/orbit/R20181128170323-2018-12.tpd
index 8771309a..3ab072ba 100644
--- a/org.eclipse.mylyn.github.target/orbit/S20181128170323-2018-12.tpd
+++ b/org.eclipse.mylyn.github.target/orbit/R20181128170323-2018-12.tpd
@@ -1,7 +1,7 @@
-target "S20181128170323-2018-12" with source configurePhase
+target "R20181128170323-2018-12" with source configurePhase
// see http://download.eclipse.org/tools/orbit/downloads/
-location "http://download.eclipse.org/tools/orbit/downloads/drops/S20181128170323/repository" {
+location "http://download.eclipse.org/tools/orbit/downloads/drops/R20181128170323/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]

Back to the top