Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2020-06-07 20:07:37 -0400
committerMatthias Sohn2020-06-07 20:07:37 -0400
commitc1fdd42d51278180f45c250a74329926a2c0ce78 (patch)
treed0b513241f523151a15c6abbc7414066514277ca
parent68b549172f2e7c14f537d86dff9aec75a4c2bb2b (diff)
parentd1286704bc443a605325fd1577ca603f1b35d86b (diff)
downloadegit-github-c1fdd42d51278180f45c250a74329926a2c0ce78.tar.gz
egit-github-c1fdd42d51278180f45c250a74329926a2c0ce78.tar.xz
egit-github-c1fdd42d51278180f45c250a74329926a2c0ce78.zip
Merge branch 'master' into stable-5.8
* master: Update Orbit to R20200529191137 for final 2020-06 Adding the mergeableState field to pull requests Update jetty to 9.4.28.v20200408 Update Orbit to S20200519202422 and ant to 1.10.8 Change-Id: Ib95b46f3fb850f96450b27df82e656c9746f5724
-rwxr-xr-xorg.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java3
-rw-r--r--org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java18
-rw-r--r--org.eclipse.mylyn.github.target/github.target54
-rw-r--r--org.eclipse.mylyn.github.target/github.tpd2
-rw-r--r--org.eclipse.mylyn.github.target/orbit/R20200529191137-2020-06.tpd (renamed from org.eclipse.mylyn.github.target/orbit/I20200506000552.tpd)20
-rw-r--r--org.eclipse.mylyn.github.target/projects/jetty-9.4.x.tpd34
6 files changed, 76 insertions, 55 deletions
diff --git a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java
index 8f1270bb..5d5ce64b 100755
--- a/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java
+++ b/org.eclipse.egit.github.core.tests/src/org/eclipse/egit/github/core/tests/PullRequestTest.java
@@ -40,6 +40,7 @@ public class PullRequestTest {
public void defaultState() {
PullRequest request = new PullRequest();
assertNull(request.isMergeable());
+ assertNull(request.getMergeableState());
assertFalse(request.isMerged());
assertEquals(0, request.getAdditions());
assertNull(request.getBase());
@@ -81,6 +82,8 @@ public class PullRequestTest {
PullRequest request = new PullRequest();
assertTrue(request.setMerged(true).isMerged());
assertTrue(request.setMergeable(true).isMergeable());
+ assertEquals("clean", request.setMergeableState("clean")
+ .getMergeableState());
assertEquals(15, request.setAdditions(15).getAdditions());
PullRequestMarker base = new PullRequestMarker();
assertEquals(base, request.setBase(base).getBase());
diff --git a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java
index 2df4f767..c1f66720 100644
--- a/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java
+++ b/org.eclipse.egit.github.core/src/org/eclipse/egit/github/core/PullRequest.java
@@ -28,6 +28,8 @@ public class PullRequest implements Serializable {
private Boolean mergeable;
+ private String mergeableState;
+
private boolean merged;
private Date closedAt;
@@ -114,6 +116,22 @@ public class PullRequest implements Serializable {
}
/**
+ * @return mergeableState
+ */
+ public String getMergeableState() {
+ return mergeableState;
+ }
+
+ /**
+ * @param mergeableState
+ * @return this pull request
+ */
+ public PullRequest setMergeableState(String mergeableState) {
+ this.mergeableState = mergeableState;
+ return this;
+ }
+
+ /**
* @return merged
*/
public boolean isMerged() {
diff --git a/org.eclipse.mylyn.github.target/github.target b/org.eclipse.mylyn.github.target/github.target
index 7771ac76..dc94778e 100644
--- a/org.eclipse.mylyn.github.target/github.target
+++ b/org.eclipse.mylyn.github.target/github.target
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="github" sequenceNumber="1588778440">
+<target name="github" sequenceNumber="1591573599">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.client" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.client.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.continuation.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.http.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.io.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.security.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.server.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.servlet.source" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util" version="9.4.25.v20191220"/>
- <unit id="org.eclipse.jetty.util.source" version="9.4.25.v20191220"/>
- <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/"/>
+ <unit id="org.eclipse.jetty.client" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.client.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.continuation.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.http.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.io.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.security.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.server.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util" version="9.4.28.v20200408"/>
+ <unit id="org.eclipse.jetty.util.source" version="9.4.28.v20200408"/>
+ <repository id="jetty-9.4.25" location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -54,8 +54,8 @@
<unit id="net.bytebuddy.byte-buddy.source" version="1.9.0.v20181107-1410"/>
<unit id="net.i2p.crypto.eddsa" version="0.3.0.v20181102-1323"/>
<unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20181102-1323"/>
- <unit id="org.apache.ant" version="1.10.7.v20190926-0324"/>
- <unit id="org.apache.ant.source" version="1.10.7.v20190926-0324"/>
+ <unit id="org.apache.ant" version="1.10.8.v20200515-1239"/>
+ <unit id="org.apache.ant.source" version="1.10.8.v20200515-1239"/>
<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
@@ -74,12 +74,12 @@
<unit id="org.apache.sshd.sftp.source" version="2.4.0.v20200319-1547"/>
<unit id="org.assertj" version="3.14.0.v20200120-1926"/>
<unit id="org.assertj.source" version="3.14.0.v20200120-1926"/>
- <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200502-2229"/>
- <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200502-2229"/>
- <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200502-2229"/>
- <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200502-2229"/>
- <unit id="org.bouncycastle.bcprov" version="1.65.0.v20200502-2229"/>
- <unit id="org.bouncycastle.bcprov.source" version="1.65.0.v20200502-2229"/>
+ <unit id="org.bouncycastle.bcpg" version="1.65.0.v20200527-1955"/>
+ <unit id="org.bouncycastle.bcpg.source" version="1.65.0.v20200527-1955"/>
+ <unit id="org.bouncycastle.bcpkix" version="1.65.0.v20200527-1955"/>
+ <unit id="org.bouncycastle.bcpkix.source" version="1.65.0.v20200527-1955"/>
+ <unit id="org.bouncycastle.bcprov" version="1.65.1.v20200529-1514"/>
+ <unit id="org.bouncycastle.bcprov.source" version="1.65.1.v20200529-1514"/>
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
<unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
@@ -105,7 +105,7 @@
<unit id="org.slf4j.impl.log4j12.source" version="1.7.2.v20131105-2200"/>
<unit id="org.tukaani.xz" version="1.8.0.v20180207-1613"/>
<unit id="org.tukaani.xz.source" version="1.8.0.v20180207-1613"/>
- <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/I20200506000552/repository"/>
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/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 397c3701..113c136d 100644
--- a/org.eclipse.mylyn.github.target/github.tpd
+++ b/org.eclipse.mylyn.github.target/github.tpd
@@ -3,5 +3,5 @@ target "github" with source configurePhase
include "projects/jetty-9.4.x.tpd"
include "projects/license.tpd"
include "projects/swtbot-snapshot.tpd"
-include "orbit/I20200506000552.tpd"
+include "orbit/R20200529191137-2020-06.tpd"
include "releasetrain/4.7-oxygen.tpd" \ No newline at end of file
diff --git a/org.eclipse.mylyn.github.target/orbit/I20200506000552.tpd b/org.eclipse.mylyn.github.target/orbit/R20200529191137-2020-06.tpd
index 394665f5..6aabd7cb 100644
--- a/org.eclipse.mylyn.github.target/orbit/I20200506000552.tpd
+++ b/org.eclipse.mylyn.github.target/orbit/R20200529191137-2020-06.tpd
@@ -1,7 +1,7 @@
-target "I20200506000552" with source configurePhase
+target "R20200529191137-2020-06" with source configurePhase
// see https://download.eclipse.org/tools/orbit/downloads/
-location "https://download.eclipse.org/tools/orbit/downloads/drops/I20200506000552/repository" {
+location "https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/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.55.v20190404-1902,0.1.55.v20190404-1902]
@@ -23,8 +23,8 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/I202005060005
net.bytebuddy.byte-buddy.source [1.9.0.v20181107-1410,1.9.0.v20181107-1410]
net.i2p.crypto.eddsa [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323]
- org.apache.ant [1.10.7.v20190926-0324,1.10.7.v20190926-0324]
- org.apache.ant.source [1.10.7.v20190926-0324,1.10.7.v20190926-0324]
+ org.apache.ant [1.10.8.v20200515-1239,1.10.8.v20200515-1239]
+ org.apache.ant.source [1.10.8.v20200515-1239,1.10.8.v20200515-1239]
org.apache.commons.codec [1.13.0.v20200108-0001,1.13.0.v20200108-0001]
org.apache.commons.codec.source [1.13.0.v20200108-0001,1.13.0.v20200108-0001]
org.apache.commons.compress [1.19.0.v20200106-2343,1.19.0.v20200106-2343]
@@ -43,12 +43,12 @@ location "https://download.eclipse.org/tools/orbit/downloads/drops/I202005060005
org.apache.sshd.sftp.source [2.4.0.v20200319-1547,2.4.0.v20200319-1547]
org.assertj [3.14.0.v20200120-1926,3.14.0.v20200120-1926]
org.assertj.source [3.14.0.v20200120-1926,3.14.0.v20200120-1926]
- org.bouncycastle.bcpg [1.65.0.v20200502-2229,1.65.0.v20200502-2229]
- org.bouncycastle.bcpg.source [1.65.0.v20200502-2229,1.65.0.v20200502-2229]
- org.bouncycastle.bcpkix [1.65.0.v20200502-2229,1.65.0.v20200502-2229]
- org.bouncycastle.bcpkix.source [1.65.0.v20200502-2229,1.65.0.v20200502-2229]
- org.bouncycastle.bcprov [1.65.0.v20200502-2229,1.65.0.v20200502-2229]
- org.bouncycastle.bcprov.source [1.65.0.v20200502-2229,1.65.0.v20200502-2229]
+ org.bouncycastle.bcpg [1.65.0.v20200527-1955,1.65.0.v20200527-1955]
+ org.bouncycastle.bcpg.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955]
+ org.bouncycastle.bcpkix [1.65.0.v20200527-1955,1.65.0.v20200527-1955]
+ org.bouncycastle.bcpkix.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955]
+ org.bouncycastle.bcprov [1.65.1.v20200529-1514,1.65.1.v20200529-1514]
+ org.bouncycastle.bcprov.source [1.65.1.v20200529-1514,1.65.1.v20200529-1514]
org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000]
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]
diff --git a/org.eclipse.mylyn.github.target/projects/jetty-9.4.x.tpd b/org.eclipse.mylyn.github.target/projects/jetty-9.4.x.tpd
index fb9bb2d0..0eea06d6 100644
--- a/org.eclipse.mylyn.github.target/projects/jetty-9.4.x.tpd
+++ b/org.eclipse.mylyn.github.target/projects/jetty-9.4.x.tpd
@@ -1,20 +1,20 @@
target "jetty-9.4.x" with source configurePhase
-location jetty-9.4.25 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.25.v20191220/" {
- org.eclipse.jetty.client [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.client.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.continuation [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.continuation.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.http [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.http.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.io [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.io.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.security [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.security.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.server [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.server.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.servlet [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.servlet.source [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.util [9.4.25.v20191220,9.4.25.v20191220]
- org.eclipse.jetty.util.source [9.4.25.v20191220,9.4.25.v20191220]
+location jetty-9.4.25 "https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.28.v20200408/" {
+ org.eclipse.jetty.client [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.client.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.continuation [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.continuation.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.http [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.http.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.io [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.io.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.security [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.security.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.server [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.server.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.servlet [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.servlet.source [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.util [9.4.28.v20200408,9.4.28.v20200408]
+ org.eclipse.jetty.util.source [9.4.28.v20200408,9.4.28.v20200408]
}

Back to the top