Skip to content

Commit 962f131

Browse files
authored
Merge pull request #541 from car-roll/bump-ghapi
bump github-api to support new teams api
2 parents 01cb1ac + 7fb89a1 commit 962f131

File tree

5 files changed

+11
-10
lines changed

5 files changed

+11
-10
lines changed

pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
<java.level>8</java.level>
2828
<jenkins.version>2.323</jenkins.version>
2929
<useBeta>true</useBeta>
30+
<!-- TODO remove jth override when we bump the parent version -->
31+
<jenkins-test-harness.version>1706.v5257fc59612a_</jenkins-test-harness.version>
3032
</properties>
3133

3234
<scm>
@@ -39,7 +41,7 @@
3941
<dependency>
4042
<groupId>org.jenkins-ci.plugins</groupId>
4143
<artifactId>github-api</artifactId>
42-
<version>1.122</version>
44+
<version>1.303-400.v35c2d8258028</version>
4345
</dependency>
4446
<dependency>
4547
<groupId>com.coravy.hudson.plugins.github</groupId>
@@ -122,7 +124,7 @@
122124
<dependency>
123125
<groupId>io.jenkins.tools.bom</groupId>
124126
<artifactId>bom-2.289.x</artifactId>
125-
<version>1090.v0a_33df40457a_</version>
127+
<version>1280.vd669827e38cd</version>
126128
<scope>import</scope>
127129
<type>pom</type>
128130
</dependency>

src/test/resources/api/__files/body-(root)-XwEI7.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"current_user_repositories_url": "https://api.github.com/user/repos{?type,page,per_page,sort}",
2525
"starred_url": "https://api.github.com/user/starred{/owner}{/repo}",
2626
"starred_gists_url": "https://api.github.com/gists/starred",
27-
"team_url": "https://api.github.com/teams",
2827
"user_url": "https://api.github.com/users/{user}",
2928
"user_organizations_url": "https://api.github.com/user/orgs",
3029
"user_repositories_url": "https://api.github.com/users/{user}/repos{?type,page,per_page,sort}",
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"id": 1,
33
"node_id": "MDQ6VGVhbTE=",
4-
"url": "https://api.github.com/teams/1",
4+
"url": "https://api.github.com/organizations/4181899/team/1/",
55
"name": "Justice League",
66
"slug": "justice-league",
77
"description": "A great team.",
88
"privacy": "closed",
99
"permission": "admin",
10-
"members_url": "https://api.github.com/teams/1/members{/member}",
11-
"repositories_url": "https://api.github.com/teams/1/repos",
10+
"members_url": "https://api.github.com/organizations/4181899/team/1/members{/member}",
11+
"repositories_url": "https://api.github.com/organizations/4181899/teams/1/repos",
1212
"parent": null
1313
}

src/test/resources/api/mappings/mapping-body-orgs-cloudbeers-teams-repo-gOYDg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"request" : {
3-
"url" : "/teams/1/repos?per_page=100",
3+
"url" : "/organizations/4181899/team/1/repos?per_page=100",
44
"method" : "GET"
55
},
66
"response" : {

src/test/resources/api/mappings/mapping-contents-fu-nMBRw.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"method" : "GET"
77
},
88
"response" : {
9-
"status" : 301,
9+
"status" : 200,
1010
"bodyFileName" : "body-contents-fu-nMBRw.json",
1111
"headers" : {
1212
"Date" : "Wed, 24 Apr 2019 07:12:07 GMT",
1313
"Content-Type" : "application/json; charset=utf-8",
1414
"Server" : "GitHub.com",
15-
"Status" : "301 Moved Permanently",
15+
"Status" : "200 OK",
1616
"X-RateLimit-Limit" : "60",
1717
"X-RateLimit-Remaining" : "59",
1818
"X-RateLimit-Reset" : "1556093527",
@@ -29,4 +29,4 @@
2929
"X-GitHub-Request-Id" : "C1B8:23BE:6A64B8:8175F2:5CC00C46"
3030
}
3131
}
32-
}
32+
}

0 commit comments

Comments
 (0)